Merge lp:~dpm/ubuntu-filemanager-app/xdguserdir into lp:ubuntu-filemanager-app

[David Planella]

Add a plugin to return the user's directories via the XDG spec

Add a plugin to return the user's directories via the XDG spec

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

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

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

review: Needs Fixing (continuous-integration)

[Michael Spencer (ibelieve)]

What is the reason for replacing "~" with userdirs.locationHome? "~" will get converted automatically into the right directory for use by the model, but is used throughout the app to refer to the home folder.

Also, you should mark your branch as fixing LP #1328332 and assign your self to the bug.

review: Needs Information

[Michael Spencer (ibelieve)]

I see the bug related to the "~" question I was wondering about, but I don't think using userdirs.locationHome is the right solution (assuming it is something like /home/mspencer). The folder property is designed to use "~", so if that is not working, it is a bug elsewhere, most likely involving the path property, which expands "~" to the user's home directory.

review: Needs Fixing

[David Planella (dpm)]

To answer the first question, the model does not seem to do the "~" expansion. This is the first bug this branch addresses.

The next one is about it not loading the localized user dirs.

Why do you think that userdirs.locationHome is not the right solution?

review: Needs Information

[Nicholas Skaggs (nskaggs)]

Add the depends?

file:///usr/share/filemanager/qml/filemanager.qml:24:1: module "com.canonical.xdguserdir" is not installed
import com.canonical.xdguserdir 1.0

[Michael Spencer (ibelieve)]

Actually, it is doing the expansion correctly, at least it is when I just checked. The bug is here:

    FolderListModel {
        id: repeaterModel
        path: folderListPage.folder

        onPathChanged: {
            console.log("Path: " + repeaterModel.path)
        }
    }

userdirs.locationHome is wrong because folder is designed to use "~", while path converts that to the actual /home/<user> path:

    // This stores the location using ~ to represent home
    property string folder: homeFolder
    property string homeFolder: "~"

    // This replaces ~ with the actual home folder, since the
    // plugin doesn't recognize the ~
    property string path: folder.replace("~", folderModel.homePath())

So the actual fix to that bug should be changing:

    id: repeaterModel
    path: folderListPage.folder

To:

    id: repeaterModel
    path: folderListPage.path

Does that make sense, or is there something else I am missing?

[lp:~dpm/ubuntu-filemanager-app/xdguserdir]

210. By David Planella on 2014-06-18

Fixed ~ replacements, renamed plugin

211. By David Planella on 2014-06-18

Created debian package for the XDG user dirs plugin

[David Planella (dpm)]

Ah, I know what you mean now. Yes, what you are saying makes sense, and if that'd be the only bug targetted, this would be the fix that I'd favour too.

However, while fixing the hardcoded Documents, Music, etc. folders, I think it makes sense to return the home dir as part of the XDG user dirs listing, and it gives us the ability to use that as a model for the places sidebar and the places popup. Also, after your last comment, I've made some changes to remove the need to do on-the-fly replacement of "~"

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

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

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

review: Needs Fixing (continuous-integration)

Unmerged revisions

=== modified file 'debian/control'
--- debian/control	2014-05-06 17:57:59 +0000
+++ debian/control	2014-06-18 07:41:55 +0000
@@ -41,6 +41,16 @@
  This package contains the Folder List model plugin of the Nemo QML 
  plugins collection.
 
+Package: qtdeclarative5-xdguserdirs0.1
+Architecture: any
+Multi-Arch: same
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         ${misc:Pre-Depends},
+Description: XDG user dirs QML plugin
+ This package contains a plugin that enables QML apps to list the
+ XDG user locations in the file system.
+
 Package: ubuntu-filemanager-app-autopilot
 Architecture: all
 Depends: ${misc:Depends},

