Merge lp:~ibelieve/ubuntu-filemanager-app/better-desktop-support into lp:ubuntu-filemanager-app

[Michael Spencer]

Added desktop features, including multiple tabs, icon view, and a path bar.

This adds the following features:

 * Multiple tabs
 * Icon view
 * A path bar
 * Collapsible sidebar
 * Keyboard support for going to a location (Ctrl+L), same as Nautilus

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

FAILED: Continuous integration, rev:103
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/99/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/359
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-ci/99
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-ci/99
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-ci/49

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

review: Needs Fixing (continuous-integration)

[lp:~ibelieve/ubuntu-filemanager-app/better-desktop-support]

104. By Michael Spencer on 2013-12-07

Added back wideAspect property

[Victor Thompson (vthompson)]

Here are a few things that need fixing or may be desirable:
1. The Grid can't be swiped up or down if the user clicks/touches an icon and tried to flick the view up or down.
2. Clicking the Settings icon for the first time doesn't have the intended effect any more. Previously the Component.onComplete function had a push and pop of the Settings page that fixed this.
3. I think a long press on a folder should allow the user to open it up in a new tab.
4. I don't get how the "tabsPopover" actions can be called. How does one produce that pop over?
5. I think it'd be best if the "Path bar" didn't have the large whitespace in between the path and the edit icon. I think the edit icon should align either be to the left of the path or to the immediate right with no whitespace.

review: Needs Fixing

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

FAILED: Continuous integration, rev:104
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/100/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/360
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-ci/100
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-ci/100
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-ci/50

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

review: Needs Fixing (continuous-integration)

[Michael Spencer (ibelieve)]

Hi Victor,

Sorry I haven't responded to your feedback until now. I finally had some spare time and got my development VM set up again, so I'm back in business!

I'll work on fixing (1), (2), and (5). Here are the answers to your other feedback:

3) Long press is already used on a touch device as the equivalent to a right-click, and doing so opens a popover with options for the current folder.

4) That is accessed by the "Tabs" toolbar button.

[lp:~ibelieve/ubuntu-filemanager-app/better-desktop-support]

105. By Michael Spencer on 2014-01-21

Various fixes

106. By Michael Spencer on 2014-01-21

Fixed the pathbar width

107. By Michael Spencer on 2014-01-21

Animations for the path bar and removed the Unix-style directory header

[Michael Spencer (ibelieve)]

Okay, (2) and (5) are fixed. As for (1), I'm able to drag while on top of an icon most of the time. Not sure why it doesn't work all the time. I've already set the MouseView to progagate events.

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

FAILED: Continuous integration, rev:107
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/109/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/752/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-ci/109/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-ci/109/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-ci/59/console

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

review: Needs Fixing (continuous-integration)

[Victor Thompson (vthompson)]

For (1) it seems like the first click and drag on an icon does not allow you to scroll, but subsequent attempts on the same icon do. I think this is probably good enough and that can be fixed later. A user on the desktop would most likely use a mouse scroll bar--tablet support would need the click and drag on an icon so it isn't *that* important at the moment, IMO. 14.04 would be a good target.

review: Approve

[lp:~ibelieve/ubuntu-filemanager-app/better-desktop-support]

108. By Michael Spencer on 2014-02-18

Merged in master

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

FAILED: Continuous integration, rev:108
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/129/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1368/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-ci/129/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-ci/129/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-ci/79/console

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

review: Needs Fixing (continuous-integration)

[lp:~ibelieve/ubuntu-filemanager-app/better-desktop-support]

109. By Michael Spencer on 2014-02-18

Working on fixing AP tests

110. By Michael Spencer on 2014-02-18

Merged in master

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

FAILED: Continuous integration, rev:109
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/130/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1372/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-ci/130/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-ci/130/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-ci/80/console

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

review: Needs Fixing (continuous-integration)

[lp:~ibelieve/ubuntu-filemanager-app/better-desktop-support]

111. By Michael Spencer on 2014-02-18

More AP test fixes

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

FAILED: Continuous integration, rev:110
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/131/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1378/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-ci/131/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-ci/131/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-ci/81/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:111
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/132/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1379/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-ci/132/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-ci/132/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-ci/82/console

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

review: Needs Fixing (continuous-integration)

[lp:~ibelieve/ubuntu-filemanager-app/better-desktop-support]

112. By Michael Spencer on 2014-02-18

Fixed Cmake file

113. By Michael Spencer on 2014-02-18

Fixed some problems with the list header

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

FAILED: Continuous integration, rev:113
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/133/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1382/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-ci/133/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-ci/133/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-ci/83/console

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

review: Needs Fixing (continuous-integration)

[lp:~ibelieve/ubuntu-filemanager-app/better-desktop-support]

114. By Michael Spencer on 2014-02-18

Fixed pep8 errors

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

FAILED: Continuous integration, rev:114
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/134/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1386
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-ci/134
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-ci/134
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-ci/84

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

review: Needs Fixing (continuous-integration)

[lp:~ibelieve/ubuntu-filemanager-app/better-desktop-support]

115. By Michael Spencer on 2014-02-18

Added files to CMakeList

116. By Michael Spencer on 2014-02-19

Refactored files into sub-directories

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

FAILED: Continuous integration, rev:115
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/135/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1390
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-ci/135
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-ci/135
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-ci/85

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

review: Needs Fixing (continuous-integration)

[lp:~ibelieve/ubuntu-filemanager-app/better-desktop-support]

117. By Michael Spencer on 2014-02-19

Fixed a few problems

118. By Michael Spencer on 2014-02-19

Removed old test

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

PASSED: Continuous integration, rev:116
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/136/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1394
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-ci/136
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-ci/136
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-ci/86

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

review: Approve (continuous-integration)

[Michael Spencer (ibelieve)]

I'm top-approving this myself since Victor has already approved it.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-02-13 02:52:22 +0000
+++ CMakeLists.txt	2014-02-19 00:47:29 +0000
@@ -47,12 +47,7 @@
 file(GLOB SRC_FILES
      RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
      *.qml *.js *.png *.js *.json)
-install(DIRECTORY icons DESTINATION ${DATA_DIR})
-install(FILES Sidebar.qml GoToDialog.qml ViewPopover.qml NotifyDialog.qml
-    SettingsPage.qml ConfirmDialog.qml PlacesPopover.qml PlacesSidebar.qml
-    FolderListPage.qml FolderListView.qml VerticalDivider.qml
-    FileActionDialog.qml FileDetailsPopover.qml FolderListDelegate.qml
-    ConfirmDialogWithInput.qml FileOperationProgressDialog.qml
+install(DIRECTORY ui components icons
     DESTINATION ${DATA_DIR})
 install(FILES ${MAIN_QML} DESTINATION ${DATA_DIR})
 

=== removed file 'ConfirmDialog.qml'
--- ConfirmDialog.qml	2013-07-11 22:40:40 +0000
+++ ConfirmDialog.qml	1970-01-01 00:00:00 +0000
@@ -1,60 +0,0 @@
-/*
- * 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: Arto Jalkanen <[e-mail]>
- */
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Components.Popups 0.1
-
-Dialog {
-    id: root
-
-    signal accepted
-    signal rejected
-
-    Button {
-        id: okButton
-        objectName: "okButton"
-        text: i18n.tr("Ok")
-        onClicked: {
-            accepted()
-            PopupUtils.close(root)
-        }
-    }
-
-    Button {
-        id: cancelButton
-        objectName: "cancelButton"
-        text: i18n.tr("Cancel")
-
-        gradient: Gradient {
-            GradientStop {
-                position: 0
-                color: "gray"
-            }
-
-            GradientStop {
-                position: 1
-                color: "lightgray"
-            }
-        }
-
-        onClicked: {
-            rejected()
-            PopupUtils.close(root)
-        }
-    }
-}

=== removed file 'ConfirmDialogWithInput.qml'
--- ConfirmDialogWithInput.qml	2013-07-04 20:33:07 +0000
+++ ConfirmDialogWithInput.qml	1970-01-01 00:00:00 +0000
@@ -1,70 +0,0 @@
-/*
- * 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: Arto Jalkanen <[e-mail]>
- */
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Components.Popups 0.1
-
-Dialog {
-    id: root
-
-    property alias inputText: input.text
-    property alias placeholderText: input.placeholderText
-    signal accepted
-    signal rejected
-
-    TextField {
-        id: input
-        objectName: "inputField"
-        focus: true
-        validator: RegExpValidator {
-            regExp: /.+/
-        }
-    }
-
-    Button {
-        objectName: "okButton"
-        text: i18n.tr("Ok")
-        enabled: input.acceptableInput
-        onClicked: {
-            accepted()
-            PopupUtils.close(root)
-        }
-    }
-
-    Button {
-        objectName: "cancelButton"
-        text: i18n.tr("Cancel")
-
-        gradient: Gradient {
-            GradientStop {
-                position: 0
-                color: "gray"
-            }
-
-            GradientStop {
-                position: 1
-                color: "lightgray"
-            }
-        }
-
-        onClicked: {
-            rejected()
-            PopupUtils.close(root)
-        }
-    }
-}

=== removed file 'FileActionDialog.qml'
--- FileActionDialog.qml	2013-07-12 01:18:25 +0000
+++ FileActionDialog.qml	1970-01-01 00:00:00 +0000
@@ -1,60 +0,0 @@
-/*
- * 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: Arto Jalkanen <[e-mail]>
- */
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Components.Popups 0.1
-import org.nemomobile.folderlistmodel 1.0
-
-Dialog {
-    id: root
-
-    property string fileName
-    property string filePath
-    property FolderListModel folderListModel
-
-    title: i18n.tr("Choose action")
-    text: i18n.tr("For file: %1").arg(fileName)
-
-    Button {
-        objectName: "openButton"
-        text: i18n.tr("Open")
-        onClicked: {
-            console.log("Opening file", filePath)
-            folderListModel.openPath(filePath)
-            onClicked: PopupUtils.close(root)
-        }
-    }
-
-    Button {
-        objectName: "cancelButton"
-        text: i18n.tr("Cancel")
-        onClicked: PopupUtils.close(root)
-
-        gradient: Gradient {
-            GradientStop {
-                position: 0
-                color: "gray"
-            }
-
-            GradientStop {
-                position: 1
-                color: "lightgray"
-            }
-        }
-    }
-}

=== removed file 'FileDetailsPopover.qml'
--- FileDetailsPopover.qml	2013-09-28 18:48:28 +0000
+++ FileDetailsPopover.qml	1970-01-01 00:00:00 +0000
@@ -1,140 +0,0 @@
-/*
- * 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: Arto Jalkanen <[e-mail]>
- */
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Components.Popups 0.1
-
-Popover {
-    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) || "Unknown"
-    }
-
-    function permissionsToString(model) {
-        var permissions = []
-        if (model.isReadable) {
-            permissions.push(i18n.tr("Readable"))
-        }
-        if (pathIsWritable()) {
-            permissions.push(i18n.tr("Writable"))
-        }
-        if (model.isExecutable) {
-            permissions.push(i18n.tr("Executable"))
-        }
-
-        // Now why does this not work?
-        // return permissions.join(", ")
-        var permStr = ""
-        for (var i = 0; i < permissions.length; ++i) {
-            if (permStr.length > 0) {
-                permStr += ", "
-            }
-            permStr += permissions[i]
-        }
-        return permStr
-    }
-
-    Column {
-        id: contents
-        spacing: units.gu(1)
-        anchors {
-            margins: units.gu(2)
-            left: parent.left
-            right: parent.right
-            top: parent.top
-        }
-
-        Row {
-            spacing: units.gu(1)
-            Image {
-                anchors.verticalCenter: parent.verticalCenter
-
-                // TODO: how to get proper icon?
-                source: fileIcon(root.path, model.isDir)
-            }
-
-            Label {
-                anchors.verticalCenter: parent.verticalCenter
-
-                text: folderName(root.path)
-                color: Theme.palette.normal.overlayText
-                font.bold: true
-            }
-        }
-
-        Grid {
-            columns: 2
-            spacing: units.gu(1)
-
-            Label {
-                text: i18n.tr("Path:")
-                color: Theme.palette.normal.overlayText
-            }
-
-            Label {
-                objectName: "pathLabel"
-                text: root.path
-                color: Theme.palette.normal.overlayText
-            }
-
-            Label {
-                text: model.isDir ? i18n.tr("Contents:")
-                                  : i18n.tr("Size:")
-                color: Theme.palette.normal.overlayText
-            }
-            Label {
-                text: model.fileSize
-                color: Theme.palette.normal.overlayText
-            }
-
-            Label {
-                text: i18n.tr("Accessed:")
-                color: Theme.palette.normal.overlayText
-            }
-            Label {
-                text: dateTimeFormat(pathAccessedDate())
-                color: Theme.palette.normal.overlayText
-            }
-
-            Label {
-                text: i18n.tr("Modified:")
-                color: Theme.palette.normal.overlayText
-            }
-            Label {
-                text: dateTimeFormat(pathModifiedDate())
-                color: Theme.palette.normal.overlayText
-            }
-
-            Label {
-                text: i18n.tr("Permissions:")
-                color: Theme.palette.normal.overlayText
-            }
-            Label {
-                text: permissionsToString(model)
-                color: Theme.palette.normal.overlayText
-            }
-
-        }
-    }
-}

