Merge lp:~dpm/ubuntu-filemanager-app/placesmodel-2 into lp:ubuntu-filemanager-app

[David Planella]

Add places model plugin

This is the re-submission of https://code.launchpad.net/~dpm/ubuntu-filemanager-app/placesmodel/+merge/223548

To cut a long story short: the branch was prematurely merged, and then it was accidentally reverted to fix an unrelated test failure. I'm resubmitting it again now, with the same changes plus the fix for bug 1331702. I've decided to address bug 1331699 as a separate branch [1] in order to minimize the changes on this branch.

In a nutshell, add a plugin to return:

a) User directories from the XDG spec
b) A model to retrieve and store user places

[1]: https://code.launchpad.net/~dpm/ubuntu-filemanager-app/readable-root-fix-1331699/+merge/224046

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

FAILED: Continuous integration, rev:213
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/263/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/599
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/599/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-ci/61

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:215
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/264/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/600
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/600/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-ci/62

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

review: Approve (continuous-integration)

[Michael Spencer (ibelieve)]

Looks good on my end! Did you want balloons to review this too, or should I top-approve?

review: Approve

[David Planella (dpm)]

Awesome, thanks Michael for the review! As a File Manager developer, and given the fact it's passed both human and automated QA review, please feel free to top-approve. I'll take care of giving Nick a heads up too.

[Nicholas Skaggs (nskaggs)]

I see it, and I'm happy.

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-autolanding/93/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/637/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-autolanding/23/console

review: Needs Fixing (continuous-integration)

[David Planella (dpm)]

Hm, pep8 failures in the tests? Why are these triggered now and not before, has anything changed in the Jenkins jobs config since it last approved the branch?

[David Planella (dpm)]

Ah, here's what happened: https://launchpad.net/ubuntu/utopic/+source/pep8/+changelog

So 2 days ago pep8 1.5.6 was uploaded in utopic. This version, unlike the previous 1.4.6 version (which is the one that also trusty has) is more strict regarding E265, which is the error it's complaining about.

[lp:~dpm/ubuntu-filemanager-app/placesmodel-2]

216. By David Planella on 2014-06-26

Make pep8 v1.5.6 happy

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

PASSED: Continuous integration, rev:216
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/268/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/658
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/658/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-ci/66

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

review: Approve (continuous-integration)

[David Planella (dpm)]

Top-approving as per previous reviews and top-approval.

[Nicholas Skaggs (nskaggs)]

Yes, fm is not the only project to suffer from pep8 changes :-)

=== modified file 'debian/control'
--- debian/control	2014-06-19 15:58:49 +0000
+++ debian/control	2014-06-26 06:20:10 +0000
@@ -38,9 +38,19 @@
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
  .
- This package contains the Folder List model plugin of the Nemo QML 
+ This package contains the Folder List model plugin of the Nemo QML
  plugins collection.
 
+Package: qtdeclarative5-placesmodel0.1
+Architecture: any
+Multi-Arch: same
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         ${misc:Pre-Depends},
+Description: Places model QML plugin
+ This package contains a plugin that enables QML apps to list and
+ modify a set of places (bookmarks) in the file system.
+
 Package: ubuntu-filemanager-app-autopilot
 Architecture: all
 Depends: ${misc:Depends},
@@ -49,5 +59,6 @@
          ubuntu-filemanager-app (>= ${source:Version}),
          ubuntu-ui-toolkit-autopilot,
          python3-autopilot,
+         python3-fixtures,
 Description: Autopilot tests for File Manager Application
  This package contains the autopilot tests for the File Manager

