Merge lp:~ibelieve/ubuntu-filemanager-app/improved-toolbar into lp:ubuntu-filemanager-app

[Michael Spencer]

Redesigned the toolbar and added settings and some new features

This adds the following new features to the toolbar:

* Places (bookmarks) menu & location entry field
* Actions menu
* Settings menu

This also adds the following new settings:

* Show hidden files
* Sort by name/date
* Sort ascending/descending

In addition, this adds a Properties popover for the current folder.

[lp:~ibelieve/ubuntu-filemanager-app/improved-toolbar]

44. By Michael Spencer on 2013-06-26

Fixed paste action and made minor changes in order of actions and naming of dialogs

45. By Michael Spencer on 2013-06-26

Disabled hiding of paste action (doesn't work)

46. By Michael Spencer on 2013-06-27

Added settings menu and ability to show hidden files

47. By Michael Spencer on 2013-06-27

Added UI to sort the list of files

48. By Michael Spencer on 2013-06-27

Pulled in autopilot test and fixed it to work with the new UI

49. By Michael Spencer on 2013-06-27

Added test for going home and to the root folder (fixed LP# 1188734)

50. By Michael Spencer on 2013-06-27

Added UI to go to a location entered by the user

51. By Michael Spencer on 2013-06-28

Improved location entry UI

52. By Michael Spencer on 2013-06-29

Added path entry validation

53. By Michael Spencer on 2013-06-30

Added properties popover for the current folder and also added icons for file system root, home folder, and main folders in home

54. By Michael Spencer on 2013-07-01

Added more icons for common folders

[Arto Jalkanen (ajalkane)]

Great changes, thank you!

review: Approve

[David Planella (dpm)]

Nice work!

A couple of things that I've noticed:

- The toolbar icons are highly pixelated. Nothing that your branch can do about it, as it might be due to bug 1184569. Perhaps it might be worth shipping local copies of .png images until that bug is fixed?
- The properties popup for folders seem to always return "Unknown" for "Created:" and "Modified:"

[lp:~ibelieve/ubuntu-filemanager-app/improved-toolbar]

55. By Michael Spencer on 2013-07-03

Added local png icons for the toolbar

[Michael Spencer (ibelieve)]

> Nice work!
>
> A couple of things that I've noticed:
>
> - The toolbar icons are highly pixelated. Nothing that your branch can do
> about it, as it might be due to bug 1184569. Perhaps it might be worth
> shipping local copies of .png images until that bug is fixed?

I've added local copies for the 4 icons in the toolbar.

> - The properties popup for folders seem to always return "Unknown" for
> "Created:" and "Modified:"

Clicking on a folder and choosing Properties should work. If you mean clicking Actions and then Properties, that is because it's using new features from the model that Carlos just added, so it won't show up until the plugin gets updated. (Same with the current folder being writable or not).

[lp:~ibelieve/ubuntu-filemanager-app/improved-toolbar]

56. By Michael Spencer on 2013-07-03

Colored the cancel buttons gray and made the go to location button green

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

review: Approve (continuous-integration)

=== modified file 'ConfirmDialog.qml'
--- ConfirmDialog.qml	2013-04-17 17:55:41 +0000
+++ ConfirmDialog.qml	2013-07-03 15:05:30 +0000
@@ -35,6 +35,19 @@
 
     Button {
         text: i18n.tr("Cancel")
+
+        gradient: Gradient {
+            GradientStop {
+                position: 0
+                color: "gray"
+            }
+
+            GradientStop {
+                position: 1
+                color: "lightgray"
+            }
+        }
+
         onClicked: {
             rejected()
             PopupUtils.close(root)
 
=== modified file 'ConfirmDialogWithInput.qml'
--- ConfirmDialogWithInput.qml	2013-04-17 17:55:41 +0000
+++ ConfirmDialogWithInput.qml	2013-07-03 15:05:30 +0000
@@ -29,10 +29,14 @@
     TextField {
         id: input
         focus: true
+        validator: RegExpValidator {
+            regExp: /.+/
+        }
     }
 
     Button {
         text: i18n.tr("Ok")
+        enabled: input.acceptableInput
         onClicked: {
             accepted()
             PopupUtils.close(root)
@@ -41,6 +45,19 @@
 
     Button {
         text: i18n.tr("Cancel")
+
+        gradient: Gradient {
+            GradientStop {
+                position: 0
+                color: "gray"
+            }
+
+            GradientStop {
+                position: 1
+                color: "lightgray"
+            }
+        }
+
         onClicked: {
             rejected()
             PopupUtils.close(root)
 
=== modified file 'FileDetailsPopover.qml'
--- FileDetailsPopover.qml	2013-06-25 23:43:54 +0000
+++ FileDetailsPopover.qml	2013-07-03 15:05:30 +0000
@@ -23,10 +23,12 @@
     id: root
     property var model
 
+    property string path: model.path || (fileView.path + '/' + model.fileName)
+
     contentHeight: contents.height + 2 * contents.anchors.margins
 
     function dateTimeFormat(dateTime) {
-        return Qt.formatDateTime(dateTime, Qt.DefaultLocaleShortDate)
+        return Qt.formatDateTime(dateTime, Qt.DefaultLocaleShortDate) || "Uknown"
     }
 
     function permissionsToString(model) {
@@ -66,22 +68,35 @@
         Row {
             spacing: units.gu(1)
             Image {
+                anchors.verticalCenter: parent.verticalCenter
+
                 // TODO: how to get proper icon?
-                source: model.isDir
-                        ? "/usr/share/icons/Humanity/places/48/folder.svg"
-                        : "/usr/share/icons/Humanity/mimes/48/empty.svg"
+                source: fileIcon(root.path, model.isDir)
             }
+
             Label {
-                text: model.fileName
                 anchors.verticalCenter: parent.verticalCenter
+
+                text: folderName(root.path)
+                font.bold: true
             }
         }
 
         Grid {
             columns: 2
             spacing: units.gu(1)
-            Label {
-                text: i18n.tr("Size:")
+
+            Label {
+                text: i18n.tr("Path:")
+            }
+
+            Label {
+                text: root.path
+            }
+
+            Label {
+                text: model.isDir ? i18n.tr("Contents:")
+                                  : i18n.tr("Size:")
             }
             Label {
                 text: model.fileSize
 
=== modified file 'FileOperationProgressDialog.qml'
--- FileOperationProgressDialog.qml	2013-05-16 15:32:16 +0000
+++ FileOperationProgressDialog.qml	2013-07-03 15:05:30 +0000
@@ -57,4 +57,12 @@
             }
         }
     }
+
+    // Errors from model
+    Connections {
+        target: pageModel
+        onError: {
+            PopupUtils.close(root)
+        }
+    }
 }
 
=== modified file 'FolderListDelegate.qml'
--- FolderListDelegate.qml	2013-06-25 16:22:38 +0000
+++ FolderListDelegate.qml	2013-07-03 15:05:30 +0000
@@ -24,11 +24,8 @@
     objectName: "folder" + index
     text: model.fileName
     subText: Qt.formatDateTime(model.modifiedDate, Qt.DefaultLocaleShortDate) + (!model.isDir ? ", " + fileSize : "")
-    // 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.
-    icon: model.isDir ? "/usr/share/icons/Humanity/places/48/folder.svg" : "/usr/share/icons/Humanity/mimes/48/empty.svg"
+
+    property string path: fileView.path + '/' + model.fileName
+    icon: fileIcon(path, model.isDir)
     progression: model.isDir
 }
 
=== modified file 'FolderListPage.qml'
--- FolderListPage.qml	2013-06-27 14:18:10 +0000
+++ FolderListPage.qml	2013-07-03 15:05:30 +0000
@@ -24,17 +24,146 @@
     id: root
     anchors.fill: parent
 
+    title: folderName(folder)
+
+    property variant fileView: root
+
+    property bool showHiddenFiles: false
+
+    onShowHiddenFilesChanged: {
+        pageModel.showHiddenFiles = root.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
-    title: folderName(pageModel.path)
-    property string homeFolder: pageModel.homePath()
+    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(root.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)
+        }
+
+        root.folder = location.replace(pageModel.homePath(), "~")
+        refresh()
+    }
+
+    function refresh() {
+        pageModel.refresh()
+    }
+
+    // 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(), "~")
+        if (file === "~") {
+            return "/usr/share/icons/ubuntu-mono-dark/places/48/folder-home.svg"
+        } else if (file === i18n.tr("~/Desktop")) {
+            return "/usr/share/icons/Humanity/places/48/user-desktop.svg"
+        } else if (file === i18n.tr("~/Documents")) {
+            return "/usr/share/icons/Humanity/places/48/folder-documents.svg"
+        } else if (file === i18n.tr("~/Downloads")) {
+            return "/usr/share/icons/Humanity/places/48/folder-downloads.svg"
+        } else if (file === i18n.tr("~/Music")) {
+            return "/usr/share/icons/Humanity/places/48/folder-music.svg"
+        } else if (file === i18n.tr("~/Pictures")) {
+            return "/usr/share/icons/Humanity/places/48/folder-pictures.svg"
+        } else if (file === i18n.tr("~/Public")) {
+            return "/usr/share/icons/Humanity/places/48/folder-publicshare.svg"
+        } else if (file === i18n.tr("~/Programs")) {
+            return "/usr/share/icons/Humanity/places/48/folder-system.svg"
+        } else if (file === i18n.tr("~/Templates")) {
+            return "/usr/share/icons/Humanity/places/48/folder-templates.svg"
+        } else if (file === i18n.tr("~/Videos")) {
+            return "/usr/share/icons/Humanity/places/48/folder-videos.svg"
+        } else if (file === "/") {
+            return "/usr/share/icons/Humanity/devices/48/drive-harddisk.svg"
+        }
+
+        if (isDir) {
+            return "/usr/share/icons/Humanity/places/48/folder.svg"
+        } else {
+            return "/usr/share/icons/Humanity/mimes/48/empty.svg"
+        }
+    }
 
     function folderName(folder) {
-        if (folder === pageModel.homePath()) {
-            return "Home"
+        folder = folder.replace(pageModel.homePath(), "~")
+
+        if (folder === root.homeFolder) {
+            return i18n.tr("Home")
         } else if (folder === "/") {
-            return folder
-        } else {
-            return folder.substr(folder.lastIndexOf('/') + 1)
+            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
         }
     }
 
@@ -42,13 +171,103 @@
 
     FolderListModel {
         id: pageModel
+
+        path: root.path
+
+        // 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 date creationDate: pageModel.pathCreatedDate
+        property date modifiedDate: pageModel.pathModifiedDate
+        property bool isWriteable: pageModel.pathIsWriteable
+        property bool isReadable: true
+        property bool isExecutable: true
+    }
+
+    FolderListModel {
+        id: repeaterModel
         path: root.folder
+
+        onPathChanged: {
+            console.log("Path: " + repeaterModel.path)
+        }
+    }
+
+    ActionSelectionPopover {
+        id: folderActionsPopover
+        objectName: "folderActionsPopover"
+
+        actions: ActionList {
+            Action {
+                text: i18n.tr("Create New Folder")
+                onTriggered: {
+                    print(text)
+
+                    PopupUtils.open(createFolderDialog, root)
+                }
+            }
+
+            // 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)
+                    PopupUtils.open(Qt.resolvedUrl("FileOperationProgressDialog.qml"),
+                                    root,
+                                    {
+                                        title: i18n.tr("Paste files"),
+                                        folderListModel: pageModel
+                                     }
+                                    )
+
+
+                    pageModel.paste()
+                }
+
+                // FIXME: This property is depreciated and doesn't seem to work!
+                //visible: pageModel.clipboardUrlsCounter > 0
+
+                enabled: pageModel.clipboardUrlsCounter > 0
+            }
+
+            Action {
+                text: i18n.tr("Properties")
+                onTriggered: {
+                    print(text)
+                    PopupUtils.open(Qt.resolvedUrl("FileDetailsPopover.qml"),
+                                    root,
+                                        { "model": pageModel
+                                        }
+                                    )
+                }
+            }
+        }
+
+        // Without this the popover jumps up at the start of the application. SDK bug?
+        // Bug report has been made of these https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1152270
+        visible: false
     }
 
     Component {
         id: createFolderDialog
         ConfirmDialogWithInput {
-            title: i18n.tr("Create folder?")
+            title: i18n.tr("Create folder")
             text: i18n.tr("Enter name for new folder")
 
             onAccepted: {
@@ -62,6 +281,25 @@
         }
     }
 
+    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")
+                }
+            }
+        }
+    }
+
+
+
     tools: ToolbarItems {
         id: toolbar
         locked: true
@@ -69,7 +307,7 @@
 
         back: ToolbarButton {
             text: "Up"
-            iconSource: "/usr/share/icons/ubuntu-mobile/actions/scalable/keyboard-caps.svg"
+            iconSource: "icons/up.png"
             visible: folder != "/"
             onTriggered: {
                 goTo(pageModel.parentPath)
@@ -77,52 +315,40 @@
         }
 
         ToolbarButton {
-            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"),
-                                root,
-                                {
-                                    title: i18n.tr("Paste files"),
-                                    folderListModel: pageModel
-                                 }
-                                )
-
-
-                pageModel.paste()
-            }
-            visible: pageModel.clipboardUrlsCounter > 0
-        }
-
-        // IMPROVE: would rather have this as more hidden, in a separate menu that has
-        // file manipulation operations
-        ToolbarButton {
-            text: i18n.tr("Create folder")
-            // TODO: temporary
-            iconSource: "/usr/share/icons/ubuntu-mobile/actions/scalable/add.svg"
-            onTriggered: {
-                print(text)
-                PopupUtils.open(createFolderDialog, root)
-            }
-        }
-
-        ToolbarButton {
-            text: i18n.tr("Home")
-            // TODO: temporary
-            iconSource: "/usr/share/icons/ubuntu-mobile/actions/scalable/go-to.svg"
-            onTriggered: {
-                goHome()
-
-                //pageModel.path = pageModel.homePath()
-                console.log("Home triggered")
+            text: i18n.tr("Actions")
+            iconSource: "icons/edit.png"
+
+            onTriggered: {
+                print(text)
+                folderActionsPopover.caller = caller
+                folderActionsPopover.show();
+            }
+        }
+
+        ToolbarButton {
+            text: i18n.tr("Settings")
+            iconSource: "icons/settings.png"
+
+            onTriggered: {
+                print(text)
+
+                PopupUtils.open(Qt.resolvedUrl("SettingsPopover.qml"), caller)
+            }
+        }
+
+        ToolbarButton {
+            text: i18n.tr("Places")
+            iconSource: "icons/location.png"
+            onTriggered: {
+                print(text)
+
+                PopupUtils.open(Qt.resolvedUrl("PlacesPopover.qml"), caller)
             }
         }
     }
 
     Column {
-        anchors.centerIn: root
+        anchors.centerIn: parent
         Label {
             text: i18n.tr("No files")
             fontSize: "large"
 
=== modified file 'FolderListView.qml'
--- FolderListView.qml	2013-06-27 14:21:42 +0000
+++ FolderListView.qml	2013-07-03 15:05:30 +0000
@@ -28,10 +28,11 @@
     property string folderPath: folderListModel.path
     model: folderListModel
 
-    header: Caption {
+    header: Header {
         objectName: "directoryHeader"
-        text: (root.count == 1 ? i18n.tr("%1 (%2 file)").arg(root.folderPath).arg(root.count) :
-                                 i18n.tr("%1 (%2 files)").arg(root.folderPath).arg(root.count))
+        text: (root.count == 1
+               ? i18n.tr("%1 (1 file)").arg(root.folderPath)
+               : i18n.tr("%1 (%2 files)").arg(root.folderPath).arg(root.count))
     }
 
     Component {
@@ -71,7 +72,7 @@
             // the filesystem, but may be a problem in the future.
             property int modelRow
 
-            title: i18n.tr("Rename?")
+            title: i18n.tr("Rename")
             text: i18n.tr("Enter a new name")
 
             onAccepted: {
@@ -100,16 +101,16 @@
         property var model
         actions: ActionList {
             Action {
-                text: i18n.tr("Show details")
+                text: i18n.tr("Cut")
+                // TODO: temporary
+                iconSource: "/usr/share/icons/Humanity/actions/48/edit-cut.svg"
                 onTriggered: {
-                    print(text)
-                    PopupUtils.open(Qt.resolvedUrl("FileDetailsPopover.qml"),
-                                    actionSelectionPopover.caller,
-                                        { "model": actionSelectionPopover.model
-                                        }
-                                    )
+                    console.log("Cut on row called for", actionSelectionPopover.model.fileName, actionSelectionPopover.model.index)
+                    model.cutIndex(actionSelectionPopover.model.index)
+                    console.log("CliboardUrlsCounter after copy", folderListModel.clipboardUrlsCounter)
                 }
             }
+
             Action {
                 text: i18n.tr("Copy")
                 // TODO: temporary.
@@ -121,16 +122,7 @@
                     console.log("CliboardUrlsCounter after copy", folderListModel.clipboardUrlsCounter)
                 }
             }
-            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)
-                    model.cutIndex(actionSelectionPopover.model.index)
-                    console.log("CliboardUrlsCounter after copy", folderListModel.clipboardUrlsCounter)
-                }
-            }
+
             Action {
                 text: i18n.tr("Delete")
                 // TODO: temporary
@@ -142,7 +134,8 @@
                                       "fileName" : actionSelectionPopover.model.fileName }
                                     )
                 }
-            }            
+            }
+
             Action {
                 text: i18n.tr("Rename")
                 // TODO: temporary
@@ -156,6 +149,17 @@
                 }
             }
 
