X-Git-Url: http://cgit.sxemacs.org/?p=harmattan%2Fcameraplus;a=blobdiff_plain;f=qml%2FVideoSceneButton.qml;h=b08fb8f2ea344a91ff15229c77ee3ad42b64d9a0;hp=d87d4830d430f996ba01ad69db2dd253dceffa56;hb=b37d0ab04228a193a8302417f0657a73c8fdbd3f;hpb=8948cca8d885c3d54e9f3e4c781735520fa6b6eb

diff --git a/qml/VideoSceneButton.qml b/qml/VideoSceneButton.qml
index d87d483..b08fb8f 100644
--- a/qml/VideoSceneButton.qml
+++ b/qml/VideoSceneButton.qml
@@ -20,35 +20,34 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-import QtQuick 1.1
-import com.nokia.meego 1.1
+import QtQuick 2.0
 import QtCamera 1.0
-import "data.js" as Data
 
-ToolIcon {
+CameraToolIcon {
     id: button
 
-    iconSource: "image://theme/" + Data.vsmIcon(settings.videoSceneMode)
+    iconSource: cameraTheme.videoSceneModeIcon(settings.videoSceneMode)
 
-    property list<Item> items: [
-        Label {
+    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
             text: qsTr("Scene")
             verticalAlignment: Text.AlignVCenter
-        },
-        CheckButton {
-            normalIcon: "image://theme/" + Data.vsmIcon(value)
-            checkedIcon: "image://theme/" + Data.vsmSelectedIcon(value)
-            savedValue: settings.videoSceneMode
-            onClicked: settings.videoSceneMode = value
-            value: Scene.Auto
-        },
-        CheckButton {
-            normalIcon: "image://theme/" + Data.vsmIcon(value)
-            checkedIcon: "image://theme/" + Data.vsmSelectedIcon(value)
-            savedValue: settings.videoSceneMode
-            onClicked: settings.videoSceneMode = value
-            value: Scene.Night
         }
-    ]
+
+        Repeater {
+            model: parent != null && parent.visible ? toolsModel : undefined
+
+            delegate: CheckButton {
+                iconSource: icon
+                onClicked: settings.videoSceneMode = value
+                checked: settings.videoSceneMode == value
+            }
+        }
+    }
 }