Merge lp:~ibelieve/ubuntu-filemanager-app/code-refactoring into lp:ubuntu-filemanager-app

[Michael Spencer]

Cleaned up the code, reenabled multi-tab support, and fixed a bug

Lots of work on refactoring code, including:

 * Moved all of the model code from FolderListPage into a separate FolderModel class
 * Moved some of the popovers from FOlderListPage into separate classes
 * Moved the places model from PlacesSidbar and PlacesPopover into FolderModel, removing the extra duplicate

Also, fixed some other bugs:

 * Renabled multi-tab support, as this was fixed in the SDK
 * Expanding the app's window automatically expands the sidebar if it was previously expanded

Unmerged revisions

207. By Michael Spencer on 2014-06-16

Sidebar expands automatically when changing the size of the app on the desktop

206. By Michael Spencer on 2014-06-16

Re-enabled multi-tab support

205. By Michael Spencer on 2014-06-16

More code refactoring
 * split some popovers into separate classes
 * Use local icons from the Suru theme
 * Moved the places list into one location in the FolderModel

204. By Michael Spencer on 2014-06-16

Initial refactoring of the model code into a separate backend class

=== added directory 'src/app/qml/backend'
=== added file 'src/app/qml/backend/FolderModel.qml'
--- src/app/qml/backend/FolderModel.qml	1970-01-01 00:00:00 +0000
+++ src/app/qml/backend/FolderModel.qml	2014-06-16 21:32:33 +0000
@@ -0,0 +1,303 @@
+/*
+ * Copyright (C) 2014 Michael Spencer <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import org.nemomobile.folderlistmodel 1.0
+
+Object {
+    id: model
+
+    property bool loading: folderModel.awaitingResults
+
+    property alias folderModel: folderModel
+
+    /*!
+     * The user-friendly title for the current directory
+     */
+    property string title: folderName(folder)
+
+    /*!
+     * Set to <code>true</code> true to show hidden files begining with a .
+     * in the current directory
+     */
+    property bool showHiddenFiles: false
+
+    // TODO: Can this be replaced by a property binding?
+    onShowHiddenFilesChanged: {
+        folderModel.showHiddenFiles = folderListPage.showHiddenFiles
+    }
+
+    /*!
+     * The sorting mode for the current directory.
+     *
+     * Can be one of: Name or Date
+     */
+    property string sortingMethod: "Name"
+
+    // TODO: Can this be replaced by a property binding?
+    onSortingMethodChanged: {
+        console.log("Sorting by: " + sortingMethod)
+        if (sortingMethod === "Name") {
+            folderModel.sortBy = FolderListModel.SortByName
+        } else if (sortingMethod === "Date") {
+            folderModel.sortBy = FolderListModel.SortByDate
+        } else {
+            // Something fatal happened!
+            console.log("ERROR: Invalid sort type:", sortingMethod)
+        }
+    }
+    /*!
+     * Set to <code>true</code> true to sort A-Z, or <code>false</code>
+     * to sort in reverse, from Z to A.
+     */
+    property bool sortAccending: true
+
+    // TODO: Can this be replaced by a property binding?
+    onSortAccendingChanged: {
+        console.log("Sorting accending: " + sortAccending)
+
+        if (sortAccending) {
+            folderModel.sortOrder = FolderListModel.SortAscending
+        } else {
+            folderModel.sortOrder = FolderListModel.SortDescending
+        }
+    }
+
+    // This stores the location using ~ to represent home
+    property string folder: homeFolder
+    property string homeFolder: "~"
+
+    // This replaces ~ with the actual home folder, since the
+    // plugin doesn't recognize the ~
+    property string path: folder.replace("~", folderModel.homePath())
+    property string homePath: folderModel.homePath()
+
+
+    /*!
+     * Switches directories to the user's home directory
+     */
+    function goHome() {
+        goTo(model.homeFolder)
+    }
+
+    /*!
+     * Switches directories to the specified path. Can use either /home/<user> or ~
+     * to represent the user's home folder
+     */
+    function goTo(location) {
+        // Since the FolderListModel returns paths using the actual
+        // home folder, this replaces with ~ before actually going
+        // to the specified folder
+        while (location !== '/' && location.substring(location.lastIndexOf('/')+1) === "") {
+            location = location.substring(0, location.length - 1)
+        }
+
+        model.folder = location.replace(homePath, "~")
+        refresh()
+    }
+
+    /*!
+     * Opens the specified file in the default app for the file's type
+     */
+    function openFile(filePath) {
+        if (!folderModel.openPath(filePath)) {
+            error(i18n.tr("File operation error"), i18n.tr("Unable to open '%11").arg(filePath))
+        }
+    }
+
+    /*!
+     * Refreshes the folder model
+     */
+    // TODO: Is this needed?
+    function refresh() {
+        folderModel.refresh()
+    }
+
+    /*!
+     * Returns the user-friendly name for the specified path. Can use either
+     * /home/<user> or ~ to represent the user's home folder
+     */
+    function folderName(folder) {
+        folder = folder.replace(homePath, "~")
+
+        if (folder === homeFolder) {
+            return i18n.tr("Home")
+        } else if (folder === "/") {
+            return i18n.tr("File System")
+        } else {
+            return pathName(folder)
+        }
+    }
+
+    /*!
+     * Returns the last element of the specified path, or / for the
+     * root folder.
+     */
+    function pathName(folder) {
+        if (folder === "/") {
+            return "/"
+        } else {
+            return folder.substr(folder.lastIndexOf('/') + 1)
+        }
+    }
+
+    function pathAccessedDate() {
+        console.log("calling method folderModel.curPathAccessedDate()")
+        return folderModel.curPathAccessedDate()
+    }
+
+    function pathModifiedDate() {
+        console.log("calling method folderModel.curPathModifiedDate()")
+        return folderModel.curPathModifiedDate()
+    }
+
+    function pathIsWritable() {
+        console.log("calling method folderModel.curPathIsWritable()")
+        return folderModel.curPathIsWritable()
+    }
+
+    /*!
+     * Returns true if the specified path exists in the file system.
+     */
+    function pathExists(path) {
+        path = path.replace("~", folderModel.homePath())
+
+        if (path === '/')
+            return true
+
+        if(path.charAt(0) === '/') {
+            console.log("Directory: " + path.substring(0, path.lastIndexOf('/')+1))
+            repeaterModel.path = path.substring(0, path.lastIndexOf('/')+1)
+            console.log("Sub dir: " + path.substring(path.lastIndexOf('/')+1))
+            if (path.substring(path.lastIndexOf('/')+1) !== "" && !repeaterModel.cdIntoPath(path.substring(path.lastIndexOf('/')+1))) {
+                return false
+            } else {
+                return true
+            }
+        } else {
+            return false
+        }
+    }
+
+
+    /*!
+     * Returns the icon for the specified file or folder.
+     */
+    // FIXME: hard coded path for icon, assumes Ubuntu desktop icon available.
+    // Nemo mobile has icon provider. Have to figure out what's the proper way
+    // to get "system wide" icons in Ubuntu Touch, or if we have to use
+    // icons packaged into the application. Both folder and individual
+    // files will need an icon.
+    // TODO: Remove isDir parameter and use new model functions
+    function fileIcon(file, isDir) {
+        file = file.replace(folderModel.homePath(), "~")
+        var iconPath = isDir ? "/usr/share/icons/Humanity/places/48/folder.svg"
+                             : "/usr/share/icons/Humanity/mimes/48/empty.svg"
+
+        if (file === "~") {
+            iconPath = "../icons/folder-home.svg"
+        } else if (file === i18n.tr("~/Desktop")) {
+            iconPath = "/usr/share/icons/Humanity/places/48/user-desktop.svg"
+        } else if (file === i18n.tr("~/Documents")) {
+            iconPath = "/usr/share/icons/Humanity/places/48/folder-documents.svg"
+        } else if (file === i18n.tr("~/Downloads")) {
+            iconPath = "/usr/share/icons/Humanity/places/48/folder-downloads.svg"
+        } else if (file === i18n.tr("~/Music")) {
+            iconPath = "/usr/share/icons/Humanity/places/48/folder-music.svg"
+        } else if (file === i18n.tr("~/Pictures")) {
+            iconPath = "/usr/share/icons/Humanity/places/48/folder-pictures.svg"
+        } else if (file === i18n.tr("~/Public")) {
+            iconPath = "/usr/share/icons/Humanity/places/48/folder-publicshare.svg"
+        } else if (file === i18n.tr("~/Programs")) {
+            iconPath = "/usr/share/icons/Humanity/places/48/folder-system.svg"
+        } else if (file === i18n.tr("~/Templates")) {
+            iconPath = "/usr/share/icons/Humanity/places/48/folder-templates.svg"
+        } else if (file === i18n.tr("~/Videos")) {
+            iconPath = "/usr/share/icons/Humanity/places/48/folder-videos.svg"
+        } else if (file === "/") {
+            iconPath = "/usr/share/icons/Humanity/devices/48/drive-harddisk.svg"
+        }
+
+        return Qt.resolvedUrl(iconPath)
+    }
+
+    /*!
+     * The places list for the sidebar
+     */
+    property ListModel places: ListModel {
+        ListElement {
+            objectName: "placeHome"
+            path: "~"
+        }
+
+        ListElement {
+            path: "~/Documents"
+        }
+
+        ListElement {
+            path: "~/Downloads"
+        }
+
+        ListElement {
+            path: "~/Music"
+        }
+
+        ListElement {
+            path: "~/Pictures"
+        }
+
+        ListElement {
+            path: "~/Videos"
+        }
+
+        ListElement {
+            objectName: "placeRoot"
+            path: "/"
+        }
+    }
+
+    /*!
+     * The folder model used to represent the currently selected folder
+     */
+    FolderListModel {
+        id: folderModel
+
+        path: model.path
+
+        enableExternalFSWatcher: true
+
+        // Properties to emulate a model entry for use by FileDetailsPopover
+        property bool isDir: true
+        property string fileName: pathName(folderModel.path)
+        property string fileSize: (folderListView.count === 1
+                                   ? i18n.tr("1 file")
+                                   : i18n.tr("%1 files").arg(folderListView.count))
+        property bool isReadable: true
+        property bool isExecutable: true
+    }
+
+    /*!
+     * The folder model used for checking to see if a specified path exists
+     */
+    FolderListModel {
+        id: repeaterModel
+        path: model.folder
+
+        onPathChanged: {
+            console.log("Path: " + repeaterModel.path)
+        }
+    }
+}

