Reworked ModeButton to use a Switch

[harmattan/cameraplus] / qml / ImageSceneButton.qml

diff --git a/qml/ImageSceneButton.qml b/qml/ImageSceneButton.qml
index 78640ec..59ba290 100644 (file)
--- a/qml/ImageSceneButton.qml
+++ b/qml/ImageSceneButton.qml
@@ -1,27 +1,37 @@
 // -*- qml -*-
+
+/*!
+ * This file is part of CameraPlus.
+ *
+ * Copyright (C) 2012 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
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
 import QtQuick 1.1
 import com.nokia.meego 1.1
 import QtCamera 1.0
+import "data.js" as Data
 
 Selector {
         id: button
 
-        property int value: settings.imageSceneMode
-
-        iconSource: sceneIcon(scene.value);
+        iconSource: "image://theme/" + Data.ismIcon(settings.imageSceneMode);
 
         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
@@ -34,48 +44,48 @@ Selector {
                 }
 
                 CheckButton {
-                        normalIcon: "image://theme/icon-m-camera-scene-auto"
-                        checkedIcon: "image://theme/icon-m-camera-scene-auto-selected"
+                        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/icon-m-camera-scene-macro"
-                        checkedIcon: "image://theme/icon-m-camera-scene-macro-selected"
+                        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/icon-m-camera-scene-landscape"
-                        checkedIcon: "image://theme/icon-m-camera-scene-landscape-selected"
+                        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/icon-m-camera-scene-portrait"
-                        checkedIcon: "image://theme/icon-m-camera-scene-portrait-selected"
+                        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/icon-m-camera-night"
-                        checkedIcon: "image://theme/icon-m-camera-night-selected"
+                        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/icon-m-camera-scene-sports"
-                        checkedIcon: "image://theme/icon-m-camera-scene-sports-selected"
+                        normalIcon: "image://theme/" + Data.ismIcon(value);
+                        checkedIcon: "image://theme/" + Data.ismSelectedIcon(value);
                         savedValue: settings.imageSceneMode
                         onClicked: settings.imageSceneMode = value;
                         value: Scene.Sport