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

[Florian Boucault]

Added cancel button in content export mode.

[Bill Filler (bfiller)]

works, note that the back button disappears when switching back/front cameras but this is due to another bug tracked here: https://bugs.launchpad.net/barajas/+bug/1362645

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:369
http://jenkins.qa.ubuntu.com/job/camera-app-ci/281/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-amd64-ci/97
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-armhf-ci/97
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-armhf-ci/97/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-i386-ci/97
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/326
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3287
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/467
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/522
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12559
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2698
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3581
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3581/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

=== modified file 'ViewFinderOverlay.qml'
--- ViewFinderOverlay.qml	2014-08-27 00:06:32 +0000
+++ ViewFinderOverlay.qml	2014-09-03 14:09:28 +0000
@@ -498,6 +498,22 @@
         FocusRing {
             id: focusRing
         }
+
+        CircleButton {
+            id: exportBackButton
+            objectName: "exportBackButton"
+
+            anchors {
+                top: parent.top
+                topMargin: units.gu(4)
+                left: recordModeButton.left
+            }
+
+            iconName: visible ? "go-previous" : ""
+            visible: main.contentExportMode
+            enabled: main.contentExportMode
+            onClicked: main.cancelExport()
+        }
     }
 
     Loader {