=== removed file 'FileOperationProgressDialog.qml'
--- FileOperationProgressDialog.qml	2013-09-17 16:40:38 +0000
+++ FileOperationProgressDialog.qml	1970-01-01 00:00:00 +0000
@@ -1,86 +0,0 @@
-/*
- * 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: Arto Jalkanen <[e-mail]>
- */
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Components.Popups 0.1
-import org.nemomobile.folderlistmodel 1.0
-
-Dialog {
-    id: root
-    property FolderListModel model
-    property Page page
-    property string descriptionPrepend: i18n.tr("Operation in progress")
-
-    title: "File operation"
-    text: descriptionPrepend
-
-    function startOperation(name) {
-        root.title = name
-    }
-
-    ProgressBar {
-        id: progress
-        minimumValue: 0.0
-        maximumValue: 100.0
-        value: 0.0
-    }
-
-    Button {
-        text: i18n.tr("Cancel")
-        onClicked: {
-            console.log("Cancelling file progress action")
-            model.cancelAction()
-            PopupUtils.close(root)
-        }
-    }
-
-    Connections {
-        target: model
-        onProgress: {
-            // curItem == 0 && percent == 0 means the Action has just been created, check getProgressCounter() before
-            if (curItem == 0 && percent == 0) {
-                console.log("Creating dialog:", model.getProgressCounter())
-                if (model.getProgressCounter()  > 20) {
-                    // show/activate/make visible    the dialog here
-                    print("Showing dialog...")
-                    PopupUtils.open(root, page)
-                    root.show()
-                }
-            }
-
-            console.log("On progress ", curItem, totalItems, percent)
-
-            progress.value = percent
-            if (percent == 100 && curItem == totalItems) {
-                console.log("All files processed, closing progress dialog")
-                //PopupUtils.close(root)
-                root.hide()
-            } else {
-                root.text = descriptionPrepend + " (" + curItem + "/" + totalItems + ")"
-            }
-        }
-    }
-
-    // Errors from model
-    Connections {
-        target: pageModel
-        onError: {
-            PopupUtils.close(root)
-        }
-    }
-}

=== removed file 'FolderListDelegate.qml'
--- FolderListDelegate.qml	2014-01-31 19:51:25 +0000
+++ FolderListDelegate.qml	1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-/*
- * 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: Arto Jalkanen <[e-mail]>
- */
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Components.ListItems 0.1 as ListItem
-import org.nemomobile.folderlistmodel 1.0
-
-ListItem.Subtitled {
-    objectName: "folder" + index
-
-    property string fileName: model.fileName
-    property string filePath: path
-
-    text: model.fileName
-    subText: Qt.formatDateTime(model.modifiedDate, Qt.DefaultLocaleShortDate) + (!model.isDir ? ", " + fileSize : "")
-
-    property string path: fileView.path + '/' + model.fileName
-    iconSource: fileIcon(path, model.isDir)
-    progression: model.isDir
-    iconFrame: false
-}

=== removed file 'FolderListPage.qml'
--- FolderListPage.qml	2013-12-07 18:51:06 +0000
+++ FolderListPage.qml	1970-01-01 00:00:00 +0000
@@ -1,498 +0,0 @@
-/*
- * 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: Arto Jalkanen <[e-mail]>
- */
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Components.Popups 0.1
-import Ubuntu.Components.ListItems 0.1
-import org.nemomobile.folderlistmodel 1.0
-
-Page {
-    id: folderListPage
-
-    title: folderName(folder)
-
-    property variant fileView: folderListPage
-
-    property bool showHiddenFiles: false
-
-    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: 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
-                                            }
-                                        )
-                    }
-                }
-            }
-
-            delegate: Empty {
-                id: listItem
-                Label {
-                    text: listItem.text
-                    anchors {
-                        verticalCenter: parent.verticalCenter
-                        horizontalCenter: parent.horizontalCenter
-                    }
-                    wrapMode: Text.Wrap
-                    color: Theme.palette.normal.overlayText
-                }
-
-                /*! \internal */
-                onTriggered: folderActionsPopover.hide()
-                visible: listItem.enabled
-                height: visible ? implicitHeight : 0
-            }
-        }
-    }
-
-    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")
-                }
-            }
-        }
-    }
-
-
-
-    tools: ToolbarItems {
-        id: toolbar
-        locked: wideAspect
-        opened: wideAspect
-
-        onLockedChanged: opened = Qt.binding(function() { return wideAspect })
-
-        back: ToolbarButton {
-            objectName: "up"
-            text: "Up"
-            iconSource: getIcon("up")
-            visible: folder != "/"
-            onTriggered: {
-                goTo(pageModel.parentPath)
-            }
-        }
-
-        ToolbarButton {
-            id: actionsButton
-            objectName: "actions"
-            text: i18n.tr("Actions")
-            iconSource: getIcon("edit")
-
-            onTriggered: {
-                print(text)
-                PopupUtils.open(folderActionsPopoverComponent, actionsButton)
-            }
-        }
-
-        ToolbarButton {
-            text: i18n.tr("View")
-            iconSource: getIcon("properties")
-            id: optionsButton
-
-            onTriggered: {
-                print(text)
-
-                PopupUtils.open(Qt.resolvedUrl("ViewPopover.qml"), optionsButton)
-            }
-        }
-
-        ToolbarButton {
-            id: goToButton
-            visible: wideAspect
-            objectName: "goTo"
-            text: i18n.tr("Go To")
-            iconSource: getIcon("location")
-            onTriggered: {
-                print(text)
-
-                PopupUtils.open(Qt.resolvedUrl("GoToDialog.qml"), goToButton)
-            }
-        }
-
-        ToolbarButton {
-            id: placesButton
-            visible: !wideAspect
-            objectName: "places"
-            text: i18n.tr("Places")
-            iconSource: getIcon("location")
-            onTriggered: {
-                print(text)
-
-                PopupUtils.open(Qt.resolvedUrl("PlacesPopover.qml"), placesButton)
-            }
-        }
-
-        ToolbarButton {
-            id: settingsButton
-            visible: wideAspect
-            objectName: "settings"
-            action: settingsAction
-        }
-    }
-
-    flickable: !wideAspect ? folderListView : null
-
-    onFlickableChanged: {
-        if (wideAspect) {
-            folderListView.topMargin = 0
-        } else {
-            folderListView.topMargin = units.gu(9.5)
-        }
-    }
-
-    PlacesSidebar {
-        id: sidebar
-        objectName: "placesSidebar"
-
-//        anchors {
-//            top: parent.top
-//            bottom: parent.bottom
-//            bottomMargin: units.gu(-2)
-//        }
-
-        expanded: wideAspect
-    }
-
-    FolderListView {
-        id: folderListView
-
-        clip: true
-
-        folderListModel: pageModel
-        anchors {
-            top: parent.top
-            bottom: parent.bottom
-            left: sidebar.right
-            right: parent.right
-        }
-    }
-
-    Item {
-        id: contents
-
-        anchors {
-            top: parent.top
-            bottom: parent.bottom
-            left: sidebar.right
-            right: parent.right
-        }
-
-        Column {
-            anchors.centerIn: parent
-            Label {
-                text: i18n.tr("No files")
-                fontSize: "large"
-                visible: folderListView.count == 0 && !pageModel.awaitingResults
-            }
-            ActivityIndicator {
-                running: pageModel.awaitingResults
-                width: units.gu(8)
-                height: units.gu(8)
-            }
-        }
-    }
-
-    // Errors from model
-    Connections {
-        target: pageModel
-        onError: {
-            console.log("FolderListModel Error Title/Description", errorTitle, errorMessage)
-            PopupUtils.open(Qt.resolvedUrl("NotifyDialog.qml"), folderListPage,
-                            {
-                                // Unfortunately title can not handle too long texts. TODO: bug report
-                                // title: i18n.tr(errorTitle),
-                                title: i18n.tr("File operation error"),
-                                text: errorTitle + ": " + errorMessage
-                            })
-        }
-    }
-
-    FileOperationProgressDialog {
-        id: fileOperationDialog
-
-        page: folderListPage
-        model: pageModel
-    }
-}

=== removed file 'FolderListView.qml'
--- FolderListView.qml	2013-09-17 16:40:38 +0000
+++ FolderListView.qml	1970-01-01 00:00:00 +0000
@@ -1,204 +0,0 @@
-/*
- * 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: Arto Jalkanen <[e-mail]>
- */
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Components.ListItems 0.1
-import Ubuntu.Components.Popups 0.1
-import org.nemomobile.folderlistmodel 1.0
-
-ListView {
-    id: root
-
-    property FolderListModel folderListModel
-    property string folderPath: folderListModel.path
-    model: folderListModel
-
-    header: Header {
-        objectName: "directoryHeader"
-        text: (root.count == 1
-               ? i18n.tr("%1 (1 file)").arg(root.folderPath)
-               : i18n.tr("%1 (%2 files)").arg(root.folderPath).arg(root.count))
-    }
-
-    Component {
-        id: confirmSingleDeleteDialog
-        ConfirmDialog {
-            property string filePath
-            property string fileName
-            title: i18n.tr("Delete")
-            text: i18n.tr("Are you sure you want to permanently delete '%1'?").arg(fileName)
-
-            onAccepted: {
-                console.log("Delete accepted for filePath, fileName", filePath, fileName)
-
-                fileOperationDialog.startOperation("Deleting files")
-                console.log("Doing delete")
-                folderListModel.rm(filePath)
-            }
-        }
-    }
-
-    Component {
-        id: confirmRenameDialog
-        ConfirmDialogWithInput {
-            // IMPROVE: this does not seem good: the backend excepts row and new name.
-            // But what if new files are added/deleted in the background while user is
-            // entering the new name? The indices change and wrong file is renamed.
-            // Perhaps the backend should take as parameters the "old name" and "new name"?
-            // This is not currently a problem since the backend does not poll changes in
-            // the filesystem, but may be a problem in the future.
-            property int modelRow
-
-            title: i18n.tr("Rename")
-            text: i18n.tr("Enter a new name")
-
-            onAccepted: {
-                console.log("Rename accepted", inputText)
-                if (inputText !== '') {
-                    console.log("Rename commensed, modelRow/inputText", modelRow, inputText)
-                    if (pageModel.rename(modelRow, inputText) === false) {
-                        PopupUtils.open(Qt.resolvedUrl("NotifyDialog.qml"), delegate,
-                                        {
-                                            title: i18n.tr("Could not rename"),
-                                            text: i18n.tr("Insufficient permissions or name already exists?")
-                                         })
-
-                    }
-                } else {
-                    console.log("Empty new name given, ignored")
-                }
-            }
-        }
-    }
-
-    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", folderListModel.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", folderListModel.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
-                                            }
-                                        )
-                    }
-                }
-            }
-        }
-    }
-
-    delegate: FolderListDelegate {
-        id: delegate
-
-        onClicked: {
-            if (model.isDir) {
-                if (model.isReadable && model.isExecutable) {
-                    console.log("Changing to dir", model.filePath)
-                    goTo(model.filePath)
-                } else {
-                    PopupUtils.open(Qt.resolvedUrl("NotifyDialog.qml"), delegate,
-                                    {
-                                        title: i18n.tr("Folder not accessible"),
-                                        text: i18n.tr("Can not access ") + model.fileName
-
-                                     })
-                }
-            } else {
-                console.log("Non dir clicked")
-                PopupUtils.open(Qt.resolvedUrl("FileActionDialog.qml"), root,
-                                {
-                                    fileName: model.fileName,
-                                    filePath: model.filePath,
-                                    folderListModel: root.folderListModel
-                                })
-            }
-        }
-
-        onPressAndHold: {
-            console.log("FolderListDelegate onPressAndHold")
-            PopupUtils.open(actionSelectionPopoverComponent, delegate,
-                            {
-                                model: model
-                            })
-        }
-    }
-
-    Scrollbar {
-        flickableItem: root
-        align: Qt.AlignTrailing
-    }
-}

