Merge lp:~jonas-drange/ubuntu-settings-components/filepicker into lp:ubuntu-settings-components

[Jonas G. Drange]

create file picker component for export

[Ken VanDine (ken-vandine)]

One copyright question inline

review: Needs Information

[Lukáš Tinkl (lukas-kde)]

Two other minor points inline

review: Needs Information

[Ken VanDine (ken-vandine)]

Looks fine to me

review: Approve

[Marco Trevisan (Treviño) (3v1n0)]

Is this something we still want to land?

[Jonas G. Drange (jonas-drange)]

It's scheduled to land after silo 2078.

On 27 October 2016 at 18:16, Marco Trevisan (Treviño) <[e-mail]>
wrote:

> Is this something we still want to land?
> --
> https://code.launchpad.net/~jonas-drange/ubuntu-settings-
> components/filepicker/+merge/300180
> You are the owner of lp:~jonas-drange/ubuntu-settings-components/
> filepicker.
>

[lp:~jonas-drange/ubuntu-settings-components/filepicker]

166. By Jonas G. Drange on 2017-01-24

bumps filepicker change

167. By Jonas G. Drange on 2017-01-25

syncs with trunk

[Ken VanDine (ken-vandine)]

I'll reviewed the commits since my last approval, looks fine.

review: Approve

Unmerged revisions

167. By Jonas G. Drange on 2017-01-25

syncs with trunk

166. By Jonas G. Drange on 2017-01-24

bumps filepicker change

165. By Jonas G. Drange on 2017-01-24

sync with trunk

164. By Jonas G. Drange on 2016-10-19

bump version

163. By Jonas G. Drange on 2016-10-19

drop bump

162. By Jonas G. Drange on 2016-10-19

merge trunk

161. By Jonas G. Drange on 2016-07-18

update pot

160. By Jonas G. Drange on 2016-07-18

address comments, use glib to format size

159. By Jonas G. Drange on 2016-07-18

update pot

158. By Jonas G. Drange on 2016-07-15

make file name elide in the middle

=== modified file 'debian/changelog'
--- debian/changelog	2017-01-18 15:20:00 +0000
+++ debian/changelog	2017-01-25 13:04:17 +0000
@@ -1,3 +1,9 @@
+ubuntu-settings-components (0.13+17.04.20170104-0ubuntu2) UNRELEASED; urgency=medium
+
+  * create file picker component for export  
+
+ -- Jonas G. Drange <[e-mail]>  Tue, 24 Jan 2017 15:01:25 +0100
+
 ubuntu-settings-components (0.12+17.04.20170118-0ubuntu1) zesty; urgency=medium
 
   [ Pete Woods ]

=== modified file 'debian/control'
--- debian/control	2016-12-07 17:02:20 +0000
+++ debian/control	2017-01-25 13:04:17 +0000
@@ -5,6 +5,7 @@
 Build-Depends: cmake,
                cmake-extras (>= 0.10),
                debhelper (>= 9),
+               libglib2.0-dev (>= 2.37.92),
                pkg-config,
                python3:any,
                qml-module-qt-labs-folderlistmodel,

=== added file 'examples/FilePickerComponent.qml'
--- examples/FilePickerComponent.qml	1970-01-01 00:00:00 +0000
+++ examples/FilePickerComponent.qml	2017-01-25 13:04:17 +0000
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2016 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/>.
+ *
+ * Authored by Jonas G. Drange <[e-mail]>
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import Ubuntu.Settings.Components 0.1
+import Ubuntu.Components.Popups 1.3
+
+MainView {
+    id: mainView
+    // Note! applicationName needs to match the .desktop filename
+    applicationName: "SettingsComponents"
+
+    width: units.gu(42)
+    height: units.gu(75)
+
+    property var _diag
+    property alias _accepted: acceptedLabel.acceptedPath
+
+    Component {
+        id: fp
+        FilePicker {
+            onReject: {
+                if (_diag) {
+                    PopupUtils.close(_diag)
+                }
+                _accepted = ""
+            }
+            onAccept: {
+                _accepted = path
+                if (_diag) {
+                    PopupUtils.close(_diag)
+                }
+            }
+        }
+    }
+
+    Page {
+        header: PageHeader {
+            id: pageHeader
+            title: "FilePicker"
+        }
+
+        Column {
+            spacing: units.gu(2)
+            anchors {
+                top: pageHeader.bottom
+                left: parent.left
+                right: parent.right
+                bottom: parent.bottom
+                margins: units.gu(2)
+            }
+
+            Button {
+                anchors { left: parent.left; right: parent.right }
+                text: i18n.tr("Select dark theme")
+                onClicked: theme.name = "Ubuntu.Components.Themes.SuruDark"
+            }
+
+            Button {
+                anchors { left: parent.left; right: parent.right }
+                text: i18n.tr("Open file picker")
+                onClicked: _diag = PopupUtils.open(fp)
+            }
+
+            Label {
+                id: acceptedLabel
+                property string acceptedPath
+                visible: acceptedPath
+                anchors { left: parent.left; right: parent.right }
+                text: i18n.tr("Accepted path: %1").arg(acceptedPath)
+                elide: Text.ElideMiddle
+            }
+        }
+    }
+}

=== modified file 'plugins/Ubuntu/Settings/Components/CMakeLists.txt'
--- plugins/Ubuntu/Settings/Components/CMakeLists.txt	2016-01-29 00:44:43 +0000
+++ plugins/Ubuntu/Settings/Components/CMakeLists.txt	2017-01-25 13:04:17 +0000
@@ -1,9 +1,15 @@
 project(UbuntuSettingsComponentsQml)
 
+pkg_search_module(GLIB REQUIRED glib-2.0)
+include_directories(
+    ${GLIB_INCLUDE_DIRS}
+)
+
 add_definitions(-DUBUNTUSETTINGSCOMPONENTS_LIBRARY)
 
 add_library(UbuntuSettingsComponentsQml MODULE
     plugin.cpp
+    filepickerhelper.cpp
     serverpropertysynchroniser.cpp
 )
 
@@ -11,6 +17,7 @@
     Qt5::Core
     Qt5::Qml
     Qt5::Quick
+    ${GLIB_LDFLAGS}
 )
 
 add_usc_plugin(Ubuntu.Settings.Components 0.1 Ubuntu/Settings/Components TARGETS UbuntuSettingsComponentsQml)