=== added file 'debian/qtdeclarative5-placesmodel0.1.install'
--- debian/qtdeclarative5-placesmodel0.1.install	1970-01-01 00:00:00 +0000
+++ debian/qtdeclarative5-placesmodel0.1.install	2014-06-26 06:20:10 +0000
@@ -0,0 +1,1 @@
+usr/lib/*/qt5/qml/com/ubuntu/PlacesModel/

=== 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-26 06:20:10 +0000
@@ -47,7 +47,7 @@
     objectName: "folder" + index
 
     property string fileName: model.fileName
-    property string filePath: fileView.path + '/' + fileName
+    property string filePath: fileView.folder + '/' + fileName
 
     property string text: fileName
     property string subText: Qt.formatDateTime(model.modifiedDate, Qt.DefaultLocaleShortDate) + (!model.isDir ? ", " + fileSize : "")

=== 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-26 06:20:10 +0000
@@ -29,7 +29,7 @@
     text: model.fileName
     subText: Qt.formatDateTime(model.modifiedDate, Qt.DefaultLocaleShortDate) + (!model.isDir ? ", " + fileSize : "")
 
-    property string path: fileView.path + '/' + model.fileName
+    property string path: fileView.folder + '/' + model.fileName
     iconSource: fileIcon(path, model.isDir)
 
     progression: model.isDir

=== modified file 'src/app/qml/components/PathBar.qml'
--- src/app/qml/components/PathBar.qml	2014-06-19 15:58:49 +0000
+++ src/app/qml/components/PathBar.qml	2014-06-26 06:20:10 +0000
@@ -87,6 +87,7 @@
 
             Repeater {
                 id: repeater
+                // This refers to a parent FolderListPage.folder
                 model: folder === "/" ? [""] : folder.split("/")
                 delegate: Rectangle {
                     MouseArea {
@@ -117,7 +118,7 @@
                     Label {
                         id: label
                         anchors.centerIn: parent
-                        text: modelData === "" ? "/" : modelData === "~" ? i18n.tr("Home") : modelData
+                        text: modelData === "" ? "/" : modelData
                         color: UbuntuColors.coolGrey
                     }
 

=== modified file 'src/app/qml/components/PlacesSidebar.qml'
--- src/app/qml/components/PlacesSidebar.qml	2014-06-19 15:58:49 +0000
+++ src/app/qml/components/PlacesSidebar.qml	2014-06-26 06:20:10 +0000
@@ -20,6 +20,7 @@
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1
 import Ubuntu.Components.Popups 0.1
+import com.ubuntu.PlacesModel 0.1
 
 Sidebar {
     id: root
@@ -42,40 +43,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
@@ -87,15 +54,25 @@
             text: i18n.tr("Places")
         }
 
+        PlacesModel {
+            id: userplaces
+
+            // By default, the model only contains the
+            // user directories. Add the file system location too
+            Component.onCompleted: {
+                addLocation("/");
+            }
+        }
+
         Repeater {
             id: placesList
             objectName: "placesList"
 
-            model: places
+            model: userplaces
 
             delegate: Standard {
-                objectName: model.objectName
-                text: folderName(path)
+                objectName: "place" + folderDisplayName(path).replace(/ /g,'')
+                text: folderDisplayName(path)
 
                 Image {
                     anchors {
@@ -123,6 +100,7 @@
                 height: units.gu(5)
                 showDivider: !collapsed
 
+                // This refers to a parent FolderListPage.folder
                 selected: folder === path
                 iconFrame: false
             }

=== modified file 'src/app/qml/filemanager.qml'
--- src/app/qml/filemanager.qml	2014-06-19 15:58:49 +0000
+++ src/app/qml/filemanager.qml	2014-06-26 06:20:10 +0000
@@ -21,6 +21,7 @@
 import Ubuntu.Components.Popups 0.1
 import Ubuntu.Unity.Action 1.0 as UnityActions
 import U1db 1.0 as U1db
+import com.ubuntu.PlacesModel 0.1
 
 import "ui"
 
@@ -60,6 +61,10 @@
     backgroundColor: "#797979"
     footerColor: "#808080"
 
+    PlacesModel {
+       id: userplaces
+    }
+
     // HUD Actions
     Action {
         id: settingsAction
@@ -72,7 +77,7 @@
 
     property var pageStack: pageStack
 
-    property var folderTabs: ["~"]
+    property var folderTabs: [userplaces.locationHome]
 
     function openTab(folder) {
         var list = folderTabs
@@ -100,7 +105,7 @@
                 page: FolderListPage {
                     objectName: "folderPage"
 
-                    folder: "~"//modelData
+                    folder: userplaces.locationHome //modelData
                 }
             }
 

=== 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-26 06:20:10 +0000
@@ -23,7 +23,7 @@
     id: root
     property var model
 
-    property string path: model.path || (fileView.path + '/' + model.fileName)
+    property string path: model.path || (fileView.folder + '/' + model.fileName)
 
     contentHeight: contents.height + 2 * contents.anchors.margins
 
@@ -77,7 +77,7 @@
             Label {
                 anchors.verticalCenter: parent.verticalCenter
 
-                text: folderName(root.path)
+                text: folderDisplayName(root.path)
                 color: Theme.palette.normal.overlayText
                 font.bold: true
             }

=== modified file 'src/app/qml/ui/FolderListPage.qml'
--- src/app/qml/ui/FolderListPage.qml	2014-06-19 15:58:49 +0000
+++ src/app/qml/ui/FolderListPage.qml	2014-06-26 06:20:10 +0000
@@ -20,25 +20,27 @@
 import Ubuntu.Components.Popups 0.1
 import Ubuntu.Components.ListItems 0.1
 import org.nemomobile.folderlistmodel 1.0
+import com.ubuntu.PlacesModel 0.1
 import "../components"
 
 Page {
     id: folderListPage
-
-    title: folderName(folder)
+    title: folderDisplayName(folder)
+    flickable: !sidebar.expanded ?
+                   (folderListView.visible ? folderListView : folderIconView.flickable) : null
 
     property variant fileView: folderListPage
-
     property bool showHiddenFiles: false
-
     property bool showingListView: folderListView.visible
+    property string sortingMethod: "Name"
+    property bool sortAscending: true
+    property string folder
+    property bool loading: pageModel.awaitingResults
 
     onShowHiddenFilesChanged: {
         pageModel.showHiddenFiles = folderListPage.showHiddenFiles
     }
 
-    property string sortingMethod: "Name"
-
     onSortingMethodChanged: {
         console.log("Sorting by: " + sortingMethod)
         if (sortingMethod === "Name") {
@@ -51,154 +53,39 @@
         }
     }
 
-    property bool sortAccending: true
-
-    onSortAccendingChanged: {
-        console.log("Sorting accending: " + sortAccending)
-
-        if (sortAccending) {
+    onSortAscendingChanged: {
+        console.log("Sorting ascending: " + sortAscending)
+
+        if (sortAscending) {
             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
+    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)
+        }
+    }
+
+
+
+    PlacesModel { id: userplaces }
 
     FolderListModel {
         id: pageModel
-
-        path: folderListPage.path
-
+        path: folderListPage.folder
         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 string fileSize: i18n.tr("%1 file", "%1 files", folderListView.count).arg(folderListView.count)
         property bool isReadable: true
         property bool isExecutable: true
     }
@@ -208,7 +95,7 @@
         path: folderListPage.folder
 
         onPathChanged: {
-            console.log("Path: " + repeaterModel.path)
+            console.log("Path changed to: " + repeaterModel.path)
         }
     }
 
@@ -270,11 +157,9 @@
     //            }
 
                 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)
+                    text: pageModel.clipboardUrlsCounter === 0 ?
+                            i18n.tr("Paste") :
+                            i18n.tr("Paste %1 File", "Paste %1 Files", pageModel.clipboardUrlsCounter).arg(pageModel.clipboardUrlsCounter)
                     onTriggered: {
                         console.log("Pasting to current folder items of count " + pageModel.clipboardUrlsCounter)
                         fileOperationDialog.startOperation(i18n.tr("Paste files"))
@@ -349,12 +234,6 @@
         }
     }
 
-    function openFile(filePath) {
-        if (!pageModel.openPath(filePath)) {
-            error(i18n.tr("File operation error"), i18n.tr("Unable to open '%11").arg(filePath))
-        }
-    }
-
     tools: ToolbarItems {
         id: toolbar
         locked: showToolbar
@@ -364,7 +243,7 @@
 
         back: ToolbarButton {
             objectName: "up"
-            text: "Up"
+            text: i18n.tr("Up")
             iconSource: getIcon("keyboard-caps")
             enabled: folder != "/"
             onTriggered: {
@@ -451,18 +330,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"
@@ -677,6 +544,122 @@
         model: pageModel
     }
 
+    function goTo(location) {
+        // This allows us to enter "~" as a shortcut to the home folder
+        // when entering a location on the Go To dialog
+        folderListPage.folder = location.replace("~", userplaces.locationHome)
+        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) {
+        var iconPath = isDir ? "/usr/share/icons/Humanity/places/48/folder.svg"
+                             : "/usr/share/icons/Humanity/mimes/48/empty.svg"
+
+        if (file === userplaces.locationHome) {
+            iconPath = "../icons/folder-home.svg"
+        } else if (file === i18n.tr("~/Desktop")) {
+            iconPath = "/usr/share/icons/Humanity/places/48/user-desktop.svg"
+        } else if (file === userplaces.locationDocuments) {
+            iconPath = "/usr/share/icons/Humanity/places/48/folder-documents.svg"
+        } else if (file === userplaces.locationDownloads) {
+            iconPath = "/usr/share/icons/Humanity/places/48/folder-downloads.svg"
+        } else if (file === userplaces.locationMusic) {
+            iconPath = "/usr/share/icons/Humanity/places/48/folder-music.svg"
+        } else if (file === userplaces.locationPictures) {
+            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 === userplaces.locationVideos) {
+            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 folderDisplayName(folder) {
+        if (folder === userplaces.locationHome) {
+            return i18n.tr("Home")
+        } else if (folder === "/") {
+            return i18n.tr("File System")
+        } else {
+            return basename(folder)
+        }
+    }
+
+    function pathName(folder) {
+        if (folder === "/") {
+            return "/"
+        } else {
+            return basename(folder)
+        }
+    }
+
+    function basename(folder) {
+        // Returns the latest component (folder) of an absolute path
+        // E.g. basename('/home/phablet/Música') returns 'Música'
+
+        // Remove the last trailing '/' if there is one
+        folder.replace(/\/$/, "")
+        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
+        }
+    }
+
+    function openFile(filePath) {
+        if (!pageModel.openPath(filePath)) {
+            error(i18n.tr("File operation error"), i18n.tr("Unable to open '%1'").arg(filePath))
+        }
+    }
+
     function itemClicked(model) {
         if (model.isDir) {
             if (model.isReadable && model.isExecutable) {

=== 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-26 06:20:10 +0000
@@ -39,7 +39,7 @@
 
         property bool valid: pathExists(text)
 
-        text: fileView.path
+        text: fileView.folder
 
         placeholderText: i18n.tr("Location...")
 

=== modified file 'src/app/qml/ui/PlacesPopover.qml'
--- src/app/qml/ui/PlacesPopover.qml	2014-06-19 15:58:49 +0000
+++ src/app/qml/ui/PlacesPopover.qml	2014-06-26 06:20:10 +0000
@@ -19,45 +19,12 @@
 import Ubuntu.Components 0.1
 import Ubuntu.Components.Popups 0.1
 import Ubuntu.Components.ListItems 0.1
+import com.ubuntu.PlacesModel 0.1
 
 Popover {
     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
@@ -81,7 +48,7 @@
 
                 property bool valid: pathExists(text)
 
-                text: fileView.path
+                text: fileView.folder
 
                 placeholderText: i18n.tr("Location...")
 
@@ -113,17 +80,17 @@
             id: placesList
             objectName: "placesList"
 
-            model: places
+            model: PlacesModel {}
 
             delegate: Standard {
                 objectName: model.objectName
-                property string name: folderName(path)
+                property string name: folderDisplayName(path)
 
                 Label {
                     anchors.left: parent.left
                     anchors.leftMargin: units.gu(8)
                     anchors.verticalCenter: parent.verticalCenter
-                    text: folderName(path)
+                    text: folderDisplayName(path)
                     color: selected ? UbuntuColors.orange : Theme.palette.normal.overlayText
                 }
 

=== modified file 'src/app/qml/ui/ViewPopover.qml'
--- src/app/qml/ui/ViewPopover.qml	2014-02-19 00:00:15 +0000
+++ src/app/qml/ui/ViewPopover.qml	2014-06-26 06:20:10 +0000
@@ -109,14 +109,14 @@
                 anchors.topMargin: units.gu(1.7)
             }
 
-            selectedIndex: sortAccending ? 0 : 1
+            selectedIndex: sortAscending ? 0 : 1
             values: [
                 i18n.tr("Ascending"),
                 i18n.tr("Descending")
             ]
 
             onSelectedIndexChanged: {
-                fileView.sortAccending = (values[selectedIndex] === i18n.tr("Ascending"))
+                fileView.sortAscending = (values[selectedIndex] === i18n.tr("Ascending"))
             }
         }
 

=== modified file 'src/plugin/CMakeLists.txt'
--- src/plugin/CMakeLists.txt	2014-06-19 15:58:49 +0000
+++ src/plugin/CMakeLists.txt	2014-06-26 06:20:10 +0000
@@ -5,3 +5,4 @@
 find_package(Qt5Widgets)
 
 add_subdirectory(folderlistmodel)
+add_subdirectory(placesmodel)

=== added directory 'src/plugin/placesmodel'
=== added file 'src/plugin/placesmodel/CMakeLists.txt'
--- src/plugin/placesmodel/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/plugin/placesmodel/CMakeLists.txt	2014-06-26 06:20:10 +0000
@@ -0,0 +1,35 @@
+include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+set(PLUGIN_DIR com/ubuntu/PlacesModel)
+
+set(placesmodel_SRCS
+    placesmodel.cpp
+    placesmodel.h
+    placesmodel_plugin.cpp
+    placesmodel_plugin.h
+)
+
+add_library(PlacesModel MODULE
+    ${placesmodel_SRCS}
+)
+
+qt5_use_modules(PlacesModel Gui Qml Quick Widgets)
+
+# Copy the plugin, the qmldir file and other assets to the build dir for running in QtCreator
+if(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
+    add_custom_command(TARGET PlacesModel POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/../${PLUGIN_DIR}
+        COMMENT "Creating plugin directory layout in the build directory"
+        COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/qmldir ${CMAKE_CURRENT_BINARY_DIR}/../${PLUGIN_DIR}
+        COMMENT "Copying the qmldir file to the build directory"
+        COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:PlacesModel> ${CMAKE_CURRENT_BINARY_DIR}/../${PLUGIN_DIR}
+        COMMENT "Copying the plugin binary to the build directory"
+    )
+endif(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
+
+# Install plugin file
+install(TARGETS PlacesModel DESTINATION ${QT_IMPORTS_DIR}/${PLUGIN_DIR})
+install(FILES qmldir DESTINATION ${QT_IMPORTS_DIR}/${PLUGIN_DIR})
+

=== added file 'src/plugin/placesmodel/placesmodel.cpp'
--- src/plugin/placesmodel/placesmodel.cpp	1970-01-01 00:00:00 +0000
+++ src/plugin/placesmodel/placesmodel.cpp	2014-06-26 06:20:10 +0000
@@ -0,0 +1,174 @@
+/*
+ * 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/>.
+ *
+ * Author : David Planella <[e-mail]>
+ */
+
+#include "placesmodel.h"
+#include <QDebug>
+#include <QDir>
+#include <QAbstractItemModel>
+#include <QCoreApplication>
+#include <QStandardPaths>
+#include <QDebug>
+
+PlacesModel::PlacesModel(QAbstractListModel *parent) :
+    QAbstractListModel(parent)
+{
+
+    QStringList defaultLocations;
+    // Set the storage location to a path that works well
+    // with app isolation
+    QString settingsLocation =
+            QStandardPaths::standardLocations(QStandardPaths::ConfigLocation).first()
+            + "/" + QCoreApplication::applicationName() + "/" + "places.conf";
+    m_settings = new QSettings(settingsLocation, QSettings::IniFormat, this);
+
+    // Prepopulate the model with the user locations
+    // for the first time it's used
+    defaultLocations.append(locationHome());
+    defaultLocations.append(locationDocuments());
+    defaultLocations.append(locationDownloads());
+    defaultLocations.append(locationMusic());
+    defaultLocations.append(locationPictures());
+    defaultLocations.append(locationVideos());
+
+    if (!m_settings->contains("storedLocations")) {
+        m_locations.append(defaultLocations);
+    } else {
+        m_locations = m_settings->value("storedLocations").toStringList();
+    }
+
+    foreach (const QString &location, m_locations) {
+        qDebug() << "Location: " << location;
+    }
+
+}
+
+PlacesModel::~PlacesModel() {
+
+}
+
+QString PlacesModel::standardLocation(QStandardPaths::StandardLocation location) const
+{
+    QStringList locations = QStandardPaths::standardLocations(location);
+    QString standardLocation = "";
+
+    foreach (const QString &location, locations) {
+        // We always return the first location or an empty string
+        // The frontend should check out that it exists
+        if (QDir(location).exists()) {
+            standardLocation = location;
+            break;
+        }
+    }
+
+    return standardLocation;
+}
+
+QString PlacesModel::locationHome() const
+{
+    return standardLocation(QStandardPaths::HomeLocation);
+}
+
+QString PlacesModel::locationDocuments() const
+{
+    return standardLocation(QStandardPaths::DocumentsLocation);
+}
+
+QString PlacesModel::locationDownloads() const
+{
+    return standardLocation(QStandardPaths::DownloadLocation);
+}
+
+QString PlacesModel::locationMusic() const
+{
+    return standardLocation(QStandardPaths::MusicLocation);
+}
+
+QString PlacesModel::locationPictures() const
+{
+    return standardLocation(QStandardPaths::PicturesLocation);
+}
+
+QString PlacesModel::locationVideos() const
+{
+    return standardLocation(QStandardPaths::MoviesLocation);
+}
+
+int PlacesModel::rowCount(const QModelIndex &parent) const
+{
+    Q_UNUSED(parent)
+
+    return m_locations.count();
+}
+
+QVariant PlacesModel::data(const QModelIndex &index, int role) const
+{
+    Q_UNUSED(role)
+
+    return m_locations.at(index.row());
+}
+
+QHash<int, QByteArray> PlacesModel::roleNames() const
+{
+    QHash<int, QByteArray> roles;
+    roles.insert(Qt::UserRole, "path");
+
+    return roles;
+}
+
+void PlacesModel::removeItem(int indexToRemove)
+{
+
+    // Tell Qt that we're going to be changing the model
+    // There's no tree-parent, first new item will be at
+    // indexToRemove, and the last one too
+    beginRemoveRows(QModelIndex(), indexToRemove, indexToRemove);
+
+    // Remove the actual location
+    m_locations.removeAt(indexToRemove);
+
+    // Tell Qt we're done with modifying the model so that
+    // it can update the UI and everything else to reflect
+    // the new state
+    endRemoveRows();
+
+    // Remove the location permanently
+    m_settings->setValue("storedLocations", m_locations);
+}
+
+void PlacesModel::addLocation(const QString &location)
+{
+    // Do not allow for duplicates
+    if (!m_locations.contains(location)) {
+        // Tell Qt that we're going to be changing the model
+        // There's no tree-parent, first new item will be at
+        // m_locations.count(), and the last one too
+        beginInsertRows(QModelIndex(), m_locations.count(), m_locations.count());
+
+        // Append the actual location
+        m_locations.append(location);
+
+
+        // Tell Qt we're done with modifying the model so that
+        // it can update the UI and everything else to reflect
+        // the new state
+        endInsertRows();
+
+        // Store the location permanently
+        m_settings->setValue("storedLocations", m_locations);
+    }
+}