=== removed file 'GoToDialog.qml'
--- GoToDialog.qml	2013-11-25 21:16:38 +0000
+++ GoToDialog.qml	1970-01-01 00:00:00 +0000
@@ -1,79 +0,0 @@
-/*
- * 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
-
-Dialog {
-    id: root
-
-    title: i18n.tr("Go To Location")
-
-    text: i18n.tr("Enter a location to go to:")
-
-    TextField {
-        id: locationField
-        objectName: "inputField"
-
-        inputMethodHints: Qt.ImhNoAutoUppercase
-
-        property bool valid: pathExists(text)
-
-        text: fileView.path
-
-        placeholderText: i18n.tr("Location...")
-
-        onAccepted: goButton.clicked()
-    }
-
-    Button {
-        id: goButton
-        objectName: "okButton"
-
-        text: i18n.tr("Go")
-        enabled: locationField.acceptableInput && locationField.valid
-
-        onClicked: {
-            print("User switched to:", locationField.text)
-            goTo(locationField.text)
-            PopupUtils.close(root)
-        }
-    }
-
-    Button {
-        id: cancelButton
-        objectName: "cancelButton"
-        text: i18n.tr("Cancel")
-
-        gradient: Gradient {
-            GradientStop {
-                position: 0
-                color: "gray"
-            }
-
-            GradientStop {
-                position: 1
-                color: "lightgray"
-            }
-        }
-
-        onClicked: {
-            PopupUtils.close(root)
-        }
-    }
-}

=== removed file 'NotifyDialog.qml'
--- NotifyDialog.qml	2013-04-17 17:55:41 +0000
+++ NotifyDialog.qml	1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
-/*
- * 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: Arto Jalkanen <[e-mail]>
- */
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Components.Popups 0.1
-
-Dialog {
-    id: root
-    Button {
-        text: i18n.tr("Ok")
-        onClicked: {
-            PopupUtils.close(root)
-        }
-    }
-}

=== removed file 'PlacesPopover.qml'
--- PlacesPopover.qml	2014-01-31 19:51:25 +0000
+++ PlacesPopover.qml	1970-01-01 00:00:00 +0000
@@ -1,140 +0,0 @@
-/*
- * 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
-        }
-
-        Empty {
-
-            TextField {
-                id: locationField
-                objectName: "inputField"
-                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
-                objectName: "okButton"
-                anchors {
-                    top: locationField.top
-                    bottom: locationField.bottom
-                    right: parent.right
-                    rightMargin: units.gu(1)
-                }
-
-                text: i18n.tr("Go")
-                enabled: locationField.acceptableInput && locationField.valid
-
-                onClicked: {
-                    print("User switched to:", locationField.text)
-                    goTo(locationField.text)
-                    PopupUtils.close(root)
-                }
-            }
-        }
-
-        Repeater {
-            id: placesList
-            objectName: "placesList"
-
-            model: places
-
-            delegate: Standard {
-                property string name: folderName(path)
-
-                Label {
-                    anchors.left: parent.left
-                    anchors.leftMargin: units.gu(8)
-                    anchors.verticalCenter: parent.verticalCenter
-                    text: folderName(path)
-                    color: selected ? UbuntuColors.orange : Theme.palette.normal.overlayText
-                }
-
-                iconSource: model.icon || fileIcon(model.path, true)
-
-                onClicked: {
-                    PopupUtils.close(root)
-                    goTo(model.path)
-                }
-
-                selected: folder === path
-                iconFrame: false
-                showDivider: index < (placesList.count - 1)
-            }
-        }
-    }
-}

=== removed file 'PlacesSidebar.qml'
--- PlacesSidebar.qml	2014-01-31 19:51:25 +0000
+++ PlacesSidebar.qml	1970-01-01 00:00:00 +0000
@@ -1,105 +0,0 @@
-/*
- * 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.ListItems 0.1
-import Ubuntu.Components.Popups 0.1
-
-Sidebar {
-    id: root
-
-    //color: Qt.rgba(0.5,0.5,0.5,0.3)
-    width: units.gu(30)
-
-    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
-        }
-
-        Header {
-//            Label {
-//                anchors.left: parent.left
-//                anchors.leftMargin: units.gu(1)
-//                anchors.verticalCenter: parent.verticalCenter
-                text: i18n.tr("Places")
-//                color: Theme.palette.normal.overlayText
-//            }
-        }
-
-        Repeater {
-            id: placesList
-            objectName: "placesList"
-
-            model: places
-
-            delegate: Standard {
-//                Label {
-//                    anchors.left: parent.left
-//                    anchors.leftMargin: units.gu(8)
-//                    anchors.verticalCenter: parent.verticalCenter
-                    text: folderName(path)
-//                    color: Theme.palette.normal.overlayText
-//                }
-                iconSource: model.icon || fileIcon(model.path, true)
-
-                onClicked: {
-                    goTo(model.path)
-                }
-
-                height: units.gu(5)
-
-                selected: folder === path
-                iconFrame: false
-            }
-        }
-    }
-}

=== removed file 'SettingsPage.qml'
--- SettingsPage.qml	2013-08-30 16:05:42 +0000
+++ SettingsPage.qml	1970-01-01 00:00:00 +0000
@@ -1,48 +0,0 @@
-/*
- * 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.ListItems 0.1
-import Ubuntu.Components.Popups 0.1
-
-/*
- * The Settings page holds global settings/preferences.
- *
- * TODO: Make sure this fits with the UI guidelines if
- * they are updated to include About/Settings info.
- */
-Page {
-    id: root
-
-    title: i18n.tr("Settings")
-
-    Column {
-        anchors.fill: parent
-
-        Standard {
-            text: i18n.tr("Show Advanced Features")
-            control: CheckBox {
-                id: showAdvancedFeaturesCheckBox
-                checked: showAdvancedFeatures
-                onCheckedChanged: {
-                    saveSetting("showAdvancedFeatures", showAdvancedFeaturesCheckBox.checked ? "true" : "false");
-                }
-            }
-        }
-    }
-}

=== removed file 'Sidebar.qml'
--- Sidebar.qml	2014-02-04 20:47:28 +0000
+++ Sidebar.qml	1970-01-01 00:00:00 +0000
@@ -1,143 +0,0 @@
-/***************************************************************************
- *                                                                         *
- * 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 3 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 0.1
-import Ubuntu.Components.ListItems 0.1
-
-/*!
-    \qmltype Sidebar
-    \brief A sidebar component for use in adaptive layouts
-
-    To use, simply add an instance to your code, and anchor other components to it.
-
-    To show or hide, set the expanded property.
-
-    By default, the sidebar has a flickable built in, and whatever contents are added
-    will be placed in the flickable. When you want this disabled, or want to fill the
-    entire sidebar, set the autoFill property to false.
-
-    Examples:
-    \qml
-        property bool wideAspect: width > units.gu(80)
-
-        Sidebar {
-            expanded: wideAspect
-
-            // Anchoring is automatic
-        }
-    \endqml
-*/
-Rectangle {
-    id: root
-
-    color: Qt.rgba(0.2,0.2,0.2,0.4)
-
-    property bool expanded: true
-
-    property string mode: "left" // or "right"
-    property alias header: headerItem.text
-
-    anchors {
-        left: mode === "left" ? parent.left : undefined
-        right: mode === "right" ? parent.right : undefined
-        top: parent.top
-        bottom: parent.bottom
-    }
-
-    VerticalDivider {
-        mode: root.mode
-
-        anchors {
-            top: parent.top
-            bottom: parent.bottom
-            right: mode === "left" ? parent.right : undefined
-            left: mode === "right" ? parent.left : undefined
-            rightMargin: -1
-        }
-    }
-
-    width: units.gu(35)
-
-
-    anchors.leftMargin: expanded ? 0 : -width
-    anchors.rightMargin: expanded ? 0 : -width
-
-    Behavior on anchors.leftMargin {
-        UbuntuNumberAnimation {}
-    }
-
-    Behavior on anchors.rightMargin {
-        UbuntuNumberAnimation {}
-    }
-
-    default property alias contents: contents.data
-
-    Header {
-        id: headerItem
-
-        visible: text !== ""
-    }
-
-    property bool autoFlick: true
-
-    Flickable {
-        id: flickable
-
-        clip: true
-
-        anchors {
-            top: headerItem.visible ? headerItem.bottom : parent.top
-            left: parent.left
-            right: parent.right
-            bottom: parent.bottom
-            rightMargin: mode === "left" ? 1 : 0
-            leftMargin: mode === "right" ? 1 : 0
-        }
-
-        contentWidth: width
-        contentHeight: autoFlick ? contents.height : height
-        interactive: contentHeight > height
-
-        Item {
-            id: contents
-
-            width: flickable.width
-            height: autoFlick ? childrenRect.height : flickable.height
-        }
-
-        function getFlickableChild(item) {
-            if (item && item.hasOwnProperty("children")) {
-                for (var i=0; i < item.children.length; i++) {
-                    var child = item.children[i];
-                    if (internal.isVerticalFlickable(child)) {
-                        if (child.anchors.top === page.top || child.anchors.fill === page) {
-                            return item.children[i];
-                        }
-                    }
-                }
-            }
-            return null;
-        }
-    }
-
-    Scrollbar {
-        flickableItem: flickable
-    }
-}

