Convert TextSwitch to a platform specific component and rename it to CameraTextSwitch

[harmattan/cameraplus] / qml / VideoWhiteBalanceButton.qml

diff --git a/qml/VideoWhiteBalanceButton.qml b/qml/VideoWhiteBalanceButton.qml
index d7c49e4..8867db2 100644 (file)
--- a/qml/VideoWhiteBalanceButton.qml
+++ b/qml/VideoWhiteBalanceButton.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.videoWhiteBalance)
+    iconSource: 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 {
-            iconId: Data.wbIcon(WhiteBalance.Auto)
-            onClicked: settings.videoWhiteBalance = WhiteBalance.Auto
-            checked: settings.videoWhiteBalance == WhiteBalance.Auto
-        },
-        CheckButton {
-            iconId: Data.wbIcon(WhiteBalance.Sunset)
-            onClicked: settings.videoWhiteBalance = WhiteBalance.Sunset
-            checked: settings.videoWhiteBalance == WhiteBalance.Sunset
-        },
-        CheckButton {
-            iconId: Data.wbIcon(WhiteBalance.Cloudy)
-            onClicked: settings.videoWhiteBalance = WhiteBalance.Cloudy
-            checked: settings.videoWhiteBalance == WhiteBalance.Cloudy
-        },
-        CheckButton {
-            iconId: Data.wbIcon(WhiteBalance.Flourescent)
-            onClicked: settings.videoWhiteBalance = WhiteBalance.Flourescent
-            checked: settings.videoWhiteBalance == WhiteBalance.Flourescent
-        },
-        CheckButton {
-            iconId: Data.wbIcon(WhiteBalance.Tungsten)
-            onClicked: settings.videoWhiteBalance = WhiteBalance.Tungsten
-            checked: settings.videoWhiteBalance == WhiteBalance.Tungsten
         }
-    ]
+
+        Repeater {
+            model: parent != null && parent.visible ? toolsModel : undefined
+
+            delegate: CheckButton {
+                iconSource: icon
+                onClicked: settings.videoWhiteBalance = value
+                checked: settings.videoWhiteBalance == value
+            }
+        }
+    }
 }