From dac140f602bb04c5b6c940b32725f2fd68d6f88c Mon Sep 17 00:00:00 2001 From: Mohammed Sameer Date: Mon, 11 Mar 2013 23:02:36 +0200 Subject: [PATCH] Capture button should not be visible if we use zoom for capturing and we have the resources --- qml/ImagePage.qml | 4 ++-- qml/RecordingPage.qml | 2 +- qml/VideoPage.qml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qml/ImagePage.qml b/qml/ImagePage.qml index bd3f42b..632e6d9 100644 --- a/qml/ImagePage.qml +++ b/qml/ImagePage.qml @@ -30,7 +30,7 @@ CameraPage { id: page policyMode: CameraResources.Image - controlsVisible: capture.visible + controlsVisible: imageMode.canCapture && !cameraMode.busy && dimmer.opacity == 0.0 && !previewAnimationRunning && cam.running orientationLock: PageOrientation.LockLandscape @@ -82,7 +82,7 @@ CameraPage { height: 75 opacity: 0.5 onClicked: captureImage(); - visible: imageMode.canCapture && !cameraMode.busy && dimmer.opacity == 0.0 && !previewAnimationRunning && cam.running + visible: controlsVisible && (!settings.zoomAsShutter && keys.active) onExited: { if (mouseX <= 0 || mouseY <= 0 || mouseX > width || mouseY > height) { diff --git a/qml/RecordingPage.qml b/qml/RecordingPage.qml index e935679..e40830f 100644 --- a/qml/RecordingPage.qml +++ b/qml/RecordingPage.qml @@ -111,7 +111,7 @@ CameraPage { opacity: 0.5 onClicked: page.stopRecording(); - visible: controlsVisible + visible: controlsVisible && (!settings.zoomAsShutter && keys.active) } Connections { diff --git a/qml/VideoPage.qml b/qml/VideoPage.qml index 849877e..147e66a 100644 --- a/qml/VideoPage.qml +++ b/qml/VideoPage.qml @@ -67,7 +67,7 @@ CameraPage { onClicked: startRecording(); - visible: controlsVisible + visible: controlsVisible && (!settings.zoomAsShutter && keys.active) } VideoMode { -- 2.25.1