Add missing capability.cpp

[harmattan/cameraplus] / qml / ImageResolutionSettings.qml

diff --git a/qml/ImageResolutionSettings.qml b/qml/ImageResolutionSettings.qml
index 514115d..b968b95 100644 (file)
--- a/qml/ImageResolutionSettings.qml
+++ b/qml/ImageResolutionSettings.qml
@@ -28,8 +28,14 @@ Column {
 
     spacing: 10
 
+    property string __aspectRatio: settings.device == 1 ?
+        settings.secondaryImageAspectRatio : settings.primaryImageAspectRatio
+    property string __resolution: settings.device == 1 ?
+        settings.secondaryImageResolution : settings.primaryImageResolution
+
     SectionHeader {
         text: qsTr("Aspect ratio")
+        visible: aspectRatioRow.visible
     }
 
     CameraButtonRow {
@@ -37,19 +43,27 @@ Column {
         width: parent.width
         enabled: camera ? camera.idle : false
         exclusive: false
+        visible: imageSettings.aspectRatioCount > 1
 
         Repeater {
             model: imageSettings.aspectRatios
             delegate: CameraButton {
                 text: qsTr(modelData)
-                checked: settings.imageAspectRatio == modelData
-                onClicked: settings.imageAspectRatio = modelData
+                checked: __aspectRatio == modelData
+                onClicked: {
+                    if (settings.device == 1) {
+                        settings.secondaryImageAspectRatio = modelData
+                    } else {
+                        settings.primaryImageAspectRatio = modelData
+                    }
+                }
             }
         }
     }
 
     SectionHeader {
         text: qsTr("Resolution")
+        visible: resolutionsRow.visible
     }
 
     CameraButtonRow {
@@ -57,23 +71,39 @@ Column {
         width: parent.width
         enabled: camera ? camera.idle : false
         exclusive: false
+        visible: imageSettings.resolutions.count > 1
 
         Binding {
             target: imageSettings.resolutions
             property: "aspectRatio"
-            value: settings.imageAspectRatio
+            value: settings.primaryImageAspectRatio
+            when: settings.device == 0
+        }
+
+        Binding {
+            target: imageSettings.resolutions
+            property: "aspectRatio"
+            value: settings.secondaryImageAspectRatio
+            when: settings.device == 1
         }
 
         Repeater {
             id: resolutions
-            model: imageSettings.resolutions.aspectRatio == settings.imageAspectRatio ?
+
+            model: imageSettings.resolutions.aspectRatio == __aspectRatio ?
                 imageSettings.resolutions : undefined
 
             delegate: CameraButton {
                 capitalize: true
                 text: qsTr("%1 %2 Mpx").arg(resolutionName).arg(megaPixels)
-                checked: settings.imageResolution == resolutionName
-                onClicked: settings.imageResolution = resolutionName
+                checked: __resolution == resolutionName
+                onClicked: {
+                    if (settings.device == 1) {
+                        settings.secondaryImageResolution = resolutionName
+                    } else {
+                        settings.primaryImageResolution = resolutionName
+                    }
+                }
             }
         }
     }