Convert TextSwitch to a platform specific component and rename it to CameraTextSwitch

[harmattan/cameraplus] / qml / FlashButton.qml

diff --git a/qml/FlashButton.qml b/qml/FlashButton.qml
index cabaf46..0202913 100644 (file)
--- a/qml/FlashButton.qml
+++ b/qml/FlashButton.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,48 +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 {
-        id: button
+CameraToolIcon {
+    id: button
 
-        iconSource: "image://theme/" + Data.flashIcon(settings.imageFlashMode)
+    iconSource: cameraTheme.flashIcon(settings.imageFlashMode)
 
-        property list<Item> items: [
-                Label {
-                        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
-                }]
+    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
+        }
+
+        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)
+            }
+        }
+    }
 }