Fixed VideoPlayerPage.qml failure to set cameraConfig

[harmattan/cameraplus] / qml / VideoSceneButton.qml

diff --git a/qml/VideoSceneButton.qml b/qml/VideoSceneButton.qml
index 3e5d1d7..2ab0bc8 100644 (file)
--- a/qml/VideoSceneButton.qml
+++ b/qml/VideoSceneButton.qml
@@ -3,7 +3,7 @@
 /*!
  * This file is part of CameraPlus.
  *
- * Copyright (C) 2012 Mohammed Sameer <msameer@foolab.org>
+ * Copyright (C) 2012-2013 Mohammed Sameer <msameer@foolab.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,53 +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
 
-Selector {
-        id: button
-
-        iconSource: sceneIcon(settings.videoSceneMode);
-
-        title: qsTr("Scene mode");
-
-        function sceneIcon(val) {
-                var x = row.children.length;
-                var i = 0;
-                for (i = 0; i < x; i++) {
-                        if (row.children[i].value == val) {
-                                return row.children[i].normalIcon;
-                        }
-                }
-        }
-
-        widget: Row {
-                id: row
-                height: button.checked ? 64 : 0
-                width: button.checked ? (children.length * height) +  (children.length - 1) * spacing : 0
-                spacing: 10
-
-                Behavior on width {
-                        // TODO: seems animation is not working
-                        PropertyAnimation { duration: 250; }
-                }
-
-                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
-                }
+CameraToolIcon {
+    id: button
+
+    iconSource: "image://theme/" + Data.vsmIcon(settings.videoSceneMode)
+
+    property list<Item> items: [
+        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
         }
+    ]
 }