=== removed file 'VerticalDivider.qml'
--- VerticalDivider.qml	2014-02-04 20:47:28 +0000
+++ VerticalDivider.qml	1970-01-01 00:00:00 +0000
@@ -1,46 +0,0 @@
-/***************************************************************************
- *                                                                         *
- * 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 3 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 0.1
-import Ubuntu.Components.ListItems 0.1
-import QtQuick 2.0
-
-Item {
-    property string mode: "left" // or right
-
-    ThinDivider {
-        id: divider
-        rotation: mode === "left" ? 90 : -90
-
-        width: parent.height
-
-        anchors {
-            left: undefined
-            right: undefined
-            centerIn: parent
-        }
-    }
-    width: divider.height
-
-    anchors {
-        top: parent ? parent.top : undefined
-        bottom: parent ? parent.bottom : undefined
-    }
-}

=== removed file 'ViewPopover.qml'
--- ViewPopover.qml	2013-09-07 09:08:11 +0000
+++ ViewPopover.qml	1970-01-01 00:00:00 +0000
@@ -1,133 +0,0 @@
-/*
- * 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: "viewPopover"
-
-    Column {
-        anchors {
-            left: parent.left
-            right: parent.right
-            top: parent.top
-        }
-
-        Standard {
-            id: showHiddenFileCheckBox
-            objectName: "showHiddenFileCheckBox"
-
-            Label {
-                text: i18n.tr("Show Hidden Files")
-                fontSize: "medium"
-                color: Theme.palette.normal.overlayText
-                anchors.left: parent.left
-                anchors.leftMargin: units.gu(2)
-                anchors.verticalCenter: parent.verticalCenter
-            }
-
-            control: CheckBox {
-                anchors.verticalCenter: parent.verticalCenter
-
-                checked: fileView.showHiddenFiles
-                onCheckedChanged: {
-                    fileView.showHiddenFiles = checked
-                }
-            }
-        }
-
-        ValueSelector {
-            Label {
-                text: i18n.tr("Sort By")
-                fontSize: "medium"
-                color: Theme.palette.normal.overlayText
-                anchors.left: parent.left
-                anchors.leftMargin: units.gu(2)
-                anchors.top: parent.top
-                anchors.topMargin: units.gu(1.6)
-            }
-
-            selectedIndex: values.indexOf(fileView.sortingMethod)
-            values: [
-                i18n.tr("Name"),
-                i18n.tr("Date")
-            ]
-
-            onSelectedIndexChanged: {
-                fileView.sortingMethod = values[selectedIndex]
-            }
-        }
-
-        ValueSelector {
-            Label {
-                text: i18n.tr("Sort Order")
-                fontSize: "medium"
-                color: Theme.palette.normal.overlayText
-                anchors.left: parent.left
-                anchors.leftMargin: units.gu(2)
-                anchors.top: parent.top
-                anchors.topMargin: units.gu(1.7)
-            }
-
-            selectedIndex: sortAccending ? 0 : 1
-            values: [
-                i18n.tr("Ascending"),
-                i18n.tr("Descending")
-            ]
-
-            onSelectedIndexChanged: {
-                fileView.sortAccending = (values[selectedIndex] === i18n.tr("Ascending"))
-            }
-        }
-
-        Standard {
-            visible: showAdvancedFeatures
-
-            Label {
-                text: i18n.tr("Filter")
-                fontSize: "medium"
-                color: Theme.palette.normal.overlayText
-                anchors.left: parent.left
-                anchors.leftMargin: units.gu(2)
-                anchors.verticalCenter: parent.verticalCenter
-            }
-
-            TextField {
-                id: filterField
-                anchors {
-                    verticalCenter: parent.verticalCenter
-                    right: parent.right
-                    margins: units.gu(1)
-                }
-
-                inputMethodHints: Qt.ImhNoAutoUppercase
-
-                text: pageModel.nameFilters
-
-                onAccepted: goButton.clicked()
-                onTextChanged: {
-                    if (text !== pageModel.nameFilters)
-                        pageModel.nameFilters = [text]
-                }
-            }
-        }
-    }
-}

=== removed file '[e-mail]'
Binary files [e-mail]	2013-02-12 16:18:48 +0000 and [e-mail]	1970-01-01 00:00:00 +0000 differ
=== added directory 'components'
=== added file 'components/AutoSpacedGrid.qml'
--- components/AutoSpacedGrid.qml	1970-01-01 00:00:00 +0000
+++ components/AutoSpacedGrid.qml	2014-02-19 00:47:29 +0000
@@ -0,0 +1,102 @@
+/***************************************************************************
+ * Whatsoever ye do in word or deed, do all in the name of the             *
+ * Lord Jesus, giving thanks to God and the Father by him.                 *
+ * - Colossians 3:17                                                       *
+ *                                                                         *
+ * 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
+
+Item {
+    id: root
+
+
+    property int cellWidth
+    property int cellHeight
+
+    property int xCount
+    property int yCount: {
+        var count = cellCount/xCount
+        if (cellCount % xCount > 0)
+            count++
+        return count
+    }
+
+    height: yCount * cellHeight + (yCount - 1) * ySpacing + 2 * outerSpacing
+
+    property int cellCount
+
+    Component.onCompleted: layout()
+
+    onWidthChanged: layout()
+
+    // FIXME: A really uggly hack to get the layout right
+    Timer {
+        interval: 1
+        running: true
+        onTriggered: layout()
+    }
+
+    function layout() {
+        var count = 1
+        var space = calcSpacing(count)
+        while (space >= minSpacing) {
+            count++
+            space = calcSpacing(count)
+        }
+
+        count--
+        spacing = calcSpacing(count)
+        if (root.cellCount <= count) {
+            spacing = minSpacing
+        }
+
+        xCount = count
+    }
+
+    function calcSpacing(count) {
+        var spacing = (width - count * cellWidth)/(count)
+        print("Spacing for count", count, "is", spacing/8, "gu")
+        return spacing
+    }
+
+    property real spacing
+    property int minSpacing: units.gu(2)
+    property int outerSpacing: 1/2 * spacing
+    property real ySpacing: spacing
+
+    default property alias children: grid.children
+
+//    Rectangle {
+//        color: "gray"
+//        anchors.fill: grid
+//    }
+
+    Grid {
+        id: grid
+        anchors {
+            fill: parent
+            margins: root.outerSpacing
+        }
+
+        columns: xCount
+
+        columnSpacing: root.spacing
+        rowSpacing: root.ySpacing
+    }
+}

=== added file 'components/FolderIconDelegate.qml'
--- components/FolderIconDelegate.qml	1970-01-01 00:00:00 +0000
+++ components/FolderIconDelegate.qml	2014-02-19 00:47:29 +0000
@@ -0,0 +1,152 @@
+/*
+ * 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 QtGraphicalEffects 1.0
+import Ubuntu.Components 0.1
+
+Item {
+    id: delegate
+    height: units.gu(11)
+    width: units.gu(11)
+
+    property bool selected
+    property alias mouseOver: mouseArea.containsMouse
+
+    Rectangle {
+        anchors.centerIn: parent
+       // anchors.verticalCenterOffset: units.gu(0.5)
+        height: parent.height// + units.gu(1)
+        width: height
+
+        radius: units.gu(2)
+        smooth: true
+        antialiasing: true
+        opacity: selected ? 0.5 : 0
+        color: UbuntuColors.orange
+
+        Behavior on opacity {
+            UbuntuNumberAnimation {}
+        }
+    }
+
+    objectName: "folder" + index
+
+    property string fileName: model.fileName
+    property string filePath: fileView.path + '/' + fileName
+
+    property string text: fileName
+    property string subText: Qt.formatDateTime(model.modifiedDate, Qt.DefaultLocaleShortDate) + (!model.isDir ? ", " + fileSize : "")
+
+    property var icon: fileIcon(filePath, model.isDir)
+
+    Item {
+        anchors {
+            left: parent.left
+            right: parent.right
+            top: parent.top
+            bottom: label.top
+            topMargin: units.gu(0.5)
+            bottomMargin: units.gu(1)
+            leftMargin: units.gu(1)
+            rightMargin: units.gu(1)
+        }
+
+        Image {
+            id: image
+            anchors.centerIn: parent
+            width: units.gu(6)
+            height: width
+
+            source: delegate.icon
+        }
+
+        BrightnessContrast {
+            anchors.fill: image
+            brightness: 0.3
+            source: image
+            opacity: mouseOver ? 1 : 0
+
+            Behavior on opacity {
+                UbuntuNumberAnimation {}
+            }
+        }
+    }
+
+    property bool expand: mouseOver && label.implicitWidth >= label.width
+    z: expand ? 1 : 0
+
+    Rectangle {
+        anchors {
+            fill: label
+            margins: units.gu(-0.5)
+            leftMargin: units.gu(-1)
+            rightMargin: units.gu(-1)
+        }
+        color: "white"
+        radius: height/2
+        border.color: UbuntuColors.warmGrey
+        antialiasing: true
+        opacity: expand ? 1 : 0
+
+        Behavior on opacity {
+            UbuntuNumberAnimation {}
+        }
+    }
+
+    Label {
+        id: label
+        anchors {
+            horizontalCenter: parent.horizontalCenter
+            bottom: parent.bottom
+            bottomMargin: units.gu(0.75)
+        }
+
+        width: expand ? implicitWidth : (parent.width - units.gu(0.5))
+
+        Behavior on width {
+            UbuntuNumberAnimation {}
+        }
+
+        horizontalAlignment: Text.AlignHCenter
+        elide: Text.ElideMiddle
+
+        text: delegate.text
+        color: expand ? UbuntuColors.coolGrey : Theme.palette.selected.backgroundText
+        Behavior on color {
+            ColorAnimation { duration: 200 }
+        }
+    }
+
+    MouseArea {
+        id: mouseArea
+        anchors.fill: parent
+        hoverEnabled: true
+        acceptedButtons: (Qt.LeftButton | Qt.RightButton)
+
+        onClicked: {
+            if (mouse.button === Qt.RightButton)
+                pressAndHold(mouse)
+            else
+                itemClicked(model)
+        }
+
+        propagateComposedEvents: true
+
+        onPressAndHold: itemLongPress(delegate, model)
+    }
+}

=== added file 'components/FolderIconView.qml'
--- components/FolderIconView.qml	1970-01-01 00:00:00 +0000
+++ components/FolderIconView.qml	2014-02-19 00:47:29 +0000
@@ -0,0 +1,88 @@
+/*
+ * 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 as ListItem
+
+Item {
+    id: root
+
+    property var folderListModel
+    property string folderPath: folderListModel.path
+    property int count: repeater.count
+    property Flickable flickable: flickable
+    property bool smallMode: !wideAspect
+
+    Flickable {
+        id: flickable
+        clip: true
+        anchors {
+            top: parent.top
+            left: parent.left
+            right: parent.right
+            bottom: parent.bottom
+        }
+
+        contentWidth: width
+        contentHeight: column.height
+
+        Column {
+            id: column
+
+            width: flickable.contentWidth
+            // This must be visible so Autopilot can see it
+            ListItem.Header {
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                }
+
+                objectName: "iconViewHeader"
+                text: (root.count == 1
+                       ? i18n.tr("%1 (1 file)").arg(root.folderPath)
+                       : i18n.tr("%1 (%2 files)").arg(root.folderPath).arg(root.count))
+                height: smallMode ? units.gu(4) : 0
+                clip: true
+            }
+
+            AutoSpacedGrid {
+                id: grid
+                width: root.width
+
+                cellCount: repeater.count
+                cellWidth: units.gu(11)
+                cellHeight: units.gu(11)
+                minSpacing: units.gu(2)
+                ySpacing: 1/2 * spacing
+
+                Repeater {
+                    id: repeater
+                    model: folderListModel
+                    delegate: FolderIconDelegate {
+
+                    }
+                }
+            }
+        }
+    }
+
+    Scrollbar {
+        flickableItem: flickable
+    }
+}

=== added file 'components/FolderListDelegate.qml'
--- components/FolderListDelegate.qml	1970-01-01 00:00:00 +0000
+++ components/FolderListDelegate.qml	2014-02-19 00:47:29 +0000
@@ -0,0 +1,37 @@
+/*
+ * 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: Arto Jalkanen <[e-mail]>
+ */
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+import org.nemomobile.folderlistmodel 1.0
+
+ListItem.Subtitled {
+    objectName: "folder" + index
+
+    property string fileName: model.fileName
+    property string filePath: path
+
+    text: model.fileName
+    subText: Qt.formatDateTime(model.modifiedDate, Qt.DefaultLocaleShortDate) + (!model.isDir ? ", " + fileSize : "")
+
+    property string path: fileView.path + '/' + model.fileName
+    iconSource: fileIcon(path, model.isDir)
+
+    progression: model.isDir
+    iconFrame: false
+}

