ubuntu-touch-coreapps-reviewers team mailing list archive
-
ubuntu-touch-coreapps-reviewers team
-
Mailing list archive
-
Message #08121
[Merge] lp:~verzegnassi-stefano/ubuntu-docviewer-app/fix-1544149 into lp:ubuntu-docviewer-app
Stefano Verzegnassi has proposed merging lp:~verzegnassi-stefano/ubuntu-docviewer-app/fix-1544149 into lp:ubuntu-docviewer-app.
Commit message:
Fixed ContentTransferHint being visible during an export
Requested reviews:
Ubuntu Document Viewer Developers (ubuntu-docviewer-dev)
Related bugs:
Bug #1544149 in Ubuntu Document Viewer App: "Transfer dialog overlays content picker when trying to import from another app"
https://bugs.launchpad.net/ubuntu-docviewer-app/+bug/1544149
For more details, see:
https://code.launchpad.net/~verzegnassi-stefano/ubuntu-docviewer-app/fix-1544149/+merge/285641
Fixed ContentTransferHint being visible during an export
--
Your team Ubuntu Document Viewer Developers is requested to review the proposed merge of lp:~verzegnassi-stefano/ubuntu-docviewer-app/fix-1544149 into lp:ubuntu-docviewer-app.
=== modified file 'src/app/qml/common/ContentHubProxy.qml'
--- src/app/qml/common/ContentHubProxy.qml 2015-10-10 12:03:30 +0000
+++ src/app/qml/common/ContentHubProxy.qml 2016-02-10 17:47:23 +0000
@@ -23,11 +23,12 @@
Item {
id: contentHubProxy
- property var activeTransfer
+ property var activeImportTransfer
+ property var activeExportTransfer
// This property is used in ../documentPage/Document(Grid|List)View.qml
// so that we avoid to import Ubuntu.Content module outside this proxy.
- property bool multipleSelectionType: !activeTransfer || activeTransfer.selectionType == ContentTransfer.Multiple
+ property bool multipleSelectionType: !activeExportTransfer || activeExportTransfer.selectionType == ContentTransfer.Multiple
property alias rejectedDocuments: rejectedDocsModel
property alias importedDocuments: importedDocsModel
@@ -36,22 +37,22 @@
ListModel { id: importedDocsModel }
ContentTransferHint {
- activeTransfer: contentHubProxy.activeTransfer
+ activeTransfer: contentHubProxy.activeImportTransfer
}
Connections {
target: ContentHub
onImportRequested: {
- activeTransfer = transfer
+ activeImportTransfer = transfer
- if (activeTransfer.state === ContentTransfer.Charged) {
+ if (activeImportTransfer.state === ContentTransfer.Charged) {
mainView.switchToBrowseMode()
internal.clearModels()
- for (var i=0; i<activeTransfer.items.length; i++) {
- var sourcePath = internal.getPathFromUrl(activeTransfer.items[i].url)
+ for (var i=0; i<activeImportTransfer.items.length; i++) {
+ var sourcePath = internal.getPathFromUrl(activeImportTransfer.items[i].url)
if (DocumentViewer.isFileSupported(sourcePath)) {
var documentsLocation = DocumentViewer.getXdgDocumentsLocation()
@@ -84,7 +85,7 @@
}
onExportRequested: {
- activeTransfer = transfer
+ activeExportTransfer = transfer
mainView.switchToPickMode()
}
}
@@ -125,7 +126,7 @@
}
function finalizeImport() {
- activeTransfer.finalize()
+ activeImportTransfer.finalize()
}
function handleNotifications() {
=== modified file 'src/app/qml/documentPage/DocumentListView.qml'
--- src/app/qml/documentPage/DocumentListView.qml 2015-11-01 16:50:23 +0000
+++ src/app/qml/documentPage/DocumentListView.qml 2016-02-10 17:47:23 +0000
@@ -24,7 +24,7 @@
function isMultipleSelection() {
// No active transfer, then we're in selection mode.
- if (!contentHubProxy.activeTransfer)
+ if (!contentHubProxy.activeExportTransfer)
return true
// We have an active transfer, get the value from the content hub proxy
=== modified file 'src/app/qml/documentPage/DocumentPagePickModeHeader.qml'
--- src/app/qml/documentPage/DocumentPagePickModeHeader.qml 2015-10-23 14:10:47 +0000
+++ src/app/qml/documentPage/DocumentPagePickModeHeader.qml 2016-02-10 17:47:23 +0000
@@ -29,10 +29,10 @@
objectName: "cancelButton"
iconName: "close"
onTriggered: {
- if (!contentHubProxy.activeTransfer)
+ if (!contentHubProxy.activeExportTransfer)
return;
- contentHubProxy.activeTransfer.state = ContentTransfer.Aborted;
+ contentHubProxy.activeExportTransfer.state = ContentTransfer.Aborted;
}
}
@@ -51,7 +51,7 @@
enabled: viewLoader.item.selectedItems.count > 0
iconName: "ok"
onTriggered: {
- if (!enabled || !contentHubProxy.activeTransfer)
+ if (!enabled || !contentHubProxy.activeExportTransfer)
return;
var urlList = []
@@ -61,8 +61,8 @@
urlList.push("file://" + folderModel.get(i).path);
}
- contentHubProxy.activeTransfer.items = urlList
- contentHubProxy.activeTransfer.state = ContentTransfer.Charged
+ contentHubProxy.activeExportTransfer.items = urlList
+ contentHubProxy.activeExportTransfer.state = ContentTransfer.Charged
}
}
]
Follow ups