=== added file 'debian/qtdeclarative5-xdguserdirs0.1.install'
--- debian/qtdeclarative5-xdguserdirs0.1.install	1970-01-01 00:00:00 +0000
+++ debian/qtdeclarative5-xdguserdirs0.1.install	2014-06-18 07:41:55 +0000
@@ -0,0 +1,1 @@
+usr/lib/*/qt5/qml/com/ubuntu/XdgUserDirs/

=== modified file 'src/app/qml/components/PathBar.qml'
--- src/app/qml/components/PathBar.qml	2014-06-03 23:27:22 +0000
+++ src/app/qml/components/PathBar.qml	2014-06-18 07:41:55 +0000
@@ -1,6 +1,7 @@
 import QtQuick 2.0
 import Ubuntu.Components 0.1
 import Ubuntu.Components.Popups 0.1
+import com.ubuntu.XdgUserDirs 0.1
 
 Rectangle {
     id: root
@@ -17,6 +18,10 @@
         UbuntuNumberAnimation {}
     }
 
+    XdgUserDirs {
+       id: userdirs
+    }
+
     Rectangle {
         id: goToButton
         objectName: "goToButton"
@@ -117,7 +122,7 @@
                     Label {
                         id: label
                         anchors.centerIn: parent
-                        text: modelData === "" ? "/" : modelData === "~" ? i18n.tr("Home") : modelData
+                        text: modelData === "" ? "/" : modelData
                         color: UbuntuColors.coolGrey
                     }
 

=== modified file 'src/app/qml/components/PlacesSidebar.qml'
--- src/app/qml/components/PlacesSidebar.qml	2014-06-10 02:34:07 +0000
+++ src/app/qml/components/PlacesSidebar.qml	2014-06-18 07:41:55 +0000
@@ -20,6 +20,7 @@
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1
 import Ubuntu.Components.Popups 0.1
+import com.ubuntu.XdgUserDirs 0.1
 
 Sidebar {
     id: root
@@ -42,40 +43,6 @@
         UbuntuNumberAnimation {}
     }
 
-    ListModel {
-        id: places
-
-        ListElement {
-            objectName: "placeHome"
-            path: "~"
-        }
-
-        ListElement {
-            path: "~/Documents"
-        }
-
-        ListElement {
-            path: "~/Downloads"
-        }
-
-        ListElement {
-            path: "~/Music"
-        }
-
-        ListElement {
-            path: "~/Pictures"
-        }
-
-        ListElement {
-            path: "~/Videos"
-        }
-
-        ListElement {
-            objectName: "placeRoot"
-            path: "/"
-        }
-    }
-
     Column {
         anchors {
             left: parent.left
@@ -91,7 +58,7 @@
             id: placesList
             objectName: "placesList"
 
-            model: places
+            model: XdgUserDirs {}
 
             delegate: Standard {
                 objectName: model.objectName

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

=== modified file 'src/app/qml/ui/FolderListPage.qml'
--- src/app/qml/ui/FolderListPage.qml	2014-04-30 08:54:08 +0000
+++ src/app/qml/ui/FolderListPage.qml	2014-06-18 07:41:55 +0000
@@ -20,6 +20,7 @@
 import Ubuntu.Components.Popups 0.1
 import Ubuntu.Components.ListItems 0.1
 import org.nemomobile.folderlistmodel 1.0
+import com.ubuntu.XdgUserDirs 0.1
 import "../components"
 
 Page {
@@ -63,27 +64,15 @@
         }
     }
 
-    // This stores the location using ~ to represent home
+    XdgUserDirs { id: userdirs }
+
     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)
-    }
+    property string path: folder
 
     function goTo(location) {
-        // Since the FolderListModel returns paths using the actual
-        // home folder, this replaces with ~ before actually going
-        // to the specified folder
-        while (location !== '/' && location.substring(location.lastIndexOf('/')+1) === "") {
-            location = location.substring(0, location.length - 1)
-        }
-
-        folderListPage.folder = location.replace(pageModel.homePath(), "~")
+        // This allows us to enter "~" as a shortcut to the home folder
+        // when entering a location on the Go To dialog
+        folderListPage.folder = location.replace("~", userdirs.locationHome)
         refresh()
     }
 
@@ -113,21 +102,20 @@
     // 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 === "~") {
+        if (file === userdirs.locationHome) {
             iconPath = "../icons/folder-home.svg"
         } else if (file === i18n.tr("~/Desktop")) {
             iconPath = "/usr/share/icons/Humanity/places/48/user-desktop.svg"
-        } else if (file === i18n.tr("~/Documents")) {
+        } else if (file === userdirs.locationDocuments) {
             iconPath = "/usr/share/icons/Humanity/places/48/folder-documents.svg"
-        } else if (file === i18n.tr("~/Downloads")) {
+        } else if (file === userdirs.locationDownloads) {
             iconPath = "/usr/share/icons/Humanity/places/48/folder-downloads.svg"
-        } else if (file === i18n.tr("~/Music")) {
+        } else if (file === userdirs.locationMusic) {
             iconPath = "/usr/share/icons/Humanity/places/48/folder-music.svg"
-        } else if (file === i18n.tr("~/Pictures")) {
+        } else if (file === userdirs.locationPictures) {
             iconPath = "/usr/share/icons/Humanity/places/48/folder-pictures.svg"
         } else if (file === i18n.tr("~/Public")) {
             iconPath = "/usr/share/icons/Humanity/places/48/folder-publicshare.svg"
@@ -135,7 +123,7 @@
             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")) {
+        } else if (file === userdirs.locationVideos) {
             iconPath = "/usr/share/icons/Humanity/places/48/folder-videos.svg"
         } else if (file === "/") {
             iconPath = "/usr/share/icons/Humanity/devices/48/drive-harddisk.svg"
@@ -145,9 +133,8 @@
     }
 
     function folderName(folder) {
-        folder = folder.replace(pageModel.homePath(), "~")
 
-        if (folder === folderListPage.homeFolder) {
+        if (folder === userdirs.locationHome) {
             return i18n.tr("Home")
         } else if (folder === "/") {
             return i18n.tr("File System")
@@ -208,7 +195,7 @@
         path: folderListPage.folder
 
         onPathChanged: {
-            console.log("Path: " + repeaterModel.path)
+            console.log("Path changed to: " + repeaterModel.path)
         }
     }
 

=== modified file 'src/app/qml/ui/PlacesPopover.qml'
--- src/app/qml/ui/PlacesPopover.qml	2014-06-10 02:34:07 +0000
+++ src/app/qml/ui/PlacesPopover.qml	2014-06-18 07:41:55 +0000
@@ -19,45 +19,12 @@
 import Ubuntu.Components 0.1
 import Ubuntu.Components.Popups 0.1
 import Ubuntu.Components.ListItems 0.1
+import com.ubuntu.XdgUserDirs 0.1
 
 Popover {
     id: root
     objectName: "placesPopover"
 
-    ListModel {
-        id: places
-
-        ListElement {
-            objectName: 'placeHome'
-            path: "~"
-        }
-
-        ListElement {
-            path: "~/Documents"
-        }
-
-        ListElement {
-            path: "~/Downloads"
-        }
-
-        ListElement {
-            path: "~/Music"
-        }
-
-        ListElement {
-            path: "~/Pictures"
-        }
-
-        ListElement {
-            path: "~/Videos"
-        }
-
-        ListElement {
-            objectName: "placeRoot"
-            path: "/"
-        }
-    }
-
     Column {
         anchors {
             left: parent.left
@@ -113,7 +80,7 @@
             id: placesList
             objectName: "placesList"
 
-            model: places
+            model: XdgUserDirs {}
 
             delegate: Standard {
                 objectName: model.objectName

=== modified file 'src/plugin/CMakeLists.txt'
--- src/plugin/CMakeLists.txt	2014-03-29 17:04:56 +0000
+++ src/plugin/CMakeLists.txt	2014-06-18 07:41:55 +0000
@@ -5,3 +5,4 @@
 find_package(Qt5Widgets)
 
 add_subdirectory(folderlistmodel)
+add_subdirectory(xdguserdir)

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

=== added file 'src/plugin/xdguserdir/qmldir'
--- src/plugin/xdguserdir/qmldir	1970-01-01 00:00:00 +0000
+++ src/plugin/xdguserdir/qmldir	2014-06-18 07:41:55 +0000
@@ -0,0 +1,2 @@
+module com.ubuntu.XdgUserDirs
+plugin XdgUserDirs

=== added file 'src/plugin/xdguserdir/xdguserdir.cpp'
--- src/plugin/xdguserdir/xdguserdir.cpp	1970-01-01 00:00:00 +0000
+++ src/plugin/xdguserdir/xdguserdir.cpp	2014-06-18 07:41:55 +0000
@@ -0,0 +1,108 @@
+/*
+ * Copyright (C) 2013 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author : David Planella <[e-mail]>
+ */
+
+#include "xdguserdir.h"
+#include <QDebug>
+#include <QDir>
+
+XdgUserDir::XdgUserDir(QAbstractListModel *parent) :
+    QAbstractListModel(parent)
+{
+
+}
+
+XdgUserDir::~XdgUserDir() {
+
+}
+
+QString XdgUserDir::standardLocation(QStandardPaths::StandardLocation location) const
+{
+    QStringList locations = QStandardPaths::standardLocations(location);
+    QString standardLocation = "";
+
+    foreach (const QString &location, locations) {
+        // We always return the first location or an empty string
+        // The frontend should check out that it exists
+        if (QDir(location).exists()) {
+            standardLocation = location;
+            break;
+        }
+    }
+
+    return standardLocation;
+}
+
+QString XdgUserDir::locationHome() const
+{
+    return standardLocation(QStandardPaths::HomeLocation);
+}
+
+QString XdgUserDir::locationDocuments() const
+{
+    return standardLocation(QStandardPaths::DocumentsLocation);
+}
+
+QString XdgUserDir::locationDownloads() const
+{
+    return standardLocation(QStandardPaths::DownloadLocation);
+}
+
+QString XdgUserDir::locationMusic() const
+{
+    return standardLocation(QStandardPaths::MusicLocation);
+}
+
+QString XdgUserDir::locationPictures() const
+{
+    return standardLocation(QStandardPaths::PicturesLocation);
+}
+
+QString XdgUserDir::locationVideos() const
+{
+    return standardLocation(QStandardPaths::MoviesLocation);
+}
+
+int XdgUserDir::rowCount(const QModelIndex &parent) const
+{
+    Q_UNUSED(parent)
+    return 6;
+}
+
+QVariant XdgUserDir::data(const QModelIndex &index, int role) const
+{
+    Q_UNUSED(role)
+
+    switch(index.row()) {
+        case 0: return locationHome();
+        case 1: return locationDocuments();
+        case 2: return locationDownloads();
+        case 3: return locationMusic();
+        case 4: return locationPictures();
+        case 5: return locationVideos();
+    }
+
+    return QVariant();
+}
+
+QHash<int, QByteArray> XdgUserDir::roleNames() const
+{
+    QHash<int, QByteArray> roles;
+    roles.insert(Qt::UserRole, "path");
+
+    return roles;
+ }