=== added file 'components/FolderListView.qml'
--- components/FolderListView.qml	1970-01-01 00:00:00 +0000
+++ components/FolderListView.qml	2014-02-19 00:47:29 +0000
@@ -0,0 +1,54 @@
+/*
+ * 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: Arto Jalkanen <[e-mail]>
+ */
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1
+import Ubuntu.Components.Popups 0.1
+import org.nemomobile.folderlistmodel 1.0
+
+ListView {
+    id: root
+
+    property FolderListModel folderListModel
+    property string folderPath: folderListModel.path
+    model: folderListModel
+    property bool smallMode: !wideAspect
+
+    // This must be visible so Autopilot can see it
+    header: Header {
+        objectName: "listViewSmallHeader"
+        text: (root.count == 1
+               ? i18n.tr("%1 (1 file)").arg(root.folderPath)
+               : i18n.tr("%1 (%2 files)").arg(root.folderPath).arg(root.count))
+        height: smallMode ? units.gu(4) : 0
+        clip: true
+    }
+
+    delegate: FolderListDelegate {
+        id: delegate
+
+        onClicked: itemClicked(model)
+
+        onPressAndHold: itemLongPress(delegate, model)
+    }
+
+    Scrollbar {
+        flickableItem: root
+        align: Qt.AlignTrailing
+    }
+}

=== added file 'components/PathBar.qml'
--- components/PathBar.qml	1970-01-01 00:00:00 +0000
+++ components/PathBar.qml	2014-02-19 00:47:29 +0000
@@ -0,0 +1,140 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.Popups 0.1
+
+Rectangle {
+    id: root
+    objectName: "pathbar"
+    radius: units.gu(0.5)
+    border.color: UbuntuColors.warmGrey
+
+    antialiasing: true
+    anchors.verticalCenter: parent.verticalCenter
+
+    implicitWidth: goToButton.width + row.width
+
+    Behavior on width {
+        UbuntuNumberAnimation {}
+    }
+
+    Rectangle {
+        id: goToButton
+        objectName: "goToButton"
+        anchors {
+            top: parent.top
+            bottom: parent.bottom
+            right: parent.right
+        }
+
+        MouseArea {
+            id: mouseArea2
+            anchors.fill: parent
+            hoverEnabled: true
+
+            onClicked: {
+                PopupUtils.open(Qt.resolvedUrl("../ui/GoToDialog.qml"), goToButton)
+            }
+        }
+
+        color: mouseArea2.containsMouse ? Qt.rgba(0.5,0.5,0.5,0.2) : Qt.rgba(0.5,0.5,0.5,0)
+
+        Behavior on color {
+            ColorAnimation { duration: 200 }
+        }
+
+        width: parent.height
+
+        Image {
+            id: editImage
+            anchors.centerIn: parent
+
+            source: getIcon("edit")
+            height: units.gu(2)
+            width: height
+        }
+
+        Rectangle {
+            anchors {
+                left: parent.left
+                top: parent.top
+                bottom: parent.bottom
+                rightMargin: units.gu(1)
+            }
+
+            width: 1
+            color: UbuntuColors.warmGrey
+        }
+    }
+
+    Flickable {
+        anchors {
+            left: parent.left
+            right: goToButton.left
+            top: parent.top
+            bottom: parent.bottom
+        }
+
+        clip: true
+
+        flickableDirection: Flickable.HorizontalFlick
+        contentWidth: row.width
+        contentHeight: parent.height
+
+        Row {
+            id: row
+            height: root.height
+            width: implicitWidth - 1
+
+            Repeater {
+                id: repeater
+                model: folder === "/" ? [""] : folder.split("/")
+                delegate: Rectangle {
+                    MouseArea {
+                        id: mouseArea
+                        anchors.fill: parent
+                        hoverEnabled: true
+
+                        onClicked: {
+                            var upCount = index
+                            var path = modelData
+                            while (upCount > 0) {
+                                path = repeater.model[--upCount] + "/" + path
+                                //print(path)
+                            }
+
+                            if (path === "") path = "/"
+
+                            goTo(path)
+                        }
+                    }
+
+                    color: mouseArea.containsMouse ? Qt.rgba(0.5,0.5,0.5,0.2) : Qt.rgba(0.5,0.5,0.5,0)
+
+                    Behavior on color {
+                        ColorAnimation { duration: 200 }
+                    }
+
+                    Label {
+                        id: label
+                        anchors.centerIn: parent
+                        text: modelData === "" ? "/" : modelData === "~" ? i18n.tr("Home") : modelData
+                        color: UbuntuColors.coolGrey
+                    }
+
+                    height: parent.height
+                    width: label.width + units.gu(4)
+
+                    Rectangle {
+                        anchors {
+                            right: parent.right
+                            top: parent.top
+                            bottom: parent.bottom
+                        }
+                        width: 1
+                        color: UbuntuColors.warmGrey
+                    }
+                }
+            }
+        }
+    }
+}

=== added file 'components/PlacesSidebar.qml'
--- components/PlacesSidebar.qml	1970-01-01 00:00:00 +0000
+++ components/PlacesSidebar.qml	2014-02-19 00:47:29 +0000
@@ -0,0 +1,128 @@
+/*
+ * 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 QtGraphicalEffects 1.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1
+import Ubuntu.Components.Popups 0.1
+
+Sidebar {
+    id: root
+
+    //color: Qt.rgba(0.5,0.5,0.5,0.3)
+    width: collapsed ? units.gu(8) : units.gu(22)
+
+    property bool collapsed: collapsedSidebar
+
+    MouseArea {
+        anchors.fill: parent
+        onClicked: {
+            saveSetting("collapsedSidebar", !collapsedSidebar)
+        }
+    }
+
+    property bool tempExpanded: false
+
+    Behavior on width {
+        UbuntuNumberAnimation {}
+    }
+
+    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
+        }
+
+        Header {
+            text: i18n.tr("Places")
+        }
+
+        Repeater {
+            id: placesList
+            objectName: "placesList"
+
+            model: places
+
+            delegate: Standard {
+                text: folderName(path)
+
+                Image {
+                    anchors {
+                        verticalCenter: parent.verticalCenter
+                        left: parent.left
+                    }
+
+                    height: units.gu(1.1)
+                    width: height
+
+                    source: getIcon("arrow")
+                    opacity: selected && collapsed ? 1 : 0
+
+                    Behavior on opacity {
+                        UbuntuNumberAnimation {}
+                    }
+                }
+
+                iconSource: model.icon || fileIcon(model.path, true)
+
+                onClicked: {
+                    goTo(model.path)
+                }
+
+                height: units.gu(5)
+                showDivider: !collapsed
+
+                selected: folder === path
+                iconFrame: false
+            }
+        }
+    }
+}

=== added file 'components/Sidebar.qml'
--- components/Sidebar.qml	1970-01-01 00:00:00 +0000
+++ components/Sidebar.qml	2014-02-19 00:47:29 +0000
@@ -0,0 +1,143 @@
+/***************************************************************************
+ *                                                                         *
+ * 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 3 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 0.1
+import Ubuntu.Components.ListItems 0.1
+
+/*!
+    \qmltype Sidebar
+    \brief A sidebar component for use in adaptive layouts
+
+    To use, simply add an instance to your code, and anchor other components to it.
+
+    To show or hide, set the expanded property.
+
+    By default, the sidebar has a flickable built in, and whatever contents are added
+    will be placed in the flickable. When you want this disabled, or want to fill the
+    entire sidebar, set the autoFill property to false.
+
+    Examples:
+    \qml
+        property bool wideAspect: width > units.gu(80)
+
+        Sidebar {
+            expanded: wideAspect
+
+            // Anchoring is automatic
+        }
+    \endqml
+*/
+Rectangle {
+    id: root
+
+    color: Qt.rgba(0.2,0.2,0.2,0.4)
+
+    property bool expanded: true
+
+    property string mode: "left" // or "right"
+    property alias header: headerItem.text
+
+    anchors {
+        left: mode === "left" ? parent.left : undefined
+        right: mode === "right" ? parent.right : undefined
+        top: parent.top
+        bottom: parent.bottom
+    }
+
+    VerticalDivider {
+        mode: root.mode
+
+        anchors {
+            top: parent.top
+            bottom: parent.bottom
+            right: mode === "left" ? parent.right : undefined
+            left: mode === "right" ? parent.left : undefined
+            rightMargin: -1
+        }
+    }
+
+    width: units.gu(35)
+
+
+    anchors.leftMargin: expanded ? 0 : -width
+    anchors.rightMargin: expanded ? 0 : -width
+
+    Behavior on anchors.leftMargin {
+        UbuntuNumberAnimation {}
+    }
+
+    Behavior on anchors.rightMargin {
+        UbuntuNumberAnimation {}
+    }
+
+    default property alias contents: contents.data
+
+    Header {
+        id: headerItem
+
+        visible: text !== ""
+    }
+
+    property bool autoFlick: true
+
+    Flickable {
+        id: flickable
+
+        clip: true
+
+        anchors {
+            top: headerItem.visible ? headerItem.bottom : parent.top
+            left: parent.left
+            right: parent.right
+            bottom: parent.bottom
+            rightMargin: mode === "left" ? 1 : 0
+            leftMargin: mode === "right" ? 1 : 0
+        }
+
+        contentWidth: width
+        contentHeight: autoFlick ? contents.height : height
+        interactive: contentHeight > height
+
+        Item {
+            id: contents
+
+            width: flickable.width
+            height: autoFlick ? childrenRect.height : flickable.height
+        }
+
+        function getFlickableChild(item) {
+            if (item && item.hasOwnProperty("children")) {
+                for (var i=0; i < item.children.length; i++) {
+                    var child = item.children[i];
+                    if (internal.isVerticalFlickable(child)) {
+                        if (child.anchors.top === page.top || child.anchors.fill === page) {
+                            return item.children[i];
+                        }
+                    }
+                }
+            }
+            return null;
+        }
+    }
+
+    Scrollbar {
+        flickableItem: flickable
+    }
+}

