Fixes and indentation for ImageEvCompButton.qml

diff --git a/qml/ImageEvCompButton.qml b/qml/ImageEvCompButton.qml
index 3651ce9..1abcb82 100644 (file)
--- a/qml/ImageEvCompButton.qml
+++ b/qml/ImageEvCompButton.qml
@@ -25,33 +25,34 @@ import com.nokia.meego 1.1
 import QtCamera 1.0
 
 ToolIcon {
-        id: button
+    id: button
 
-        iconSource: settings.imageEvComp == 0 ? "image://theme/icon-m-camera-manual-exposure" : ""
+    iconSource: settings.imageEvComp == 0 ? "image://theme/icon-m-camera-manual-exposure" : ""
 
+    Label {
+        anchors.fill: parent
+        verticalAlignment: Text.AlignVCenter
+        visible: settings.imageEvComp != 0
+        text: settings.imageEvComp == 0 ? "" : settings.imageEvComp.toFixed(1)
+    }
+
+    property list<Item> items: [
         Label {
-                anchors.fill: parent
-                verticalAlignment: Text.AlignVCenter
-                visible: settings.imageEvComp != 0
-                text: settings.imageEvComp == 0 ? "" : settings.imageEvComp.toFixed(1);
+            height: parent ? parent.height : 0
+            text: qsTr("EV")
+            verticalAlignment: Text.AlignVCenter
+        },
+        Slider {
+            id: slider
+            width: 500
+            orientation: Qt.Horizontal
+            minimumValue: cam ? cam.evComp.minimum : 0
+            maximumValue: cam ? cam.evComp.maximum : 0
+            value: settings.imageEvComp
+            valueIndicatorVisible: true
+            stepSize: 0.1
+            onValueChanged: settings.imageEvComp = value.toFixed(1)
+            Component.onCompleted: { slider.value = settings.imageEvComp.toFixed(1) }
         }
-
-        property list<Item> items: [
-                Label {
-                        height: parent ? parent.height : 0
-                        text: qsTr("EV");
-                        verticalAlignment: Text.AlignVCenter
-                },
-                Slider {
-                        id: slider
-                        width: 500
-                        orientation: Qt.Horizontal
-                        minimumValue: cam.evComp.minimum
-                        maximumValue: cam.evComp.maximum
-                        value: settings.imageEvComp
-                        valueIndicatorVisible: true
-                        stepSize: 0.1
-                        onValueChanged: settings.imageEvComp = value.toFixed(1);
-                        Component.onCompleted: { slider.value = settings.imageEvComp.toFixed(1); }
-                }]
+    ]
 }

diff --git a/qml/qml.qrc b/qml/qml.qrc
index 5f210f6..f182915 100644 (file)
--- a/qml/qml.qrc
+++ b/qml/qml.qrc
@@ -32,11 +32,12 @@
        <file>PostCaptureItem.qml</file>
        <file>VideoPlayerPage.qml</file>
        <file>Standby.qml</file>
+       <file>ImageEvCompButton.qml</file>
 
        <file>CameraPage.qml</file>
        <file>FlashButton.qml</file>
        <file>ImageSceneButton.qml</file>
-       <file>ImageEvCompButton.qml</file>
+
        <file>ImageWhiteBalanceButton.qml</file>
        <file>ImageColorFilterButton.qml</file>
        <file>ImageIsoButton.qml</file>