=== added file 'src/plugin/xdguserdir/xdguserdir.h'
--- src/plugin/xdguserdir/xdguserdir.h	1970-01-01 00:00:00 +0000
+++ src/plugin/xdguserdir/xdguserdir.h	2014-06-18 07:41:55 +0000
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2013 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author : David Planella <[e-mail]>
+ */
+
+#ifndef XDGUSERDIR_H
+#define XDGUSERDIR_H
+
+#include <QObject>
+#include <QAbstractListModel>
+#include <QStandardPaths>
+
+class XdgUserDir : public QAbstractListModel
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QString locationHome READ locationHome CONSTANT)
+    Q_PROPERTY(QString locationDocuments READ locationDocuments CONSTANT)
+    Q_PROPERTY(QString locationDownloads READ locationDownloads CONSTANT)
+    Q_PROPERTY(QString locationMusic READ locationMusic CONSTANT)
+    Q_PROPERTY(QString locationPictures READ locationPictures CONSTANT)
+    Q_PROPERTY(QString locationVideos READ locationVideos CONSTANT)
+
+public:
+    explicit XdgUserDir(QAbstractListModel *parent = 0);
+    ~XdgUserDir();
+    QString locationHome() const;
+    QString locationDocuments() const;
+    QString locationDownloads() const;
+    QString locationMusic() const;
+    QString locationPictures() const;
+    QString locationVideos() const;
+    int rowCount(const QModelIndex &parent) const override;
+    QVariant data(const QModelIndex &index, int role) const override;
+    QHash<int, QByteArray> roleNames() const override;
+
+private:
+    QString standardLocation(QStandardPaths::StandardLocation location) const;
+};
+
+#endif // XDGUSERDIR_H
+
+
+