=== added file 'src/plugin/placesmodel/placesmodel.h'
--- src/plugin/placesmodel/placesmodel.h	1970-01-01 00:00:00 +0000
+++ src/plugin/placesmodel/placesmodel.h	2014-06-26 06:20:10 +0000
@@ -0,0 +1,64 @@
+/*
+ * 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/>.
+ *
+ * Author : David Planella <[e-mail]>
+ */
+
+#ifndef PLACESMODEL_H
+#define PLACESMODEL_H
+
+#include <QObject>
+#include <QAbstractListModel>
+#include <QStandardPaths>
+#include <QSettings>
+
+class PlacesModel : public QAbstractListModel
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QString locationHome READ locationHome CONSTANT)
+    Q_PROPERTY(QString locationDocuments READ locationDocuments CONSTANT)
+    Q_PROPERTY(QString locationDownloads READ locationDownloads CONSTANT)
+    Q_PROPERTY(QString locationMusic READ locationMusic CONSTANT)
+    Q_PROPERTY(QString locationPictures READ locationPictures CONSTANT)
+    Q_PROPERTY(QString locationVideos READ locationVideos CONSTANT)
+
+public:
+    explicit PlacesModel(QAbstractListModel *parent = 0);
+    ~PlacesModel();
+    QString locationHome() const;
+    QString locationDocuments() const;
+    QString locationDownloads() const;
+    QString locationMusic() const;
+    QString locationPictures() const;
+    QString locationVideos() const;
+    int rowCount(const QModelIndex &parent) const override;
+    QVariant data(const QModelIndex &index, int role) const override;
+    QHash<int, QByteArray> roleNames() const override;
+
+public slots:
+    void addLocation(const QString &location);
+    void removeItem(int indexToRemove);
+
+private:
+    QString standardLocation(QStandardPaths::StandardLocation location) const;
+    QStringList m_locations;
+    QSettings *m_settings;
+};
+
+#endif // PLACESMODEL_H
+
+
+

