Reworked preview animation

[harmattan/cameraplus] / qml / ImageWhiteBalanceButton.qml

diff --git a/qml/ImageWhiteBalanceButton.qml b/qml/ImageWhiteBalanceButton.qml
index 8c98279..1aa147d 100644 (file)
--- a/qml/ImageWhiteBalanceButton.qml
+++ b/qml/ImageWhiteBalanceButton.qml
@@ -22,12 +22,19 @@
 
 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<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 {
@@ -36,34 +43,14 @@ CameraToolIcon {
             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
-        }
+        Repeater {
+            model: parent != null && parent.visible ? toolsModel : undefined
 
-        CheckButton {
-            iconId: Data.wbIcon(WhiteBalance.Tungsten)
-            onClicked: settings.imageWhiteBalance = WhiteBalance.Tungsten
-            checked: settings.imageWhiteBalance == WhiteBalance.Tungsten
+            delegate: CheckButton {
+                iconSource: icon
+                onClicked: settings.imageWhiteBalance = value
+                checked: settings.imageWhiteBalance == value
+            }
         }
     }
 }