Added an option to enable using proximity sensor to capture

[harmattan/cameraplus] / qml / VideoOverlay.qml

diff --git a/qml/VideoOverlay.qml b/qml/VideoOverlay.qml
index 48ce2ff..6f19d48 100644 (file)
--- a/qml/VideoOverlay.qml
+++ b/qml/VideoOverlay.qml
@@ -69,9 +69,10 @@ Item {
         onReleased: overlay.toggleRecording()
     }
 
-    ZoomCaptureCancel {
+    CaptureCancel {
         anchors.fill: parent
-        zoomCapture: zoomCapture
+        enabled: zoomCapture.zoomPressed
+        onPressed: zoomCapture.zoomPressed = false
     }
 
     CaptureButton {
@@ -86,7 +87,7 @@ Item {
 
         onClicked: overlay.toggleRecording()
 
-        visible: controlsVisible && (!settings.zoomAsShutter && keys.active)
+        visible: controlsVisible
     }
 
     CameraToolBar {
@@ -150,9 +151,8 @@ Item {
 
             Indicator {
                 id: resolutionIndicator
-                property string videoResolution: settings.device == 1 ? settings.secondaryVideoResolution : settings.primaryVideoResolution
-                property string videoRatio: settings.device == 1 ? settings.secondaryVideoAspectRatio : settings.primaryVideoAspectRatio
-                source: cameraTheme.videoIcon(videoRatio, videoResolution, settings.device)
+                source: cameraTheme.videoIcon(settings.videoAspectRatio,
+                    settings.videoResolution, settings.device)
             }
 
             Indicator {