1
=== modified file 'src/app/qml/common/ContentHubProxy.qml'
2
--- src/app/qml/common/ContentHubProxy.qml	2015-10-10 12:03:30 +0000
3
+++ src/app/qml/common/ContentHubProxy.qml	2016-02-12 13:03:03 +0000
4
@@ -23,11 +23,12 @@
5
23
Item {
23
Item {
6
24
    id: contentHubProxy
24
    id: contentHubProxy
7
25
25
9
26
    property var activeTransfer
26
    property var activeImportTransfer
10
27
    property var activeExportTransfer
11
27
28
12
28
    // This property is used in ../documentPage/Document(Grid|List)View.qml
29
    // This property is used in ../documentPage/Document(Grid|List)View.qml
13
29
    // so that we avoid to import Ubuntu.Content module outside this proxy.
30
    // so that we avoid to import Ubuntu.Content module outside this proxy.
15
30
    property bool multipleSelectionType: !activeTransfer || activeTransfer.selectionType == ContentTransfer.Multiple
31
    property bool multipleSelectionType: !activeExportTransfer || activeExportTransfer.selectionType == ContentTransfer.Multiple
16
31
32
17
32
    property alias rejectedDocuments: rejectedDocsModel
33
    property alias rejectedDocuments: rejectedDocsModel
18
33
    property alias importedDocuments: importedDocsModel
34
    property alias importedDocuments: importedDocsModel
19
@@ -36,22 +37,22 @@
20
36
    ListModel { id: importedDocsModel }
37
    ListModel { id: importedDocsModel }
21
37
38
22
38
    ContentTransferHint {
39
    ContentTransferHint {
24
39
        activeTransfer: contentHubProxy.activeTransfer
40
        activeTransfer: contentHubProxy.activeImportTransfer
25
40
    }
41
    }
26
41
42
27
42
    Connections {
43
    Connections {
28
43
        target: ContentHub
44
        target: ContentHub
29
44
45
30
45
        onImportRequested: {
46
        onImportRequested: {
32
46
             activeTransfer = transfer
47
             activeImportTransfer = transfer
33
47
48
35
48
            if (activeTransfer.state === ContentTransfer.Charged) {
49
            if (activeImportTransfer.state === ContentTransfer.Charged) {
36
49
                mainView.switchToBrowseMode()
50
                mainView.switchToBrowseMode()
37
50
51
38
51
                internal.clearModels()
52
                internal.clearModels()
39
52
53
42
53
                for (var i=0; i<activeTransfer.items.length; i++) {
54
                for (var i=0; i<activeImportTransfer.items.length; i++) {
43
54
                    var sourcePath = internal.getPathFromUrl(activeTransfer.items[i].url)
55
                    var sourcePath = internal.getPathFromUrl(activeImportTransfer.items[i].url)
44
55
56
45
56
                    if (DocumentViewer.isFileSupported(sourcePath)) {
57
                    if (DocumentViewer.isFileSupported(sourcePath)) {
46
57
                        var documentsLocation = DocumentViewer.getXdgDocumentsLocation()
58
                        var documentsLocation = DocumentViewer.getXdgDocumentsLocation()
47
@@ -84,7 +85,7 @@
48
84
        }
85
        }
49
85
86
50
86
        onExportRequested: {
87
        onExportRequested: {
52
87
            activeTransfer = transfer
88
            activeExportTransfer = transfer
53
88
            mainView.switchToPickMode()
89
            mainView.switchToPickMode()
54
89
        }
90
        }
55
90
    }
91
    }
56
@@ -125,7 +126,7 @@
57
125
        }
126
        }
58
126
127
59
127
        function finalizeImport() {
128
        function finalizeImport() {
61
128
            activeTransfer.finalize()
129
            activeImportTransfer.finalize()
62
129
        }
130
        }
63
130
131
64
131
        function handleNotifications() {
132
        function handleNotifications() {
65
132
133
66
=== modified file 'src/app/qml/documentPage/DocumentListView.qml'
67
--- src/app/qml/documentPage/DocumentListView.qml	2015-11-01 16:50:23 +0000
68
+++ src/app/qml/documentPage/DocumentListView.qml	2016-02-12 13:03:03 +0000
69
@@ -24,7 +24,7 @@
70
24
24
71
25
    function isMultipleSelection() {
25
    function isMultipleSelection() {
72
26
        // No active transfer, then we're in selection mode.
26
        // No active transfer, then we're in selection mode.
74
27
        if (!contentHubProxy.activeTransfer)
27
        if (!contentHubProxy.activeExportTransfer)
75
28
            return true
28
            return true
76
29
29
77
30
        // We have an active transfer, get the value from the content hub proxy
30
        // We have an active transfer, get the value from the content hub proxy
78
31
31
79
=== modified file 'src/app/qml/documentPage/DocumentPagePickModeHeader.qml'
80
--- src/app/qml/documentPage/DocumentPagePickModeHeader.qml	2015-10-23 14:10:47 +0000
81
+++ src/app/qml/documentPage/DocumentPagePickModeHeader.qml	2016-02-12 13:03:03 +0000
82
@@ -29,10 +29,13 @@
83
29
        objectName: "cancelButton"
29
        objectName: "cancelButton"
84
30
        iconName: "close"
30
        iconName: "close"
85
31
        onTriggered: {
31
        onTriggered: {
90
32
            if (!contentHubProxy.activeTransfer)
32
            if (!contentHubProxy.activeExportTransfer)
91
33
                return;
33
                return
92
34
34
93
35
            contentHubProxy.activeTransfer.state = ContentTransfer.Aborted;
35
            contentHubProxy.activeExportTransfer.items = []
94
36
            contentHubProxy.activeExportTransfer.state = ContentTransfer.Aborted
95
37
96
38
            mainView.switchToBrowseMode()
97
36
        }
39
        }
98
37
    }
40
    }
99
38
41
100
@@ -48,23 +51,32 @@
101
48
        Action {
51
        Action {
102
49
            text: i18n.tr("Pick")
52
            text: i18n.tr("Pick")
103
50
            objectName: "pickButton"
53
            objectName: "pickButton"
105
51
            enabled: viewLoader.item.selectedItems.count > 0
54
            enabled: viewLoader.item.ViewItems.selectedIndices.length > 0
106
52
            iconName: "ok"
55
            iconName: "ok"
107
53
            onTriggered: {
56
            onTriggered: {
109
54
                if (!enabled || !contentHubProxy.activeTransfer)
57
                if (!enabled || !contentHubProxy.activeExportTransfer)
110
55
                    return;
58
                    return;
111
56
59
114
57
                var urlList = []
60
                var contentList = []
115
58
                var indices = documentPage.view.item.selectedIndices;
61
                var indices = viewLoader.item.ViewItems.selectedIndices
116
62
117
63
                console.log("[content-hub] Following files will be exported:")
118
59
64
119
60
                for (var i=0; i < indices.length; i++) {
65
                for (var i=0; i < indices.length; i++) {
121
61
                    urlList.push("file://" + folderModel.get(i).path);
66
                    var filePath = "file://" + folderModel.get(i).path
122
67
                    console.log(filePath)
123
68
124
69
                    contentList.push(contentItem.createObject(rootItem, { "url": filePath }))
125
62
                }
70
                }
126
63
71
129
64
                contentHubProxy.activeTransfer.items = urlList
72
                contentHubProxy.activeExportTransfer.items = contentList
130
65
                contentHubProxy.activeTransfer.state = ContentTransfer.Charged
73
                contentHubProxy.activeExportTransfer.state = ContentTransfer.Charged
131
74
132
75
                mainView.switchToBrowseMode()
133
66
            }
76
            }
134
67
        }
77
        }
135
68
    ]
78
    ]
136
79
137
80
    property Component contentItem: Component { ContentItem {} }
138
69
}
81
}
139
70
82
Reviewer	Review Type	Date Requested	Status
Alan Pope 🍺🐧🐱 🦄 (community)		2016-02-10	Approve on 2016-02-12
Jenkins Bot	continuous-integration		Approve on 2016-02-12
Review via email: mp+285641@code.launchpad.net