X-Git-Url: http://cgit.sxemacs.org/?p=harmattan%2Fcameraplus;a=blobdiff_plain;f=qml%2FFlashButton.qml;h=02029137b628a7beefd2f54f9c6bad295ccd060f;hp=2f5497b63e3de26671ff9758bb990bd2918da486;hb=e5ae33a4ee7a287d9790ea92e270a4d0fd4c4554;hpb=8948cca8d885c3d54e9f3e4c781735520fa6b6eb

diff --git a/qml/FlashButton.qml b/qml/FlashButton.qml
index 2f5497b..0202913 100644
--- a/qml/FlashButton.qml
+++ b/qml/FlashButton.qml
@@ -20,49 +20,37 @@
  * 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.flashIcon(settings.imageFlashMode)
+    iconSource: cameraTheme.flashIcon(settings.imageFlashMode)
 
-    property list<Item> items: [
-        Label {
+    property list<ToolsModelItem> toolsModel: [
+        ToolsModelItem {icon: cameraTheme.flashAutoIconId; value: Flash.Auto },
+        ToolsModelItem {icon: cameraTheme.flashOnIconId; value: Flash.On },
+        ToolsModelItem {icon: cameraTheme.flashOffIconId; value: Flash.Off },
+        ToolsModelItem {icon: cameraTheme.flashRedEyeIconId; value: Flash.RedEye }
+    ]
+
+    property CameraToolBarTools tools: CameraToolBarTools {
+        CameraLabel {
             height: parent ? parent.height : 0
             text: qsTr("Flash")
             verticalAlignment: Text.AlignVCenter
-        },
-        CheckButton {
-            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/" + Data.flashIcon(value)
-            checkedIcon: "image://theme/" + Data.flashPressedIcon(value)
-            onClicked: settings.imageFlashMode = value
-            value: Flash.On
-            savedValue: settings.imageFlashMode
-        },
-        CheckButton {
-            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/" + Data.flashIcon(value)
-            checkedIcon: "image://theme/" + Data.flashPressedIcon(value)
-            onClicked: settings.imageFlashMode = value
-            value: Flash.RedEye
-            savedValue: settings.imageFlashMode
         }
-    ]
+
+        Repeater {
+            model: parent != null && parent.visible ? toolsModel : undefined
+
+            delegate: CheckButton {
+                iconSource: icon
+                onClicked: settings.imageFlashMode = value
+                checked: settings.imageFlashMode == value
+                visible: !(overlay.cam.quirks.hasQuirk(Quirks.NoRedEyeFlash) && value == Flash.RedEye)
+            }
+        }
+    }
 }