=== added file 'src/plugin/placesmodel/placesmodel_plugin.cpp'
--- src/plugin/placesmodel/placesmodel_plugin.cpp	1970-01-01 00:00:00 +0000
+++ src/plugin/placesmodel/placesmodel_plugin.cpp	2014-06-26 06:20:10 +0000
@@ -0,0 +1,34 @@
+/*
+ * 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/>.
+ *
+ * Author : David Planella <[e-mail]>
+ */
+
+#include <QtQml>
+#include <QtQml/QQmlContext>
+#include "placesmodel_plugin.h"
+#include "placesmodel.h"
+
+void BackendPlugin::registerTypes(const char *uri)
+{
+    Q_ASSERT(uri == QLatin1String(QUOTES(PLUGIN_URI)));
+
+    qmlRegisterType<PlacesModel>(uri, 0, 1, "PlacesModel");
+}
+
+void BackendPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
+{
+    QQmlExtensionPlugin::initializeEngine(engine, uri);
+}

=== added file 'src/plugin/placesmodel/placesmodel_plugin.h'
--- src/plugin/placesmodel/placesmodel_plugin.h	1970-01-01 00:00:00 +0000
+++ src/plugin/placesmodel/placesmodel_plugin.h	2014-06-26 06:20:10 +0000
@@ -0,0 +1,39 @@
+/*
+ * 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/>.
+ *
+ * Author : David Planella <[e-mail]>
+ */
+
+#ifndef PLACESMODEL_PLUGIN_H
+#define PLACESMODEL_PLUGIN_H
+
+#include <QtQml/QQmlEngine>
+#include <QtQml/QQmlExtensionPlugin>
+
+class BackendPlugin : public QQmlExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
+
+public:
+    void registerTypes(const char *uri);
+    void initializeEngine(QQmlEngine *engine, const char *uri);
+};
+#endif // PLACESMODEL_PLUGIN_H
+
+
+
+
+