=== modified file 'src/app/qml/components/FolderIconDelegate.qml'
--- src/app/qml/components/FolderIconDelegate.qml	2014-03-29 09:20:11 +0000
+++ src/app/qml/components/FolderIconDelegate.qml	2014-06-16 21:32:33 +0000
@@ -52,7 +52,7 @@
     property string text: fileName
     property string subText: Qt.formatDateTime(model.modifiedDate, Qt.DefaultLocaleShortDate) + (!model.isDir ? ", " + fileSize : "")
 
-    property var icon: fileIcon(filePath, model.isDir)
+    property var icon: folderModel.fileIcon(filePath, model.isDir)
 
     Item {
         anchors {

=== modified file 'src/app/qml/components/FolderListDelegate.qml'
--- src/app/qml/components/FolderListDelegate.qml	2014-03-29 09:20:11 +0000
+++ src/app/qml/components/FolderListDelegate.qml	2014-06-16 21:32:33 +0000
@@ -30,7 +30,7 @@
     subText: Qt.formatDateTime(model.modifiedDate, Qt.DefaultLocaleShortDate) + (!model.isDir ? ", " + fileSize : "")
 
     property string path: fileView.path + '/' + model.fileName
-    iconSource: fileIcon(path, model.isDir)
+    iconSource: folderModel.fileIcon(path, model.isDir)
 
     progression: model.isDir
     iconFrame: false

=== added file 'src/app/qml/components/OverlayStandard.qml'
--- src/app/qml/components/OverlayStandard.qml	1970-01-01 00:00:00 +0000
+++ src/app/qml/components/OverlayStandard.qml	2014-06-16 21:32:33 +0000
@@ -0,0 +1,55 @@
+/***************************************************************************
+ * Ubuntu UI Extras - A collection of QML widgets not available            *
+ *                    in the default Ubuntu UI Toolkit                     *
+ * Copyright (C) 2013 Michael Spencer <[e-mail]>          *
+ *                                                                         *
+ * This program is free software: you can redistribute it and/or modify    *
+ * it under the terms of the GNU General Public License as published by    *
+ * the Free Software Foundation, either version 2 of the License, or       *
+ * (at your option) any later version.                                     *
+ *                                                                         *
+ * This program is distributed in the hope that it will be useful,         *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of          *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the            *
+ * GNU General Public License for more details.                            *
+ *                                                                         *
+ * You should have received a copy of the GNU General Public License       *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.    *
+ ***************************************************************************/
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+import Ubuntu.Components.ListItems 1.0
+
+Standard {
+    id: standard
+
+    property alias text: label.text
+    property alias iconSource: image.source
+
+    Image {
+        id: image
+        width: units.gu(3.5)
+        height: width
+
+        anchors {
+            verticalCenter: parent.verticalCenter
+            left: parent.left
+            leftMargin: units.gu(2)
+        }
+        opacity: standard.enabled ? 1 : 0.5
+    }
+
+    //FIXME: Hack because of Suru theme!
+    Label {
+        id: label
+        anchors {
+            verticalCenter: parent.verticalCenter
+            left: parent.left
+            leftMargin: image.source === "" ? units.gu(2) : image.width + units.gu(4)
+        }
+
+        fontSize: "medium"
+        color: standard.selected ? UbuntuColors.orange : "#666"
+        opacity: standard.enabled ? 1 : 0.5
+    }
+}

=== modified file 'src/app/qml/components/PathBar.qml'
--- src/app/qml/components/PathBar.qml	2014-06-03 23:27:22 +0000
+++ src/app/qml/components/PathBar.qml	2014-06-16 21:32:33 +0000
@@ -87,7 +87,7 @@
 
             Repeater {
                 id: repeater
-                model: folder === "/" ? [""] : folder.split("/")
+                model: folderModel.folder === "/" ? [""] : folderModel.folder.split("/")
                 delegate: Rectangle {
                     MouseArea {
                         id: mouseArea

=== modified file 'src/app/qml/components/PlacesSidebar.qml'
--- src/app/qml/components/PlacesSidebar.qml	2014-06-10 02:34:07 +0000
+++ src/app/qml/components/PlacesSidebar.qml	2014-06-16 21:32:33 +0000
@@ -27,7 +27,7 @@
     //color: Qt.rgba(0.5,0.5,0.5,0.3)
     width: collapsed ? units.gu(8) : units.gu(22)
 
-    property bool collapsed: collapsedSidebar
+    property bool collapsed: collapsedSidebar || !allowSidebarExpanded
 
     MouseArea {
         anchors.fill: parent
@@ -42,40 +42,6 @@
         UbuntuNumberAnimation {}
     }
 
-    ListModel {
-        id: places
-
-        ListElement {
-            objectName: "placeHome"
-            path: "~"
-        }
-
-        ListElement {
-            path: "~/Documents"
-        }
-
-        ListElement {
-            path: "~/Downloads"
-        }
-
-        ListElement {
-            path: "~/Music"
-        }
-
-        ListElement {
-            path: "~/Pictures"
-        }
-
-        ListElement {
-            path: "~/Videos"
-        }
-
-        ListElement {
-            objectName: "placeRoot"
-            path: "/"
-        }
-    }
-
     Column {
         anchors {
             left: parent.left
@@ -91,11 +57,11 @@
             id: placesList
             objectName: "placesList"
 
-            model: places
+            model: folderModel.places
 
             delegate: Standard {
                 objectName: model.objectName
-                text: folderName(path)
+                text: folderModel.folderName(path)
 
                 Image {
                     anchors {
@@ -114,16 +80,16 @@
                     }
                 }
 
-                iconSource: model.icon || fileIcon(model.path, true)
+                iconSource: model.icon || folderModel.fileIcon(model.path, true)
 
                 onClicked: {
-                    goTo(model.path)
+                    folderModel.goTo(model.path)
                 }
 
                 height: units.gu(5)
                 showDivider: !collapsed
 
-                selected: folder === path
+                selected: folderModel.folder === path
                 iconFrame: false
             }
         }

=== modified file 'src/app/qml/filemanager.qml'
--- src/app/qml/filemanager.qml	2014-04-29 18:05:45 +0000
+++ src/app/qml/filemanager.qml	2014-06-16 21:32:33 +0000
@@ -47,11 +47,6 @@
 
     property bool allowSidebarExpanded: width >= units.gu(80)
 
-    onAllowSidebarExpandedChanged: {
-        if (!allowSidebarExpanded)
-            saveSetting("collapsedSidebar", true)
-    }
-
     property bool showSidebar: width >= units.gu(50)
 
     property bool showToolbar: width >= units.gu(80)
@@ -95,27 +90,17 @@
         Tabs {
             id: tabs
 
-            Tab {
-                title: page.title
-                page: FolderListPage {
-                    objectName: "folderPage"
+            Repeater {
+                model: folderTabs
+                delegate: Tab {
+                    title: page.title
+                    page: FolderListPage {
+                        objectName: "folderPage"
 
-                    folder: "~"//modelData
+                        folder: modelData
+                    }
                 }
             }
-
-            // TODO: Temporarily disabled tabs support since this is broken in the SDK (lp:1295242)
-//            Repeater {
-//                model: folderTabs
-//                delegate: Tab {
-//                    title: page.title
-//                    page: FolderListPage {
-//                        objectName: "folderPage"
-
-//                        folder: modelData
-//                    }
-//                }
-//            }
         }
 
         Component.onCompleted: {
@@ -192,7 +177,7 @@
     }
 
     function getIcon(name) {
-        return "/usr/share/icons/ubuntu-mobile/actions/scalable/" + name + ".svg" //Qt.resolvedUrl("icons/" + name + ".png")
+        return Qt.resolvedUrl("icons/" + name + ".png")
     }
 
     function error(title, message) {

=== added file 'src/app/qml/icons/add.png'
Binary files src/app/qml/icons/add.png	1970-01-01 00:00:00 +0000 and src/app/qml/icons/add.png	2014-06-16 21:32:33 +0000 differ
=== added file 'src/app/qml/icons/delete.png'
Binary files src/app/qml/icons/delete.png	1970-01-01 00:00:00 +0000 and src/app/qml/icons/delete.png	2014-06-16 21:32:33 +0000 differ
=== added file 'src/app/qml/icons/edit-copy.png'
Binary files src/app/qml/icons/edit-copy.png	1970-01-01 00:00:00 +0000 and src/app/qml/icons/edit-copy.png	2014-06-16 21:32:33 +0000 differ
=== added file 'src/app/qml/icons/edit-cut.png'
Binary files src/app/qml/icons/edit-cut.png	1970-01-01 00:00:00 +0000 and src/app/qml/icons/edit-cut.png	2014-06-16 21:32:33 +0000 differ
=== added file 'src/app/qml/icons/edit-paste.png'
Binary files src/app/qml/icons/edit-paste.png	1970-01-01 00:00:00 +0000 and src/app/qml/icons/edit-paste.png	2014-06-16 21:32:33 +0000 differ
=== modified file 'src/app/qml/icons/edit.png'
Binary files src/app/qml/icons/edit.png	2013-09-17 16:47:57 +0000 and src/app/qml/icons/edit.png	2014-06-16 21:32:33 +0000 differ
=== added file 'src/app/qml/icons/info.png'
Binary files src/app/qml/icons/info.png	1970-01-01 00:00:00 +0000 and src/app/qml/icons/info.png	2014-06-16 21:32:33 +0000 differ
=== modified file 'src/app/qml/icons/location.png'
Binary files src/app/qml/icons/location.png	2013-09-17 16:47:57 +0000 and src/app/qml/icons/location.png	2014-06-16 21:32:33 +0000 differ
=== modified file 'src/app/qml/icons/navigation-menu.png'
Binary files src/app/qml/icons/navigation-menu.png	2013-11-28 01:55:21 +0000 and src/app/qml/icons/navigation-menu.png	2014-06-16 21:32:33 +0000 differ
=== modified file 'src/app/qml/icons/properties.png'
Binary files src/app/qml/icons/properties.png	2013-12-04 19:05:26 +0000 and src/app/qml/icons/properties.png	2014-06-16 21:32:33 +0000 differ
=== added file 'src/app/qml/ui/FileActionsPopover.qml'
--- src/app/qml/ui/FileActionsPopover.qml	1970-01-01 00:00:00 +0000
+++ src/app/qml/ui/FileActionsPopover.qml	2014-06-16 21:32:33 +0000
@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) 2014 Michael Spencer <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.Popups 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+import "../components"
+
+Popover {
+    id: root
+
+    property var model
+
+    property list<Action> actions: [
+        Action {
+            text: i18n.tr("Cut")
+            iconSource: getIcon("edit-cut")
+            onTriggered: {
+                console.log("Cut on row called for", root.model.fileName, root.model.index)
+                folderModel.folderModel.cutIndex(root.model.index)
+                console.log("CliboardUrlsCounter after copy", folderModel.folderModel.clipboardUrlsCounter)
+            }
+        },
+
+        Action {
+            text: i18n.tr("Copy")
+            iconSource: getIcon("edit-copy")
+
+            onTriggered: {
+                console.log("Copy on row called for", root.model.fileName, root.model.index)
+                folderModel.folderModel.copyIndex(root.model.index)
+                console.log("CliboardUrlsCounter after copy", folderModel.folderModel.clipboardUrlsCounter)
+            }
+        },
+
+        Action {
+            text: i18n.tr("Delete")
+            iconSource: getIcon("delete")
+            onTriggered: {
+                print(text)
+                PopupUtils.open(confirmSingleDeleteDialog, root.caller,
+                                { "filePath" : root.model.filePath,
+                                  "fileName" : root.model.fileName }
+                                )
+            }
+        },
+
+        Action {
+            text: i18n.tr("Rename")
+            iconSource: getIcon("edit")
+            onTriggered: {
+                print(text)
+                PopupUtils.open(confirmRenameDialog, root.caller,
+                                { "modelRow"  : root.model.index,
+                                  "inputText" : root.model.fileName
+                                })
+            }
+        },
+
+        Action {
+            text: i18n.tr("Properties")
+            iconSource: getIcon("info")
+            onTriggered: {
+                print(text)
+                PopupUtils.open(Qt.resolvedUrl("FileDetailsPopover.qml"),
+                                value,
+                                    { "model": root.model
+                                    }
+                                )
+            }
+        }
+    ]
+
+    Column {
+        anchors {
+            left: parent.left
+            right: parent.right
+        }
+
+        Repeater {
+            id: repeater
+            model: actions
+            delegate: OverlayStandard {
+                property Action action: modelData
+
+                visible: action.visible
+                enabled: action.enabled
+                text: action.text
+                iconSource: action.iconSource
+                iconFrame: false
+
+                onClicked: {
+                    action.triggered(root.caller)
+                    PopupUtils.close(root)
+                }
+
+                showDivider: index < repeater.count - 1
+            }
+        }
+    }
+}

=== modified file 'src/app/qml/ui/FileDetailsPopover.qml'
--- src/app/qml/ui/FileDetailsPopover.qml	2014-02-19 00:00:15 +0000
+++ src/app/qml/ui/FileDetailsPopover.qml	2014-06-16 21:32:33 +0000
@@ -71,13 +71,13 @@
                 anchors.verticalCenter: parent.verticalCenter
 
                 // TODO: how to get proper icon?
-                source: fileIcon(root.path, model.isDir)
+                source: folderModel.fileIcon(root.path, model.isDir)
             }
 
             Label {
                 anchors.verticalCenter: parent.verticalCenter
 
-                text: folderName(root.path)
+                text: folderModel.folderName(root.path)
                 color: Theme.palette.normal.overlayText
                 font.bold: true
             }

=== modified file 'src/app/qml/ui/FileOperationProgressDialog.qml'
--- src/app/qml/ui/FileOperationProgressDialog.qml	2014-02-19 00:00:15 +0000
+++ src/app/qml/ui/FileOperationProgressDialog.qml	2014-06-16 21:32:33 +0000
@@ -78,7 +78,7 @@
 
     // Errors from model
     Connections {
-        target: pageModel
+        target: folderModel
         onError: {
             PopupUtils.close(root)
         }

=== added file 'src/app/qml/ui/FolderActionsPopover.qml'
--- src/app/qml/ui/FolderActionsPopover.qml	1970-01-01 00:00:00 +0000
+++ src/app/qml/ui/FolderActionsPopover.qml	2014-06-16 21:32:33 +0000
@@ -0,0 +1,116 @@
+/*
+ * Copyright (C) 2014 Michael Spencer <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.Popups 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+import "../components"
+
+Popover {
+    id: root
+
+    property list<Action> actions: [
+        Action {
+            text: i18n.tr("Create New Folder")
+            iconSource: getIcon("add")
+            onTriggered: {
+                print(text)
+
+                PopupUtils.open(createFolderDialog, folderListPage)
+            }
+        },
+
+        // TODO: Disabled until backend supports creating files
+//            Action {
+//                text: i18n.tr("Create New File")
+//                onTriggered: {
+//                    print(text)
+
+//                    PopupUtils.open(createFileDialog, root)
+//                }
+//            },
+
+        Action {
+            text: folderModel.folderModel.clipboardUrlsCounter === 0
+                  ? i18n.tr("Paste")
+                  : folderModel.folderModel.clipboardUrlsCounter === 1
+                    ? i18n.tr("Paste %1 File").arg(folderModel.folderModel.clipboardUrlsCounter)
+                    : i18n.tr("Paste %1 Files").arg(folderModel.folderModel.clipboardUrlsCounter)
+            onTriggered: {
+                console.log("Pasting to current folder items of count " + folderModel.folderModel.clipboardUrlsCounter)
+                fileOperationDialog.startOperation(i18n.tr("Paste files"))
+                folderModel.folderModel.paste()
+            }
+            iconSource: getIcon("edit-paste")
+
+            enabled: folderModel.folderModel.clipboardUrlsCounter > 0
+        },
+
+        // TODO: Disabled until support for opening apps is added
+        Action {
+            text: i18n.tr("Open in Terminal")
+            onTriggered: {
+                print(text)
+
+                // Is this the way it will work??
+                Qt.openUrlExternally("app://terminal")
+            }
+
+            visible: showAdvancedFeatures && false
+        },
+
+        Action {
+            text: i18n.tr("Properties")
+            iconSource: getIcon("info")
+            onTriggered: {
+                print(text)
+                PopupUtils.open(Qt.resolvedUrl("FileDetailsPopover.qml"),
+                                folderListPage,
+                                    { "model": folderModel.folderModel
+                                    }
+                                )
+            }
+        }
+    ]
+
+    Column {
+        anchors {
+            left: parent.left
+            right: parent.right
+        }
+
+        Repeater {
+            id: repeater
+            model: actions
+            delegate: OverlayStandard {
+                property Action action: modelData
+
+                visible: action.visible
+                enabled: action.enabled
+                text: action.text
+                iconSource: action.iconSource
+                iconFrame: false
+
+                onClicked: {
+                    action.triggered(root.caller)
+                    PopupUtils.close(root)
+                }
+
+                showDivider: index < repeater.count - 1
+            }
+        }
+    }
+}

=== modified file 'src/app/qml/ui/FolderListPage.qml'
--- src/app/qml/ui/FolderListPage.qml	2014-04-30 08:54:08 +0000
+++ src/app/qml/ui/FolderListPage.qml	2014-06-16 21:32:33 +0000
@@ -19,339 +19,105 @@
 import Ubuntu.Components 0.1
 import Ubuntu.Components.Popups 0.1
 import Ubuntu.Components.ListItems 0.1
-import org.nemomobile.folderlistmodel 1.0
 import "../components"
+import "../backend"
 
 Page {
     id: folderListPage
 
-    title: folderName(folder)
+    title: folderModel.title
+
+    property alias folder: folderModel.folder
 
     property variant fileView: folderListPage
 
-    property bool showHiddenFiles: false
-
     property bool showingListView: folderListView.visible
 
-    onShowHiddenFilesChanged: {
-        pageModel.showHiddenFiles = folderListPage.showHiddenFiles
-    }
-
-    property string sortingMethod: "Name"
-
-    onSortingMethodChanged: {
-        console.log("Sorting by: " + sortingMethod)
-        if (sortingMethod === "Name") {
-            pageModel.sortBy = FolderListModel.SortByName
-        } else if (sortingMethod === "Date") {
-            pageModel.sortBy = FolderListModel.SortByDate
-        } else {
-            // Something fatal happened!
-            console.log("ERROR: Invalid sort type:", sortingMethod)
-        }
-    }
-
-    property bool sortAccending: true
-
-    onSortAccendingChanged: {
-        console.log("Sorting accending: " + sortAccending)
-
-        if (sortAccending) {
-            pageModel.sortOrder = FolderListModel.SortAscending
-        } else {
-            pageModel.sortOrder = FolderListModel.SortDescending
-        }
-    }
-
-    // This stores the location using ~ to represent home
-    property string folder
-    property string homeFolder: "~"
-
-    // This replaces ~ with the actual home folder, since the
-    // plugin doesn't recognize the ~
-    property string path: folder.replace("~", pageModel.homePath())
-
-    function goHome() {
-        goTo(folderListPage.homeFolder)
-    }
-
-    function goTo(location) {
-        // Since the FolderListModel returns paths using the actual
-        // home folder, this replaces with ~ before actually going
-        // to the specified folder
-        while (location !== '/' && location.substring(location.lastIndexOf('/')+1) === "") {
-            location = location.substring(0, location.length - 1)
-        }
-
-        folderListPage.folder = location.replace(pageModel.homePath(), "~")
-        refresh()
-    }
-
-    function refresh() {
-        pageModel.refresh()
-    }
-
-    function pathAccessedDate() {
-        console.log("calling method pageModel.curPathAccessedDate()")
-        return pageModel.curPathAccessedDate()
-    }
-
-    function pathModifiedDate() {
-        console.log("calling method pageModel.curPathModifiedDate()")
-        return pageModel.curPathModifiedDate()
-    }
-
-    function pathIsWritable() {
-        console.log("calling method pageModel.curPathIsWritable()")
-        return pageModel.curPathIsWritable()
-    }
-
-    // FIXME: hard coded path for icon, assumes Ubuntu desktop icon available.
-    // Nemo mobile has icon provider. Have to figure out what's the proper way
-    // to get "system wide" icons in Ubuntu Touch, or if we have to use
-    // icons packaged into the application. Both folder and individual
-    // files will need an icon.
-    // TODO: Remove isDir parameter and use new model functions
-    function fileIcon(file, isDir) {
-        file = file.replace(pageModel.homePath(), "~")
-        var iconPath = isDir ? "/usr/share/icons/Humanity/places/48/folder.svg"
-                             : "/usr/share/icons/Humanity/mimes/48/empty.svg"
-
-        if (file === "~") {
-            iconPath = "../icons/folder-home.svg"
-        } else if (file === i18n.tr("~/Desktop")) {
-            iconPath = "/usr/share/icons/Humanity/places/48/user-desktop.svg"
-        } else if (file === i18n.tr("~/Documents")) {
-            iconPath = "/usr/share/icons/Humanity/places/48/folder-documents.svg"
-        } else if (file === i18n.tr("~/Downloads")) {
-            iconPath = "/usr/share/icons/Humanity/places/48/folder-downloads.svg"
-        } else if (file === i18n.tr("~/Music")) {
-            iconPath = "/usr/share/icons/Humanity/places/48/folder-music.svg"
-        } else if (file === i18n.tr("~/Pictures")) {
-            iconPath = "/usr/share/icons/Humanity/places/48/folder-pictures.svg"
-        } else if (file === i18n.tr("~/Public")) {
-            iconPath = "/usr/share/icons/Humanity/places/48/folder-publicshare.svg"
-        } else if (file === i18n.tr("~/Programs")) {
-            iconPath = "/usr/share/icons/Humanity/places/48/folder-system.svg"
-        } else if (file === i18n.tr("~/Templates")) {
-            iconPath = "/usr/share/icons/Humanity/places/48/folder-templates.svg"
-        } else if (file === i18n.tr("~/Videos")) {
-            iconPath = "/usr/share/icons/Humanity/places/48/folder-videos.svg"
-        } else if (file === "/") {
-            iconPath = "/usr/share/icons/Humanity/devices/48/drive-harddisk.svg"
-        }
-
-        return Qt.resolvedUrl(iconPath)
-    }
-
-    function folderName(folder) {
-        folder = folder.replace(pageModel.homePath(), "~")
-
-        if (folder === folderListPage.homeFolder) {
-            return i18n.tr("Home")
-        } else if (folder === "/") {
-            return i18n.tr("File System")
-        } else {
-            return folder.substr(folder.lastIndexOf('/') + 1)
-        }
-    }
-
-    function pathName(folder) {
-        if (folder === "/") {
-            return "/"
-        } else {
-            return folder.substr(folder.lastIndexOf('/') + 1)
-        }
-    }
-
-    function pathExists(path) {
-        path = path.replace("~", pageModel.homePath())
-
-        if (path === '/')
-            return true
-
-        if(path.charAt(0) === '/') {
-            console.log("Directory: " + path.substring(0, path.lastIndexOf('/')+1))
-            repeaterModel.path = path.substring(0, path.lastIndexOf('/')+1)
-            console.log("Sub dir: " + path.substring(path.lastIndexOf('/')+1))
-            if (path.substring(path.lastIndexOf('/')+1) !== "" && !repeaterModel.cdIntoPath(path.substring(path.lastIndexOf('/')+1))) {
-                return false
-            } else {
-                return true
-            }
-        } else {
-            return false
-        }
-    }
-
-    property bool loading: pageModel.awaitingResults
-
-    FolderListModel {
-        id: pageModel
-
-        path: folderListPage.path
-
-        enableExternalFSWatcher: true
-
-        // Properties to emulate a model entry for use by FileDetailsPopover
-        property bool isDir: true
-        property string fileName: pathName(pageModel.path)
-        property string fileSize: (folderListView.count === 1
-                                   ? i18n.tr("1 file")
-                                   : i18n.tr("%1 files").arg(folderListView.count))       
-        property bool isReadable: true
-        property bool isExecutable: true
-    }
-
-    FolderListModel {
-        id: repeaterModel
-        path: folderListPage.folder
-
-        onPathChanged: {
-            console.log("Path: " + repeaterModel.path)
-        }
-    }
-
-    Component {
-        id: tabsPopover
-        ActionSelectionPopover {
-            objectName: "tabsPopover"
-
-            property var tab
-
-            grabDismissAreaEvents: true
-
-            actions: ActionList {
-                Action {
-                    text: i18n.tr("Open in a new tab")
-                    onTriggered: {
-                        openTab(folderListPage.folder)
-                    }
-                }
-
-                // The current tab can be closed as long as there is at least one tab remaining
-                Action {
-                    text: i18n.tr("Close this tab")
-                    onTriggered: {
-                        closeTab(tab.index)
-                    }
-                    enabled: tabs.count > 1
-                }
-            }
-        }
-    }
-
-    Component {
-        id: folderActionsPopoverComponent
-        ActionSelectionPopover {
-            id: folderActionsPopover
-            objectName: "folderActionsPopover"
-
-            grabDismissAreaEvents: true
-
-            actions: ActionList {
-                Action {
-                    text: i18n.tr("Create New Folder")
-                    onTriggered: {
-                        print(text)
-
-                        PopupUtils.open(createFolderDialog, folderListPage)
-                    }
-                }
-
-                // TODO: Disabled until backend supports creating files
-    //            Action {
-    //                text: i18n.tr("Create New File")
-    //                onTriggered: {
-    //                    print(text)
-
-    //                    PopupUtils.open(createFileDialog, root)
-    //                }
-    //            }
-
-                Action {
-                    text: pageModel.clipboardUrlsCounter === 0
-                          ? i18n.tr("Paste")
-                          : pageModel.clipboardUrlsCounter === 1
-                            ? i18n.tr("Paste %1 File").arg(pageModel.clipboardUrlsCounter)
-                            : i18n.tr("Paste %1 Files").arg(pageModel.clipboardUrlsCounter)
-                    onTriggered: {
-                        console.log("Pasting to current folder items of count " + pageModel.clipboardUrlsCounter)
-                        fileOperationDialog.startOperation(i18n.tr("Paste files"))
-                        pageModel.paste()
-                    }
-
-                    // FIXME: This property is depreciated and doesn't seem to work!
-                    //visible: pageModel.clipboardUrlsCounter > 0
-
-                    enabled: pageModel.clipboardUrlsCounter > 0
-                }
-
-                // TODO: Disabled until support for opening apps is added
-                Action {
-                    text: i18n.tr("Open in Terminal")
-                    onTriggered: {
-                        print(text)
-
-                        // Is this the way it will work??
-                        Qt.openUrlExternally("app://terminal")
-                    }
-
-                    enabled: showAdvancedFeatures && false
-                }
-
-                Action {
-                    text: i18n.tr("Properties")
-                    onTriggered: {
-                        print(text)
-                        PopupUtils.open(Qt.resolvedUrl("FileDetailsPopover.qml"),
-                                        folderListPage,
-                                            { "model": pageModel
-                                            }
-                                        )
-                    }
-                }
-            }
-        }
-    }
-
-    Component {
-        id: createFolderDialog
-        ConfirmDialogWithInput {
-            title: i18n.tr("Create folder")
-            text: i18n.tr("Enter name for new folder")
-
-            onAccepted: {
-                console.log("Create folder accepted", inputText)
-                if (inputText !== '') {
-                    pageModel.mkdir(inputText)
-                } else {
-                    console.log("Empty directory name, ignored")
-                }
-            }
-        }
-    }
-
-    Component {
-        id: createFileDialog
-        ConfirmDialogWithInput {
-            title: i18n.tr("Create file")
-            text: i18n.tr("Enter name for new file")
-
-            onAccepted: {
-                console.log("Create file accepted", inputText)
-                if (inputText !== '') {
-                    //FIXME: Actually create a new file!
-                } else {
-                    console.log("Empty file name, ignored")
-                }
-            }
-        }
-    }
-
-    function openFile(filePath) {
-        if (!pageModel.openPath(filePath)) {
-            error(i18n.tr("File operation error"), i18n.tr("Unable to open '%11").arg(filePath))
+    FolderModel {
+        id: folderModel
+    }
+
+    flickable: !sidebar.expanded ? folderListView.visible ? folderListView : folderIconView.flickable : null
+
+    onFlickableChanged: {
+        if (flickable === null) {
+            folderListView.topMargin = 0
+            folderIconView.flickable.topMargin = 0
+        } else {
+            folderListView.topMargin = units.gu(9.5)
+            folderIconView.flickable.topMargin = units.gu(9.5)
+        }
+    }
+
+    PlacesSidebar {
+        id: sidebar
+        objectName: "placesSidebar"
+
+//        anchors {
+//            top: parent.top
+//            bottom: parent.bottom
+//            bottomMargin: units.gu(-2)
+//        }
+
+        expanded: showSidebar
+    }
+
+    FolderIconView {
+        id: folderIconView
+
+        clip: true
+
+        folderListModel: folderModel.folderModel
+        anchors {
+            top: parent.top
+            bottom: parent.bottom
+            left: sidebar.right
+            right: parent.right
+        }
+        smallMode: !sidebar.expanded
+        visible: viewMethod === i18n.tr("Icons")
+    }
+
+    FolderListView {
+        id: folderListView
+
+        clip: true
+
+        folderListModel: folderModel.folderModel
+        anchors {
+            top: parent.top
+            bottom: parent.bottom
+            left: sidebar.right
+            right: parent.right
+        }
+        smallMode: !sidebar.expanded
+        visible: viewMethod === i18n.tr("List")
+    }
+
+    Item {
+        id: contents
+
+        anchors {
+            top: parent.top
+            bottom: parent.bottom
+            left: sidebar.right
+            right: parent.right
+        }
+
+
+        Label {
+            text: i18n.tr("No files")
+            fontSize: "large"
+            opacity: 0.5
+            anchors.centerIn: parent
+            visible: folderListView.count == 0 && !folderModel.folderModel.awaitingResults
+        }
+
+        ActivityIndicator {
+            running: folderModel.folderModel.awaitingResults
+            width: units.gu(8)
+            height: units.gu(8)
+            anchors.centerIn: parent
         }
     }
 
@@ -366,16 +132,15 @@
             objectName: "up"
             text: "Up"
             iconSource: getIcon("keyboard-caps")
-            enabled: folder != "/"
+            enabled: folderModel.folder != "/"
             onTriggered: {
-                goTo(pageModel.parentPath)
+                goTo(folderModel.folderModel.parentPath)
             }
         }
 
         Item {
             id: pathItem
-            // TODO: Uncomment after re-enabling tab support (caused by lp:1295242)
-            width: folderListPage.width - units.gu(31)//folderListPage.width - units.gu(37)
+            width: folderListPage.width - units.gu(37)
             height: units.gu(5)
             anchors.verticalCenter: parent.verticalCenter
             PathBar {
@@ -398,7 +163,7 @@
 
             onTriggered: {
                 print(text)
-                PopupUtils.open(folderActionsPopoverComponent, actionsButton)
+                PopupUtils.open(Qt.resolvedUrl("FolderActionsPopover.qml"), actionsButton)
             }
         }
 
@@ -427,21 +192,20 @@
             }
         }
 
-        // TODO: Uncomment after re-enabling tab support (caused by lp:1295242)
-//        ToolbarButton {
-//            id: tabsButton
-//            objectName: "tabs"
-//            text: i18n.tr("Tabs")
-//            iconSource: getIcon("browser-tabs")
-
-//            onTriggered: {
-//                print(text)
-
-//                PopupUtils.open(tabsPopover, tabsButton, {
-//                                    tab: folderListPage.parent
-//                                })
-//            }
-//        }
+        ToolbarButton {
+            id: tabsButton
+            objectName: "tabs"
+            text: i18n.tr("Tabs")
+            iconSource: getIcon("browser-tabs")
+
+            onTriggered: {
+                print(text)
+
+                PopupUtils.open(tabsPopover, tabsButton, {
+                                    tab: folderListPage.parent
+                                })
+            }
+        }
 
         ToolbarButton {
             id: settingsButton
@@ -451,90 +215,6 @@
         }
     }
 
-    flickable: !sidebar.expanded ? folderListView.visible ? folderListView : folderIconView.flickable : null
-
-    onFlickableChanged: {
-        if (flickable === null) {
-            folderListView.topMargin = 0
-            folderIconView.flickable.topMargin = 0
-        } else {
-            folderListView.topMargin = units.gu(9.5)
-            folderIconView.flickable.topMargin = units.gu(9.5)
-        }
-    }
-
-    PlacesSidebar {
-        id: sidebar
-        objectName: "placesSidebar"
-
-//        anchors {
-//            top: parent.top
-//            bottom: parent.bottom
-//            bottomMargin: units.gu(-2)
-//        }
-
-        expanded: showSidebar
-    }
-
-    FolderIconView {
-        id: folderIconView
-
-        clip: true
-
-        folderListModel: pageModel
-        anchors {
-            top: parent.top
-            bottom: parent.bottom
-            left: sidebar.right
-            right: parent.right
-        }
-        smallMode: !sidebar.expanded
-        visible: viewMethod === i18n.tr("Icons")
-    }
-
-    FolderListView {
-        id: folderListView
-
-        clip: true
-
-        folderListModel: pageModel
-        anchors {
-            top: parent.top
-            bottom: parent.bottom
-            left: sidebar.right
-            right: parent.right
-        }
-        smallMode: !sidebar.expanded
-        visible: viewMethod === i18n.tr("List")
-    }
-
-    Item {
-        id: contents
-
-        anchors {
-            top: parent.top
-            bottom: parent.bottom
-            left: sidebar.right
-            right: parent.right
-        }
-
-
-        Label {
-            text: i18n.tr("No files")
-            fontSize: "large"
-            opacity: 0.5
-            anchors.centerIn: parent
-            visible: folderListView.count == 0 && !pageModel.awaitingResults
-        }
-
-        ActivityIndicator {
-            running: pageModel.awaitingResults
-            width: units.gu(8)
-            height: units.gu(8)
-            anchors.centerIn: parent
-        }
-    }
-
     Component {
         id: confirmSingleDeleteDialog
         ConfirmDialog {
@@ -548,7 +228,53 @@
 
                 fileOperationDialog.startOperation("Deleting files")
                 console.log("Doing delete")
-                pageModel.rm(filePath)
+                folderModel.folderModel.rm(filePath)
+            }
+        }
+    }
+
+    Component {
+        id: tabsPopover
+        ActionSelectionPopover {
+            objectName: "tabsPopover"
+
+            property var tab
+
+            grabDismissAreaEvents: true
+
+            actions: ActionList {
+                Action {
+                    text: i18n.tr("Open in a new tab")
+                    onTriggered: {
+                        openTab(folderListPage.folder)
+                    }
+                }
+
+                // The current tab can be closed as long as there is at least one tab remaining
+                Action {
+                    text: i18n.tr("Close this tab")
+                    onTriggered: {
+                        closeTab(tab.index)
+                    }
+                    enabled: tabs.count > 1
+                }
+            }
+        }
+    }
+
+    Component {
+        id: createFolderDialog
+        ConfirmDialogWithInput {
+            title: i18n.tr("Create folder")
+            text: i18n.tr("Enter name for new folder")
+
+            onAccepted: {
+                console.log("Create folder accepted", inputText)
+                if (inputText !== '') {
+                    folderModel.folderModel.mkdir(inputText)
+                } else {
+                    console.log("Empty directory name, ignored")
+                }
             }
         }
     }
@@ -571,7 +297,7 @@
                 console.log("Rename accepted", inputText)
                 if (inputText !== '') {
                     console.log("Rename commensed, modelRow/inputText", modelRow, inputText)
-                    if (pageModel.rename(modelRow, inputText) === false) {
+                    if (folderModel.folderModel.rename(modelRow, inputText) === false) {
                         PopupUtils.open(Qt.resolvedUrl("NotifyDialog.qml"), delegate,
                                         {
                                             title: i18n.tr("Could not rename"),
@@ -586,84 +312,9 @@
         }
     }
 
-    Component {
-        id: actionSelectionPopoverComponent
-
-        ActionSelectionPopover {
-            id: actionSelectionPopover
-            objectName: "fileActionsPopover"
-
-            grabDismissAreaEvents: true
-
-            property var model
-            actions: ActionList {
-                Action {
-                    text: i18n.tr("Cut")
-                    // TODO: temporary
-                    iconSource: "/usr/share/icons/Humanity/actions/48/edit-cut.svg"
-                    onTriggered: {
-                        console.log("Cut on row called for", actionSelectionPopover.model.fileName, actionSelectionPopover.model.index)
-                        pageModel.cutIndex(actionSelectionPopover.model.index)
-                        console.log("CliboardUrlsCounter after copy", pageModel.clipboardUrlsCounter)
-                    }
-                }
-
-                Action {
-                    text: i18n.tr("Copy")
-                    // TODO: temporary.
-                    iconSource: "/usr/share/icons/Humanity/actions/48/edit-copy.svg"
-
-                    onTriggered: {
-                        console.log("Copy on row called for", actionSelectionPopover.model.fileName, actionSelectionPopover.model.index)
-                        pageModel.copyIndex(actionSelectionPopover.model.index)
-                        console.log("CliboardUrlsCounter after copy", pageModel.clipboardUrlsCounter)
-                    }
-                }
-
-                Action {
-                    text: i18n.tr("Delete")
-                    // TODO: temporary
-                    iconSource: "/usr/share/icons/Humanity/actions/48/edit-delete.svg"
-                    onTriggered: {
-                        print(text)
-                        PopupUtils.open(confirmSingleDeleteDialog, actionSelectionPopover.caller,
-                                        { "filePath" : actionSelectionPopover.model.filePath,
-                                          "fileName" : actionSelectionPopover.model.fileName }
-                                        )
-                    }
-                }
-
-                Action {
-                    text: i18n.tr("Rename")
-                    // TODO: temporary
-                    iconSource: "/usr/share/icons/Humanity/actions/48/rotate.svg"
-                    onTriggered: {
-                        print(text)
-                        PopupUtils.open(confirmRenameDialog, actionSelectionPopover.caller,
-                                        { "modelRow"  : actionSelectionPopover.model.index,
-                                          "inputText" : actionSelectionPopover.model.fileName
-                                        })
-                    }
-                }
-
-                Action {
-                    text: i18n.tr("Properties")
-                    onTriggered: {
-                        print(text)
-                        PopupUtils.open(Qt.resolvedUrl("FileDetailsPopover.qml"),
-                                        actionSelectionPopover.caller,
-                                            { "model": actionSelectionPopover.model
-                                            }
-                                        )
-                    }
-                }
-            }
-        }
-    }
-
     // Errors from model
     Connections {
-        target: pageModel
+        target: folderModel.folderModel
         onError: {
             console.log("FolderListModel Error Title/Description", errorTitle, errorMessage)
             error(i18n.tr("File operation error"), errorTitle + ": " + errorMessage)
@@ -674,19 +325,19 @@
         id: fileOperationDialog
 
         page: folderListPage
-        model: pageModel
+        model: folderModel.folderModel
     }
 
     function itemClicked(model) {
         if (model.isDir) {
             if (model.isReadable && model.isExecutable) {
                 console.log("Changing to dir", model.filePath)
-                goTo(model.filePath)
+                folderModel.goTo(model.filePath)
             } else {
                 PopupUtils.open(Qt.resolvedUrl("NotifyDialog.qml"), delegate,
                                 {
                                     title: i18n.tr("Folder not accessible"),
-				    // TRANSLATORS: this refers to a folder name
+                        // TRANSLATORS: this refers to a folder name
 		         	    text: i18n.tr("Can not access %1").arg(model.fileName)
 
                                  })
@@ -694,18 +345,12 @@
         } else {
             console.log("Non dir clicked")
             openFile(model.fileName)
-//            PopupUtils.open(Qt.resolvedUrl("FileActionDialog.qml"), root,
-//                            {
-//                                fileName: model.fileName,
-//                                filePath: model.filePath,
-//                                folderListModel: root.folderListModel
-//                            })
         }
     }
 
     function itemLongPress(delegate, model) {
         console.log("FolderListDelegate onPressAndHold")
-        PopupUtils.open(actionSelectionPopoverComponent, delegate,
+        PopupUtils.open(Qt.resolvedUrl("FileActionsPopover.qml"), delegate,
                         {
                             model: model
                         })

=== modified file 'src/app/qml/ui/GoToDialog.qml'
--- src/app/qml/ui/GoToDialog.qml	2014-02-19 00:00:15 +0000
+++ src/app/qml/ui/GoToDialog.qml	2014-06-16 21:32:33 +0000
@@ -37,7 +37,7 @@
 
         inputMethodHints: Qt.ImhNoAutoUppercase
 
-        property bool valid: pathExists(text)
+        property bool valid: folderModel.pathExists(text)
 
         text: fileView.path
 
@@ -55,7 +55,7 @@
 
         onClicked: {
             print("User switched to:", locationField.text)
-            goTo(locationField.text)
+            folderModel.goTo(locationField.text)
             PopupUtils.close(root)
         }
     }

=== modified file 'src/app/qml/ui/PlacesPopover.qml'
--- src/app/qml/ui/PlacesPopover.qml	2014-06-10 02:34:07 +0000
+++ src/app/qml/ui/PlacesPopover.qml	2014-06-16 21:32:33 +0000
@@ -24,40 +24,6 @@
     id: root
     objectName: "placesPopover"
 
-    ListModel {
-        id: places
-
-        ListElement {
-            objectName: 'placeHome'
-            path: "~"
-        }
-
-        ListElement {
-            path: "~/Documents"
-        }
-
-        ListElement {
-            path: "~/Downloads"
-        }
-
-        ListElement {
-            path: "~/Music"
-        }
-
-        ListElement {
-            path: "~/Pictures"
-        }
-
-        ListElement {
-            path: "~/Videos"
-        }
-
-        ListElement {
-            objectName: "placeRoot"
-            path: "/"
-        }
-    }
-
     Column {
         anchors {
             left: parent.left
@@ -79,7 +45,7 @@
 
                 inputMethodHints: Qt.ImhNoAutoUppercase
 
-                property bool valid: pathExists(text)
+                property bool valid: folderModel.pathExists(text)
 
                 text: fileView.path
 
@@ -103,7 +69,7 @@
 
                 onClicked: {
                     print("User switched to:", locationField.text)
-                    goTo(locationField.text)
+                    folderModel.goTo(locationField.text)
                     PopupUtils.close(root)
                 }
             }
@@ -113,7 +79,7 @@
             id: placesList
             objectName: "placesList"
 
-            model: places
+            model: folderModel.places
 
             delegate: Standard {
                 objectName: model.objectName
@@ -123,18 +89,18 @@
                     anchors.left: parent.left
                     anchors.leftMargin: units.gu(8)
                     anchors.verticalCenter: parent.verticalCenter
-                    text: folderName(path)
+                    text: folderModel.folderName(path)
                     color: selected ? UbuntuColors.orange : Theme.palette.normal.overlayText
                 }
 
-                iconSource: model.icon || fileIcon(model.path, true)
+                iconSource: model.icon || folderModel.fileIcon(model.path, true)
 
                 onClicked: {
                     PopupUtils.close(root)
                     goTo(model.path)
                 }
 
-                selected: folder === path
+                selected: folderModel.folder === path
                 iconFrame: false
                 showDivider: index < (placesList.count - 1)
             }