Hide post capture toolbar immediately when we start video playback

[harmattan/cameraplus] / qml / VideoSceneButton.qml

diff --git a/qml/VideoSceneButton.qml b/qml/VideoSceneButton.qml
index d87d483..119be51 100644 (file)
--- a/qml/VideoSceneButton.qml
+++ b/qml/VideoSceneButton.qml
@@ -20,35 +20,32 @@
  * 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)
+    iconId: Data.vsmIcon(settings.videoSceneMode)
 
-    property list<Item> items: [
-        Label {
+    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
-        },
+            iconId: Data.vsmIcon(Scene.Auto)
+            onClicked: settings.videoSceneMode = Scene.Auto
+            checked: settings.videoSceneMode == 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
+            iconId: Data.vsmIcon(Scene.Night)
+            onClicked: settings.videoSceneMode = Scene.Night
+            checked: settings.videoSceneMode == Scene.Night
         }
-    ]
+    }
 }