unload post capture and settings views when we are in camera view

[harmattan/cameraplus] / qml / VideoResolutionSettings.qml

diff --git a/qml/VideoResolutionSettings.qml b/qml/VideoResolutionSettings.qml
index 5100116..c105c55 100644 (file)
--- a/qml/VideoResolutionSettings.qml
+++ b/qml/VideoResolutionSettings.qml
@@ -21,17 +21,22 @@
  */
 
 import QtQuick 2.0
+import QtCamera 1.0
 
 Column {
+    property Camera camera: null
+
     spacing: 10
 
+    visible: videoSettings.resolutions.count > 1
+
     SectionHeader {
         text: qsTr("Resolution")
     }
 
     CameraButtonRow {
         width: parent.width
-        enabled: cam.idle
+        enabled: camera ? camera.idle : false
         exclusive: false
 
         Repeater {
@@ -40,7 +45,7 @@ Column {
             model: videoSettings.resolutions
 
             delegate: CameraButton {
-                font.capitalization: Font.Capitalize
+                capitalize: true
                 text: qsTr("%1 %2").arg(resolutionName).arg(resolution)
                 checked: settings.videoResolution == resolutionName
                 onClicked: settings.videoResolution = resolutionName