=== added file 'components/SuruSheetStyle.qml'
--- components/SuruSheetStyle.qml	1970-01-01 00:00:00 +0000
+++ components/SuruSheetStyle.qml	2014-02-19 00:47:29 +0000
@@ -0,0 +1,150 @@
+/*
+ * Copyright 2012 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser 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.ListItems 0.1 as ListItem
+
+Item {
+    id: visuals
+    // styling properties
+    property color backgroundColor: Qt.rgba(0.2,0.2,0.2,0.97)
+    property color headerColor: Qt.rgba(0,0,0,0.2)
+    property real headerHeight: units.gu(8)
+    property real buttonContainerWidth: units.gu(14)
+
+    implicitWidth: MathUtils.clamp(styledItem.contentsWidth, styledItem.minWidth, styledItem.maxWidth)
+    implicitHeight: header.height + containerItem.height
+
+    property alias contentItem: containerItem
+
+    property bool maximized: styledItem.contentsWidth > styledItem.maxWidth
+
+    UbuntuShape {
+        id: background
+        color: backgroundColor
+        visible: !maximized
+        anchors {
+            left: parent.left
+            right: parent.right
+            top: header.top
+            bottom: containerItem.bottom
+        }
+    }
+
+    Rectangle {
+        color: backgroundColor
+        visible: maximized
+        anchors {
+            left: parent.left
+            right: parent.right
+            top: header.top
+            bottom: containerItem.bottom
+        }
+    }
+
+    Item {
+        id: header
+        height: visuals.headerHeight
+        clip: true
+
+        anchors {
+            top: parent.top
+            left: parent.left
+            right: parent.right
+        }
+
+        UbuntuShape {
+            anchors {
+                fill: parent
+                bottomMargin: -units.gu(2)
+            }
+
+            visible: !maximized
+            color: visuals.headerColor
+        }
+
+        Rectangle {
+            anchors {
+                fill: parent
+            }
+
+            visible: maximized
+            color: visuals.headerColor
+        }
+
+        Label {
+            id: headerText
+            anchors {
+                verticalCenter: parent.verticalCenter
+                left: leftButtonContainer.right
+                right: rightButtonContainer.left
+            }
+            width: headerText.implicitWidth + units.gu(4)
+            elide: Text.ElideRight
+            horizontalAlignment: Text.AlignHCenter
+            text: styledItem.title
+            fontSize: "large"
+        }
+
+        Item {
+            id: leftButtonContainer
+            anchors {
+                left: parent.left
+                top: parent.top
+                bottom: parent.bottom
+            }
+            width: visuals.buttonContainerWidth
+            Component.onCompleted: header.updateButton(styledItem.leftButton, leftButtonContainer)
+        }
+
+        Item {
+            id: rightButtonContainer
+            anchors {
+                right: parent.right
+                top: parent.top
+                bottom: parent.bottom
+            }
+            width: visuals.buttonContainerWidth
+            Component.onCompleted: header.updateButton(styledItem.rightButton, rightButtonContainer)
+        }
+
+        function updateButton(button, container) {
+            if (!button) return;
+            button.parent = container;
+            button.anchors.left = container.left;
+            button.anchors.right = container.right;
+            button.anchors.verticalCenter = container.verticalCenter;
+            button.anchors.margins = units.gu(1);
+        }
+
+        Connections {
+            target: styledItem
+            onLeftButtonChanged: header.updateButton(styledItem.leftButton, leftButtonContainer)
+            onRightButtonChanged: header.updateButton(styledItem.rightButton, rightButtonContainer)
+        }
+    }
+
+    Item {
+        id: containerItem
+        height: false ? styledItem.maxHeight - header.height : MathUtils.clamp(styledItem.contentsHeight, styledItem.minHeight - header.height, styledItem.maxHeight - header.height)
+        anchors {
+            top: header.bottom
+            left: parent.left
+            right: parent.right
+        }
+    }
+}

=== added file 'components/VerticalDivider.qml'
--- components/VerticalDivider.qml	1970-01-01 00:00:00 +0000
+++ components/VerticalDivider.qml	2014-02-19 00:47:29 +0000
@@ -0,0 +1,46 @@
+/***************************************************************************
+ *                                                                         *
+ * 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 3 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 0.1
+import Ubuntu.Components.ListItems 0.1
+import QtQuick 2.0
+
+Item {
+    property string mode: "left" // or right
+
+    ThinDivider {
+        id: divider
+        rotation: mode === "left" ? 90 : -90
+
+        width: parent.height
+
+        anchors {
+            left: undefined
+            right: undefined
+            centerIn: parent
+        }
+    }
+    width: divider.height
+
+    anchors {
+        top: parent ? parent.top : undefined
+        bottom: parent ? parent.bottom : undefined
+    }
+}

=== added file 'icons/arrow.png'
Binary files icons/arrow.png	1970-01-01 00:00:00 +0000 and icons/arrow.png	2014-02-19 00:47:29 +0000 differ
=== added file 'icons/browser-tabs.png'
Binary files icons/browser-tabs.png	1970-01-01 00:00:00 +0000 and icons/browser-tabs.png	2014-02-19 00:47:29 +0000 differ
=== added file 'icons/home.png'
Binary files icons/home.png	1970-01-01 00:00:00 +0000 and icons/home.png	2014-02-19 00:47:29 +0000 differ
=== renamed file 'icons/up.png' => 'icons/keyboard-caps.png'
=== added file 'icons/navigation-menu.png'
Binary files icons/navigation-menu.png	1970-01-01 00:00:00 +0000 and icons/navigation-menu.png	2014-02-19 00:47:29 +0000 differ
=== modified file 'tests/autopilot/ubuntu_filemanager_app/emulators.py'
--- tests/autopilot/ubuntu_filemanager_app/emulators.py	2014-02-13 03:41:36 +0000
+++ tests/autopilot/ubuntu_filemanager_app/emulators.py	2014-02-19 00:47:29 +0000
@@ -54,7 +54,7 @@
 
     def get_places_popover(self):
         """Return the Places popover."""
-        if not(self.wideAspect):
+        if not(self.internal_wideAspect):
             # XXX It would be easier if the places popover was an object
             # that inherits from Popover, like the
             # ActionSelectionPopover does.
@@ -105,7 +105,7 @@
         return self.wait_select_single(Popover)
 
 
-class Sidebar(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
+class PlacesSidebar(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
     """PlacesSidebar Autopilot emulator."""
 
     def get_place(self, text):
@@ -122,7 +122,10 @@
 
     def get_number_of_files_from_list(self):
         """Return the number of files shown on the folder."""
-        return len(self.select_many(FolderListDelegate))
+        if self.showingListView:
+            return len(self.select_many(FolderListDelegate))
+        else:
+            return len(self.select_many(FolderIconDelegate))
 
     def get_file_by_index(self, index):
         """Return the FolderListDelegate emulator of the file or folder.
@@ -130,7 +133,10 @@
         :parameter index: The index of file or folder.
 
         """
-        file_ = self.select_many(FolderListDelegate)[index]
+        if self.showingListView:
+            file_ = self.select_many(FolderListDelegate)[index]
+        else:
+            file_ = self.select_many(FolderIconDelegate)[index]
         file_.list_view = self.select_single(FolderListView)
         return file_
 
@@ -141,25 +147,43 @@
 
         """
         files = self.select_many(FolderListDelegate)
+        if not(self.showingListView):
+            files = self.select_many(FolderIconDelegate)
         for file_ in files:
             if file_.fileName == name:
-                file_.list_view = self.select_single(FolderListView)
+                if self.showingListView:
+                    file_.list_view = self.select_single(FolderListView)
+                else:
+                    file_.list_view = self.select_single(FolderIconView)
                 return file_
         raise ValueError(
             'File with name "{0}" not found.'.format(name))
 
     def get_current_path(self):
-        return self.select_single(FolderListView).get_current_path()
+        if self.showingListView:
+            return self.select_single(FolderListView).get_current_path()
+        else:
+            return self.select_single(FolderIconView).get_current_path()
 
     def get_number_of_files_from_header(self):
-        return self.select_single(FolderListView).get_number_of_files()
+        if self.showingListView:
+            return self.select_single(FolderListView).get_number_of_files()
+        else:
+            return self.select_single(FolderIconView).get_number_of_files()
 
     def get_sidebar(self):
-        if self.main_view.wideAspect:
-            return self.select_single(Sidebar)
-        else:
-            raise ValueError(
-                'Places sidebar is hidden in wide mode.')
+        if self.main_view.internal_wideAspect:
+            return self.select_single(PlacesSidebar)
+        else:
+            raise ValueError(
+                'Places sidebar is hidden in small mode.')
+
+    def get_pathbar(self):
+        if self.main_view.internal_wideAspect:
+            return self.main_view.get_toolbar().select_single(PathBar)
+        else:
+            raise ValueError(
+                'Path bar is hidden in small mode.')
 
 
 class FolderListView(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
@@ -188,6 +212,32 @@
         return int(number_of_files)
 
 
+class FolderIconView(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
+    """FolderListView Autopilot emulator."""
+
+    SPLIT_HEADER_REGEX = '(.+) \((\d+) \w+\)$'
+    # Regular expression to split the header text. The header text has the form
+    # /path/to/dir (# files). So with this expression, we can split the header
+    # in two groups, (.+) will match the path and (\d+) the number of files.
+
+    def get_current_path(self):
+        path, _ = self._split_header_text()
+        return path
+
+    def _split_header_text(self):
+        header_text = self.select_single(
+            'Header', objectName='iconViewHeader').text
+        match = re.match(self.SPLIT_HEADER_REGEX, header_text)
+        if match:
+            path = match.group(1)
+            number_of_files = match.group(2)
+            return path, number_of_files
+
+    def get_number_of_files(self):
+        _, number_of_files = self._split_header_text()
+        return int(number_of_files)
+
+
 class FolderListDelegate(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
     """FolderListPage Autopilot emulator.
 
@@ -229,6 +279,47 @@
         # --elopio - 2013-07-25
 
 
+class FolderIconDelegate(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
+    """FolderIconPage Autopilot emulator.
+
+    This is a file or folder on the FolderListPage.
+
+    """
+
+    def __init__(self, *args):
+        super(FolderIconDelegate, self).__init__(*args)
+        self.pointing_device = toolkit_emulators.get_pointing_device()
+
+    def open_directory(self):
+        """Open the directory."""
+        # TODO Check if it is a directory. If not, raise an error.
+        # This is not currently possible because Autopilot is overwriting the
+        # path attribute. Reported on
+        # https://bugs.launchpad.net/autopilot/+bug/1205204
+        # --elopio - 2013-07-25
+        self.pointing_device.click_object(self)
+
+    def open_file(self):
+        # TODO For this we would need to access the FileActionDialog that's
+        # child of the MainView, but that's not currently possible with
+        # autopilot. Reported on
+        # bug https://bugs.launchpad.net/autopilot/+bug/1195141
+        # --elopio - 2013-07-25
+        raise NotImplementedError()
+
+    def open_actions_popover(self):
+        """Open the actions popover of the file or folder."""
+        self.pointing_device.move_to_object(self)
+        self.pointing_device.press()
+        time.sleep(1)
+        self.pointing_device.release()
+        # TODO wait for the popover to be opened. For this we would need to
+        # access the MainView, but that's not currently possible with
+        # autopilot. Reported on
+        # https://bugs.launchpad.net/autopilot/+bug/1195141
+        # --elopio - 2013-07-25
+
+
 class FileActionDialog(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
     """FileActionDialog Autopilot emulator."""
 
@@ -362,3 +453,10 @@
 
     def get_path(self):
         return self.select_single('Label', objectName='pathLabel').text
+
+
+class PathBar(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
+
+    def go_to_location(self):
+        editButton = self.select_single(objectName='goToButton')
+        self.pointing_device.click_object(editButton)

=== modified file 'tests/autopilot/ubuntu_filemanager_app/tests/test_filemanager.py'
--- tests/autopilot/ubuntu_filemanager_app/tests/test_filemanager.py	2014-02-13 03:41:36 +0000
+++ tests/autopilot/ubuntu_filemanager_app/tests/test_filemanager.py	2014-02-19 00:47:29 +0000
@@ -102,7 +102,7 @@
         # https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1205201
         # --elopio - 2013-07-25
         place = None
-        if self.main_view.wideAspect:
+        if self.main_view.internal_wideAspect:
             place = (self.main_view.get_folder_list_page().get_sidebar()
                      .get_place(text))
         else:
@@ -117,9 +117,10 @@
         #on wide UI display, we get the location dialog
         #on phone UI display, we get places popover
         device = model()
-        if self.main_view.wideAspect:
+        if self.main_view.internal_wideAspect:
             logger.debug("Using goto to goto %s on %s" % (location, device))
-            toolbar.click_button('goTo')
+            (self.main_view.get_folder_list_page().get_pathbar()
+                .go_to_location())
             goto_location = self.main_view.get_dialog()
         else:
             logger.debug("Using places to goto %s on %s" % (location, device))
@@ -269,20 +270,6 @@
         file_ = self._get_file_by_name(file_name)
         self.assertThat(file_.fileName, Eventually(Equals(file_name)))
 
-    def test_cancel_file_action_dialog(self):
-        file_name = os.path.basename(self._make_file_in_testhome())
-
-        first_file = self._get_file_by_name(file_name)
-        self.pointing_device.click_object(first_file)
-
-        dialog = self.main_view.get_file_action_dialog()
-        dialog.visible.wait_for(True)
-        dialog.cancel()
-
-        self.assertThat(
-            self.main_view.file_action_dialog_exists,
-            Eventually(Equals(False)))
-
     def test_cancel_rename_directory(self):
         dir_path = self._make_directory_in_testhome()
         dir_name = os.path.basename(dir_path)

=== modified file 'ubuntu-filemanager-app.qml'
--- ubuntu-filemanager-app.qml	2014-01-31 19:37:58 +0000
+++ ubuntu-filemanager-app.qml	2014-02-19 00:47:29 +0000
@@ -22,6 +22,8 @@
 import Ubuntu.Unity.Action 1.0 as UnityActions
 import U1db 1.0 as U1db
 
+import "ui"
+
 /*!
     \brief MainView with Tabs element.
            First Tab has a single Label and
@@ -29,7 +31,7 @@
 */
 
 MainView {
-    id: root
+    id: mainView
     // objectName for functional testing purposes (autopilot-qt5)
     objectName: "filemanager"
     applicationName: "com.ubuntu.filemanager"
@@ -37,11 +39,23 @@
     width: units.gu(100)
     height: units.gu(75)
 
-    property alias filemanager: root
+    property alias filemanager: mainView
 
+    property bool internal_wideAspect: width >= units.gu(80)
     property bool wideAspect: width >= units.gu(80) && loaded
     property bool loaded: false
 
+    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)
+
     headerColor: "#464646"
     backgroundColor: "#797979"
     footerColor: "#808080"
