Reworked how we create items for toolbar.

[harmattan/cameraplus] / qml / VideoSceneButton.qml

diff --git a/qml/VideoSceneButton.qml b/qml/VideoSceneButton.qml
index 119be51..5a217ea 100644 (file)
--- a/qml/VideoSceneButton.qml
+++ b/qml/VideoSceneButton.qml
@@ -29,6 +29,11 @@ CameraToolIcon {
 
     iconId: Data.vsmIcon(settings.videoSceneMode)
 
+    property list<ToolsModelItem> toolsModel: [
+        ToolsModelItem {icon: cameraTheme.videoSceneModeAutoIconId; value: Scene.Auto},
+        ToolsModelItem {icon: cameraTheme.videoSceneModeNightIconId; value: Scene.Night}
+    ]
+
     property CameraToolBarTools tools: CameraToolBarTools {
         CameraLabel {
             height: parent ? parent.height : 0
@@ -36,16 +41,14 @@ CameraToolIcon {
             verticalAlignment: Text.AlignVCenter
         }
 
-        CheckButton {
-            iconId: Data.vsmIcon(Scene.Auto)
-            onClicked: settings.videoSceneMode = Scene.Auto
-            checked: settings.videoSceneMode == Scene.Auto
-        }
+        Repeater {
+            model: parent != null && parent.visible ? toolsModel : undefined
 
-        CheckButton {
-            iconId: Data.vsmIcon(Scene.Night)
-            onClicked: settings.videoSceneMode = Scene.Night
-            checked: settings.videoSceneMode == Scene.Night
+            delegate: CheckButton {
+                iconId: icon
+                onClicked: settings.videoSceneMode = value
+                checked: settings.videoSceneMode == value
+            }
         }
     }
 }