No need for the when condition for binding camera zoom value to slider value

[harmattan/cameraplus] / qml / ImageIsoButton.qml

diff --git a/qml/ImageIsoButton.qml b/qml/ImageIsoButton.qml
index 7cccff7..1740151 100644 (file)
--- a/qml/ImageIsoButton.qml
+++ b/qml/ImageIsoButton.qml
@@ -20,61 +20,36 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-@IMPORT_QT_QUICK@
-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.isoIcon(settings.imageIso)
+    iconSource: cameraTheme.isoIcon(settings.imageIso)
 
-    property list<Item> items: [
-        Label {
+    property list<ToolsModelItem> toolsModel: [
+        ToolsModelItem {icon: cameraTheme.isoAudoIconId; value: 0 },
+        ToolsModelItem {icon: cameraTheme.iso100IconId; value: 100 },
+        ToolsModelItem {icon: cameraTheme.iso200IconId; value: 200 },
+        ToolsModelItem {icon: cameraTheme.iso400IconId; value: 400 },
+        ToolsModelItem {icon: cameraTheme.iso800IconId; value: 800 }
+    ]
+
+    property CameraToolBarTools tools: CameraToolBarTools {
+        CameraLabel {
             height: parent ? parent.height : 0
             text: qsTr("ISO")
             verticalAlignment: Text.AlignVCenter
-        },
-        Button {
-            property int value: 0
-            onClicked: settings.imageIso = value
-            text: qsTr("Auto")
-            width: 100
-            checked: settings.imageIso == value
-            anchors.verticalCenter: parent ? parent.verticalCenter : undefined
-        },
-        Button {
-            property int value: 100
-            onClicked: settings.imageIso = value
-            text: value
-            width: 100
-            checked: settings.imageIso == value
-            anchors.verticalCenter: parent ? parent.verticalCenter : undefined
-        },
-        Button {
-            property int value: 200
-            onClicked: settings.imageIso = value
-            text: value
-            width: 100
-            checked: settings.imageIso == value
-            anchors.verticalCenter: parent ? parent.verticalCenter : undefined
-        },
-        Button {
-            property int value: 400
-            onClicked: settings.imageIso = value
-            text: value
-            width: 100
-            checked: settings.imageIso == value
-            anchors.verticalCenter: parent ? parent.verticalCenter : undefined
-        },
-        Button {
-            property int value: 800
-            onClicked: settings.imageIso = value
-            text: value
-            width: 100
-            checked: settings.imageIso == value
-            anchors.verticalCenter: parent ? parent.verticalCenter : undefined
         }
-    ]
+
+        Repeater {
+            model: parent != null && parent.visible ? toolsModel : undefined
+            delegate: CheckButton {
+                iconSource: icon
+                onClicked: settings.imageIso = value
+                checked: settings.imageIso == value
+            }
+        }
+    }
 }