X-Git-Url: http://cgit.sxemacs.org/?p=harmattan%2Fcameraplus;a=blobdiff_plain;f=qml%2FImageWhiteBalanceButton.qml;h=1aa147d6796cd7a192dee1109335ddc96e8ebc9b;hp=55290e9194d6289a03d03155e82ec5f5b3a464bf;hb=19c9b1ccce5430c6d001ee0c28f25a585817da5f;hpb=bb079e0dff5557e811af63194a86a5d6548b4cfd

diff --git a/qml/ImageWhiteBalanceButton.qml b/qml/ImageWhiteBalanceButton.qml
index 55290e9..1aa147d 100644
--- a/qml/ImageWhiteBalanceButton.qml
+++ b/qml/ImageWhiteBalanceButton.qml
@@ -20,56 +20,37 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-@IMPORT_QT_QUICK@
-import com.nokia.meego 1.1
+import QtQuick 2.0
 import QtCamera 1.0
-import "data.js" as Data
 
-ToolIcon {
+CameraToolIcon {
     id: button
 
-    iconSource: "image://theme/" + Data.wbIcon(settings.imageWhiteBalance)
+    iconSource: cameraTheme.whiteBalanceIcon(settings.imageWhiteBalance)
 
-    property list<Item> items: [
-        Label {
+    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)
-            onClicked: settings.imageWhiteBalance = value
-            value: WhiteBalance.Auto
-            savedValue: settings.imageWhiteBalance
-        },
-        CheckButton {
-            normalIcon: "image://theme/" + Data.wbIcon(value)
-            checkedIcon: "image://theme/" + Data.wbSelectedIcon(value)
-            onClicked: settings.imageWhiteBalance = value
-            value: WhiteBalance.Sunset
-            savedValue: settings.imageWhiteBalance
-        },
-        CheckButton {
-            normalIcon: "image://theme/" + Data.wbIcon(value)
-            checkedIcon: "image://theme/" + Data.wbSelectedIcon(value)
-            onClicked: settings.imageWhiteBalance = value
-            value: WhiteBalance.Cloudy
-            savedValue: settings.imageWhiteBalance
-        },
-        CheckButton {
-            normalIcon: "image://theme/" + Data.wbIcon(value)
-            checkedIcon: "image://theme/" + Data.wbSelectedIcon(value)
-            onClicked: settings.imageWhiteBalance = value
-            value: WhiteBalance.Flourescent
-            savedValue: settings.imageWhiteBalance
-        },
-        CheckButton {
-            normalIcon: "image://theme/" + Data.wbIcon(value)
-            checkedIcon: "image://theme/" + Data.wbSelectedIcon(value)
-            onClicked: settings.imageWhiteBalance = value
-            value: WhiteBalance.Tungsten
-            savedValue: settings.imageWhiteBalance
         }
-    ]
+
+        Repeater {
+            model: parent != null && parent.visible ? toolsModel : undefined
+
+            delegate: CheckButton {
+                iconSource: icon
+                onClicked: settings.imageWhiteBalance = value
+                checked: settings.imageWhiteBalance == value
+            }
+        }
+    }
 }