Merge lp:~ajalkane/ubuntu-filemanager-app/placeholder-icons-for-toolbar into lp:ubuntu-filemanager-app

[Arto Jalkanen]

Placeholder icons for toolbar.

Placeholder icons for toolbar.

[Arto Jalkanen (ajalkane)]

Aye

review: Approve

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

review: Approve (continuous-integration)

=== modified file 'FileActionDialog.qml'
--- FileActionDialog.qml	2013-04-17 17:55:41 +0000
+++ FileActionDialog.qml	2013-05-16 18:52:25 +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 'FolderListPage.qml'
--- FolderListPage.qml	2013-05-16 14:59:43 +0000
+++ FolderListPage.qml	2013-05-16 18:52:25 +0000
@@ -53,6 +53,8 @@
 
         back: Action {
             text: i18n.tr("Up")
+            // TODO: temporary
+            iconSource: "/usr/share/icons/Humanity/actions/48/up.svg"
             onTriggered: {
                 pageModel.path = pageModel.parentPath
                 console.log("Up triggered")
@@ -61,6 +63,8 @@
         }
         Action {
             text: i18n.tr("Paste" + " (" + pageModel.clipboardUrlsCounter + ")")
+            // TODO: temporary
+            iconSource: "/usr/share/icons/Humanity/actions/48/edit-paste.svg"
             onTriggered: {
                 console.log("Pasting to current folder items of count " + pageModel.clipboardUrlsCounter)
                 PopupUtils.open(Qt.resolvedUrl("FileOperationProgressDialog.qml"),
@@ -81,6 +85,8 @@
         // file manipulation operations
         Action {
             text: i18n.tr("Create folder")
+            // TODO: temporary
+            iconSource: "/usr/share/icons/Humanity/actions/48/folder-new.svg"
             onTriggered: {
                 print(text)
                 PopupUtils.open(createFolderDialog, root)
@@ -89,6 +95,8 @@
 
         Action {
             text: i18n.tr("Home")
+            // TODO: temporary
+            iconSource: "/usr/share/icons/Humanity/actions/48/go-home.svg"
             onTriggered: {
                 pageModel.path = pageModel.homePath()
                 console.log("Home triggered")

=== modified file 'FolderListView.qml'
--- FolderListView.qml	2013-04-23 16:54:17 +0000
+++ FolderListView.qml	2013-05-16 18:52:25 +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
                                  })
             }
         }