projects
/
harmattan
/
cameraplus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reworked iso settings to use icons instead of buttons and text
[harmattan/cameraplus]
/
qml
/
VideoEvCompButton.qml
diff --git
a/qml/VideoEvCompButton.qml
b/qml/VideoEvCompButton.qml
index
6721b4d
..
922cef8
100644
(file)
--- a/
qml/VideoEvCompButton.qml
+++ b/
qml/VideoEvCompButton.qml
@@
-20,13
+20,13
@@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
* 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
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
CameraLabel {
anchors.fill: parent
@@
-35,15
+35,15
@@
CameraToolIcon {
text: settings.videoEvComp == 0 ? "" : settings.videoEvComp.toFixed(1)
}
text: settings.videoEvComp == 0 ? "" : settings.videoEvComp.toFixed(1)
}
- property
list<Item> items: [
+ property
CameraToolBarTools tools: CameraToolBarTools {
CameraLabel {
height: parent ? parent.height : 0
text: qsTr("EV")
verticalAlignment: Text.AlignVCenter
CameraLabel {
height: parent ? parent.height : 0
text: qsTr("EV")
verticalAlignment: Text.AlignVCenter
- },
+ }
+
CameraSlider {
id: slider
CameraSlider {
id: slider
- width: 500
orientation: Qt.Horizontal
minimumValue: cam ? cam.evComp.minimum : 0
maximumValue: cam ? cam.evComp.maximum : 0
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) }
}
onValueChanged: settings.videoEvComp = value.toFixed(1)
Component.onCompleted: { slider.value = settings.videoEvComp.toFixed(1) }
}
- ]
+
+ CameraToolIcon {
+ iconSource: cameraTheme.resetIconId
+ onClicked: slider.value = 0
+ }
+ }
}
}