X-Git-Url: http://cgit.sxemacs.org/?p=harmattan%2Fcameraplus;a=blobdiff_plain;f=qml%2FVideoEvCompButton.qml;h=922cef835ed056ae1c5a3eb94f79a910c5f69645;hp=6721b4d78cdeabe0d2b9d7315a44c053d3adbaa5;hb=55dea704e2a7d57b5f69fa5776d58623f4ebcf5f;hpb=9299fa292ded077de6e80532f3cfc79c523d7d8f diff --git a/qml/VideoEvCompButton.qml b/qml/VideoEvCompButton.qml index 6721b4d..922cef8 100644 --- a/qml/VideoEvCompButton.qml +++ b/qml/VideoEvCompButton.qml @@ -20,13 +20,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -@IMPORT_QT_QUICK@ +import QtQuick 2.0 import QtCamera 1.0 CameraToolIcon { id: button - iconSource: settings.videoEvComp == 0 ? "image://theme/icon-m-camera-manual-exposure" : "" + iconSource: settings.videoEvComp == 0 ? cameraTheme.cameraManualExposureIconId : "" CameraLabel { anchors.fill: parent @@ -35,15 +35,15 @@ CameraToolIcon { text: settings.videoEvComp == 0 ? "" : settings.videoEvComp.toFixed(1) } - property list items: [ + property CameraToolBarTools tools: CameraToolBarTools { CameraLabel { height: parent ? parent.height : 0 text: qsTr("EV") verticalAlignment: Text.AlignVCenter - }, + } + CameraSlider { id: slider - width: 500 orientation: Qt.Horizontal minimumValue: cam ? cam.evComp.minimum : 0 maximumValue: cam ? cam.evComp.maximum : 0 @@ -53,5 +53,10 @@ CameraToolIcon { onValueChanged: settings.videoEvComp = value.toFixed(1) Component.onCompleted: { slider.value = settings.videoEvComp.toFixed(1) } } - ] + + CameraToolIcon { + iconSource: cameraTheme.resetIconId + onClicked: slider.value = 0 + } + } }