X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=qml%2FImageSceneButton.qml;h=dcd4bfe7d6b9158254efb9c663548230ec3501ea;hb=0bcc5e36c09c707add18c70e2a95317d7db8b271;hp=7321a0ca7ad60cf2d45da9ea2eca8f5eceaa2c2d;hpb=0a6854919642d691208c88cf23b60bd3a553bf63;p=harmattan%2Fcameraplus

diff --git a/qml/ImageSceneButton.qml b/qml/ImageSceneButton.qml
index 7321a0c..dcd4bfe 100644
--- a/qml/ImageSceneButton.qml
+++ b/qml/ImageSceneButton.qml
@@ -22,48 +22,35 @@
 
 import QtQuick 2.0
 import QtCamera 1.0
-import "data.js" as Data
 
 CameraToolIcon {
     id: button
 
-    iconId: Data.ismIcon(settings.imageSceneMode)
+    iconId: cameraTheme.imageSceneModeIcon(settings.imageSceneMode)
+    property list<ToolsModelItem> toolsModel: [
+        ToolsModelItem {icon: cameraTheme.imageSceneModeAutoIconId; value: Scene.Auto},
+        ToolsModelItem {icon: cameraTheme.imageSceneModeCloseupIconId; value: Scene.Closeup},
+        ToolsModelItem {icon: cameraTheme.imageSceneModeLandscapeIconId; value: Scene.Landscape},
+        ToolsModelItem {icon: cameraTheme.imageSceneModePortraitIconId; value: Scene.Portrait},
+        ToolsModelItem {icon: cameraTheme.imageSceneModeNightIconId; value: Scene.Night},
+        ToolsModelItem {icon: cameraTheme.imageSceneModeSportIconId; value: Scene.Sport}
+    ]
 
-    property list<Item> items: [
+    property CameraToolBarTools tools: CameraToolBarTools {
         CameraLabel {
             height: parent ? parent.height : 0
             text: qsTr("Scene")
             verticalAlignment: Text.AlignVCenter
-        },
-        CheckButton {
-            iconId: Data.ismIcon(Scene.Auto)
-            onClicked: settings.imageSceneMode = Scene.Auto
-            checked: settings.imageSceneMode == Scene.Auto
-        },
-        CheckButton {
-            iconId: Data.ismIcon(Scene.Closeup)
-            onClicked: settings.imageSceneMode = Scene.Closeup
-            checked: settings.imageSceneMode == Scene.Closeup
-        },
-        CheckButton {
-            iconId: Data.ismIcon(Scene.Landscape)
-            onClicked: settings.imageSceneMode = Scene.Landscape
-            checked: settings.imageSceneMode == Scene.Landscape
-        },
-        CheckButton {
-            iconId: Data.ismIcon(Scene.Portrait)
-            onClicked: settings.imageSceneMode = Scene.Portrait
-            checked: settings.imageSceneMode == Scene.Portrait
-        },
-        CheckButton {
-            iconId: Data.ismIcon(Scene.Night)
-            onClicked: settings.imageSceneMode = Scene.Night
-            checked: settings.imageSceneMode == Scene.Night
-        },
-        CheckButton {
-            iconId: Data.ismIcon(Scene.Sport)
-            onClicked: settings.imageSceneMode = Scene.Sport
-            checked: settings.imageSceneMode == Scene.Sport
         }
-    ]
+
+        Repeater {
+            model: parent != null && parent.visible ? toolsModel : undefined
+
+            delegate: CheckButton {
+                iconId: icon
+                onClicked: settings.imageSceneMode = value
+                checked: settings.imageSceneMode == value
+            }
+        }
+    }
 }