1
=== modified file 'rc/qml/AlbumViewer/AlbumViewer.qml'
2
--- rc/qml/AlbumViewer/AlbumViewer.qml	2013-08-16 12:55:55 +0000
3
+++ rc/qml/AlbumViewer/AlbumViewer.qml	2013-09-18 12:48:12 +0000
4
@@ -54,6 +54,8 @@
5
54
54
6
55
    // When the user clicks the back button or pages back to the cover.
55
    // When the user clicks the back button or pages back to the cover.
7
56
    signal closeRequested(bool stayOpen, int viewingPage)
56
    signal closeRequested(bool stayOpen, int viewingPage)
8
57
    // When the user clicks the back button or pages back to the cover.
9
58
    signal quickCloseRequested()
10
57
59
11
58
    Image {
60
    Image {
12
59
        anchors.fill: parent
61
        anchors.fill: parent
13
@@ -74,6 +76,11 @@
14
74
        closeRequested(album.containedCount > 0, albumSpreadViewer.viewingPage)
76
        closeRequested(album.containedCount > 0, albumSpreadViewer.viewingPage)
15
75
    }
77
    }
16
76
78
17
79
    /// Closes the view without animation or storing anything
18
80
    function __quickClose() {
19
81
        quickCloseRequested()
20
82
    }
21
83
22
77
    FadeOutAnimation {
84
    FadeOutAnimation {
23
78
        id: fadeOutAnimation
85
        id: fadeOutAnimation
24
79
86
25
@@ -374,12 +381,10 @@
26
374
        id: albumTrashDialog
381
        id: albumTrashDialog
27
375
        visible: false
382
        visible: false
28
376
        onDeleteClicked: {
383
        onDeleteClicked: {
31
377
            // FIXME do not show the close animation
384
            __quickClose();
30
378
            __close()
32
379
        }
385
        }
33
380
        onDeleteWithContentsClicked: {
386
        onDeleteWithContentsClicked: {
36
381
            // FIXME do not show the close animation
387
            __quickClose();
35
382
            __close()
37
383
        }
388
        }
38
384
    }
389
    }
39
385
390
40
@@ -397,15 +402,15 @@
41
397
            text: i18n.tr("Add") // text in toolbar
402
            text: i18n.tr("Add") // text in toolbar
42
398
        }
403
        }
43
399
        ToolbarButton {
404
        ToolbarButton {
44
405
            id: deleteButton
45
400
            objectName: "deleteButton"
406
            objectName: "deleteButton"
46
401
            text: i18n.tr("Delete")
407
            text: i18n.tr("Delete")
47
402
            iconSource: Qt.resolvedUrl("../../img/delete.png")
408
            iconSource: Qt.resolvedUrl("../../img/delete.png")
48
403
            onTriggered: {
409
            onTriggered: {
49
404
                albumTrashDialog.album = album
410
                albumTrashDialog.album = album
51
405
                albumTrashDialog.caller = caller
411
                albumTrashDialog.caller = deleteButton
52
406
                albumTrashDialog.show()
412
                albumTrashDialog.show()
53
407
            }
413
            }
54
408
            enabled: false // FIXME enable once the close animation is not shown anymore
55
409
        }
414
        }
56
410
        back: ToolbarButton {
415
        back: ToolbarButton {
57
411
            text: i18n.tr("Back")
416
            text: i18n.tr("Back")
58
412
417
59
=== modified file 'rc/qml/AlbumViewer/AlbumViewerAnimated.qml'
60
--- rc/qml/AlbumViewer/AlbumViewerAnimated.qml	2013-06-20 11:54:49 +0000
61
+++ rc/qml/AlbumViewer/AlbumViewerAnimated.qml	2013-09-18 12:48:12 +0000
62
@@ -87,6 +87,13 @@
63
87
                    inner_albumViewer.visible = false
87
                    inner_albumViewer.visible = false
64
88
                    isOpen = false
88
                    isOpen = false
65
89
                }
89
                }
66
90
                onQuickCloseRequested: {
67
91
                    inner_albumViewer.visible = false
68
92
                    isOpen = false
69
93
                    if (previewItem)
70
94
                        previewItem.visible = true;
71
95
                    loader_albumViewer.unload();
72
96
                }
73
90
            }
97
            }
74
91
98
75
92
            AlbumViewerTransition {
99
            AlbumViewerTransition {
Reviewer	Review Type	Date Requested	Status
Thomas Moenicke (community)		2013-09-18	Approve on 2013-09-18
PS Jenkins bot	continuous-integration		Approve on 2013-09-18
Review via email: mp+186309@code.launchpad.net