X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=qml%2FFlashButton.qml;h=9582323c19598fdcee099632ca9b55678bc8714b;hb=960eb792acde51e3e0b862c19d58acaf3082c500;hp=80034b0732edba4dca9e39b69b8fe0f1bc9bd5c4;hpb=b49c9adf02cc8fdd2157f4205cdf5731b63f876a;p=harmattan%2Fcameraplus

diff --git a/qml/FlashButton.qml b/qml/FlashButton.qml
index 80034b0..9582323 100644
--- a/qml/FlashButton.qml
+++ b/qml/FlashButton.qml
@@ -1,71 +1,67 @@
 // -*- qml -*-
+
+/*!
+ * This file is part of CameraPlus.
+ *
+ * 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
+ * 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 {
+ToolIcon {
         id: button
 
-        property alias value: flash.value
-
-        iconSource: flashIcon(flash.value);
-
-        title: qsTr("Flash mode");
-
-        Flash {
-                id: flash
-                camera: cam
-                // TODO: hardcoding
-                value: Flash.Auto
-        }
-
-        function flashIcon(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; }
-                }
+        iconSource: "image://theme/" + Data.flashIcon(settings.imageFlashMode)
 
+        property list<Item> items: [
+                Label {
+                        height: parent ? parent.height : 0
+                        text: qsTr("Flash");
+                        verticalAlignment: Text.AlignVCenter
+                },
                 CheckButton {
-                        normalIcon: "image://theme/icon-m-camera-flash-auto"
-                        checkedIcon: "image://theme/icon-m-camera-flash-auto-pressed"
-                        controller: flash
+                        normalIcon: "image://theme/" + Data.flashIcon(value)
+                        checkedIcon: "image://theme/" + Data.flashPressedIcon(value)
+                        onClicked: settings.imageFlashMode = value;
                         value: Flash.Auto
-                }
-
+                        savedValue: settings.imageFlashMode
+                },
                 CheckButton {
-                        normalIcon: "image://theme/icon-m-camera-flash-always"
-                        checkedIcon: "image://theme/icon-m-camera-flash-always-pressed"
-                        controller: flash
+                        normalIcon: "image://theme/" + Data.flashIcon(value)
+                        checkedIcon: "image://theme/" + Data.flashPressedIcon(value)
+                        onClicked: settings.imageFlashMode = value;
                         value: Flash.On
-                }
-
+                        savedValue: settings.imageFlashMode
+                },
                 CheckButton {
-                        normalIcon: "image://theme/icon-m-camera-flash-off"
-                        checkedIcon: "image://theme/icon-m-camera-flash-off-pressed"
-                        controller: flash
+                        normalIcon: "image://theme/" + Data.flashIcon(value)
+                        checkedIcon: "image://theme/" + Data.flashPressedIcon(value)
+                        onClicked: settings.imageFlashMode = value;
                         value: Flash.Off
-                }
-
+                        savedValue: settings.imageFlashMode
+                },
                 CheckButton {
-                        normalIcon: "image://theme/icon-m-camera-flash-red-eye"
-                        checkedIcon: "image://theme/icon-m-camera-flash-red-eye-pressed"
-                        controller: flash
+                        normalIcon: "image://theme/" + Data.flashIcon(value)
+                        checkedIcon: "image://theme/" + Data.flashPressedIcon(value)
+                        onClicked: settings.imageFlashMode = value;
                         value: Flash.RedEye
-                }
-        }
+                        savedValue: settings.imageFlashMode
+                }]
 }