X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=qml%2FVideoWhiteBalanceButton.qml;h=e519396d9d3cde502db701fc70cc7b3df773c17c;hb=2c2f08f3b7b82a5de3fb82a7b5a4422e5eb33692;hp=d5e73d3de65ff382abe0de6da606ed65de1bc4fe;hpb=9299fa292ded077de6e80532f3cfc79c523d7d8f;p=harmattan%2Fcameraplus

diff --git a/qml/VideoWhiteBalanceButton.qml b/qml/VideoWhiteBalanceButton.qml
index d5e73d3..e519396 100644
--- a/qml/VideoWhiteBalanceButton.qml
+++ b/qml/VideoWhiteBalanceButton.qml
@@ -20,55 +20,37 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-@IMPORT_QT_QUICK@
+import QtQuick 2.0
 import QtCamera 1.0
-import "data.js" as Data
 
 CameraToolIcon {
     id: button
 
-    iconSource: "image://theme/" + Data.wbIcon(settings.videoWhiteBalance)
+    iconId: cameraTheme.whiteBalanceIcon(settings.videoWhiteBalance)
 
-    property list<Item> items: [
+    property list<ToolsModelItem> toolsModel: [
+        ToolsModelItem {icon: cameraTheme.whiteBalanceAutoIconId; value: WhiteBalance.Auto },
+        ToolsModelItem {icon: cameraTheme.whiteBalanceSunsetIconId; value: WhiteBalance.Sunset },
+        ToolsModelItem {icon: cameraTheme.whiteBalanceCloudyIconId; value: WhiteBalance.Cloudy },
+        ToolsModelItem {icon: cameraTheme.whiteBalanceFlourescentIconId; value: WhiteBalance.Flourescent },
+        ToolsModelItem {icon: cameraTheme.whiteBalanceTungstenIconId; value: WhiteBalance.Tungsten }
+    ]
+
+    property CameraToolBarTools tools: CameraToolBarTools {
         CameraLabel {
             height: parent ? parent.height : 0
             text: qsTr("WB")
             verticalAlignment: Text.AlignVCenter
-        },
-        CheckButton {
-            normalIcon: "image://theme/" + Data.wbIcon(value)
-            checkedIcon: "image://theme/" + Data.wbSelectedIcon(value)
-            value: WhiteBalance.Auto
-            savedValue: settings.videoWhiteBalance
-            onClicked: settings.videoWhiteBalance = value
-        },
-        CheckButton {
-            normalIcon: "image://theme/" + Data.wbIcon(value)
-            checkedIcon: "image://theme/" + Data.wbSelectedIcon(value)
-            value: WhiteBalance.Sunset
-            savedValue: settings.videoWhiteBalance
-            onClicked: settings.videoWhiteBalance = value
-        },
-        CheckButton {
-            normalIcon: "image://theme/" + Data.wbIcon(value)
-            checkedIcon: "image://theme/" + Data.wbSelectedIcon(value)
-            value: WhiteBalance.Cloudy
-            savedValue: settings.videoWhiteBalance
-            onClicked: settings.videoWhiteBalance = value
-        },
-        CheckButton {
-            normalIcon: "image://theme/" + Data.wbIcon(value)
-            checkedIcon: "image://theme/" + Data.wbSelectedIcon(value)
-            value: WhiteBalance.Flourescent
-            savedValue: settings.videoWhiteBalance
-            onClicked: settings.videoWhiteBalance = value
-        },
-        CheckButton {
-            normalIcon: "image://theme/" + Data.wbIcon(value)
-            checkedIcon: "image://theme/" + Data.wbSelectedIcon(value)
-            value: WhiteBalance.Tungsten
-            savedValue: settings.videoWhiteBalance
-            onClicked: settings.videoWhiteBalance = value
         }
-    ]
+
+        Repeater {
+            model: parent != null && parent.visible ? toolsModel : undefined
+
+            delegate: CheckButton {
+                iconId: icon
+                onClicked: settings.videoWhiteBalance = value
+                checked: settings.videoWhiteBalance == value
+            }
+        }
+    }
 }