+            Action {
+                text: i18n.tr("Properties")
+                onTriggered: {
+                    print(text)
+                    PopupUtils.open(Qt.resolvedUrl("FileDetailsPopover.qml"),
+                                    actionSelectionPopover.caller,
+                                        { "model": actionSelectionPopover.model
+                                        }
+                                    )
+                }
+            }
         }
         // TODO: problem: clicking outside popup makes the click go through to the
         // folder listview, so for example you'd change directory while only trying
 
=== added file 'PlacesPopover.qml'
--- PlacesPopover.qml	1970-01-01 00:00:00 +0000
+++ PlacesPopover.qml	2013-07-03 15:05:30 +0000
@@ -0,0 +1,137 @@
+/*
+ * Copyright (C) 2013 Canonical Ltd
+ *
+ * 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/>.
+ *
+ * Authored by: Michael Spencer <[e-mail]>
+ */
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.Popups 0.1
+import Ubuntu.Components.ListItems 0.1
+
+Popover {
+    id: root
+    objectName: "placesPopover"
+
+    ListModel {
+        id: places
+
+        ListElement {
+            path: "~"
+        }
+
+        ListElement {
+            path: "~/Documents"
+        }
+
+        ListElement {
+            path: "~/Downloads"
+        }
+
+        ListElement {
+            path: "~/Music"
+        }
+
+        ListElement {
+            path: "~/Pictures"
+        }
+
+        ListElement {
+            path: "~/Videos"
+        }
+
+        ListElement {
+            path: "/"
+        }
+    }
+
+    Column {
+        anchors {
+            left: parent.left
+            right: parent.right
+            top: parent.top
+        }
+
+        Repeater {
+            id: placesList
+            objectName: "placesList"
+
+            model: places
+
+            delegate: Standard {
+                text: folderName(path)
+                icon: model.icon || fileIcon(model.path, true)
+
+                onClicked: {
+                    PopupUtils.close(root)
+                    goTo(model.path)
+                }
+            }
+        }
+
+        Empty {
+
+            TextField {
+                id: locationField
+                anchors {
+                    verticalCenter: parent.verticalCenter
+                    left: parent.left
+                    right: goButton.left
+                    margins: units.gu(1)
+                }
+
+                inputMethodHints: Qt.ImhNoAutoUppercase
+
+                property bool valid: pathExists(text)
+
+                text: fileView.path
+
+                placeholderText: i18n.tr("Location...")
+
+                onAccepted: goButton.clicked()
+            }
+
+            Button {
+                id: goButton
+                anchors {
+                    top: locationField.top
+                    bottom: locationField.bottom
+                    right: parent.right
+                    rightMargin: units.gu(1)
+                }
+
+                gradient: Gradient {
+                    GradientStop {
+                        position: 0
+                        color: "green"//Qt.rgba(0,0.7,0,1)
+                    }
+
+                    GradientStop {
+                        position: 1
+                        color: Qt.rgba(0.3,0.7,0.3,1)
+                    }
+                }
+
+                text: i18n.tr("Go")
+                enabled: locationField.acceptableInput && locationField.valid
+
+                onClicked: {
+                    print("User switched to:", locationField.text)
+                    goTo(locationField.text)
+                    PopupUtils.close(root)
+                }
+            }
+        }
+    }
+}
 