=== added file 'src/plugin/placesmodel/qmldir'
--- src/plugin/placesmodel/qmldir	1970-01-01 00:00:00 +0000
+++ src/plugin/placesmodel/qmldir	2014-06-26 06:20:10 +0000
@@ -0,0 +1,2 @@
+module com.ubuntu.PlacesModel
+plugin PlacesModel

=== modified file 'tests/autopilot/filemanager/tests/__init__.py'
--- tests/autopilot/filemanager/tests/__init__.py	2014-06-19 15:59:52 +0000
+++ tests/autopilot/filemanager/tests/__init__.py	2014-06-26 06:20:10 +0000
@@ -125,14 +125,14 @@
         self.useFixture(temp_dir_fixture)
         temp_dir = temp_dir_fixture.path
 
-        #If running under xvfb, as jenkins does,
-        #xsession will fail to start without xauthority file
-        #Thus if the Xauthority file is in the home directory
-        #make sure we copy it to our temp home directory
+        # If running under xvfb, as jenkins does,
+        # xsession will fail to start without xauthority file
+        # Thus if the Xauthority file is in the home directory
+        # make sure we copy it to our temp home directory
         self._copy_xauthority_file(temp_dir)
 
-        #click requires using initctl env (upstart), but the desktop can set
-        #an environment variable instead
+        # click requires using initctl env (upstart), but the desktop can set
+        # an environment variable instead
         if self.test_type == 'click':
             self.useFixture(toolkit_fixtures.InitctlEnvironmentVariable(
                             HOME=temp_dir))

