Kill data.js and move all icons and functions to CameraTheme

[harmattan/cameraplus] / qml / VideoEvCompButton.qml

diff --git a/qml/VideoEvCompButton.qml b/qml/VideoEvCompButton.qml
index a00710b..d2ab04e 100644 (file)
--- a/qml/VideoEvCompButton.qml
+++ b/qml/VideoEvCompButton.qml
@@ -3,7 +3,7 @@
 /*!
  * This file is part of CameraPlus.
  *
- * Copyright (C) 2012 Mohammed Sameer <msameer@foolab.org>
+ * Copyright (C) 2012-2013 Mohammed Sameer <msameer@foolab.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,38 +20,39 @@
  * 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
 
-ToolIcon {
-        id: button
+CameraToolIcon {
+    id: button
 
-        iconSource: settings.videoEvComp == 0 ? "image://theme/icon-m-camera-manual-exposure" : ""
+    iconId: settings.videoEvComp == 0 ? cameraTheme.cameraManualExposureIconId : ""
 
-        Label {
-                anchors.fill: parent
-                verticalAlignment: Text.AlignVCenter
-                visible: settings.videoEvComp != 0
-                text: settings.videoEvComp == 0 ? "" : settings.videoEvComp.toFixed(1);
+    CameraLabel {
+        anchors.fill: parent
+        verticalAlignment: Text.AlignVCenter
+        visible: settings.videoEvComp != 0
+        text: settings.videoEvComp == 0 ? "" : settings.videoEvComp.toFixed(1)
+    }
+
+    property CameraToolBarTools tools: CameraToolBarTools {
+        CameraLabel {
+            height: parent ? parent.height : 0
+            text: qsTr("EV")
+            verticalAlignment: Text.AlignVCenter
         }
 
-        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.videoEvComp
-                        valueIndicatorVisible: true
-                        stepSize: 0.1
-                        onValueChanged: settings.videoEvComp = value.toFixed(1);
-                        Component.onCompleted: { slider.value = settings.videoEvComp.toFixed(1); }
-                }]
+        CameraSlider {
+            id: slider
+            width: 500
+            orientation: Qt.Horizontal
+            minimumValue: cam ? cam.evComp.minimum : 0
+            maximumValue: cam ? cam.evComp.maximum : 0
+            value: settings.videoEvComp
+            valueIndicatorVisible: true
+            stepSize: 0.1
+            onValueChanged: settings.videoEvComp = value.toFixed(1)
+            Component.onCompleted: { slider.value = settings.videoEvComp.toFixed(1) }
+        }
+    }
 }