X-Git-Url: http://cgit.sxemacs.org/?p=harmattan%2Fcameraplus;a=blobdiff_plain;f=qml%2FFlashButton.qml;h=02029137b628a7beefd2f54f9c6bad295ccd060f;hp=084b56e1dc232a73a6cfabb4fbd74d88342268af;hb=fe8df7dd5b30cd8eba36fefe267d94ab8b0f1ec9;hpb=349ef473e9ab563f95b9deea06d6d98717055479

diff --git a/qml/FlashButton.qml b/qml/FlashButton.qml
index 084b56e..0202913 100644
--- a/qml/FlashButton.qml
+++ b/qml/FlashButton.qml
@@ -22,46 +22,35 @@
 
 import QtQuick 2.0
 import QtCamera 1.0
-import "data.js" as Data
 
 CameraToolIcon {
     id: button
 
-    iconId: Data.flashIcon(settings.imageFlashMode)
+    iconSource: cameraTheme.flashIcon(settings.imageFlashMode)
 
-    property list<Item> items: [
+    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 {
-            normalIconId: Data.flashIcon(value)
-            checkedIconId: Data.flashPressedIcon(value)
-            onClicked: settings.imageFlashMode = value
-            value: Flash.Auto
-            savedValue: settings.imageFlashMode
-        },
-        CheckButton {
-            normalIconId: Data.flashIcon(value)
-            checkedIconId: Data.flashPressedIcon(value)
-            onClicked: settings.imageFlashMode = value
-            value: Flash.On
-            savedValue: settings.imageFlashMode
-        },
-        CheckButton {
-            normalIconId: Data.flashIcon(value)
-            checkedIconId: Data.flashPressedIcon(value)
-            onClicked: settings.imageFlashMode = value
-            value: Flash.Off
-            savedValue: settings.imageFlashMode
-        },
-        CheckButton {
-            normalIconId: Data.flashIcon(value)
-            checkedIconId: 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)
+            }
+        }
+    }
 }