X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=qml%2FImageSceneButton.qml;h=dcd4bfe7d6b9158254efb9c663548230ec3501ea;hb=1076294f16fd59f1c50bf8b1484455067978c665;hp=2393e6ec762bd2cc10c64f897a1a9b56db02fa00;hpb=d9b4d99d72de642bf77d5ccac0162a61a2fa6a62;p=harmattan%2Fcameraplus

diff --git a/qml/ImageSceneButton.qml b/qml/ImageSceneButton.qml
index 2393e6e..dcd4bfe 100644
--- a/qml/ImageSceneButton.qml
+++ b/qml/ImageSceneButton.qml
@@ -22,60 +22,35 @@
 
 import QtQuick 2.0
 import QtCamera 1.0
-import "data.js" as Data
 
 CameraToolIcon {
     id: button
 
-    iconSource: "image://theme/" + 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 {
-            normalIcon: "image://theme/" + Data.ismIcon(value)
-            checkedIcon: "image://theme/" + Data.ismSelectedIcon(value)
-            savedValue: settings.imageSceneMode
-            onClicked: settings.imageSceneMode = value
-            value: Scene.Auto
-        },
-        CheckButton {
-            normalIcon: "image://theme/" + Data.ismIcon(value)
-            checkedIcon: "image://theme/" + Data.ismSelectedIcon(value)
-            savedValue: settings.imageSceneMode
-            onClicked: settings.imageSceneMode = value
-            value: Scene.Closeup
-        },
-        CheckButton {
-            normalIcon: "image://theme/" + Data.ismIcon(value)
-            checkedIcon: "image://theme/" + Data.ismSelectedIcon(value)
-            savedValue: settings.imageSceneMode
-            onClicked: settings.imageSceneMode = value
-            value: Scene.Landscape
-        },
-        CheckButton {
-            normalIcon: "image://theme/" + Data.ismIcon(value)
-            checkedIcon: "image://theme/" + Data.ismSelectedIcon(value)
-            savedValue: settings.imageSceneMode
-            onClicked: settings.imageSceneMode = value
-            value: Scene.Portrait
-        },
-        CheckButton {
-            normalIcon: "image://theme/" + Data.ismIcon(value)
-            checkedIcon: "image://theme/" + Data.ismSelectedIcon(value)
-            savedValue: settings.imageSceneMode
-            onClicked: settings.imageSceneMode = value
-            value: Scene.Night
-        },
-        CheckButton {
-            normalIcon: "image://theme/" + Data.ismIcon(value)
-            checkedIcon: "image://theme/" + Data.ismSelectedIcon(value)
-            savedValue: settings.imageSceneMode
-            onClicked: settings.imageSceneMode = value
-            value: Scene.Sport
         }
-    ]
+
+        Repeater {
+            model: parent != null && parent.visible ? toolsModel : undefined
+
+            delegate: CheckButton {
+                iconId: icon
+                onClicked: settings.imageSceneMode = value
+                checked: settings.imageSceneMode == value
+            }
+        }
+    }
 }