Merge lp:~ajalkane/ubuntu-filemanager-app/use-backend-to-open-files into lp:ubuntu-filemanager-app

[Arto Jalkanen]

Using backend to open files for more flexibility in future

Using backend to open filetypes for future flexibility.

[Arto Jalkanen (ajalkane)]

I say, no harm in this change

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Autolanding.
No commit message was specified in the merge proposal. Hit 'Add commit message' on the merge proposal web page or follow the link below. You can approve the merge proposal yourself to rerun.
https://code.launchpad.net/~ajalkane/ubuntu-filemanager-app/use-backend-to-open-files/+merge/164225/+edit-commit-message

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:30
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~ajalkane/ubuntu-filemanager-app/use-backend-to-open-files/+merge/164225/+edit-commit-message

http://91.189.93.125:8080/job/ubuntu-filemanager-app-ci/2/
Executed test runs:
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-filemanager-app-raring-amd64-ci/2

Click here to trigger a rebuild:
http://91.189.93.125:8080/job/ubuntu-filemanager-app-ci/2/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'FileActionDialog.qml'
--- FileActionDialog.qml	2013-04-17 17:55:41 +0000
+++ FileActionDialog.qml	2013-05-16 16:25:31 +0000
@@ -18,12 +18,14 @@
 import QtQuick 2.0
 import Ubuntu.Components 0.1
 import Ubuntu.Components.Popups 0.1
+import org.nemomobile.folderlistmodel 1.0
 
 Dialog {
     id: root
 
     property string fileName
     property string filePath
+    property FolderListModel folderListModel
 
     title: i18n.tr("Choose action")
     text: i18n.tr("For file: ") + fileName
@@ -32,7 +34,7 @@
         text: i18n.tr("Open")
         onClicked: {
             console.log("Opening file", filePath)
-            Qt.openUrlExternally("file://" + filePath)
+            folderListModel.openPath(filePath)
             onClicked: PopupUtils.close(root)
         }
     }

=== modified file 'FolderListView.qml'
--- FolderListView.qml	2013-04-23 16:54:17 +0000
+++ FolderListView.qml	2013-05-16 16:25:31 +0000
@@ -157,6 +157,7 @@
 
     delegate: FolderListDelegate {
         id: delegate
+
         onClicked: {
             if (model.isDir) {
                 if (model.isReadable && model.isExecutable) {
@@ -172,11 +173,11 @@
                 }
             } else {
                 console.log("Non dir clicked")
-                PopupUtils.open(Qt.resolvedUrl("FileActionDialog.qml"), delegate,
+                PopupUtils.open(Qt.resolvedUrl("FileActionDialog.qml"), root,
                                 {
                                     fileName: model.fileName,
-                                    filePath: model.filePath
-
+                                    filePath: model.filePath,
+                                    folderListModel: root.folderListModel
                                  })
             }
         }