X-Git-Url: http://cgit.sxemacs.org/?p=harmattan%2Fcameraplus;a=blobdiff_plain;f=qml%2FImageEvCompButton.qml;h=ece1bf31838e05fea3cb76091b4c11d37134021d;hp=0a12cf7eeac09583c561688fc85ebc47922e01c9;hb=HEAD;hpb=bb079e0dff5557e811af63194a86a5d6548b4cfd

diff --git a/qml/ImageEvCompButton.qml b/qml/ImageEvCompButton.qml
index 0a12cf7..ece1bf3 100644
--- a/qml/ImageEvCompButton.qml
+++ b/qml/ImageEvCompButton.qml
@@ -20,31 +20,30 @@
  * 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
 
-ToolIcon {
+CameraToolIcon {
     id: button
 
-    iconSource: settings.imageEvComp == 0 ? "image://theme/icon-m-camera-manual-exposure" : ""
+    iconSource: settings.imageEvComp == 0 ? cameraTheme.cameraManualExposureIconId : ""
 
-    Label {
+    CameraLabel {
         anchors.fill: parent
         verticalAlignment: Text.AlignVCenter
         visible: settings.imageEvComp != 0
         text: settings.imageEvComp == 0 ? "" : settings.imageEvComp.toFixed(1)
     }
 
-    property list<Item> items: [
-        Label {
+    property CameraToolBarTools tools: CameraToolBarTools {
+        CameraLabel {
             height: parent ? parent.height : 0
             text: qsTr("EV")
             verticalAlignment: Text.AlignVCenter
-        },
-        Slider {
+        }
+
+        CameraSlider {
             id: slider
-            width: 500
             orientation: Qt.Horizontal
             minimumValue: cam ? cam.evComp.minimum : 0
             maximumValue: cam ? cam.evComp.maximum : 0
@@ -54,5 +53,10 @@ ToolIcon {
             onValueChanged: settings.imageEvComp = value.toFixed(1)
             Component.onCompleted: { slider.value = settings.imageEvComp.toFixed(1) }
         }
-    ]
+
+        CameraToolIcon {
+            iconSource: cameraTheme.resetIconId
+            onClicked: slider.value = 0
+        }
+    }
 }