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

[Florian Boucault]

Remove hardcoded actions in GalleryViewHeader to make it extensible.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:563
http://jenkins.qa.ubuntu.com/job/camera-app-ci/425/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/121
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/121
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/121/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/121
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/231
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/883
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/591
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21058

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

review: Needs Fixing (continuous-integration)

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

564. By Florian Boucault on 2015-06-10

Fixed warnings.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:564
http://jenkins.qa.ubuntu.com/job/camera-app-ci/426/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/122
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/122
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/122/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/122
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/233
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/885
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/593
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21089

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

review: Needs Fixing (continuous-integration)

[Ugo Riboni (uriboni)]

Looks good to me

review: Approve

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

565. By Florian Boucault on 2015-07-03

Adapted autopilot test camera_app.tests.test_photo_editor.TestCameraPhotoEditorWithPhoto.test_editor_appears

=== modified file 'GalleryViewHeader.qml'
--- GalleryViewHeader.qml	2015-02-12 18:42:49 +0000
+++ GalleryViewHeader.qml	2015-07-03 12:36:05 +0000
@@ -138,28 +138,13 @@
             visible: header.validationVisible
         }
 
-        IconButton {
-            id: undoButton
-            objectName: "undoButton"
-            anchors {
-                top: parent.top
-                bottom: parent.bottom
-            }
-            visible: header.editMode
-            action: editModeActions.length > 0 ? editModeActions[0] : null
-            onTriggered: if (action) action.triggered()
-        }
-
-        IconButton {
-            id: redoButton
-            objectName: "redoButton"
-            anchors {
-                top: parent.top
-                bottom: parent.bottom
-            }
-            visible: header.editMode
-            action: editModeActions.length > 1 ? editModeActions[1] : null
-            onTriggered: if (action) action.triggered()
+        Repeater {
+            model: header.editMode ? header.editModeActions : null
+            IconButton {
+                Layout.fillHeight: true
+                visible: header.editMode
+                action: modelData
+            }
         }
     }
 
 
=== modified file 'tests/autopilot/camera_app/tests/test_photo_editor.py'
--- tests/autopilot/camera_app/tests/test_photo_editor.py	2015-03-11 09:25:36 +0000
+++ tests/autopilot/camera_app/tests/test_photo_editor.py	2015-07-03 12:36:05 +0000
@@ -62,14 +62,6 @@
         editor = gallery.wait_select_single(objectName="photoEditor")
         self.assertThat(editor.visible, Eventually(Equals(True)))
 
-        undo = gallery.wait_select_single(objectName="undoButton")
-        self.assertThat(undo.visible, Eventually(Equals(True)))
-        self.assertThat(undo.enabled, Eventually(Equals(False)))
-
-        redo = gallery.wait_select_single(objectName="redoButton")
-        self.assertThat(redo.visible, Eventually(Equals(True)))
-        self.assertThat(redo.enabled, Eventually(Equals(False)))
-
         back = gallery.wait_select_single(objectName="backButton")
         self.pointing_device.move_to_object(back)
         self.pointing_device.click()