X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=qml%2FImageWhiteBalanceButton.qml;h=1aa147d6796cd7a192dee1109335ddc96e8ebc9b;hb=3fa3497f2a03fcb1d483638efc831b72aac574c3;hp=e02228cf655a65084a44de743ad00594e3c981d4;hpb=0a6854919642d691208c88cf23b60bd3a553bf63;p=harmattan%2Fcameraplus

diff --git a/qml/ImageWhiteBalanceButton.qml b/qml/ImageWhiteBalanceButton.qml
index e02228c..1aa147d 100644
--- a/qml/ImageWhiteBalanceButton.qml
+++ b/qml/ImageWhiteBalanceButton.qml
@@ -22,43 +22,35 @@
 
 import QtQuick 2.0
 import QtCamera 1.0
-import "data.js" as Data
 
 CameraToolIcon {
     id: button
 
-    iconId: Data.wbIcon(settings.imageWhiteBalance)
+    iconSource: cameraTheme.whiteBalanceIcon(settings.imageWhiteBalance)
 
-    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 {
-            iconId: Data.wbIcon(WhiteBalance.Auto)
-            onClicked: settings.imageWhiteBalance = WhiteBalance.Auto
-            checked: settings.imageWhiteBalance == WhiteBalance.Auto
-        },
-        CheckButton {
-            iconId: Data.wbIcon(WhiteBalance.Sunset)
-            onClicked: settings.imageWhiteBalance = WhiteBalance.Sunset
-            checked: settings.imageWhiteBalance == WhiteBalance.Sunset
-        },
-        CheckButton {
-            iconId: Data.wbIcon(WhiteBalance.Cloudy)
-            onClicked: settings.imageWhiteBalance = WhiteBalance.Cloudy
-            checked: settings.imageWhiteBalance == WhiteBalance.Cloudy
-        },
-        CheckButton {
-            iconId: Data.wbIcon(WhiteBalance.Flourescent)
-            onClicked: settings.imageWhiteBalance = WhiteBalance.Flourescent
-            checked: settings.imageWhiteBalance == WhiteBalance.Flourescent
-        },
-        CheckButton {
-            iconId: Data.wbIcon(WhiteBalance.Tungsten)
-            onClicked: settings.imageWhiteBalance = WhiteBalance.Tungsten
-            checked: settings.imageWhiteBalance == WhiteBalance.Tungsten
         }
-    ]
+
+        Repeater {
+            model: parent != null && parent.visible ? toolsModel : undefined
+
+            delegate: CheckButton {
+                iconSource: icon
+                onClicked: settings.imageWhiteBalance = value
+                checked: settings.imageWhiteBalance == value
+            }
+        }
+    }
 }