Merge lp:~fboucault/camera-app/state_save_viewfinder into lp:camera-app

[Florian Boucault]

Save state of viewfinder: preserve back/front mode, picture/video mode, flash, HDR and location settings.

[Florian Boucault (fboucault)]

Depends on:
https://code.launchpad.net/~fboucault/qtubuntu-camera/prevent_camera_switching_at_ui_level/+merge/228479

[Florian Boucault (fboucault)]

State saving of enum fails, fix is about to be ready. I will link here since this MR will depend on it.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:325
http://jenkins.qa.ubuntu.com/job/camera-app-ci/239/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-amd64-ci/55
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-armhf-ci/55
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-armhf-ci/55/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-i386-ci/55
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/217
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2057
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/360
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/328
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10526
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1723
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2310
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2310/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Florian Boucault (fboucault)]

> State saving of enum fails, fix is about to be ready. I will link here since
> this MR will depend on it.

https://code.launchpad.net/~fboucault/ubuntu-ui-toolkit/state_saving_store_type/+merge/228503

[Florian Boucault (fboucault)]

Both depending MRs have been happroved.

[Ugo Riboni (uriboni)]

Works as expected (except for known bugs) and code looks ok

review: Approve

=== modified file 'ViewFinderOverlay.qml'
--- ViewFinderOverlay.qml	2014-07-17 13:39:48 +0000
+++ ViewFinderOverlay.qml	2014-07-28 12:59:27 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.2
 import QtQuick.Window 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 import QtMultimedia 5.0
 import QtPositioning 5.2
 import CameraApp 0.1
@@ -41,6 +41,8 @@
         property bool gpsEnabled: false
         property bool hdrEnabled: false
         property int videoFlashMode: Camera.FlashOff
+
+        StateSaver.properties: "flashMode, gpsEnabled, hdrEnabled, videoFlashMode"
     }
 
     Binding {
@@ -413,6 +415,7 @@
                 bottomMargin: units.gu(6)
             }
 
+            enabled: !camera.switchInProgress
             iconName: "camera-flip"
             onClicked: controls.switchCamera()
         }

=== modified file 'ViewFinderView.qml'
--- ViewFinderView.qml	2014-07-03 08:49:49 +0000
+++ ViewFinderView.qml	2014-07-28 12:59:27 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.2
 import QtQuick.Window 2.0
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 import QtMultimedia 5.0
 import CameraApp 0.1
 import QtGraphicalEffects 1.0
@@ -34,6 +34,7 @@
     Camera {
         id: camera
         captureMode: Camera.CaptureStillImage
+        StateSaver.properties: "captureMode"
 
         function manualFocus(x, y) {
             viewFinderOverlay.showFocusRing(x, y);
@@ -59,7 +60,9 @@
         }
 
         property AdvancedCameraSettings advanced: AdvancedCameraSettings {
+            id: advancedCamera
             camera: camera
+            StateSaver.properties: "activeCameraIndex"
         }
 
         Component.onCompleted: {

=== modified file 'camera-app.qml'
--- camera-app.qml	2014-07-03 10:18:06 +0000
+++ camera-app.qml	2014-07-28 12:59:27 +0000
@@ -137,6 +137,7 @@
         }
 
         Row {
+            id: viewsRow
             anchors {
                 top: parent.top
                 bottom: parent.bottom