X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=qml%2FImageSceneButton.qml;h=92c41fc0e133ec2679b01be3a383f511d82aacac;hb=0d891be17cf1bee5db88e1b76e83dcc7049a3b99;hp=59ba2909212c8e2516b1e603c65b7d4209d1c04e;hpb=229f607b86e1fedf49901e24eefd147005e3b833;p=harmattan%2Fcameraplus

diff --git a/qml/ImageSceneButton.qml b/qml/ImageSceneButton.qml
index 59ba290..92c41fc 100644
--- a/qml/ImageSceneButton.qml
+++ b/qml/ImageSceneButton.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,75 +20,56 @@
  * 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
+CameraToolIcon {
+    id: button
 
-        iconSource: "image://theme/" + Data.ismIcon(settings.imageSceneMode);
+    iconId: Data.ismIcon(settings.imageSceneMode)
 
-        title: qsTr("Scene mode");
-
-        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; }
-                }
+    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 {
+            iconId: Data.ismIcon(Scene.Auto)
+            onClicked: settings.imageSceneMode = Scene.Auto
+            checked: settings.imageSceneMode == 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 {
+            iconId: Data.ismIcon(Scene.Closeup)
+            onClicked: settings.imageSceneMode = Scene.Closeup
+            checked: settings.imageSceneMode == 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 {
+            iconId: Data.ismIcon(Scene.Landscape)
+            onClicked: settings.imageSceneMode = Scene.Landscape
+            checked: settings.imageSceneMode == 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 {
+            iconId: Data.ismIcon(Scene.Portrait)
+            onClicked: settings.imageSceneMode = Scene.Portrait
+            checked: settings.imageSceneMode == 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 {
+            iconId: Data.ismIcon(Scene.Night)
+            onClicked: settings.imageSceneMode = Scene.Night
+            checked: settings.imageSceneMode == 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
-                }
+        CheckButton {
+            iconId: Data.ismIcon(Scene.Sport)
+            onClicked: settings.imageSceneMode = Scene.Sport
+            checked: settings.imageSceneMode == Scene.Sport
         }
+    }
 }