=== added file 'SettingsPopover.qml'
--- SettingsPopover.qml	1970-01-01 00:00:00 +0000
+++ SettingsPopover.qml	2013-07-03 15:05:30 +0000
@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2013 Canonical Ltd
+ *
+ * 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/>.
+ *
+ * Authored by: Michael Spencer <[e-mail]>
+ */
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.Popups 0.1
+import Ubuntu.Components.ListItems 0.1
+
+Popover {
+    id: root
+    objectName: "settingsPopover"
+
+    Column {
+        anchors {
+            left: parent.left
+            right: parent.right
+            top: parent.top
+        }
+
+        Standard {
+            id: showHiddenFileCheckBox
+            objectName: "showHiddenFileCheckBox"
+
+            text: i18n.tr("Show Hidden Files")
+            control: CheckBox {
+                anchors.verticalCenter: parent.verticalCenter
+
+                checked: fileView.showHiddenFiles
+                onCheckedChanged: {
+                    fileView.showHiddenFiles = checked
+                }
+            }
+        }
+
+        ValueSelector {
+            text: "Sort By"
+            selectedIndex: values.indexOf(fileView.sortingMethod)
+            values: [
+                "Name",
+                "Date"
+            ]
+
+            onSelectedIndexChanged: {
+                fileView.sortingMethod = values[selectedIndex]
+            }
+        }
+
+        ValueSelector {
+            text: "Sort Order"
+            selectedIndex: sortAccending ? 0 : 1
+            values: [
+                "Ascending",
+                "Descending"
+            ]
+
+            onSelectedIndexChanged: {
+                fileView.sortAccending = (values[selectedIndex] === "Ascending")
+            }
+        }
+    }
+}
 
