Reworked preview animation

[harmattan/cameraplus] / qml / ImageSceneButton.qml

diff --git a/qml/ImageSceneButton.qml b/qml/ImageSceneButton.qml
index f30716b..54ca4fb 100644 (file)
--- a/qml/ImageSceneButton.qml
+++ b/qml/ImageSceneButton.qml
@@ -20,62 +20,38 @@
  * 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.ismIcon(settings.imageSceneMode);
+    iconSource: cameraTheme.imageSceneModeIcon(settings.imageSceneMode)
+    property list<ToolsModelItem> toolsModel: [
+        ToolsModelItem {icon: cameraTheme.imageSceneModeAutoIconId; value: Scene.Auto},
+        ToolsModelItem {icon: cameraTheme.imageSceneModeCloseupIconId; value: Scene.Closeup},
+        ToolsModelItem {icon: cameraTheme.imageSceneModeLandscapeIconId; value: Scene.Landscape},
+        ToolsModelItem {icon: cameraTheme.imageSceneModePortraitIconId; value: Scene.Portrait},
+        ToolsModelItem {icon: cameraTheme.imageSceneModeNightIconId; value: Scene.Night},
+        ToolsModelItem {icon: cameraTheme.imageSceneModeSportIconId; value: Scene.Sport}
+    ]
 
-        property list<Item> items: [
-                Label {
-                        height: parent ? parent.height : 0
-                        text: qsTr("Scene");
-                        verticalAlignment: Text.AlignVCenter
-                },
-                CheckButton {
-                        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/" + Data.ismIcon(value);
-                        checkedIcon: "image://theme/" + Data.ismSelectedIcon(value);
-                        savedValue: settings.imageSceneMode
-                        onClicked: settings.imageSceneMode = value;
-                        value: Scene.Closeup
-                },
-                CheckButton {
-                        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/" + Data.ismIcon(value);
-                        checkedIcon: "image://theme/" + Data.ismSelectedIcon(value);
-                        savedValue: settings.imageSceneMode
-                        onClicked: settings.imageSceneMode = value;
-                        value: Scene.Portrait
-                },
-                CheckButton {
-                        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/" + Data.ismIcon(value);
-                        checkedIcon: "image://theme/" + Data.ismSelectedIcon(value);
-                        savedValue: settings.imageSceneMode
-                        onClicked: settings.imageSceneMode = value;
-                        value: Scene.Sport
-                }]
+    property CameraToolBarTools tools: CameraToolBarTools {
+        CameraLabel {
+            height: parent ? parent.height : 0
+            text: qsTr("Scene")
+            verticalAlignment: Text.AlignVCenter
+        }
+
+        Repeater {
+            model: parent != null && parent.visible ? toolsModel : undefined
+
+            delegate: CheckButton {
+                iconSource: icon
+                onClicked: settings.imageSceneMode = value
+                checked: settings.imageSceneMode == value
+                visible: !(value == Scene.Night && overlay.cam.quirks.hasQuirk(Quirks.NoNightSceneMode))
+            }
+        }
+    }
 }