=== added file 'plugins/Ubuntu/Settings/Components/FilePicker.qml'
--- plugins/Ubuntu/Settings/Components/FilePicker.qml	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/Settings/Components/FilePicker.qml	2017-01-25 13:04:17 +0000
@@ -0,0 +1,197 @@
+/*
+ * Copyright (C) 2016 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 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 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 Qt.labs.folderlistmodel 2.1
+import QtQuick 2.4
+import QtQuick.Layouts 1.1
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItems
+import Ubuntu.Components.Popups 1.3
+import Ubuntu.Settings.Components 0.1
+
+Dialog {
+    id: root
+    objectName: "filePicker"
+
+    property string currentFilePath: ""
+
+    signal accept(string path)
+    signal reject()
+
+    function hideFunc() {
+        FilePickerProperties.lastFolder = fsModel.folder
+        currentFilePath = ""
+    }
+
+    function rejectFunc() {
+        hideFunc()
+        root.reject()
+    }
+
+    function acceptFunc() {
+        var path = currentFilePath
+        hideFunc()
+        root.accept(path)
+    }
+
+    property var fsModel: FolderListModel {
+        showDirs: true
+        showFiles: true
+        showHidden: true
+        showDirsFirst: true
+        showDotAndDotDot: false
+        showOnlyReadable: false
+        sortField: FolderListModel.Name
+
+        folder: (FilePickerProperties.lastFolder === "") ?
+            FilePickerHelper.homeDirUrl() :
+            FilePickerProperties.lastFolder
+    }
+
+    ColumnLayout {
+        spacing: units.gu(1)
+        anchors {
+            left: parent.left
+            right: parent.right
+        }
+        height: root.height - units.gu(10)
+
+        RowLayout {
+            anchors { left: parent.left; right: parent.right }
+            spacing: units.gu(1)
+
+            Icon {
+                objectName: "filePickerBackButton"
+                name: "back"
+                Layout.alignment: Qt.AlignVCenter
+                width: units.gu(2.5)
+                height: width
+
+                enabled: (FilePickerHelper.pathFromUrl(fsModel.folder)
+                          !== FilePickerHelper.rootPath())
+                opacity: enabled ? 1 : 0.5
+
+                MouseArea {
+                    anchors {
+                        fill: parent
+                        margins: -units.gu(2)
+                    }
+                    onClicked: {
+                        if (parent.enabled) {
+                            fsModel.folder = fsModel.parentFolder
+                        }
+                    }
+                }
+            }
+
+            Label {
+                objectName: "filePickerBreadcrumb"
+                Layout.alignment: Qt.AlignVCenter
+                text: {
+                    var prettyTree = [
+                        i18n.dtr("ubuntu-settings-components", "Device")
+                    ];
+                    var paths = FilePickerHelper.pathsFromUrl(fsModel.folder);
+                    for (var i = 0; i < paths.length; i++) {
+                        prettyTree.push(paths[i]);
+                    }
+                    return i18n.dtr("ubuntu-settings-components",
+                                    "%1 (%2 file)",
+                                    "%1 (%2 files)",
+                                    fsModel.count
+                            ).arg(prettyTree.join("/"))
+                             .arg(fsModel.count)
+                }
+                Layout.fillWidth: true
+                elide: Text.ElideMiddle
+            }
+        }
+
+        Rectangle {
+            Layout.fillWidth: true
+            Layout.fillHeight: true
+            color: theme.palette.normal.background
+
+            border {
+                width: 1
+                color: theme.palette.normal.overlaySecondaryText
+            }
+
+            ListView {
+                id: list
+                objectName: "filePickerList"
+                anchors.fill: parent
+                clip: true
+                model: fsModel
+
+                delegate: ListItem {
+                    objectName: "filePickerFileItem_" + index
+                    height: fileLayout.height + divider.height
+                    color: (filePath === currentFilePath) ? highlightColor : "transparent"
+
+                    onClicked: {
+                        if (fileIsDir) {
+                            fsModel.folder = fileURL
+                        } else {
+                            currentFilePath = filePath
+                        }
+                    }
+
+                    ListItemLayout {
+                        id: fileLayout
+
+                        title.text: fileName
+                        title.elide: Text.ElideMiddle
+                        title.wrapMode: Text.NoWrap
+                        subtitle.text: fileIsDir ?
+                            "" : FilePickerHelper.formatSize(fileSize)
+
+                        Icon {
+                            name: fileIsDir ? "folder" : "empty"
+                            SlotsLayout.position: SlotsLayout.Leading;
+                            width: units.gu(4)
+                        }
+                    }
+                }
+            }
+
+            Scrollbar {
+                flickableItem: list
+                align: Qt.AlignTrailing
+            }
+        }
+
+        RowLayout {
+            spacing: units.gu(1)
+
+            Button {
+                objectName: "filePickerCancel"
+                Layout.fillWidth: true
+                text: i18n.dtr("ubuntu-settings-components", "Cancel")
+                onClicked: rejectFunc()
+            }
+
+            Button {
+                objectName: "filePickerAccept"
+                Layout.fillWidth: true
+                enabled: currentFilePath !== ""
+                text: i18n.dtr("ubuntu-settings-components", "Accept")
+                onClicked: acceptFunc()
+                color: theme.palette.normal.positive
+            }
+        }
+    }
+}

=== added file 'plugins/Ubuntu/Settings/Components/FilePickerProperties.qml'
--- plugins/Ubuntu/Settings/Components/FilePickerProperties.qml	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/Settings/Components/FilePickerProperties.qml	2017-01-25 13:04:17 +0000
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2016 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 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 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/>.
+ */
+
+pragma Singleton
+import QtQuick 2.4
+
+QtObject {
+    property string lastFolder
+}

=== added file 'plugins/Ubuntu/Settings/Components/filepickerhelper.cpp'
--- plugins/Ubuntu/Settings/Components/filepickerhelper.cpp	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/Settings/Components/filepickerhelper.cpp	2017-01-25 13:04:17 +0000
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2016 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/>.
+ */
+
+#include "filepickerhelper.h"
+
+#include <glib.h>
+
+#include <QDir>
+#include <QDebug>
+
+FilePickerHelper::FilePickerHelper(QObject* parent)
+    : QObject(parent)
+{
+}
+
+QUrl FilePickerHelper::homeDirUrl()
+{
+    return QUrl::fromLocalFile(QDir::homePath());
+}
+
+QString FilePickerHelper::pathFromUrl(const QUrl &url)
+{
+    return url.path();
+}
+
+QString FilePickerHelper::rootPath()
+{
+    return QDir::rootPath();
+}
+
+QStringList FilePickerHelper::pathsFromUrl(const QUrl &url)
+{
+    QString path = url.path();
+    return path.split(QDir::separator(), QString::SkipEmptyParts);
+}
+
+QString FilePickerHelper::formatSize(const quint64 &size)
+{
+    guint64 g_size = size;
+
+    gchar * formatted_size = g_format_size (g_size);
+    QString q_formatted_size = QString::fromLocal8Bit(formatted_size);
+    g_free (formatted_size);
+
+    return q_formatted_size;
+}