=== added directory 'icons'
=== added file 'icons/edit.png'
 Binary files icons/edit.png	1970-01-01 00:00:00 +0000 and icons/edit.png	2013-07-03 15:05:30 +0000 differ
=== added file 'icons/location.png'
 Binary files icons/location.png	1970-01-01 00:00:00 +0000 and icons/location.png	2013-07-03 15:05:30 +0000 differ
=== added file 'icons/settings.png'
 Binary files icons/settings.png	1970-01-01 00:00:00 +0000 and icons/settings.png	2013-07-03 15:05:30 +0000 differ
=== added file 'icons/up.png'
 Binary files icons/up.png	1970-01-01 00:00:00 +0000 and icons/up.png	2013-07-03 15:05:30 +0000 differ
=== modified file 'tests/autopilot/ubuntu_filemanager_app/emulators/main_window.py'
--- tests/autopilot/ubuntu_filemanager_app/emulators/main_window.py	2013-06-27 14:18:10 +0000
+++ tests/autopilot/ubuntu_filemanager_app/emulators/main_window.py	2013-07-03 15:05:30 +0000
@@ -18,7 +18,10 @@
 
     def get_folder(self, index):
         """Returns the list view folder with index number."""
-        return self.app.select_many("Subtitled")[index]
+        return self.app.select_single('FolderListPage').select_many("Subtitled")[index]
+
+    def get_folder_count(self):
+        return len(self.app.select_single('FolderListPage').select_many("Subtitled"))
 
     def get_action_popover(self):
         # Returns all instances, but with current one as first index
