Merge lp:~seb128/gallery-app/validation-on-the-right into lp:gallery-app

[Sebastien Bacher]

Have the affirmative action on the right

Have the affirmative action on the right

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1077
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1027/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-amd64-ci/202
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-armhf-ci/202
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-armhf-ci/202/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-i386-ci/202
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/439/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3706
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/582/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/690
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13583
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3099
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4017
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4017/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Arthur Mello (artmello)]

lgtm

review: Approve

=== modified file 'rc/qml/PickerScreen.qml'
--- rc/qml/PickerScreen.qml	2014-09-19 01:05:46 +0000
+++ rc/qml/PickerScreen.qml	2014-09-23 09:30:08 +0000
@@ -147,6 +147,12 @@
 
     property list<Action> pickActions: [
         Action {
+            text: i18n.tr("Cancel")
+            objectName: "cancelButton"
+            iconName: "close"
+            onTriggered: APP.contentPickingCanceled()
+        },
+        Action {
             text: i18n.tr("Pick")
             objectName: "pickButton"
             enabled: allLoaded ? selectionLoader.item.selectedCount > 0 : false
@@ -157,12 +163,6 @@
                 if (allLoaded)
                     APP.returnPickedContent(mediaLibraryLoader.item.selectedMedias);
             }
-        },
-        Action {
-            text: i18n.tr("Cancel")
-            objectName: "cancelButton"
-            iconName: "close"
-            onTriggered: APP.contentPickingCanceled()
         }
     ]
 }