Add back scene mode indicators

[harmattan/cameraplus] / qml / VideoEvCompButton.qml

diff --git a/qml/VideoEvCompButton.qml b/qml/VideoEvCompButton.qml
index b012c17..d2ab04e 100644 (file)
--- a/qml/VideoEvCompButton.qml
+++ b/qml/VideoEvCompButton.qml
@@ -20,29 +20,29 @@
  * 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.videoEvComp == 0 ? "image://theme/icon-m-camera-manual-exposure" : ""
+    iconId: settings.videoEvComp == 0 ? cameraTheme.cameraManualExposureIconId : ""
 
-    Label {
+    CameraLabel {
         anchors.fill: parent
         verticalAlignment: Text.AlignVCenter
         visible: settings.videoEvComp != 0
         text: settings.videoEvComp == 0 ? "" : settings.videoEvComp.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
@@ -54,5 +54,5 @@ ToolIcon {
             onValueChanged: settings.videoEvComp = value.toFixed(1)
             Component.onCompleted: { slider.value = settings.videoEvComp.toFixed(1) }
         }
-    ]
+    }
 }