@@ -52,25 +66,44 @@
         text: i18n.tr("Settings")
         description: i18n.tr("Change app settings")
         iconSource: getIcon("settings")
-        onTriggered: pageStack.push(settingsPage)
+        onTriggered: showSettings()
     }
     actions: [settingsAction]
 
     property var pageStack: pageStack
 
+    property var folderTabs: ["~"]
+
+    function openTab(folder) {
+        var list = folderTabs
+        list.push(folder)
+        folderTabs = list
+    }
+
+    function closeTab(index) {
+        var list = folderTabs
+        list.splice(index, 1)
+        folderTabs = list
+        tabs.selectedTabIndex = 0
+    }
+
     PageStack {
         id: pageStack
 
+        anchors.bottomMargin: toolbar.tools.opened && toolbar.tools.locked ? -mainView.toolbar.triggerSize : 0
+
         Tabs {
             id: tabs
 
-            Tab {
-                title: page.title
-                page: FolderListPage {
-                    id: folderPage
-                    objectName: "folderPage"
+            Repeater {
+                model: folderTabs
+                delegate: Tab {
+                    title: page.title
+                    page: FolderListPage {
+                        objectName: "folderPage"
 
-                    folder: homeFolder
+                        folder: modelData
+                    }
                 }
             }
         }
@@ -83,19 +116,6 @@
         }
     }
 
-    property var showToolbar: wideAspect ? true : undefined
-
-    states: [
-        State {
-            when: showToolbar && toolbar.tools.opened && toolbar.tools.locked
-
-            PropertyChanges {
-                target: pageStack
-                anchors.bottomMargin: -root.toolbar.triggerSize
-            }
-        }
-    ]
-
     /* Settings Storage */
 
     U1db.Database {
@@ -112,16 +132,17 @@
 
         defaults: {
             showAdvancedFeatures: false
+            collapsedSidebar: false
         }
     }
 
-    SettingsPage {
-        id: settingsPage
-    }
-
     // Individual settings, used for bindings
     property bool showAdvancedFeatures: false
 
+    property var viewMethod
+
+    property bool collapsedSidebar: false
+
     function getSetting(name, def) {
         var tempContents = {};
         tempContents = settings.contents
@@ -146,13 +167,34 @@
         }
     }
 
+    function showSettings() {
+        PopupUtils.open(Qt.resolvedUrl("ui/SettingsSheet.qml"), mainView)
+    }
+
     function reloadSettings() {
-        showAdvancedFeatures = getSetting("showAdvancedFeatures", false)
+        //showAdvancedFeatures = getSetting("showAdvancedFeatures", false)
+        viewMethod = getSetting("viewMethod", width > units.gu(40) ? i18n.tr("Icons") : i18n.tr("List"))
+        collapsedSidebar = getSetting("collapsedSidebar", false)
     }
 
-    Component.onCompleted: reloadSettings()
+    Component.onCompleted: {
+        reloadSettings()
+    }
 
     function getIcon(name) {
-        return Qt.resolvedUrl("icons/" + name + ".png")
+        return "/usr/share/icons/ubuntu-mobile/actions/scalable/" + name + ".svg" //Qt.resolvedUrl("icons/" + name + ".png")
+    }
+
+    function error(title, message) {
+        PopupUtils.open(Qt.resolvedUrl("NotifyDialog.qml"), mainView,
+                        {
+                            title: title,
+                            text: message
+                        })
+    }
+
+    Keys.onPressed: {
+        print("Key pressed!")
+        event.accepted = tabs.currentPage.keyPressed(event.key, event.modifiers)
     }
 }

=== added directory 'ui'
=== added file 'ui/ConfirmDialog.qml'
--- ui/ConfirmDialog.qml	1970-01-01 00:00:00 +0000
+++ ui/ConfirmDialog.qml	2014-02-19 00:47:29 +0000
@@ -0,0 +1,60 @@
+/*
+ * 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: Arto Jalkanen <[e-mail]>
+ */
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.Popups 0.1
+
+Dialog {
+    id: root
+
+    signal accepted
+    signal rejected
+
+    Button {
+        id: okButton
+        objectName: "okButton"
+        text: i18n.tr("Ok")
+        onClicked: {
+            accepted()
+            PopupUtils.close(root)
+        }
+    }
+
+    Button {
+        id: cancelButton
+        objectName: "cancelButton"
+        text: i18n.tr("Cancel")
+
+        gradient: Gradient {
+            GradientStop {
+                position: 0
+                color: "gray"
+            }
+
+            GradientStop {
+                position: 1
+                color: "lightgray"
+            }
+        }
+
+        onClicked: {
+            rejected()
+            PopupUtils.close(root)
+        }
+    }
+}

=== added file 'ui/ConfirmDialogWithInput.qml'
--- ui/ConfirmDialogWithInput.qml	1970-01-01 00:00:00 +0000
+++ ui/ConfirmDialogWithInput.qml	2014-02-19 00:47:29 +0000
@@ -0,0 +1,70 @@
+/*
+ * 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: Arto Jalkanen <[e-mail]>
+ */
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.Popups 0.1
+
+Dialog {
+    id: root
+
+    property alias inputText: input.text
+    property alias placeholderText: input.placeholderText
+    signal accepted
+    signal rejected
+
+    TextField {
+        id: input
+        objectName: "inputField"
+        focus: true
+        validator: RegExpValidator {
+            regExp: /.+/
+        }
+    }
+
+    Button {
+        objectName: "okButton"
+        text: i18n.tr("Ok")
+        enabled: input.acceptableInput
+        onClicked: {
+            accepted()
+            PopupUtils.close(root)
+        }
+    }
+
+    Button {
+        objectName: "cancelButton"
+        text: i18n.tr("Cancel")
+
+        gradient: Gradient {
+            GradientStop {
+                position: 0
+                color: "gray"
+            }
+
+            GradientStop {
+                position: 1
+                color: "lightgray"
+            }
+        }
+
+        onClicked: {
+            rejected()
+            PopupUtils.close(root)
+        }
+    }
+}

=== added file 'ui/FileActionDialog.qml'
--- ui/FileActionDialog.qml	1970-01-01 00:00:00 +0000
+++ ui/FileActionDialog.qml	2014-02-19 00:47:29 +0000
@@ -0,0 +1,60 @@
+/*
+ * 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: Arto Jalkanen <[e-mail]>
+ */
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.Popups 0.1
+import org.nemomobile.folderlistmodel 1.0
+
+Dialog {
+    id: root
+
+    property string fileName
+    property string filePath
+    property FolderListModel folderListModel
+
+    title: i18n.tr("Choose action")
+    text: i18n.tr("For file: %1").arg(fileName)
+
+    Button {
+        objectName: "openButton"
+        text: i18n.tr("Open")
+        onClicked: {
+            console.log("Opening file", filePath)
+            openFile(model.filePath)
+            onClicked: PopupUtils.close(root)
+        }
+    }
+
+    Button {
+        objectName: "cancelButton"
+        text: i18n.tr("Cancel")
+        onClicked: PopupUtils.close(root)
+
+        gradient: Gradient {
+            GradientStop {
+                position: 0
+                color: "gray"
+            }
+
+            GradientStop {
+                position: 1
+                color: "lightgray"
+            }
+        }
+    }
+}

=== added file 'ui/FileDetailsPopover.qml'
--- ui/FileDetailsPopover.qml	1970-01-01 00:00:00 +0000
+++ ui/FileDetailsPopover.qml	2014-02-19 00:47:29 +0000
@@ -0,0 +1,140 @@
+/*
+ * 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: Arto Jalkanen <[e-mail]>
+ */
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.Popups 0.1
+
+Popover {
+    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) || "Unknown"
+    }
+
+    function permissionsToString(model) {
+        var permissions = []
+        if (model.isReadable) {
+            permissions.push(i18n.tr("Readable"))
+        }
+        if (pathIsWritable()) {
+            permissions.push(i18n.tr("Writable"))
+        }
+        if (model.isExecutable) {
+            permissions.push(i18n.tr("Executable"))
+        }
+
+        // Now why does this not work?
+        // return permissions.join(", ")
+        var permStr = ""
+        for (var i = 0; i < permissions.length; ++i) {
+            if (permStr.length > 0) {
+                permStr += ", "
+            }
+            permStr += permissions[i]
+        }
+        return permStr
+    }
+
+    Column {
+        id: contents
+        spacing: units.gu(1)
+        anchors {
+            margins: units.gu(2)
+            left: parent.left
+            right: parent.right
+            top: parent.top
+        }
+
+        Row {
+            spacing: units.gu(1)
+            Image {
+                anchors.verticalCenter: parent.verticalCenter
+
+                // TODO: how to get proper icon?
+                source: fileIcon(root.path, model.isDir)
+            }
+
+            Label {
+                anchors.verticalCenter: parent.verticalCenter
+
+                text: folderName(root.path)
+                color: Theme.palette.normal.overlayText
+                font.bold: true
+            }
+        }
+
+        Grid {
+            columns: 2
+            spacing: units.gu(1)
+
+            Label {
+                text: i18n.tr("Path:")
+                color: Theme.palette.normal.overlayText
+            }
+
+            Label {
+                objectName: "pathLabel"
+                text: root.path
+                color: Theme.palette.normal.overlayText
+            }
+
+            Label {
+                text: model.isDir ? i18n.tr("Contents:")
+                                  : i18n.tr("Size:")
+                color: Theme.palette.normal.overlayText
+            }
+            Label {
+                text: model.fileSize
+                color: Theme.palette.normal.overlayText
+            }
+
+            Label {
+                text: i18n.tr("Accessed:")
+                color: Theme.palette.normal.overlayText
+            }
+            Label {
+                text: dateTimeFormat(pathAccessedDate())
+                color: Theme.palette.normal.overlayText
+            }
+
+            Label {
+                text: i18n.tr("Modified:")
+                color: Theme.palette.normal.overlayText
+            }
+            Label {
+                text: dateTimeFormat(pathModifiedDate())
+                color: Theme.palette.normal.overlayText
+            }
+
+            Label {
+                text: i18n.tr("Permissions:")
+                color: Theme.palette.normal.overlayText
+            }
+            Label {
+                text: permissionsToString(model)
+                color: Theme.palette.normal.overlayText
+            }
+
+        }
+    }
+}