=== added file 'src/plugin/xdguserdir/xdguserdir_plugin.cpp'
--- src/plugin/xdguserdir/xdguserdir_plugin.cpp	1970-01-01 00:00:00 +0000
+++ src/plugin/xdguserdir/xdguserdir_plugin.cpp	2014-06-18 07:41:55 +0000
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2013 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author : David Planella <[e-mail]>
+ */
+
+#include <QtQml>
+#include <QtQml/QQmlContext>
+#include "xdguserdir_plugin.h"
+#include "xdguserdir.h"
+
+void BackendPlugin::registerTypes(const char *uri)
+{
+    Q_ASSERT(uri == QLatin1String(QUOTES(PLUGIN_URI)));
+
+    qmlRegisterType<XdgUserDir>(uri, 0, 1, "XdgUserDirs");
+}
+
+void BackendPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
+{
+    QQmlExtensionPlugin::initializeEngine(engine, uri);
+}

=== added file 'src/plugin/xdguserdir/xdguserdir_plugin.h'
--- src/plugin/xdguserdir/xdguserdir_plugin.h	1970-01-01 00:00:00 +0000
+++ src/plugin/xdguserdir/xdguserdir_plugin.h	2014-06-18 07:41:55 +0000
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2013 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author : David Planella <[e-mail]>
+ */
+
+#ifndef XDGUSERDIR_PLUGIN_H
+#define XDGUSERDIR_PLUGIN_H
+
+#include <QtQml/QQmlEngine>
+#include <QtQml/QQmlExtensionPlugin>
+
+class BackendPlugin : public QQmlExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
+
+public:
+    void registerTypes(const char *uri);
+    void initializeEngine(QQmlEngine *engine, const char *uri);
+};
+#endif // XDGUSERDIR_PLUGIN_H
+
+
+
+
+