Added a floating toolbar to be used instead of the top left buttons.

[harmattan/cameraplus] / qml / ImageEvCompButton.qml

diff --git a/qml/ImageEvCompButton.qml b/qml/ImageEvCompButton.qml
index 0f8989f..9450e02 100644 (file)
--- a/qml/ImageEvCompButton.qml
+++ b/qml/ImageEvCompButton.qml
@@ -24,25 +24,34 @@ import QtQuick 1.1
 import com.nokia.meego 1.1
 import QtCamera 1.0
 
-Selector {
+ToolIcon {
         id: button
 
         iconSource: settings.imageEvComp == 0 ? "image://theme/icon-m-camera-manual-exposure" : ""
-        text: settings.imageEvComp == 0 ? "" : settings.imageEvComp.toFixed(1);
-        font.pixelSize: 19
-        timerConstraints: slider.pressed
 
-        title: qsTr("Exposure compensation");
-
-        widget: Slider {
-                id: slider
-                width: 500
-                orientation: Qt.Horizontal
-                minimumValue: cam.evComp.minimum
-                maximumValue: cam.evComp.maximum
-                value: settings.imageEvComp
-                stepSize: 0.1
-                onValueChanged: settings.imageEvComp = value.toFixed(1);
-                Component.onCompleted: { slider.value = settings.imageEvComp.toFixed(1); }
+        Label {
+                anchors.fill: parent
+                verticalAlignment: Text.AlignVCenter
+                visible: settings.imageEvComp != 0
+                text: settings.imageEvComp == 0 ? "" : 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); }
+                }]
 }