=== added file 'plugins/Ubuntu/Settings/Components/filepickerhelper.h'
--- plugins/Ubuntu/Settings/Components/filepickerhelper.h	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/Settings/Components/filepickerhelper.h	2017-01-25 13:04:17 +0000
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2016 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/>.
+ */
+
+#ifndef FILEPICKERHELPER_H
+#define FILEPICKERHELPER_H
+
+#include <QObject>
+#include <QUrl>
+#include <QStringList>
+
+class FilePickerHelper : public QObject
+{
+    Q_OBJECT
+public:
+    FilePickerHelper(QObject* parent = nullptr);
+    Q_INVOKABLE static QUrl homeDirUrl();
+    Q_INVOKABLE static QString rootPath();
+    Q_INVOKABLE static QString pathFromUrl(const QUrl &url);
+    Q_INVOKABLE static QStringList pathsFromUrl(const QUrl &url);
+    Q_INVOKABLE static QString formatSize(const quint64 &size);
+};
+
+#endif // FILEPICKERHELPER_H

=== modified file 'plugins/Ubuntu/Settings/Components/plugin.cpp'
--- plugins/Ubuntu/Settings/Components/plugin.cpp	2016-10-26 17:09:16 +0000
+++ plugins/Ubuntu/Settings/Components/plugin.cpp	2017-01-25 13:04:17 +0000
@@ -17,6 +17,7 @@
 // local
 #include "plugin.h"
 #include "serverpropertysynchroniser.h"
+#include "filepickerhelper.h"
 
 // Qt
 #include <QtQml/qqml.h>
@@ -33,9 +34,15 @@
     Q_INVOKABLE QString formattedWeekNumber(const QDate &date) const { return QString("%1").arg(date.weekNumber(), 2, 10, QChar('0')); }
 };
 
+static QObject* filepickerhelperProvider(QQmlEngine*, QJSEngine*)
+{
+    return new FilePickerHelper;
+}
+
 void UbuntuSettingsComponentsPlugin::registerTypes(const char *uri)
 {
     qmlRegisterType<ServerPropertySynchroniser>(uri, 0, 1, "ServerPropertySynchroniser");
+    qmlRegisterSingletonType<FilePickerHelper>(uri, 0, 1, "FilePickerHelper", filepickerhelperProvider);
     qmlRegisterSingletonType<QtDateFunctions>(uri, 0, 1, "QtDateFunctions",
                                               [](QQmlEngine*, QJSEngine*) -> QObject* { return new QtDateFunctions; });
 }

=== modified file 'plugins/Ubuntu/Settings/Components/qmldir'
--- plugins/Ubuntu/Settings/Components/qmldir	2016-09-16 23:17:00 +0000
+++ plugins/Ubuntu/Settings/Components/qmldir	2017-01-25 13:04:17 +0000
@@ -4,5 +4,8 @@
 
 ActionTextField 0.1 ActionTextField.qml
 Calendar 0.1 Calendar.qml
+FilePicker 0.1 FilePicker.qml
 MessageHeader 0.1 MessageHeader.qml
 UbuntuShapeForItem 0.1 UbuntuShapeForItem.qml
+
+singleton FilePickerProperties 0.1 FilePickerProperties.qml

=== removed file 'plugins/Ubuntu/Settings/Vpn/DialogFile.qml'
--- plugins/Ubuntu/Settings/Vpn/DialogFile.qml	2016-03-14 15:01:48 +0000
+++ plugins/Ubuntu/Settings/Vpn/DialogFile.qml	1970-01-01 00:00:00 +0000
@@ -1,176 +0,0 @@
-/*
- * Copyright (C) 2016 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 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 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.4
-import QtQuick.Layouts 1.1
-import Ubuntu.Components 1.3
-import Ubuntu.Components.ListItems 1.3 as ListItems
-import Ubuntu.Components.Popups 1.3
-import Ubuntu.Settings.Vpn 0.1
-import Qt.labs.folderlistmodel 2.1
-
-Dialog {
-    objectName: "vpnDialogFile"
-    id: dialog
-
-    property string currentFilePath: ""
-
-    signal accept(string path)
-    signal reject
-
-    function hideFunc() {
-        DialogFileProperties.lastFolder = modelFs.folder
-        currentFilePath = ""
-    }
-
-    function rejectFunc() {
-        hideFunc()
-        dialog.reject()
-    }
-
-    function acceptFunc() {
-        var path = currentFilePath
-        hideFunc()
-        dialog.accept(path)
-    }
-
-    FolderListModel {
-        id: modelFs
-        showDirs: true
-        showFiles: true
-        showHidden: true
-        showDirsFirst: true
-        showDotAndDotDot: false
-        showOnlyReadable: false
-        sortField: FolderListModel.Name
-
-        folder: (DialogFileProperties.lastFolder === "")? "file:///home/" : DialogFileProperties.lastFolder
-    }
-
-    ColumnLayout {
-        height: root.height - units.gu(10)
-        spacing: units.gu(1)
-
-        Flow {
-            spacing: units.gu(1)
-            Layout.fillWidth: true
-
-            Repeater {
-                model: {
-                    var ret = []
-                    var path = "file:///"
-                    ret.push({ "name" : "/", "url" : path })
-                    var tmp = modelFs.folder.toString().replace("file:///", "").split("/")
-                    for (var idx = 0; idx < tmp.length; idx++) {
-                        var name = tmp[idx] + "/"
-                        if (name !== "/") {
-                            path += name
-                            ret.push({ "name" : name, "url" : path })
-                        }
-                    }
-                    return ret
-                }
-                delegate: Row {
-                    spacing: units.gu(0.7)
-
-                    property bool isCurrent : Positioner.isLastItem
-
-                    Rectangle {
-                        width: units.gu(0.7)
-                        height: width
-                        color: "gray"
-                        rotation: 45
-                        visible: (model.index > 0)
-                        anchors.verticalCenter: parent.verticalCenter
-                    }
-                    Label {
-                        objectName: "vpnFilePathItem_" + model.modelData["name"]
-                        text: model.modelData["name"]
-                        font.weight: (isCurrent ? Font.Bold : Font.Normal)
-                        font.underline: hoverDetector.containsMouse
-                        color: "darkblue"
-                        anchors.verticalCenter: parent.verticalCenter
-
-                        MouseArea {
-                            id: hoverDetector
-                            enabled: !isCurrent
-                            hoverEnabled: true
-                            anchors.fill: parent
-                            onClicked: modelFs.folder = model.modelData["url"]
-                        }
-                    }
-                }
-            }
-        }
-
-        Rectangle {
-            Layout.fillWidth: true
-            Layout.fillHeight: true
-
-            border {
-                width: 1
-                color: "lightgrey"
-            }
-
-            ListView {
-                objectName: "vpnFileList"
-                anchors.fill: parent
-                anchors.margins: 1
-                clip: true
-                model: modelFs
-
-                delegate: ListItems.Standard {
-                    objectName: "vpnFileItem_" + model.fileName
-                    text: model.fileName
-                    iconFrame: false
-                    iconName: model.fileIsDir ? "folder" : "empty"
-
-                    selected: (model.filePath === currentFilePath)
-
-                    onClicked: {
-                        if (model.fileIsDir) {
-                            modelFs.folder = model.fileURL
-                        } else {
-                            currentFilePath = model.filePath
-                        }
-                    }
-                }
-            }
-        }
-
-        RowLayout {
-            spacing: units.gu(1)
-            Layout.fillWidth: true
-
-            Button {
-                objectName: "vpnFileCancel"
-                Layout.fillWidth: true
-                text: i18n.dtr("ubuntu-settings-components", "Cancel")
-                onClicked: rejectFunc()
-                color: UbuntuColors.red
-            }
-
-            Button {
-                objectName: "vpnFileAccept"
-                Layout.fillWidth: true
-                enabled: currentFilePath !== ""
-                text: i18n.dtr("ubuntu-settings-components", "Accept")
-                onClicked: acceptFunc()
-                color: UbuntuColors.green
-            }
-        }
-    }
-}

=== removed file 'plugins/Ubuntu/Settings/Vpn/DialogFileProperties.qml'
--- plugins/Ubuntu/Settings/Vpn/DialogFileProperties.qml	2016-03-07 15:46:28 +0000
+++ plugins/Ubuntu/Settings/Vpn/DialogFileProperties.qml	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2016 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 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 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/>.
- */
-
-pragma Singleton
-import QtQuick 2.4
-
-QtObject {
-    property string lastFolder
-}

