Merge lp:~fboucault/camera-app/disable_controls_while_shooting into lp:camera-app/staging

[Florian Boucault]

Disable all controls while a photo is being saved.

[lp:~fboucault/camera-app/disable_controls_while_shooting]

630. By Florian Boucault on 2016-01-07

Disable focus ring also

[Ugo Riboni (uriboni)]

Works as expected and simplifies previous code as a bonus, so all good

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:629
http://jenkins.qa.ubuntu.com/job/camera-app-staging-ci/9/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-amd64-ci/9
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-amd64-ci/9/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-armhf-ci/9
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-armhf-ci/9/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-i386-ci/9
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-i386-ci/9/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/360
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-touch/1031
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/890
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26467

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-staging-ci/9/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'ViewFinderOverlay.qml'
--- ViewFinderOverlay.qml	2016-01-05 14:09:07 +0000
+++ ViewFinderOverlay.qml	2016-01-07 09:46:25 +0000
@@ -32,7 +32,6 @@
     property real revealProgress: noSpaceHint.visible ? 1.0 : bottomEdge.progress
     property var controls: controls
     property var settings: settings
-    signal photoCaptureStarting()
 
     function showFocusRing(x, y) {
         focusRing.center = Qt.point(x, y);
@@ -286,6 +285,7 @@
             height: optionsOverlayLoader.height
             onOpenedChanged: optionsOverlayLoader.item.closeValueSelector()
             enabled: camera.videoRecorder.recorderState == CameraRecorder.StoppedState
+                     && !camera.photoCaptureInProgress
             opacity: enabled ? 1.0 : 0.3
 
             Item {
@@ -698,7 +698,7 @@
                     }
                 }
 
-                viewFinderOverlay.photoCaptureStarting()
+                camera.photoCaptureInProgress = true;
                 if (main.contentExportMode) {
                     camera.imageCapture.captureToLocation(application.temporaryLocation);
                 } else if (application.removableStoragePresent && settings.preferRemovableStorage) {
@@ -787,6 +787,7 @@
             iconName: (camera.captureMode == Camera.CaptureStillImage) ? "camcorder" : "camera-symbolic"
             onClicked: controls.changeRecordMode()
             enabled: camera.videoRecorder.recorderState == CameraRecorder.StoppedState && !main.contentExportMode
+                     && !camera.photoCaptureInProgress
         }
 
         ShootButton {
@@ -836,6 +837,7 @@
             }
 
             enabled: !camera.switchInProgress && camera.videoRecorder.recorderState == CameraRecorder.StoppedState
+                     && !camera.photoCaptureInProgress
             iconName: "camera-flip"
             onClicked: controls.switchCamera()
         }
@@ -858,6 +860,7 @@
             property real maximumScale: 3.0
             property bool active: false
 
+            enabled: !camera.photoCaptureInProgress
             onPinchStarted: {
                 active = true;
                 initialZoom = zoomControl.value;
@@ -876,6 +879,7 @@
             MouseArea {
                 id: manualFocusMouseArea
                 anchors.fill: parent
+                enabled: !camera.photoCaptureInProgress
                 onClicked: {
                     camera.manualFocus(mouse.x, mouse.y);
                     mouse.accepted = false;

=== modified file 'ViewFinderOverlayLoader.qml'
--- ViewFinderOverlayLoader.qml	2016-01-05 14:04:31 +0000
+++ ViewFinderOverlayLoader.qml	2016-01-07 09:46:25 +0000
@@ -24,7 +24,6 @@
     property real revealProgress: loader.item ? loader.item.revealProgress : 0
     property var controls: loader.item ? loader.item.controls : null
     property var settings: loader.item.settings
-    signal photoCaptureStarting()
 
     function showFocusRing(x, y) {
         loader.item.showFocusRing(x, y);
@@ -34,11 +33,6 @@
         loader.item.updateResolutionOptions();
     }
 
-    Connections {
-        target: item
-        onPhotoCaptureStarting: loader.photoCaptureStarting()
-    }
-
     asynchronous: true
     Component.onCompleted: {
         loader.setSource("ViewFinderOverlay.qml", { "camera": loader.camera });

=== modified file 'ViewFinderView.qml'
--- ViewFinderView.qml	2016-01-05 14:09:07 +0000
+++ ViewFinderView.qml	2016-01-07 09:46:25 +0000
@@ -31,7 +31,6 @@
     property bool inView
     property alias captureMode: camera.captureMode
     property real aspectRatio: viewFinder.sourceRect.height != 0 ? viewFinder.sourceRect.width / viewFinder.sourceRect.height : 1.0
-    property bool photoCaptureInProgress: false
     signal photoTaken(string filePath)
     signal videoShot(string filePath)
 
@@ -39,7 +38,6 @@
     Connections {
         target: viewFinderOverlay
         onStatusChanged: decideCameraState()
-        onPhotoCaptureStarting: viewFinderView.photoCaptureInProgress = true
     }
     Connections {
         target: Qt.application
@@ -107,6 +105,7 @@
         property alias currentZoom: camera.digitalZoom
         property alias maximumZoom: camera.maximumDigitalZoom
         property bool switchInProgress: false
+        property bool photoCaptureInProgress: false
 
         imageCapture {
             onReadyChanged: {
@@ -119,7 +118,7 @@
                 }
             }
             onCaptureFailed: {
-                photoCaptureInProgress = false;
+                camera.photoCaptureInProgress = false;
                 console.log("Capture failed for request " + requestId + ": " + message);
             }
             onImageCaptured: {
@@ -137,7 +136,7 @@
                     viewFinderExportConfirmation.confirmExport(path);
                 }
                 viewFinderView.photoTaken(path);
-                photoCaptureInProgress = false;
+                camera.photoCaptureInProgress = false;
                 metricPhotos.increment();
                 console.log("Picture saved as " + path);
             }

=== modified file 'camera-app.qml'
--- camera-app.qml	2016-01-05 14:04:31 +0000
+++ camera-app.qml	2016-01-07 09:46:25 +0000
@@ -135,7 +135,7 @@
                 }
             }
         ]
-        interactive: !viewFinderView.touchAcquired && !galleryView.touchAcquired && !viewFinderView.photoCaptureInProgress
+        interactive: !viewFinderView.touchAcquired && !galleryView.touchAcquired && !viewFinderView.camera.photoCaptureInProgress
 
         Component.onCompleted: {
             // FIXME: workaround for qtubuntu not returning values depending on the grid unit definition