=== added file 'ui/FileOperationProgressDialog.qml'
--- ui/FileOperationProgressDialog.qml	1970-01-01 00:00:00 +0000
+++ ui/FileOperationProgressDialog.qml	2014-02-19 00:47:29 +0000
@@ -0,0 +1,86 @@
+/*
+ * 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: Arto Jalkanen <[e-mail]>
+ */
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.Popups 0.1
+import org.nemomobile.folderlistmodel 1.0
+
+Dialog {
+    id: root
+    property FolderListModel model
+    property Page page
+    property string descriptionPrepend: i18n.tr("Operation in progress")
+
+    title: "File operation"
+    text: descriptionPrepend
+
+    function startOperation(name) {
+        root.title = name
+    }
+
+    ProgressBar {
+        id: progress
+        minimumValue: 0.0
+        maximumValue: 100.0
+        value: 0.0
+    }
+
+    Button {
+        text: i18n.tr("Cancel")
+        onClicked: {
+            console.log("Cancelling file progress action")
+            model.cancelAction()
+            PopupUtils.close(root)
+        }
+    }
+
+    Connections {
+        target: model
+        onProgress: {
+            // curItem == 0 && percent == 0 means the Action has just been created, check getProgressCounter() before
+            if (curItem == 0 && percent == 0) {
+                console.log("Creating dialog:", model.getProgressCounter())
+                if (model.getProgressCounter()  > 20) {
+                    // show/activate/make visible    the dialog here
+                    print("Showing dialog...")
+                    PopupUtils.open(root, page)
+                    root.show()
+                }
+            }
+
+            console.log("On progress ", curItem, totalItems, percent)
+
+            progress.value = percent
+            if (percent == 100 && curItem == totalItems) {
+                console.log("All files processed, closing progress dialog")
+                //PopupUtils.close(root)
+                root.hide()
+            } else {
+                root.text = descriptionPrepend + " (" + curItem + "/" + totalItems + ")"
+            }
+        }
+    }
+
+    // Errors from model
+    Connections {
+        target: pageModel
+        onError: {
+            PopupUtils.close(root)
+        }
+    }
+}

=== added file 'ui/FolderListPage.qml'
--- ui/FolderListPage.qml	1970-01-01 00:00:00 +0000
+++ ui/FolderListPage.qml	2014-02-19 00:47:29 +0000
@@ -0,0 +1,721 @@
+/*
+ * 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: Arto Jalkanen <[e-mail]>
+ */
+import QtQuick 2.0
+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"
+
+Page {
+    id: folderListPage
+
+    title: folderName(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))
+        }
+    }
+
+    tools: ToolbarItems {
+        id: toolbar
+        locked: showToolbar
+        opened: showToolbar
+
+        onLockedChanged: opened = locked
+
+        back: ToolbarButton {
+            objectName: "up"
+            text: "Up"
+            iconSource: getIcon("keyboard-caps")
+            enabled: folder != "/"
+            onTriggered: {
+                goTo(pageModel.parentPath)
+            }
+        }
+
+        Item {
+            id: pathItem
+            width: folderListPage.width - units.gu(37)
+            height: units.gu(5)
+            anchors.verticalCenter: parent.verticalCenter
+            PathBar {
+                height: units.gu(5)
+                width: Math.min(pathItem.width, implicitWidth)
+                visible: sidebar.expanded
+            }
+        }
+
+        Item {
+            width: units.gu(1)
+            height: parent.height
+        }
+
+        ToolbarButton {
+            id: actionsButton
+            objectName: "actions"
+            text: i18n.tr("Actions")
+            iconSource: getIcon("navigation-menu")
+
+            onTriggered: {
+                print(text)
+                PopupUtils.open(folderActionsPopoverComponent, actionsButton)
+            }
+        }
+
+        ToolbarButton {
+            text: i18n.tr("View")
+            iconSource: getIcon("properties")
+            id: optionsButton
+
+            onTriggered: {
+                print(text)
+
+                PopupUtils.open(Qt.resolvedUrl("ViewPopover.qml"), optionsButton)
+            }
+        }
+
+        ToolbarButton {
+            id: placesButton
+            visible: !sidebar.expanded
+            objectName: "places"
+            text: i18n.tr("Places")
+            iconSource: getIcon("location")
+            onTriggered: {
+                print(text)
+
+                PopupUtils.open(Qt.resolvedUrl("PlacesPopover.qml"), placesButton)
+            }
+        }
+
+        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
+            visible: sidebar.expanded
+            objectName: "settings"
+            action: settingsAction
+        }
+    }
+
+    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 {
+            property string filePath
+            property string fileName
+            title: i18n.tr("Delete")
+            text: i18n.tr("Are you sure you want to permanently delete '%1'?").arg(fileName)
+
+            onAccepted: {
+                console.log("Delete accepted for filePath, fileName", filePath, fileName)
+
+                fileOperationDialog.startOperation("Deleting files")
+                console.log("Doing delete")
+                pageModel.rm(filePath)
+            }
+        }
+    }
+
+    Component {
+        id: confirmRenameDialog
+        ConfirmDialogWithInput {
+            // IMPROVE: this does not seem good: the backend excepts row and new name.
+            // But what if new files are added/deleted in the background while user is
+            // entering the new name? The indices change and wrong file is renamed.
+            // Perhaps the backend should take as parameters the "old name" and "new name"?
+            // This is not currently a problem since the backend does not poll changes in
+            // the filesystem, but may be a problem in the future.
+            property int modelRow
+
+            title: i18n.tr("Rename")
+            text: i18n.tr("Enter a new name")
+
+            onAccepted: {
+                console.log("Rename accepted", inputText)
+                if (inputText !== '') {
+                    console.log("Rename commensed, modelRow/inputText", modelRow, inputText)
+                    if (pageModel.rename(modelRow, inputText) === false) {
+                        PopupUtils.open(Qt.resolvedUrl("NotifyDialog.qml"), delegate,
+                                        {
+                                            title: i18n.tr("Could not rename"),
+                                            text: i18n.tr("Insufficient permissions or name already exists?")
+                                         })
+
+                    }
+                } else {
+                    console.log("Empty new name given, ignored")
+                }
+            }
+        }
+    }
+
+    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
+        onError: {
+            console.log("FolderListModel Error Title/Description", errorTitle, errorMessage)
+            error(i18n.tr("File operation error"), errorTitle + ": " + errorMessage)
+        }
+    }
+
+    FileOperationProgressDialog {
+        id: fileOperationDialog
+
+        page: folderListPage
+        model: pageModel
+    }
+
+    function itemClicked(model) {
+        if (model.isDir) {
+            if (model.isReadable && model.isExecutable) {
+                console.log("Changing to dir", model.filePath)
+                goTo(model.filePath)
+            } else {
+                PopupUtils.open(Qt.resolvedUrl("NotifyDialog.qml"), delegate,
+                                {
+                                    title: i18n.tr("Folder not accessible"),
+                                    text: i18n.tr("Can not access ") + model.fileName
+
+                                 })
+            }
+        } 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,
+                        {
+                            model: model
+                        })
+    }
+
+    function keyPressed(key, modifiers) {
+        if (key === Qt.Key_L && modifiers & Qt.ControlModifier) {
+            PopupUtils.open(Qt.resolvedUrl("GoToDialog.qml"), goToButton)
+            return true;
+        }
+
+        return false;
+    }
+
+    Component.onCompleted: forceActiveFocus()
+}

=== added file 'ui/GoToDialog.qml'
--- ui/GoToDialog.qml	1970-01-01 00:00:00 +0000
+++ ui/GoToDialog.qml	2014-02-19 00:47:29 +0000
@@ -0,0 +1,84 @@
+/*
+ * 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
+
+Dialog {
+    id: root
+
+    title: i18n.tr("Go To Location")
+
+    text: i18n.tr("Enter a location to go to:")
+
+    Component.onCompleted: {
+        locationField.forceActiveFocus()
+        locationField.cursorPosition = locationField.text.length
+    }
+
+    TextField {
+        id: locationField
+        objectName: "inputField"
+
+        inputMethodHints: Qt.ImhNoAutoUppercase
+
+        property bool valid: pathExists(text)
+
+        text: fileView.path
+
+        placeholderText: i18n.tr("Location...")
+
+        onAccepted: goButton.clicked()
+    }
+
+    Button {
+        id: goButton
+        objectName: "okButton"
+
+        text: i18n.tr("Go")
+        enabled: locationField.acceptableInput && locationField.valid
+
+        onClicked: {
+            print("User switched to:", locationField.text)
+            goTo(locationField.text)
+            PopupUtils.close(root)
+        }
+    }
+
+    Button {
+        id: cancelButton
+        objectName: "cancelButton"
+        text: i18n.tr("Cancel")
+
+        gradient: Gradient {
+            GradientStop {
+                position: 0
+                color: "gray"
+            }
+
+            GradientStop {
+                position: 1
+                color: "lightgray"
+            }
+        }
+
+        onClicked: {
+            PopupUtils.close(root)
+        }
+    }
+}

=== added file 'ui/NotifyDialog.qml'
--- ui/NotifyDialog.qml	1970-01-01 00:00:00 +0000
+++ ui/NotifyDialog.qml	2014-02-19 00:47:29 +0000
@@ -0,0 +1,30 @@
+/*
+ * 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: Arto Jalkanen <[e-mail]>
+ */
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.Popups 0.1
+
+Dialog {
+    id: root
+    Button {
+        text: i18n.tr("Ok")
+        onClicked: {
+            PopupUtils.close(root)
+        }
+    }
+}

=== added file 'ui/PlacesPopover.qml'
--- ui/PlacesPopover.qml	1970-01-01 00:00:00 +0000
+++ ui/PlacesPopover.qml	2014-02-19 00:47:29 +0000
@@ -0,0 +1,140 @@
+/*
+ * 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
+        }
+
+        Empty {
+
+            TextField {
+                id: locationField
+                objectName: "inputField"
+                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
+                objectName: "okButton"
+                anchors {
+                    top: locationField.top
+                    bottom: locationField.bottom
+                    right: parent.right
+                    rightMargin: units.gu(1)
+                }
+
+                text: i18n.tr("Go")
+                enabled: locationField.acceptableInput && locationField.valid
+
+                onClicked: {
+                    print("User switched to:", locationField.text)
+                    goTo(locationField.text)
+                    PopupUtils.close(root)
+                }
+            }
+        }
+
+        Repeater {
+            id: placesList
+            objectName: "placesList"
+
+            model: places
+
+            delegate: Standard {
+                property string name: folderName(path)
+
+                Label {
+                    anchors.left: parent.left
+                    anchors.leftMargin: units.gu(8)
+                    anchors.verticalCenter: parent.verticalCenter
+                    text: folderName(path)
+                    color: selected ? UbuntuColors.orange : Theme.palette.normal.overlayText
+                }
+
+                iconSource: model.icon || fileIcon(model.path, true)
+
+                onClicked: {
+                    PopupUtils.close(root)
+                    goTo(model.path)
+                }
+
+                selected: folder === path
+                iconFrame: false
+                showDivider: index < (placesList.count - 1)
+            }
+        }
+    }
+}

=== added file 'ui/SettingsSheet.qml'
--- ui/SettingsSheet.qml	1970-01-01 00:00:00 +0000
+++ ui/SettingsSheet.qml	2014-02-19 00:47:29 +0000
@@ -0,0 +1,53 @@
+/*
+ * 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.ListItems 0.1
+import Ubuntu.Components.Popups 0.1
+
+/*
+ * The Settings page holds global settings/preferences.
+ *
+ * TODO: Make sure this fits with the UI guidelines if
+ * they are updated to include About/Settings info.
+ */
+DefaultSheet {
+    id: sheet
+    title: i18n.tr("Settings")
+
+    Component.onCompleted: {
+        sheet.__leftButton.text = i18n.tr("Close")
+        sheet.__foreground.style = Theme.createStyleComponent(Qt.resolvedUrl("../components/SuruSheetStyle.qml"), sheet)
+    }
+
+    Column {
+        anchors.fill: parent
+        anchors.margins: units.gu(-1)
+
+        Standard {
+            text: i18n.tr("Show Advanced Features")
+            control: CheckBox {
+                id: showAdvancedFeaturesCheckBox
+                checked: showAdvancedFeatures
+                onCheckedChanged: {
+                    saveSetting("showAdvancedFeatures", showAdvancedFeaturesCheckBox.checked ? "true" : "false");
+                }
+            }
+        }
+    }
+}

=== added file 'ui/ViewPopover.qml'
--- ui/ViewPopover.qml	1970-01-01 00:00:00 +0000
+++ ui/ViewPopover.qml	2014-02-19 00:47:29 +0000
@@ -0,0 +1,155 @@
+/*
+ * 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.
+ *