Merge lp:~mzanetti/ubuntu-filemanager-app/share-files into lp:ubuntu-filemanager-app

[Michael Zanetti]

Add support for sharing files via contenthub on longpress

[Carlos Jose Mazieri (carlos-mazieri)]

Nice, Thanks.

review: Approve

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-autolanding/46/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/5772/console

review: Needs Fixing (continuous-integration)

[lp:~mzanetti/ubuntu-filemanager-app/share-files]

556. By Michael Zanetti on 2016-07-25

merge trunk

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'src/app/qml/content-hub/FileOpener.qml'
--- src/app/qml/content-hub/FileOpener.qml	2016-03-16 16:15:41 +0000
+++ src/app/qml/content-hub/FileOpener.qml	2016-07-25 12:19:34 +0000
@@ -29,6 +29,7 @@
     property var activeTransfer
 
     property string fileUrl
+    property bool share: false
 
     Component.onCompleted: {
         var contentType = Resolver.resolveContentType(fileUrl)
@@ -53,7 +54,7 @@
         showTitle: false
 
         // Type of handler: Source, Destination, or Share
-        handler: ContentHandler.Destination
+        handler: root.share ? ContentHandler.Share : ContentHandler.Destination
         contentType: ContentType.Pictures
 
         onPeerSelected: {

=== modified file 'src/app/qml/filemanager.qml'
--- src/app/qml/filemanager.qml	2016-07-18 22:56:04 +0000
+++ src/app/qml/filemanager.qml	2016-07-25 12:19:34 +0000
@@ -128,8 +128,8 @@
         }
     }
 
-    function openLocalFile(filePath) {
-        pageStack.push(Qt.resolvedUrl("content-hub/FileOpener.qml"), { fileUrl: "file://" + filePath} )
+    function openLocalFile(filePath, share) {
+        pageStack.push(Qt.resolvedUrl("content-hub/FileOpener.qml"), { fileUrl: "file://" + filePath, share: share} )
     }
 
     function startImport(activeTransfer) {
@@ -167,6 +167,7 @@
         }
     }
 
+
     Connections {
         target: ContentHub
         onExportRequested: {

=== modified file 'src/app/qml/ui/FolderListPage.qml'
--- src/app/qml/ui/FolderListPage.qml	2016-07-18 21:42:19 +0000
+++ src/app/qml/ui/FolderListPage.qml	2016-07-25 12:19:34 +0000
@@ -621,6 +621,14 @@
                 }
 
                 Action {
+                    id: shareAction
+                    text: i18n.tr("Share")
+                    onTriggered: {
+                        openFile(actionSelectionPopover.model, true)
+                    }
+                }
+
+                Action {
                     id: extractAction
                     visible: actionSelectionPopover.isArchive
                     text: i18n.tr("Extract archive")
@@ -934,12 +942,12 @@
         }
     }
 
-    function openFromDisk(fullpathname, name) {
+    function openFromDisk(fullpathname, name, share) {
         console.log("openFromDisk():"+ fullpathname)
         // Check if file is an archive. If yes, ask the user whether he wants to extract it
         var archiveType = getArchiveType(name)
         if (archiveType === "") {
-            openLocalFile(fullpathname)
+            openLocalFile(fullpathname, share)
         } else {
             PopupUtils.open(openArchiveDialog, folderListView,
                             {   "filePath" : fullpathname,
@@ -952,13 +960,13 @@
 
     //High Level openFile() function
     //remote files are saved as temporary files and then opened
-    function openFile(model) {
+    function openFile(model, share) {
         if (model.isRemote) {
             //download and open later when the signal downloadTemporaryComplete() arrives
             pageModel.downloadAsTemporaryFile(model.index)
         }
         else {
-            openFromDisk(model.filePath, model.fileName)
+            openFromDisk(model.filePath, model.fileName, share)
         }
     }