Merge lp:~seb128/camera-app/delete-dialog-order into lp:camera-app

[Sebastien Bacher]

List the delete action first in the confirmation dialog

List the delete action first in the confirmation dialog

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:420
http://jenkins.qa.ubuntu.com/job/camera-app-ci/302/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-amd64-ci/118
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-armhf-ci/118
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-armhf-ci/118/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-i386-ci/118
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/500/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4295/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/648/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/866
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15463
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3647/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4689
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4689/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:420
http://jenkins.qa.ubuntu.com/job/camera-app-ci/308/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/4
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/4/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/4
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/15/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/155
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/658/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/32
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15892
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/134
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/159
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/159/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Bill Filler (bfiller)]

this got included in the multi-selection MR which landed

Unmerged revisions

420. By Sebastien Bacher on 2014-11-05

List the delete action first in the confirmation dialog

=== modified file 'SlideshowView.qml'
--- SlideshowView.qml	2014-10-03 15:41:22 +0000
+++ SlideshowView.qml	2014-11-05 09:51:22 +0000
@@ -305,11 +305,6 @@
             }
 
             Button {
-                text: i18n.tr("Cancel")
-                color: UbuntuColors.warmGrey
-                onClicked: PopupUtils.close(deleteDialog)
-            }
-            Button {
                 text: i18n.tr("Delete")
                 color: UbuntuColors.orange
                 onClicked: {
@@ -326,6 +321,11 @@
                     PopupUtils.close(deleteDialog);
                 }
             }
+            Button {
+                text: i18n.tr("Cancel")
+                color: UbuntuColors.warmGrey
+                onClicked: PopupUtils.close(deleteDialog)
+            }
         }
     }
 }