@@ -27,3 +30,5 @@
     def get_current_folder_name(self):
         return self.app.select_single('FolderListView').folderPath
 
+    def get_page_title(self):
+        return self.app.select_single('FolderListPage').title
 
=== modified file 'tests/autopilot/ubuntu_filemanager_app/tests/test_filemanager.py'
--- tests/autopilot/ubuntu_filemanager_app/tests/test_filemanager.py	2013-06-27 14:18:10 +0000
+++ tests/autopilot/ubuntu_filemanager_app/tests/test_filemanager.py	2013-07-03 15:05:30 +0000
@@ -36,8 +36,17 @@
         patcher.start()
         self.addCleanup(patcher.stop)
 
-    def test_toolbar_shows(self):
-        """Dragging from the bottom reveals the hidden toolbar."""
+    def _get_place(self, name):
+        """Returns the place/bookmark with index number."""
+        self.ubuntusdk.click_toolbar_button('Places')
+        places_popover = self.app.select_single('Popover', objectName='placesPopover')
+        places = places_popover.select_many('Standard')
+        for place in places:
+            if place.text == name:
+                return place
+
+    def test_file_actions_shows(self):
+        """Checks to make sure that the file actions popover is shown."""
         self._make_directory_in_home()
 
         first_folder = self.main_window.get_folder(0)
