projects
/
harmattan
/
cameraplus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
No need for the when condition for binding camera zoom value to slider value
[harmattan/cameraplus]
/
qml
/
VideoResolutionSettings.qml
diff --git
a/qml/VideoResolutionSettings.qml
b/qml/VideoResolutionSettings.qml
index
e80be20
..
c105c55
100644
(file)
--- a/
qml/VideoResolutionSettings.qml
+++ b/
qml/VideoResolutionSettings.qml
@@
-20,19
+20,23
@@
* 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 QtQuick
1.1
-import
com.nokia.meego 1.1
+import QtQuick
2.0
+import
QtCamera 1.0
Column {
Column {
+ property Camera camera: null
+
spacing: 10
spacing: 10
+ visible: videoSettings.resolutions.count > 1
+
SectionHeader {
text: qsTr("Resolution")
}
SectionHeader {
text: qsTr("Resolution")
}
- ButtonRow {
+
Camera
ButtonRow {
width: parent.width
width: parent.width
- enabled: cam
.idl
e
+ enabled: cam
era ? camera.idle : fals
e
exclusive: false
Repeater {
exclusive: false
Repeater {
@@
-40,8
+44,8
@@
Column {
model: videoSettings.resolutions
model: videoSettings.resolutions
- delegate: Button {
-
font.capitalization: Font.Capitaliz
e
+ delegate:
Camera
Button {
+
capitalize: tru
e
text: qsTr("%1 %2").arg(resolutionName).arg(resolution)
checked: settings.videoResolution == resolutionName
onClicked: settings.videoResolution = resolutionName
text: qsTr("%1 %2").arg(resolutionName).arg(resolution)
checked: settings.videoResolution == resolutionName
onClicked: settings.videoResolution = resolutionName