Merge lp:~schwann/gallery-app/gallery-delete-album into lp:gallery-app

[Günter Schwann]

Enable delete in album view (close view without animation) fixes LP: #1163437

Enable delete in album view (close view without animation) fixes LP: #1163437

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:840
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/506/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-ci/316
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/316
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/316/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-ci/316
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3584
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1112
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3596
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3596/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/3042
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1114
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1114/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/918
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/930

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

review: Approve (continuous-integration)

[Thomas Moenicke (thomas-moenicke)]

looks good

review: Approve

=== modified file 'rc/qml/AlbumViewer/AlbumViewer.qml'
--- rc/qml/AlbumViewer/AlbumViewer.qml	2013-08-16 12:55:55 +0000
+++ rc/qml/AlbumViewer/AlbumViewer.qml	2013-09-18 12:48:12 +0000
@@ -54,6 +54,8 @@
 
     // When the user clicks the back button or pages back to the cover.
     signal closeRequested(bool stayOpen, int viewingPage)
+    // When the user clicks the back button or pages back to the cover.
+    signal quickCloseRequested()
 
     Image {
         anchors.fill: parent
@@ -74,6 +76,11 @@
         closeRequested(album.containedCount > 0, albumSpreadViewer.viewingPage)
     }
 
+    /// Closes the view without animation or storing anything
+    function __quickClose() {
+        quickCloseRequested()
+    }
+
     FadeOutAnimation {
         id: fadeOutAnimation
 
@@ -374,12 +381,10 @@
         id: albumTrashDialog
         visible: false
         onDeleteClicked: {
-            // FIXME do not show the close animation
-            __close()
+            __quickClose();
         }
         onDeleteWithContentsClicked: {
-            // FIXME do not show the close animation
-            __close()
+            __quickClose();
         }
     }
 
@@ -397,15 +402,15 @@
             text: i18n.tr("Add") // text in toolbar
         }
         ToolbarButton {
+            id: deleteButton
             objectName: "deleteButton"
             text: i18n.tr("Delete")
             iconSource: Qt.resolvedUrl("../../img/delete.png")
             onTriggered: {
                 albumTrashDialog.album = album
-                albumTrashDialog.caller = caller
+                albumTrashDialog.caller = deleteButton
                 albumTrashDialog.show()
             }
-            enabled: false // FIXME enable once the close animation is not shown anymore
         }
         back: ToolbarButton {
             text: i18n.tr("Back")

=== modified file 'rc/qml/AlbumViewer/AlbumViewerAnimated.qml'
--- rc/qml/AlbumViewer/AlbumViewerAnimated.qml	2013-06-20 11:54:49 +0000
+++ rc/qml/AlbumViewer/AlbumViewerAnimated.qml	2013-09-18 12:48:12 +0000
@@ -87,6 +87,13 @@
                     inner_albumViewer.visible = false
                     isOpen = false
                 }
+                onQuickCloseRequested: {
+                    inner_albumViewer.visible = false
+                    isOpen = false
+                    if (previewItem)
+                        previewItem.visible = true;
+                    loader_albumViewer.unload();
+                }
             }
 
             AlbumViewerTransition {