@@ -50,10 +59,12 @@
         path = tempfile.mkdtemp(dir=os.environ['HOME'])
         # Currently, we need to open again the home folder to show the newly
         # created one. See bug #1190676.
-        # TODO when the bug is fixed, remove the next line.
-        self.ubuntusdk.click_toolbar_button('Home')
-        while self.app.select_single('FolderListPage').loading:
-            pass
+        # TODO when the bug is fixed, remove the following lines up to the assert line
+        home_place = self._get_place("Home")
+        self.pointing_device.click_object(home_place)
+
+        self.assertThat(self.main_window.get_folder_count, Eventually(Equals(1)))
+
         return path
 
     def test_open_directory(self):
@@ -64,3 +75,21 @@
         self.assertThat(
             self.main_window.get_current_folder_name,
             Eventually(Equals(sub_dir)))
+
+    def test_going_home(self):
+        home_place = self._get_place("Home")
+        self.pointing_device.click_object(home_place)
+
+        self._check_location("Home", os.environ['HOME'])
+
+    def test_going_to_root(self):
+        root_place = self._get_place("File System")
+        self.pointing_device.click_object(root_place)
+
+        self._check_location("File System", "/")
+
+    def _check_location(self,title,location):
+        self.assertThat(self.main_window.get_page_title, Eventually(Equals(title)))
+
+        self.assertThat(self.main_window.get_current_folder_name,
+            Eventually(Equals(location)))
 
=== modified file 'ubuntu-filemanager-app.qml'
--- ubuntu-filemanager-app.qml	2013-06-27 14:18:10 +0000
+++ ubuntu-filemanager-app.qml	2013-07-03 15:05:30 +0000
@@ -26,29 +26,22 @@
 */
 
 MainView {
+    id: root
     // objectName for functional testing purposes (autopilot-qt5)
     objectName: "filemanager"
     applicationName: "ubuntu-filemanager-app"
     
     width: units.gu(50)
     height: units.gu(75)
-    
+
+    property alias filemanager: root
+
+    property bool wideAspect: width >= units.gu(80)
+
     FolderListPage {
+        id: folderPage
         objectName: "folderPage"
-        id: folderPage
 
         folder: homeFolder
-
-        function goHome() {
-            // FIXME: Get the user's home folder without requiring an instance
-            // of a FolderListModel
-            goTo(homeFolder)
-        }
-
-        function goTo(location) {
-            // FIXME: Why is this needed? Folder doesn't seem to refresh without it
-            folder = ""
-            folder = location
-        }
     }
 }