Make a new component CameraPositionSource to get rid of QtMobility dependency

[harmattan/cameraplus] / qml / ImageIsoButton.qml

diff --git a/qml/ImageIsoButton.qml b/qml/ImageIsoButton.qml
index b237ddd..099f9d6 100644 (file)
--- a/qml/ImageIsoButton.qml
+++ b/qml/ImageIsoButton.qml
@@ -20,60 +20,60 @@
  * 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.isoIcon(settings.imageIso);
+    iconSource: "image://theme/" + Data.isoIcon(settings.imageIso)
 
-        property list<Item> items: [
-                Label {
-                        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
-                }]
+    property list<Item> items: [
+        CameraLabel {
+            height: parent ? parent.height : 0
+            text: qsTr("ISO")
+            verticalAlignment: Text.AlignVCenter
+        },
+        CameraButton {
+            property int value: 0
+            onClicked: settings.imageIso = value
+            text: qsTr("Auto")
+            width: 100
+            checked: settings.imageIso == value
+            anchors.verticalCenter: parent ? parent.verticalCenter : undefined
+        },
+        CameraButton {
+            property int value: 100
+            onClicked: settings.imageIso = value
+            text: value
+            width: 100
+            checked: settings.imageIso == value
+            anchors.verticalCenter: parent ? parent.verticalCenter : undefined
+        },
+        CameraButton {
+            property int value: 200
+            onClicked: settings.imageIso = value
+            text: value
+            width: 100
+            checked: settings.imageIso == value
+            anchors.verticalCenter: parent ? parent.verticalCenter : undefined
+        },
+        CameraButton {
+            property int value: 400
+            onClicked: settings.imageIso = value
+            text: value
+            width: 100
+            checked: settings.imageIso == value
+            anchors.verticalCenter: parent ? parent.verticalCenter : undefined
+        },
+        CameraButton {
+            property int value: 800
+            onClicked: settings.imageIso = value
+            text: value
+            width: 100
+            checked: settings.imageIso == value
+            anchors.verticalCenter: parent ? parent.verticalCenter : undefined
+        }
+    ]
 }