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

diff --git a/qml/ImageSceneButton.qml b/qml/ImageSceneButton.qml
index 5750f58..dcd4bfe 100644
--- a/qml/ImageSceneButton.qml
+++ b/qml/ImageSceneButton.qml
@@ -20,62 +20,37 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-@IMPORT_QT_QUICK@
+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
+            }
+        }
+    }
 }