=== modified file 'plugins/Ubuntu/Settings/Vpn/FileSelector.qml'
--- plugins/Ubuntu/Settings/Vpn/FileSelector.qml	2016-03-14 15:01:48 +0000
+++ plugins/Ubuntu/Settings/Vpn/FileSelector.qml	2017-01-25 13:04:17 +0000
@@ -19,6 +19,7 @@
 import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.3
 import Ubuntu.Components.ListItems 1.3 as ListItems
+import Ubuntu.Settings.Components 0.1
 
 ListItems.ItemSelector {
     property string path
@@ -47,7 +48,7 @@
     }
 
     function createDialog() {
-        __dialog = PopupUtils.open(fileDialogComponent)
+        __dialog = PopupUtils.open(filePickerComponent)
         __dialog.accept.connect(pathAccepted)
         __dialog.reject.connect(pathRejected)
     }
@@ -91,4 +92,9 @@
             path = model[index];
         }
     }
+
+    Component {
+        id: filePickerComponent
+        FilePicker {}
+    }
 }

=== modified file 'plugins/Ubuntu/Settings/Vpn/VpnEditor.qml'
--- plugins/Ubuntu/Settings/Vpn/VpnEditor.qml	2016-12-16 13:32:35 +0000
+++ plugins/Ubuntu/Settings/Vpn/VpnEditor.qml	2017-01-25 13:04:17 +0000
@@ -68,13 +68,6 @@
         leadingActionBar.actions: []
     }
 