=== modified file 'tests/autopilot/filemanager/tests/test_filemanager.py'
--- tests/autopilot/filemanager/tests/test_filemanager.py	2014-06-19 15:59:52 +0000
+++ tests/autopilot/filemanager/tests/test_filemanager.py	2014-06-26 06:20:10 +0000
@@ -50,9 +50,9 @@
         return folder_list_page.get_file_by_index(index)
 
     def _go_to_location(self, location):
-        #go to specified location
-        #on wide UI display, we get the location dialog
-        #on phone UI display, we get places popover
+        # go to specified location
+        # on wide UI display, we get the location dialog
+        # on phone UI display, we get places popover
         device = model()
         if self.main_view.showSidebar:
             logger.debug("Using goto to goto %s on %s" % (location, device))
@@ -70,7 +70,7 @@
         expected_path = item.filePath
         list_view = item.list_view
 
-        #item.open_directory()
+        # item.open_directory()
         self.pointing_device.click_object(item)
         self.assertThat(
             list_view.get_current_path, Eventually(Equals(expected_path)))
@@ -131,7 +131,7 @@
         original_apps = process_manager.get_running_applications()
 
         dialog.open()
-        #make sure the dialog is open
+        # make sure the dialog is open
         self.main_view.get_file_action_dialog()
         # Filtering copied from
         # AutopilotTestCase._compare_system_with_app_snapshot.

=== modified file 'tests/autopilot/filemanager/tests/test_places.py'
--- tests/autopilot/filemanager/tests/test_places.py	2014-06-19 16:03:37 +0000
+++ tests/autopilot/filemanager/tests/test_places.py	2014-06-26 06:20:10 +0000
@@ -34,7 +34,7 @@
 
     def test_go_to_root_must_open_the_root_directory(self):
         """Test that opens the File System bookmark from the places section."""
-        self.main_view.go_to_place('placeRoot')
+        self.main_view.go_to_place('placeFileSystem')
 
         folder_list_page = self.main_view.get_folder_list_page()
         self.assertThat(