unset source for iso indicator if it's not visible

[harmattan/cameraplus] / qml / VideoSceneButton.qml

diff --git a/qml/VideoSceneButton.qml b/qml/VideoSceneButton.qml
index ceb4a44..444a056 100644 (file)
--- a/qml/VideoSceneButton.qml
+++ b/qml/VideoSceneButton.qml
@@ -20,33 +20,34 @@
  * 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
-
-        iconSource: "image://theme/" + Data.vsmIcon(settings.videoSceneMode);
-        property list<Item> items: [
-                Label {
-                        height: parent ? parent.height : 0
-                        text: qsTr("Scene");
-                        verticalAlignment: Text.AlignVCenter
-                },
-                CheckButton {
-                        normalIcon: "image://theme/" + Data.vsmIcon(value);
-                        checkedIcon: "image://theme/" + Data.vsmSelectedIcon(value);
-                        savedValue: settings.videoSceneMode
-                        onClicked: settings.videoSceneMode = value;
-                        value: Scene.Auto
-                },
-                CheckButton {
-                        normalIcon: "image://theme/" + Data.vsmIcon(value);
-                        checkedIcon: "image://theme/" + Data.vsmSelectedIcon(value);
-                        savedValue: settings.videoSceneMode
-                        onClicked: settings.videoSceneMode = value;
-                        value: Scene.Night
-                }]
+
+CameraToolIcon {
+    id: button
+
+    iconId: cameraTheme.videoSceneModeIcon(settings.videoSceneMode)
+
+    property list<ToolsModelItem> toolsModel: [
+        ToolsModelItem {icon: cameraTheme.videoSceneModeAutoIconId; value: Scene.Auto},
+        ToolsModelItem {icon: cameraTheme.videoSceneModeNightIconId; value: Scene.Night}
+    ]
+
+    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 {
+                iconId: icon
+                onClicked: settings.videoSceneMode = value
+                checked: settings.videoSceneMode == value
+            }
+        }
+    }
 }