-    Component {
-        id: fileDialogComponent
-        DialogFile {
-            id: fileDialog
-        }
-    }
-
     Flickable {
         id: scrollWidget
         anchors {

=== modified file 'plugins/Ubuntu/Settings/Vpn/qmldir'
--- plugins/Ubuntu/Settings/Vpn/qmldir	2016-02-29 13:52:35 +0000
+++ plugins/Ubuntu/Settings/Vpn/qmldir	2017-01-25 13:04:17 +0000
@@ -1,10 +1,6 @@
 module Ubuntu.Settings.Vpn
 plugin UbuntuSettingsVpn
 
-singleton DialogFileProperties 0.1 DialogFileProperties.qml
-
-internal DialogFile DialogFile.qml
-
 VpnList 0.1 VpnList.qml
 VpnEditor 0.1 VpnEditor.qml
 VpnPreviewDialog 0.1 VpnPreviewDialog.qml

=== modified file 'po/ubuntu-settings-components.pot'
--- po/ubuntu-settings-components.pot	2017-01-18 15:20:00 +0000
+++ po/ubuntu-settings-components.pot	2017-01-25 13:04:17 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: ubuntu-settings-components\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-18 15:20+0000\n"
+"POT-Creation-Date: 2017-01-25 14:03+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -16,12 +16,36 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
 #: plugins/Ubuntu/Settings/Components/Calendar.qml:232
 msgctxt "Header text: keep it short and upper case"
 msgid "WEEK"
 msgstr ""
 
+#: plugins/Ubuntu/Settings/Components/FilePicker.qml:105
+msgid "Device"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Components/FilePicker.qml:112
+#, qt-format
+msgid "%1 (%2 file)"
+msgid_plural "%1 (%2 files)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: plugins/Ubuntu/Settings/Components/FilePicker.qml:183
+#: plugins/Ubuntu/Settings/Fingerprint/Fingerprints.qml:336
+#: plugins/Ubuntu/Settings/Fingerprint/Setup.qml:355
+#: plugins/Ubuntu/Settings/Vpn/VpnEditor.qml:129
+#: plugins/Ubuntu/Settings/Vpn/VpnPreviewDialog.qml:104
+msgid "Cancel"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Components/FilePicker.qml:191
+msgid "Accept"
+msgstr ""
+
 #: plugins/Ubuntu/Settings/Fingerprint/Fingerprint.qml:82
 msgid "Fingerprint Name"
 msgstr ""
@@ -37,7 +61,7 @@
 #: plugins/Ubuntu/Settings/Fingerprint/Fingerprint.qml:131
 #: plugins/Ubuntu/Settings/Fingerprint/Fingerprints.qml:362
 #: plugins/Ubuntu/Settings/Fingerprint/Setup.qml:138
-#: plugins/Ubuntu/Settings/Vpn/VpnEditor.qml:149
+#: plugins/Ubuntu/Settings/Vpn/VpnEditor.qml:142
 msgid "OK"
 msgstr ""
 
@@ -74,14 +98,6 @@
 msgid "Are you sure you want to forget all stored fingerprints?"
 msgstr ""
 
-#: plugins/Ubuntu/Settings/Fingerprint/Fingerprints.qml:336
-#: plugins/Ubuntu/Settings/Fingerprint/Setup.qml:355
-#: plugins/Ubuntu/Settings/Vpn/DialogFile.qml:161
-#: plugins/Ubuntu/Settings/Vpn/VpnEditor.qml:136
-#: plugins/Ubuntu/Settings/Vpn/VpnPreviewDialog.qml:104
-msgid "Cancel"
-msgstr ""
-
 #: plugins/Ubuntu/Settings/Fingerprint/Fingerprints.qml:343
 #: plugins/Ubuntu/Settings/Vpn/VpnPreviewDialog.qml:84
 msgid "Remove"
@@ -148,15 +164,11 @@
 msgid "Send"
 msgstr ""
 
-#: plugins/Ubuntu/Settings/Vpn/DialogFile.qml:170
-msgid "Accept"
-msgstr ""
-
-#: plugins/Ubuntu/Settings/Vpn/FileSelector.qml:25
+#: plugins/Ubuntu/Settings/Vpn/FileSelector.qml:26
 msgid "Choose…"
 msgstr ""
 
-#: plugins/Ubuntu/Settings/Vpn/FileSelector.qml:34
+#: plugins/Ubuntu/Settings/Vpn/FileSelector.qml:35
 #: plugins/Ubuntu/Settings/Vpn/Openvpn/Editor.qml:431
 #: plugins/Ubuntu/Settings/Vpn/Openvpn/Editor.qml:513
 msgid "None"

=== modified file 'tests/qmltests/CMakeLists.txt'
--- tests/qmltests/CMakeLists.txt	2016-10-11 13:51:11 +0000
+++ tests/qmltests/CMakeLists.txt	2017-01-25 13:04:17 +0000
@@ -2,6 +2,7 @@
 
 add_usc_qmltest(Components ActionTextField)
 add_usc_qmltest(Components Calendar)
+add_usc_qmltest(Components FilePicker)
 add_usc_qmltest(Components ServerPropertySynchroniser)
 
 add_usc_qmltest(Menus AccessPointMenu)

=== added file 'tests/qmltests/Components/tst_FilePicker.qml'
--- tests/qmltests/Components/tst_FilePicker.qml	1970-01-01 00:00:00 +0000
+++ tests/qmltests/Components/tst_FilePicker.qml	2017-01-25 13:04:17 +0000
@@ -0,0 +1,215 @@
+/*
+ * Copyright 2016 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/>.
+ *
+ * Authored by Jonas G. Drange <[e-mail]>
+ */
+
+import Qt.labs.folderlistmodel 2.1
+import QtQuick 2.4
+import QtTest 1.0
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Popups 1.3
+import Ubuntu.Settings.Components 0.1
+import Ubuntu.Test 0.1
+
+MainView {
+    id: testRoot
+    width: units.gu(42)
+    height: units.gu(75)
+
+    Component {
+        id: filePickerComp
+
+        FilePicker {}
+    }
+
+    Component {
+        id: fsModelComp
+
+        FolderListModel {}
+    }
+
+    SignalSpy {
+        id: spy
+    }
+
+    UbuntuTestCase {
+        name: "FilePicker"
+        when: windowShown
+
+        property var instance: null
+        property var fsModel: null
+
+        function init() {
+            fsModel = fsModelComp.createObject(testRoot);
+        }
+
+        function cleanup() {
+            PopupUtils.close(instance);
+            tryCompareFunction(function () {
+                return !!findChild(testRoot, "filePicker");
+            }, false);
+            fsModel.destroy();
+            spy.clear();
+            spy.target = null;
+            spy.signalName = "";
+        }
+
+        function test_breadCrumb_data() {
+            return [
+                {
+                    folder: "file:///home/user/",
+                    parentFolder: "file:///home",
+                    count: 0,
+                    targetText: i18n.dtr("ubuntu-settings-components", "%1 (%2 files)")
+                        .arg(i18n.tr("Device") + "/home/user")
+                        .arg(0)
+                },
+                {
+                    folder: "file:///",
+                    parentFolder: "file:///",
+                    count: 10,
+                    targetText: i18n.dtr("ubuntu-settings-components", "%1 (%2 files)")
+                        .arg(i18n.tr("Device"))
+                        .arg(10)
+                },
+                {
+                    folder: "file:///bar/baz",
+                    parentFolder: "file:///bar",
+                    count: 1,
+                    targetText: i18n.dtr("ubuntu-settings-components", "%1 (%2 file)")
+                        .arg(i18n.tr("Device") + "/bar/baz")
+                        .arg(1)
+                },
+            ]
+        }
+
+        function test_breadCrumb(data) {
+            fsModel.folder = data.folder;
+            fsModel.parentFolder = data.parentFolder;
+            fsModel.count = data.count;
+            instance = PopupUtils.open(filePickerComp, null, { "fsModel": fsModel });
+            waitForRendering(instance);
+
+            var crumbs = findChild(instance, "filePickerBreadcrumb");
+            compare(crumbs.text, data.targetText)
+        }
+
+        function test_backButtonEnabled_data() {
+            return [
+                { folder: "file:///", parentFolder: "file:///", targetEnabled: false },
+                { folder: "file:///bar", parentFolder: "file:///", targetEnabled: true },
+                { folder: "file:///bar/baz", parentFolder: "file:///bar", targetEnabled: true },
+            ]
+        }
+
+        function test_backButtonEnabled(data) {
+            fsModel.folder = data.folder;
+            fsModel.parentFolder = data.parentFolder;
+            instance = PopupUtils.open(filePickerComp, null, { "fsModel": fsModel });
+            waitForRendering(instance);
+
+            var button = findChild(instance, "filePickerBackButton");
+            compare(button.enabled, data.targetEnabled);
+        }
+
+        function test_backButtonAction_data() {
+            return [
+                { folder: "file:///", parentFolder: "file:///" },
+                { folder: "file:///bar", parentFolder: "file:///" },
+                { folder: "file:///bar/baz", parentFolder: "file:///bar" }
+            ]
+        }
+
+        function test_backButtonAction(data) {
+            fsModel.folder = data.folder;
+            fsModel.parentFolder = data.parentFolder;
+            instance = PopupUtils.open(filePickerComp, null, { "fsModel": fsModel });
+            waitForRendering(instance);
+
+            var button = findChild(instance, "filePickerBackButton");
+            mouseClick(button, button.width / 2, button.height / 2);
+            compare(fsModel.folder, fsModel.parentFolder);
+        }
+
+        function test_renderFiles_data() {
+            return [
+                { files: [ ["fileA.txt", "/home/user/fileA.txt", "", 5000, "txt", false, true] ] },
+                { files: [
+                    ["fileA.txt", "/home/user/fileA.txt", "", 5000, "txt", false, true],
+                    ["fileB.txt", "/fileB.txt", "", 5000, "txt", false, true],
+                    ["somedir", "/somedir", "somedir", 4001, "", true, false]
+                ]}
+            ]
+        }
+
+        function test_renderFiles(data) {
+            for (var i = 0; i < data.files.length; i++) {
+                fsModel.mockAddFile.apply(fsModel, data.files[i]);
+            }
+            instance = PopupUtils.open(filePickerComp, null, { "fsModel": fsModel });
+            waitForRendering(instance);
+
+            // Make sure each file was rendered.
+            for (var i = 0; i < data.files.length; i++) {
+                verify(findChild(instance, "filePickerFileItem_" + i));
+            }
+        }
+
+        function test_accept_data() {
+            var files = [
+                ["fileA.txt", "file:///home/user/fileA.txt", "", 5000, "txt", false, true],
+                ["fileB.txt", "file:///fileB.txt", "", 5000, "txt", false, true]
+            ]
+            return [
+                { "files": files, accept: 0, targetAcceptPath: "file:///home/user/fileA.txt" },
+                { "files": files, accept: 1, targetAcceptPath: "file:///fileB.txt" },
+            ]
+        }
+
+        function test_accept(data) {
+            for (var i = 0; i < data.files.length; i++) {
+                fsModel.mockAddFile.apply(fsModel, data.files[i]);
+            }
+            instance = PopupUtils.open(filePickerComp, null, { "fsModel": fsModel });
+            waitForRendering(instance);
+
+            var item = findChild(instance, "filePickerFileItem_" + data.accept);
+            mouseClick(item, item.width / 2, item.height / 2);
+
+            spy.target = instance;
+            spy.signalName = "accept";
+
+            var btn = findChild(instance, "filePickerAccept");
+            mouseClick(btn, btn.width / 2, btn.height / 2);
+            spy.wait();
+            compare(spy.count, 1);
+            compare(spy.signalArguments[0][0], data.targetAcceptPath);
+        }
+
+        function test_reject() {
+            instance = PopupUtils.open(filePickerComp, null, { "fsModel": fsModel });
+            waitForRendering(instance);
+
+            spy.target = instance;
+            spy.signalName = "reject";
+
+            var btn = findChild(instance, "filePickerCancel");
+            mouseClick(btn, btn.width / 2, btn.height / 2);
+            spy.wait();
+            compare(spy.count, 1);
+        }
+    }
+}

=== modified file 'tests/qmltests/mocks/CMakeLists.txt'
--- tests/qmltests/mocks/CMakeLists.txt	2016-12-22 14:35:38 +0000
+++ tests/qmltests/mocks/CMakeLists.txt	2017-01-25 13:04:17 +0000
@@ -30,3 +30,4 @@
 
 add_subdirectory(Biometryd)
 add_subdirectory(GSettings.1.0)
+add_subdirectory(Qt)

=== added directory 'tests/qmltests/mocks/Qt'
=== added file 'tests/qmltests/mocks/Qt/CMakeLists.txt'
--- tests/qmltests/mocks/Qt/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/qmltests/mocks/Qt/CMakeLists.txt	2017-01-25 13:04:17 +0000
@@ -0,0 +1,1 @@
+add_subdirectory(labs)

=== added directory 'tests/qmltests/mocks/Qt/labs'
=== added file 'tests/qmltests/mocks/Qt/labs/CMakeLists.txt'
--- tests/qmltests/mocks/Qt/labs/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/qmltests/mocks/Qt/labs/CMakeLists.txt	2017-01-25 13:04:17 +0000
@@ -0,0 +1,1 @@
+add_subdirectory(folderlistmodel)

=== added directory 'tests/qmltests/mocks/Qt/labs/folderlistmodel'
=== added file 'tests/qmltests/mocks/Qt/labs/folderlistmodel/CMakeLists.txt'
--- tests/qmltests/mocks/Qt/labs/folderlistmodel/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/qmltests/mocks/Qt/labs/folderlistmodel/CMakeLists.txt	2017-01-25 13:04:17 +0000
@@ -0,0 +1,20 @@
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${Qt5Core_INCLUDE_DIRS}
+  ${Qt5Quick_INCLUDE_DIRS}
+)
+
+set(Qtlabs_folderlistmodel_SRCS
+  MockFolderListModel.cpp
+  plugin.cpp
+)
+
+add_library(QtLabsFolderListModelQml MODULE ${Qtlabs_folderlistmodel_SRCS})
+target_link_libraries(QtLabsFolderListModelQml
+  ${Qt5Core_LIBRARIES}
+  ${Qt5Quick_LIBRARIES}
+)
+
+qt5_use_modules(QtLabsFolderListModelQml Qml)
+
+add_usc_mock(Qt.labs.folderlistmodel 2.1 Qt.labs.folderlistmodel TARGETS QtLabsFolderListModelQml)

=== added file 'tests/qmltests/mocks/Qt/labs/folderlistmodel/MockFolderListModel.cpp'
--- tests/qmltests/mocks/Qt/labs/folderlistmodel/MockFolderListModel.cpp	1970-01-01 00:00:00 +0000
+++ tests/qmltests/mocks/Qt/labs/folderlistmodel/MockFolderListModel.cpp	2017-01-25 13:04:17 +0000
@@ -0,0 +1,241 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * 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; 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 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/>.
+ */
+
+#include "MockFolderListModel.h"
+
+#include <QDateTime>
+
+MockFolderListModel::MockFolderListModel(QObject *parent)
+    : QAbstractListModel(parent)
+    , m_files()
+{
+}
+
+QUrl MockFolderListModel::folder() const { return m_folder; }
+bool MockFolderListModel::caseSensitive() const { return m_caseSensitive; }
+int MockFolderListModel::count() const { return m_count; }
+QStringList MockFolderListModel::nameFilters() const { return m_nameFilters; }
+QUrl MockFolderListModel::parentFolder() const { return m_parentFolder; }
+QUrl MockFolderListModel::rootFolder() const { return m_rootFolder; }
+bool MockFolderListModel::showDirs() const { return m_showDirs; }
+bool MockFolderListModel::showDirsFirst() const { return m_showDirsFirst; }
+bool MockFolderListModel::showDotAndDotDot() const { return m_showDotAndDotDot; }
+bool MockFolderListModel::showFiles() const { return m_showFiles; }
+bool MockFolderListModel::showHidden() const { return m_showHidden; }
+bool MockFolderListModel::showOnlyReadable() const { return m_showOnlyReadable; }
+MockFolderListModel::Sort MockFolderListModel::sortField() const { return m_sortField; }
+bool MockFolderListModel::sortReversed() const { return m_sortReversed; }
+
+void MockFolderListModel::setCaseSensitive(const bool caseSensitive)
+{
+    if (caseSensitive != m_caseSensitive) {
+        m_caseSensitive = caseSensitive;
+        Q_EMIT caseSensitiveChanged();
+    }
+}
+
+void MockFolderListModel::setCount(const int &count)
+{
+    if (count != m_count) {
+        m_count = count;
+        Q_EMIT countChanged();
+    }
+}
+
+void MockFolderListModel::setFolder(const QUrl &folder)
+{
+    if (folder != m_folder) {
+        m_folder = folder;
+        Q_EMIT folderChanged();
+    }
+}
+
+void MockFolderListModel::setNameFilters(const QStringList &nameFilters)
+{
+    if (nameFilters != m_nameFilters) {
+        m_nameFilters = nameFilters;
+        Q_EMIT nameFiltersChanged();
+    }
+}
+
+void MockFolderListModel::setParentFolder(const QUrl &parentFolder)
+{
+    if (parentFolder != m_parentFolder) {
+        m_parentFolder = parentFolder;
+        Q_EMIT parentFolderChanged();
+    }
+}
+
+void MockFolderListModel::setRootFolder(const QUrl &rootFolder)
+{
+    if (rootFolder != m_rootFolder) {
+        m_rootFolder = rootFolder;
+        Q_EMIT rootFolderChanged();
+    }
+}
+
+void MockFolderListModel::setShowDirs(const bool showDirs)
+{
+    if (showDirs != m_showDirs) {
+        m_showDirs = showDirs;
+        Q_EMIT showDirsChanged();
+    }
+}
+
+void MockFolderListModel::setShowDirsFirst(const bool showDirsFirst)
+{
+    if (showDirsFirst != m_showDirsFirst) {
+        m_showDirsFirst = showDirsFirst;
+        Q_EMIT showDirsFirstChanged();
+    }
+}
+
+void MockFolderListModel::setShowDotAndDotDot(const bool showDotAndDotDot)
+{
+    if (showDotAndDotDot != m_showDotAndDotDot) {
+        m_showDotAndDotDot = showDotAndDotDot;
+        Q_EMIT showDotAndDotDotChanged();
+    }
+}
+
+void MockFolderListModel::setShowFiles(const bool showFiles)
+{
+    if (showFiles != m_showFiles) {
+        m_showFiles = showFiles;
+        Q_EMIT showFilesChanged();
+    }
+}
+
+void MockFolderListModel::setShowHidden(const bool showHidden)
+{
+    if (showHidden != m_showHidden) {
+        m_showHidden = showHidden;
+        Q_EMIT showHiddenChanged();
+    }
+}
+
+void MockFolderListModel::setShowOnlyReadable(const bool showOnlyReadable)
+{
+    if (showOnlyReadable != m_showOnlyReadable) {
+        m_showOnlyReadable = showOnlyReadable;
+        Q_EMIT showOnlyReadableChanged();
+    }
+}
+
+void MockFolderListModel::setSortField(const Sort &sortField)
+{
+    if (sortField != m_sortField) {
+        m_sortField = sortField;
+        Q_EMIT sortFieldChanged();
+    }
+}
+
+void MockFolderListModel::setSortReversed(const bool sortReversed)
+{
+    if (sortReversed != m_sortReversed) {
+        m_sortReversed = sortReversed;
+        Q_EMIT sortReversedChanged();
+    }
+}
+
+QHash<int, QByteArray> MockFolderListModel::roleNames() const
+{
+    QHash<int, QByteArray> names;
+
+    names[Roles::FileNameRole] = "fileName";
+    names[Roles::FilePathRole] = "filePath";
+    names[Roles::FileURLRole] = "fileURL";
+    names[Roles::FileBaseNameRole] = "fileBaseName";
+    names[Roles::FileSuffixRole] = "fileSuffix";
+    names[Roles::FileSizeRole] = "fileSize";
+    names[Roles::FileModifiedRole] = "fileModified";
+    names[Roles::FileAccessedRole] = "fileAccessed";
+    names[Roles::FileIsDirRole] = "fileIsDir";
+
+    return names;
+}
+
+
+int MockFolderListModel::rowCount(const QModelIndex&) const
+{
+    return m_files.count();
+}
+
+QVariant MockFolderListModel::data(const QModelIndex &index, int role) const
+{
+    QVariant rv;
+
+    if (index.row() >= m_files.size())
+        return rv;
+
+    switch (role)
+    {
+        case Roles::FileNameRole:
+            rv = m_files.at(index.row()).fileName;
+            break;
+        case Roles::FilePathRole:
+            rv = m_files.at(index.row()).filePath;
+            break;
+        case Roles::FileBaseNameRole:
+            rv = m_files.at(index.row()).baseName;
+            break;
+        case Roles::FileSuffixRole:
+            rv = m_files.at(index.row()).suffix;
+            break;
+        case Roles::FileSizeRole:
+            rv = m_files.at(index.row()).size;
+            break;
+        case Roles::FileModifiedRole:
+            rv = QDateTime();
+            break;
+        case Roles::FileAccessedRole:
+            rv = QDateTime();
+            break;
+        case Roles::FileIsDirRole:
+            rv = m_files.at(index.row()).isDir;
+            break;
+        case Roles::FileURLRole:
+            rv = QUrl::fromLocalFile(m_files.at(index.row()).filePath);
+            break;
+        default:
+            break;
+    }
+    return rv;
+}
+
+QModelIndex MockFolderListModel::index(int row, int column, const QModelIndex&) const
+{
+    return createIndex(row, column);
+}
+
+void MockFolderListModel::mockAddFile(const QString &fileName,
+                                      const QString &filePath,
+                                      const QString &baseName,
+                                      const qint64 &size,
+                                      const QString &suffix,
+                                      const bool isDir,
+                                      const bool isFile)
+{
+    MockFile m;
+    m.fileName = fileName;
+    m.filePath = filePath;
+    m.baseName = baseName;
+    m.size = size;
+    m.suffix = suffix;
+    m.isDir = isDir;
+    m.isFile = isFile;
+    m_files.append(m);
+}

=== added file 'tests/qmltests/mocks/Qt/labs/folderlistmodel/MockFolderListModel.h'
--- tests/qmltests/mocks/Qt/labs/folderlistmodel/MockFolderListModel.h	1970-01-01 00:00:00 +0000
+++ tests/qmltests/mocks/Qt/labs/folderlistmodel/MockFolderListModel.h	2017-01-25 13:04:17 +0000
@@ -0,0 +1,171 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * 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; 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 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/>.
+ */
+
+#ifndef MOCK_FOLDERLISTMODEL_H
+#define MOCK_FOLDERLISTMODEL_H
+
+#include <QAbstractListModel>
+#include <QObject>
+#include <QString>
+#include <QUrl>
+#include <QStringList>
+
+struct MockFile {
+    QString fileName;
+    QString filePath;
+    QString baseName;
+    qint64 size;
+    QString suffix;
+    bool isDir;
+    bool isFile;
+};
+
+class MockFolderListModel : public QAbstractListModel
+{
+    Q_OBJECT
+    Q_ENUMS(Sort)
+    Q_PROPERTY(QUrl folder READ folder WRITE setFolder NOTIFY folderChanged)
+    Q_PROPERTY(bool caseSensitive READ caseSensitive
+               WRITE setCaseSensitive NOTIFY caseSensitiveChanged)
+    Q_PROPERTY(int count READ count
+               WRITE setCount NOTIFY countChanged)
+    Q_PROPERTY(QStringList nameFilters READ nameFilters
+               WRITE setNameFilters NOTIFY nameFiltersChanged)
+    Q_PROPERTY(QUrl parentFolder READ parentFolder
+               WRITE setParentFolder NOTIFY parentFolderChanged)
+    Q_PROPERTY(QUrl rootFolder READ rootFolder
+               WRITE setRootFolder NOTIFY rootFolderChanged)
+    Q_PROPERTY(bool showDirs READ showDirs
+               WRITE setShowDirs NOTIFY showDirsChanged)
+    Q_PROPERTY(bool showDirsFirst READ showDirsFirst
+               WRITE setShowDirsFirst NOTIFY showDirsFirstChanged)
+    Q_PROPERTY(bool showDotAndDotDot READ showDotAndDotDot
+               WRITE setShowDotAndDotDot NOTIFY showDotAndDotDotChanged)
+    Q_PROPERTY(bool showFiles READ showFiles
+               WRITE setShowFiles NOTIFY showFilesChanged)
+    Q_PROPERTY(bool showHidden READ showHidden
+               WRITE setShowHidden NOTIFY showHiddenChanged)
+    Q_PROPERTY(bool showOnlyReadable READ showOnlyReadable
+               WRITE setShowOnlyReadable NOTIFY showOnlyReadableChanged)
+    Q_PROPERTY(Sort sortField READ sortField
+               WRITE setSortField NOTIFY sortFieldChanged)
+    Q_PROPERTY(bool sortReversed READ sortReversed
+               WRITE setSortReversed NOTIFY sortReversedChanged)
+
+public:
+    explicit MockFolderListModel(QObject *parent = 0);
+
+    enum Roles {
+        FileNameRole = Qt::DisplayRole + 1,
+        FilePathRole,
+        FileURLRole,
+        FileBaseNameRole,
+        FileSuffixRole,
+        FileSizeRole,
+        FileModifiedRole,
+        FileAccessedRole,
+        FileIsDirRole
+    };
+
+    enum class Sort : uint
+    {
+        Unsorted = 0,
+        Name,
+        Time,
+        Size,
+        Type
+    };
+
+    QUrl folder() const;
+    bool caseSensitive() const;
+    int count() const;
+    QStringList nameFilters() const;
+    QUrl parentFolder() const;
+    QUrl rootFolder() const;
+    bool showDirs() const;
+    bool showDirsFirst() const;
+    bool showDotAndDotDot() const;
+    bool showFiles() const;
+    bool showHidden() const;
+    bool showOnlyReadable() const;
+    Sort sortField() const;
+    bool sortReversed() const;
+
+    void setCaseSensitive(const QUrl &folder);
+    void setCaseSensitive(const bool caseSensitive);
+    void setCount(const int &count);
+    void setFolder(const QUrl &folder);
+    void setNameFilters(const QStringList &nameFilters);
+    void setParentFolder(const QUrl &parentFolder);
+    void setRootFolder(const QUrl &rootFolder);
+    void setShowDirs(const bool showDirs);
+    void setShowDirsFirst(const bool showDirsFirst);
+    void setShowDotAndDotDot(const bool showDotAndDotDot);
+    void setShowFiles(const bool showFiles);
+    void setShowHidden(const bool showHidden);
+    void setShowOnlyReadable(const bool showOnlyReadable);
+    void setSortField(const Sort &sortField);
+    void setSortReversed(const bool sortReversed);
+
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    QModelIndex index(int row, int column = 0, const QModelIndex &parent = QModelIndex()) const override;
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+    QHash<int, QByteArray> roleNames() const override;
+
+    Q_INVOKABLE void mockAddFile(const QString &fileName,
+                                 const QString &filePath,
+                                 const QString &baseName,
+                                 const qint64 &size,
+                                 const QString &suffix,
+                                 const bool isDir,
+                                 const bool isFile);
+
+Q_SIGNALS:
+    void caseSensitiveChanged();
+    void countChanged();
+    void folderChanged();
+    void nameFiltersChanged();
+    void parentFolderChanged();
+    void rootFolderChanged();
+    void showDirsChanged();
+    void showDirsFirstChanged();
+    void showDotAndDotDotChanged();
+    void showFilesChanged();
+    void showHiddenChanged();
+    void showOnlyReadableChanged();
+    void sortFieldChanged();
+    void sortReversedChanged();
+
+private:
+    QUrl m_folder = QUrl();
+    bool m_caseSensitive = false;
+    int m_count = false;
+    QStringList m_nameFilters = QStringList();
+    QUrl m_parentFolder = QUrl();
+    QUrl m_rootFolder = QUrl();
+    bool m_showDirs = false;
+    bool m_showDirsFirst = false;
+    bool m_showDotAndDotDot = false;
+    bool m_showFiles = false;
+    bool m_showHidden = false;
+    bool m_showOnlyReadable = false;
+    Sort m_sortField = Sort::Unsorted;
+    bool m_sortReversed = false;
+
+    QList<MockFile> m_files;
+};
+
+#endif // MOCK_FOLDERLISTMODEL_H

=== added file 'tests/qmltests/mocks/Qt/labs/folderlistmodel/plugin.cpp'
--- tests/qmltests/mocks/Qt/labs/folderlistmodel/plugin.cpp	1970-01-01 00:00:00 +0000
+++ tests/qmltests/mocks/Qt/labs/folderlistmodel/plugin.cpp	2017-01-25 13:04:17 +0000
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * 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; 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 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/>.
+ */
+
+#include "plugin.h"
+#include "MockFolderListModel.h"
+
+#include <QtQml/qqml.h>
+
+void MockQtLabsFolderListModelPlugin::registerTypes(const char *uri)
+{
+    Q_ASSERT(uri == QLatin1String("Qt.labs.folderlistmodel"));
+    qmlRegisterType<MockFolderListModel>(uri, 2, 1, "FolderListModel");
+}

=== added file 'tests/qmltests/mocks/Qt/labs/folderlistmodel/plugin.h'
--- tests/qmltests/mocks/Qt/labs/folderlistmodel/plugin.h	1970-01-01 00:00:00 +0000
+++ tests/qmltests/mocks/Qt/labs/folderlistmodel/plugin.h	2017-01-25 13:04:17 +0000
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * 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; 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 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/>.
+ */
+
+#ifndef QTLABS_FOLDERLISTMODEL_PLUGIN_H
+#define QTLABS_FOLDERLISTMODEL_PLUGIN_H
+
+#include <QtQml/QQmlExtensionPlugin>
+
+class MockQtLabsFolderListModelPlugin : public QQmlExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
+
+public:
+    void registerTypes(const char *uri) override;
+};
+
+#endif // QTLABS_FOLDERLISTMODEL_PLUGIN_H

=== added file 'tests/qmltests/mocks/Qt/labs/folderlistmodel/qmldir'
--- tests/qmltests/mocks/Qt/labs/folderlistmodel/qmldir	1970-01-01 00:00:00 +0000
+++ tests/qmltests/mocks/Qt/labs/folderlistmodel/qmldir	2017-01-25 13:04:17 +0000
@@ -0,0 +1,2 @@
+module Qt.labs.folderlistmodel
+plugin QtLabsFolderListModelQml