Unity 8

Merge lp:~mterry/unity8/launcher-items into lp:unity8

launcher-items
Merge into trunk

Proposed by Michael Terry on 2013-08-20

Status:	Merged
Approved by:	Michael Terry on 2013-08-29
Approved revision:	225
Merged at revision:	272
Proposed branch:	lp:~mterry/unity8/launcher-items
Merge into:	lp:unity8
Prerequisite:	lp:~mterry/unity8/demo
Diff against target:	749 lines (+365/-73) 18 files modified Launcher/LauncherDelegate.qml (+1/-1) Shell.qml (+6/-0) plugins/AccountsService/com.canonical.unity.AccountsService.xml (+7/-0) plugins/AccountsService/plugin.cpp (+2/-0) plugins/Unity/Launcher/CMakeLists.txt (+5/-1) plugins/Unity/Launcher/backend/launcherbackend.cpp (+171/-61) plugins/Unity/Launcher/backend/launcherbackend.h (+38/-5) plugins/Unity/Launcher/launchermodel.cpp (+4/-3) plugins/Unity/Launcher/launchermodel.h (+1/-1) tests/mocks/Unity/Launcher/CMakeLists.txt (+2/-0) tests/mocks/Unity/Launcher/MockLauncherItem.cpp (+1/-1) tests/plugins/Unity/CMakeLists.txt (+1/-0) tests/plugins/Unity/Launcher/CMakeLists.txt (+22/-0) tests/plugins/Unity/Launcher/abs-icon.desktop (+3/-0) tests/plugins/Unity/Launcher/launcherbackendtest.cpp (+94/-0) tests/plugins/Unity/Launcher/no-icon.desktop (+2/-0) tests/plugins/Unity/Launcher/no-name.desktop (+2/-0) tests/plugins/Unity/Launcher/rel-icon.desktop (+3/-0)
To merge this branch:	bzr merge lp:~mterry/unity8/launcher-items
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Michael Zanetti (community)		2013-08-20	Approve on 2013-08-29
PS Jenkins bot (community)	continuous-integration		Approve on 2013-08-29
Albert Astals Cid (community)			Needs Information on 2013-08-29
Omer Akram (community)			Needs Fixing on 2013-08-24
Review via email: mp+181061@code.launchpad.net

Commit message

Implement launcher item backend via AccountsService.

Description of the change

Implement launcher item backend in AccountsService.

The launcher items are currently hardcoded. But there are various TODOs to make them actually be stored on the system and have the icons an names pulled from the desktop files. This branch does that.

The storage backend is AccountsService. This is so that the greeter (once split out into a separate process) can still access the list of launcher items to show for the currently selected user. (And I've added a bit of setUser API so that the Qml code can tell the launcher backend which user to act as.)

We now look up icons for launcher items from the system icon theme, instead of our own testing icons.

And I corrected what seemed like an oversight of the LauncherModel not telling the backend when items have been pinned.

Like the demo branch (on which this depends), you should actually install the deb file, rather than just ./run_on_device, since this modifies the system dbus interface for AccountsService.

Additionally, if you want to test setting the AccountsService value manually (note that this code does not listen for changes, so you'll have to restart unity8), use a command line like the following:

gdbus call --system --dest org.freedesktop.Accounts --object-path /org/freedesktop/Accounts/User32011 --method org.freedesktop.DBus.Properties.Set com.canonical.unity.AccountsService launcher-items "<['camera-app.desktop', '/usr/share/applications/phone-app.desktop']>"

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-08-20:

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/693/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-08-22:

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/724/rebuild

review: Approve (continuous-integration)

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2013-08-22:

172 + for (int i = 0; i < m_storedApps.size(); i++) {
173 + delete m_storedApps[i].settings;
174 + }

Just a hint (not really necessary to change)

Q_FOREACH(const LauncherBackendItem &item, m_storedApps) {
delete item.settings;
}

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2013-08-22:

Actually, now that I see you're iteration more often over all the items, I'd like you to change the loops to use Q_FOREACH. It's much nicer to read than the m_storedApplications[index] everywhere.

===

338 + // Mark all apps as pinned (since we just refreshed the set)
339 + for (int i = 0; i < m_storedApps.size(); i++) {
340 + m_storedApps[i].pinned = true;
341 + }

344 +void LauncherBackend::syncToAccounts()
345 +{
346 + auto pinnedItems = QStringList();
347 + for (int i = 0; i < m_storedApps.size(); i++) {
348 + if (m_storedApps[i].pinned) {
349 + pinnedItems.append(m_storedApps[i].settings->fileName());
350 + }
351 + }
352 +
353 + if (m_user != "" && m_accounts != nullptr) {
354 + m_accounts->setUserProperty(m_user, "launcher-items", QVariant(pinnedItems));
355 + }
356 +}

the pinned state needs to be stored and reloaded from the storage. Because we will also have non-pinned, persistent items, for example the recent applications.

===

Not really sure we need the tests with the .desktop files as the QSettings in there will be replaced with Antti's proper .desktop file parser. Anyways... for now there's no need to drop it.

===

The order of the items is not stored. Reordering them in the launcher is reverted after a restart of unity.

review: Needs Fixing

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2013-08-22:

Also, we need a flag in the config that tells us if the config is just empty or if it is indeed uninitialized to avoid resetting to the default config if the user intentionally removes all items (for example to see only running/recent ones)

review: Needs Fixing

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2013-08-22:

Sorry, while starting to work on top of this I realized another issue:

The backend is supposed to deliver information for this, regardless if the item is in the list:

    QString desktopFile(const QString &appId) const;
    QString displayName(const QString &appId) const;
    QString icon(const QString &appId) const;

review: Needs Fixing

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2013-08-22:

and there is an API change in LauncherModel, which means we need to update lp:unity-api and its tests.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-08-22:

FAILED: Continuous integration, rev:216
http://jenkins.qa.ubuntu.com/job/unity8-ci/733/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2512/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/164/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1247
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/734/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/733/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2518/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/166/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/733/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-08-23:

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/761/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Omer Akram (om26er) wrote on 2013-08-24:

There is a conflict now. please merge trunk.

review: Needs Fixing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-08-25:

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/763/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-08-25:

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/764/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-08-27:

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/801/rebuild

review: Approve (continuous-integration)

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2013-08-28:

file:///usr/share/unity8/Shell.qml:470: ReferenceError: user is not defined

This causes some weird effect at startup that the width somehow is broken and everything is displaced on the Nexus 4.

review: Needs Fixing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-08-28:

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/818/rebuild

review: Approve (continuous-integration)

Revision history for this message

Michael Terry (mterry) wrote on 2013-08-28:

Fixed the user warning.

Revision history for this message

Michael Zanetti (mzanetti) on 2013-08-28:

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-08-29:

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity8-autolanding/339/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/generic-cleanup-mbs/1889/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2770/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/380/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1427/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/338/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-autolanding/339/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2776/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/382/console

review: Needs Fixing (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) wrote on 2013-08-29:

plugins/Unity/Launcher/backend/launcherbackend.cpp conflicts

Revision history for this message

Albert Astals Cid (aacid) wrote on 2013-08-29:

Reading

234 - // TODO: return real path instead of this hardcoded one
235 - return QLatin1String("/usr/share/applications/") + appId;
236 + QFileInfo fileInfo(QDir("/usr/share/applications"), appId);
237 + return fileInfo.absoluteFilePath();

maybe we want canonicalFilePath in there instead of absolute?

review: Needs Information

Revision history for this message

Michael Terry (mterry) wrote on 2013-08-29:

I tried canonicalFilePath, but that actually hits the disk and checks if the file exists. If it doesn't, it returns "". Which I didn't think we actually wanted.

Revision history for this message

Albert Astals Cid (aacid) wrote on 2013-08-29:

Ok, still

236 + QFileInfo fileInfo(QDir("/usr/share/applications"), appId);
237 + return fileInfo.absoluteFilePath();

looks like a really slow way of doing

return "/usr/share/applications/" + appdId;

no?

review: Needs Information

lp:~mterry/unity8/launcher-items updated on 2013-08-29

225. By Michael Terry on 2013-08-29: Merge from trunk

Revision history for this message

Michael Terry (mterry) wrote on 2013-08-29:

> return "/usr/share/applications/" + appdId;

That won't gracefully handle a full-path appId, which the current code allows.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-08-29:

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/835/rebuild

review: Approve (continuous-integration)

Revision history for this message

Michael Zanetti (mzanetti) on 2013-08-29:

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Michael Terry

Mohammad Rakibul Hasan

Unity Team

 === modified file 'Launcher/LauncherDelegate.qml'
 --- Launcher/LauncherDelegate.qml	2013-08-21 16:07:02 +0000
 +++ Launcher/LauncherDelegate.qml	2013-08-29 13:56:41 +0000
@@ -60,7 +60,7 @@
                  id: iconImage
                  sourceSize.width: iconShape.width
                  sourceSize.height: iconShape.height
--                source: "../graphics/applicationIcons/" + root.iconName + ".png"
++                source: root.iconName
+             }
+         }
 === modified file 'Shell.qml'
 --- Shell.qml	2013-08-28 19:59:50 +0000
 +++ Shell.qml	2013-08-29 13:56:41 +0000
@@ -19,6 +19,7 @@
  import Ubuntu.Application 0.1
  import Ubuntu.Components 0.1
  import Ubuntu.Gestures 0.1
++import Unity.Launcher 0.1
  import LightDM 0.1 as LightDM
  import Powerd 0.1
  import "Dash"
@@ -465,6 +466,11 @@
+         }
          onUnlocked: greeter.hide()
++        onSelected: {
++            // Update launcher items for new user
++            var user = LightDM.Users.data(uid, LightDM.UserRoles.NameRole);
++            LauncherModel.setUser(user);
++        }
          onLeftTeaserPressedChanged: {
              if (leftTeaserPressed) {
 === modified file 'plugins/AccountsService/com.canonical.unity.AccountsService.xml'
 --- plugins/AccountsService/com.canonical.unity.AccountsService.xml	2013-08-12 18:41:45 +0000
 +++ plugins/AccountsService/com.canonical.unity.AccountsService.xml	2013-08-29 13:56:41 +0000
@@ -6,6 +6,9 @@
      <annotation name="org.freedesktop.Accounts.Authentication.ChangeOwn"
                  value="com.canonical.unity.AccountsService.ModifyOwnUser"/>
++    <annotation name="org.freedesktop.Accounts.Authentication.ReadAny"
++                value="com.canonical.unity.AccountsService.ModifyAnyUser"/>
++
      <annotation name="org.freedesktop.Accounts.Authentication.ChangeAny"
                  value="com.canonical.unity.AccountsService.ModifyAnyUser"/>
@@ -13,5 +16,9 @@
        <annotation name="org.freedesktop.Accounts.DefaultValue" value="true"/>
      </property>
++    <property name="launcher-items" type="aa{sv}" access="readwrite">
++      <annotation name="org.freedesktop.Accounts.DefaultValue" value="[{'defaults': <true>}]"/>
++    </property>
++
    </interface>
  </node>
 === modified file 'plugins/AccountsService/plugin.cpp'
 --- plugins/AccountsService/plugin.cpp	2013-08-22 14:54:08 +0000
 +++ plugins/AccountsService/plugin.cpp	2013-08-29 13:56:41 +0000
@@ -19,6 +19,7 @@
  #include "plugin.h"
  #include "AccountsService.h"
++#include <QDBusMetaType>
  #include <QtQml>
  static QObject *service_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
@@ -31,5 +32,6 @@
  void AccountsServicePlugin::registerTypes(const char *uri)
+ {
      Q_ASSERT(uri == QLatin1String("AccountsService"));
++    qDBusRegisterMetaType<QList<QVariantMap>>();
      qmlRegisterSingletonType<AccountsService>(uri, 0, 1, "AccountsService", service_provider);
+ }
 === modified file 'plugins/Unity/Launcher/CMakeLists.txt'
 --- plugins/Unity/Launcher/CMakeLists.txt	2013-07-16 08:32:38 +0000
 +++ plugins/Unity/Launcher/CMakeLists.txt	2013-08-29 13:56:41 +0000
@@ -1,8 +1,11 @@
  include(FindPkgConfig)
  pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=2)
++add_definitions(-DSM_BUSNAME=systemBus)
++
  include_directories(
      ${CMAKE_CURRENT_SOURCE_DIR}
++    ${CMAKE_SOURCE_DIR}/plugins/AccountsService
+ )
  set(QMLLAUNCHERPLUGIN_SRC
@@ -12,6 +15,7 @@
      quicklistmodel.cpp
      common/quicklistentry.cpp
      backend/launcherbackend.cpp
++    ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsService.cpp
      ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherItemInterface.h
      ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherModelInterface.h
      ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/QuickListModelInterface.h
@@ -21,7 +25,7 @@
      ${QMLLAUNCHERPLUGIN_SRC}
+     )
--qt5_use_modules(UnityLauncher-qml Qml)
++qt5_use_modules(UnityLauncher-qml DBus Qml)
  # export the qmldir and qmltypes files
  export_qmlfiles(Unity.Launcher Unity/Launcher)
 === modified file 'plugins/Unity/Launcher/backend/launcherbackend.cpp'
 --- plugins/Unity/Launcher/backend/launcherbackend.cpp	2013-08-26 18:49:18 +0000
 +++ plugins/Unity/Launcher/backend/launcherbackend.cpp	2013-08-29 13:56:41 +0000
@@ -2,6 +2,7 @@
   * Copyright (C) 2013 Canonical, Ltd.
+  *
   * Authors:
++ *  Michael Terry <michael.terry@canonical.com>
   *  Michael Zanetti <michael.zanetti@canonical.com>
+  *
   * This program is free software; you can redistribute it and/or modify
@@ -17,104 +18,111 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
++#include "AccountsService.h"
  #include "launcherbackend.h"
--#include <QHash>
++#include <QDir>
++#include <QDBusArgument>
++#include <QFileInfo>
--LauncherBackend::LauncherBackend(QObject *parent):
--    QObject(parent)
++LauncherBackend::LauncherBackend(bool useStorage, QObject *parent):
++    QObject(parent),
++    m_accounts(nullptr)
+ {
--
--    // TODO: load default pinned ones from default config, instead of hardcoding here...
--
--    m_storedApps <<
--        QLatin1String("dialer-app.desktop") <<
--        QLatin1String("messaging-app.desktop") <<
--        QLatin1String("address-book-app.desktop") <<
--        QLatin1String("camera-app.desktop") <<
--        QLatin1String("gallery-app.desktop") <<
--        QLatin1String("facebook-webapp.desktop") <<
--        QLatin1String("webbrowser-app.desktop") <<
--        QLatin1String("twitter-webapp.desktop") <<
--        QLatin1String("gmail-webapp.desktop") <<
--        QLatin1String("ubuntu-weather-app.desktop") <<
--        QLatin1String("notes-app.desktop") <<
--        QLatin1String("calendar-app.desktop");
--
--    // TODO: get stuff from desktop files instead this hardcoded map
--    m_displayNameMap.insert("dialer-app.desktop", "Dialer");
--    m_displayNameMap.insert("messaging-app.desktop", "Messaging");
--    m_displayNameMap.insert("address-book-app.desktop", "Contacts");
--    m_displayNameMap.insert("camera-app.desktop", "Camera");
--    m_displayNameMap.insert("gallery-app.desktop", "Gallery");
--    m_displayNameMap.insert("facebook-webapp.desktop", "Facebook");
--    m_displayNameMap.insert("webbrowser-app.desktop", "Browser");
--    m_displayNameMap.insert("twitter-webapp.desktop", "Twitter");
--    m_displayNameMap.insert("gmail-webapp.desktop", "GMail");
--    m_displayNameMap.insert("ubuntu-weather-app.desktop", "Weather");
--    m_displayNameMap.insert("notes-app.desktop", "Notes");
--    m_displayNameMap.insert("calendar-app.desktop", "Calendar");
--
--    // TODO: get stuff from desktop files instead this hardcoded map
--    m_iconMap.insert("dialer-app.desktop", "phone-app");
--    m_iconMap.insert("messaging-app.desktop", "messages-app");
--    m_iconMap.insert("address-book-app.desktop", "contacts-app");
--    m_iconMap.insert("camera-app.desktop", "camera");
--    m_iconMap.insert("gallery-app.desktop", "gallery");
--    m_iconMap.insert("facebook-webapp.desktop", "facebook");
--    m_iconMap.insert("webbrowser-app.desktop", "browser");
--    m_iconMap.insert("twitter-webapp.desktop", "twitter");
--    m_iconMap.insert("gmail-webapp.desktop", "gmail");
--    m_iconMap.insert("ubuntu-weather-app.desktop", "weather");
--    m_iconMap.insert("notes-app.desktop", "notepad");
--    m_iconMap.insert("calendar-app.desktop", "calendar");
--
++    if (useStorage) {
++        m_accounts = new AccountsService(this);
++    }
++    setUser(qgetenv("USER"));
+ }
  LauncherBackend::~LauncherBackend()
+ {
++    clearItems();
++}
++void LauncherBackend::clearItems()
++{
++    for (LauncherBackendItem &app: m_storedApps) {
++        delete app.settings;
++    }
++    m_storedApps.clear();
+ }
  QStringList LauncherBackend::storedApplications() const
+ {
--    return m_storedApps;
++    auto files = QStringList();
++    for (const LauncherBackendItem &app: m_storedApps) {
++        files << app.settings->fileName();
++    }
++    return files;
+ }
  void LauncherBackend::setStoredApplications(const QStringList &appIds)
+ {
--    m_storedApps = appIds;
--    // TODO: Cleanup pinned state from settings for apps not in list any more.
++    // Record all existing pinned apps, so we can notice them in new list
++    auto pinnedItems = QStringList();
++    for (LauncherBackendItem &app: m_storedApps) {
++        if (app.pinned) {
++            pinnedItems.append(app.settings->fileName());
++        }
++    }
++
++    clearItems();
++
++    for (const QString &appId: appIds) {
++        loadApp(makeAppDetails(appId, pinnedItems.contains(desktopFile(appId))));
++    }
++
++    syncToAccounts();
+ }
  QString LauncherBackend::desktopFile(const QString &appId) const
+ {
--    // TODO: return real path instead of this hardcoded one
--    return QLatin1String("/usr/share/applications/") + appId;
++    QFileInfo fileInfo(QDir("/usr/share/applications"), appId);
++    return fileInfo.absoluteFilePath();
+ }
  QString LauncherBackend::displayName(const QString &appId) const
+ {
--    return m_displayNameMap.value(appId);
++    auto desktopFile = parseDesktopFile(appId);
++    auto displayName = desktopFile->value("Desktop Entry/Name").toString();
++    delete desktopFile;
++    return displayName;
+ }
  QString LauncherBackend::icon(const QString &appId) const
+ {
--    return m_iconMap.value(appId);
++    auto desktopFile = parseDesktopFile(appId);
++    auto iconName = desktopFile->value("Desktop Entry/Icon").toString();
++    delete desktopFile;
++
++    if (!iconName.isEmpty()) {
++        QFileInfo iconFileInfo(iconName);
++        if (iconFileInfo.isRelative()) {
++            iconName = "image://gicon/" + iconName;
++        }
++    }
++
++    return iconName;
+ }
  bool LauncherBackend::isPinned(const QString &appId) const
+ {
--    // TODO: return app's pinned state from settings
--    Q_UNUSED(appId)
--    return false;
++    auto index = findItem(appId);
++    if (index < 0) {
++        return false;
++    } else {
++        return m_storedApps[index].pinned;
++    }
+ }
  void LauncherBackend::setPinned(const QString &appId, bool pinned)
+ {
--    // TODO: Store pinned state in settings.
--    Q_UNUSED(appId)
--    Q_UNUSED(pinned)
++    auto index = findItem(appId);
++    if (index >= 0 && !m_storedApps[index].pinned) {
++        m_storedApps[index].pinned = pinned;
++        syncToAccounts();
++    }
+ }
  QList<QuickListEntry> LauncherBackend::quickList(const QString &appId) const
@@ -143,9 +151,111 @@
      return 0;
+ }
++void LauncherBackend::setUser(const QString &username)
++{
++    m_user = username;
++    syncFromAccounts();
++}
++
  void LauncherBackend::triggerQuickListAction(const QString &appId, const QString &quickListId)
+ {
      // TODO: execute the given quicklist action
      Q_UNUSED(appId)
      Q_UNUSED(quickListId)
+ }
++
++void LauncherBackend::syncFromAccounts()
++{
++    QList<QVariantMap> apps;
++    bool defaults = true;
++
++    clearItems();
++
++    if (m_user != "" && m_accounts != nullptr) {
++        auto variant = m_accounts->getUserProperty(m_user, "launcher-items");
++        apps = qdbus_cast<QList<QVariantMap>>(variant.value<QDBusArgument>());
++        defaults = isDefaultsItem(apps);
++    }
++
++    // TODO: load default pinned ones from default config, instead of hardcoding here...
++    if (defaults) {
++        apps <<
++            makeAppDetails("dialer-app.desktop", true) <<
++            makeAppDetails("messaging-app.desktop", true) <<
++            makeAppDetails("address-book-app.desktop", true) <<
++            makeAppDetails("camera-app.desktop", true) <<
++            makeAppDetails("gallery-app.desktop", true) <<
++            makeAppDetails("facebook-webapp.desktop", true) <<
++            makeAppDetails("webbrowser-app.desktop", true) <<
++            makeAppDetails("twitter-webapp.desktop", true) <<
++            makeAppDetails("gmail-webapp.desktop", true) <<
++            makeAppDetails("ubuntu-weather-app.desktop", true) <<
++            makeAppDetails("notes-app.desktop", true) <<
++            makeAppDetails("calendar-app.desktop", true);
++    }
++
++    for (const QVariant &app: apps) {
++        loadApp(app.toMap());
++    }
++}
++
++void LauncherBackend::syncToAccounts()
++{
++    if (m_user != "" && m_accounts != nullptr) {
++        QList<QVariantMap> items;
++
++        for (LauncherBackendItem &app: m_storedApps) {
++            items << makeAppDetails(app.settings->fileName(), app.pinned);
++        }
++
++        m_accounts->setUserProperty(m_user, "launcher-items", QVariant::fromValue(items));
++    }
++}
++
++QSettings *LauncherBackend::parseDesktopFile(const QString &appId) const
++{
++    auto fullAppId = desktopFile(appId);
++    return new QSettings(fullAppId, QSettings::IniFormat);
++}
++
++void LauncherBackend::loadApp(const QVariantMap &details)
++{
++    auto appId = details.value("id").toString();
++    auto isPinned = details.value("is-pinned").toBool();
++
++    if (appId.isEmpty()) {
++        return;
++    }
++
++    LauncherBackendItem item;
++    item.settings = parseDesktopFile(appId);
++    item.pinned = isPinned;
++    m_storedApps.append(item);
++}
++
++QVariantMap LauncherBackend::makeAppDetails(const QString &appId, bool pinned) const
++{
++    QVariantMap details;
++    details.insert("id", appId);
++    details.insert("is-pinned", pinned);
++    return details;
++}
++
++bool LauncherBackend::isDefaultsItem(const QList<QVariantMap> &apps) const
++{
++    // To differentiate between an empty list and a list that hasn't been set
++    // yet (and should thus be populated with the defaults), we use a special
++    // list of one item with the 'defaults' field set to true.
++    return (apps.size() == 1 && apps[0].value("defaults").toBool());
++}
++
++int LauncherBackend::findItem(const QString &appId) const
++{
++    auto fullAppId = desktopFile(appId);
++    for (int i = 0; i < m_storedApps.size(); ++i) {
++        if (m_storedApps[i].settings->fileName() == fullAppId) {
++            return i;
++        }
++    }
++    return -1;
++}
 === modified file 'plugins/Unity/Launcher/backend/launcherbackend.h'
 --- plugins/Unity/Launcher/backend/launcherbackend.h	2013-07-09 20:33:13 +0000
 +++ plugins/Unity/Launcher/backend/launcherbackend.h	2013-08-29 13:56:41 +0000
@@ -22,8 +22,10 @@
  #include "common/quicklistentry.h"
  #include <QObject>
++#include <QSettings>
  #include <QStringList>
--#include <QHash>
++
++class AccountsService;
  /**
    * @brief An interface that provides all the data needed by the launcher.
@@ -35,7 +37,7 @@
  public:
--    LauncherBackend(QObject *parent = 0);
++    LauncherBackend(bool useStorage = true, QObject *parent = 0);
      virtual ~LauncherBackend();
      /**
@@ -57,12 +59,18 @@
      /**
        * @brief Get the full path to the .desktop file.
++      *
++      * The application does not need to be in the list of stored applications.
++      *
        * @returns The full path to the .dekstop file.
        */
      QString desktopFile(const QString &appId) const;
      /**
        * @brief Get the user friendly name of an application.
++      *
++      * The application does not need to be in the list of stored applications.
++      *
        * @param appId The ID of the application.
        * @returns The user friendly name of the application.
        */
@@ -70,6 +78,9 @@
      /**
        * @brief Get the icon of an application.
++      *
++      * The application does not need to be in the list of stored applications.
++      *
        * @param appId The ID of the application.
        * @returns The full path to the icon for the application.
        */
@@ -118,15 +129,37 @@
        */
      int count(const QString &appId) const;
++    /**
++      * @brief Sets the username for which to look up launcher items.
++      * @param username The username to use.
++      */
++    void setUser(const QString &username);
++
  Q_SIGNALS:
      void quickListChanged(const QString &appId, const QList<QuickListEntry> &quickList);
      void progressChanged(const QString &appId, int progress);
      void countChanged(const QString &appId, int count);
  private:
--    QStringList m_storedApps;
--    QHash<QString, QString> m_displayNameMap;
--    QHash<QString, QString> m_iconMap;
++    QSettings *parseDesktopFile(const QString &appId) const;
++    QVariantMap makeAppDetails(const QString &appId, bool pinned) const;
++    void loadApp(const QVariantMap &details);
++    int findItem(const QString &appId) const;
++    bool isDefaultsItem(const QList<QVariantMap> &apps) const;
++    void syncFromAccounts();
++    void syncToAccounts();
++    void clearItems();
++
++    class LauncherBackendItem
++    {
++    public:
++        QSettings *settings;
++        bool pinned;
++    };
++
++    QList<LauncherBackendItem> m_storedApps;
++    AccountsService *m_accounts;
++    QString m_user;
  };
  #endif // LAUNCHERBACKEND_H
 === modified file 'plugins/Unity/Launcher/launchermodel.cpp'
 --- plugins/Unity/Launcher/launchermodel.cpp	2013-08-23 10:25:00 +0000
 +++ plugins/Unity/Launcher/launchermodel.cpp	2013-08-29 13:56:41 +0000
@@ -23,7 +23,7 @@
  LauncherModel::LauncherModel(QObject *parent):
      LauncherModelInterface(parent),
--    m_backend(new LauncherBackend(this))
++    m_backend(new LauncherBackend(true, this))
+ {
      connect(m_backend, SIGNAL(countChanged(QString,int)), SLOT(countChanged(QString,int)));
      connect(m_backend, SIGNAL(progressChanged(QString,int)), SLOT(progressChanged(QString,int)));
@@ -123,6 +123,7 @@
      if (currentIndex >= 0) {
          if (index == -1 || index == currentIndex) {
              m_list.at(currentIndex)->setPinned(true);
++            m_backend->setPinned(appId, true);
              QModelIndex modelIndex = this->index(currentIndex);
              Q_EMIT dataChanged(modelIndex, modelIndex);
          } else {
@@ -138,6 +139,7 @@
                                                m_backend->displayName(appId),
                                                m_backend->icon(appId));
          item->setPinned(true);
++        m_backend->setPinned(appId, true);
          m_list.insert(index, item);
          endInsertRows();
+     }
@@ -186,8 +188,7 @@
  void LauncherModel::setUser(const QString &username)
+ {
--    Q_UNUSED(username)
--    // TODO: Implement this...
++    m_backend->setUser(username);
+ }
  void LauncherModel::storeAppList()
 === modified file 'plugins/Unity/Launcher/launchermodel.h'
 --- plugins/Unity/Launcher/launchermodel.h	2013-08-23 10:25:00 +0000
 +++ plugins/Unity/Launcher/launchermodel.h	2013-08-29 13:56:41 +0000
@@ -17,7 +17,7 @@
   *      Michael Zanetti <michael.zanetti@canonical.com>
   */
--#ifndef LAUNCHERMODELH
++#ifndef LAUNCHERMODEL_H
  #define LAUNCHERMODEL_H
  // unity-api
 === modified file 'tests/mocks/Unity/Launcher/CMakeLists.txt'
 --- tests/mocks/Unity/Launcher/CMakeLists.txt	2013-07-10 17:13:28 +0000
 +++ tests/mocks/Unity/Launcher/CMakeLists.txt	2013-08-29 13:56:41 +0000
@@ -1,6 +1,8 @@
  include(FindPkgConfig)
  pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=2)
++add_definitions(-DTOP_SRCDIR="${CMAKE_SOURCE_DIR}")
++
  include_directories(
      ${CMAKE_CURRENT_SOURCE_DIR}
+ )
 === modified file 'tests/mocks/Unity/Launcher/MockLauncherItem.cpp'
 --- tests/mocks/Unity/Launcher/MockLauncherItem.cpp	2013-08-20 17:39:58 +0000
 +++ tests/mocks/Unity/Launcher/MockLauncherItem.cpp	2013-08-29 13:56:41 +0000
@@ -27,7 +27,7 @@
      m_appId(appId),
      m_desktopFile(desktopFile),
      m_name(name),
--    m_icon(icon),
++    m_icon(TOP_SRCDIR "/graphics/applicationIcons/" + icon + ".png"),
      m_pinned(false),
      m_running(false),
      m_recent(false),
 === modified file 'tests/plugins/Unity/CMakeLists.txt'
 --- tests/plugins/Unity/CMakeLists.txt	2013-07-12 08:37:48 +0000
 +++ tests/plugins/Unity/CMakeLists.txt	2013-08-29 13:56:41 +0000
@@ -1,4 +1,5 @@
  add_subdirectory(Indicators)
++add_subdirectory(Launcher)
  pkg_check_modules(UNITYCORE REQUIRED unity-core-6.0)
  pkg_check_modules(LIBUNITYPROTO REQUIRED unity-protocol-private)
 === added directory 'tests/plugins/Unity/Launcher'
 === added file 'tests/plugins/Unity/Launcher/CMakeLists.txt'
 --- tests/plugins/Unity/Launcher/CMakeLists.txt	1970-01-01 00:00:00 +0000
 +++ tests/plugins/Unity/Launcher/CMakeLists.txt	2013-08-29 13:56:41 +0000
@@ -0,0 +1,22 @@
++include_directories(
++    ${CMAKE_CURRENT_BINARY_DIR}
++    ${CMAKE_SOURCE_DIR}/plugins/AccountsService
++    ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher
++    ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/backend
++    )
++
++add_definitions(-DSM_BUSNAME=sessionBus)
++add_definitions(-DSRCDIR="${CMAKE_CURRENT_SOURCE_DIR}")
++
++set(testCommand ${CMAKE_CURRENT_BINARY_DIR}/launcherbackendtestExec
++      -o ${CMAKE_BINARY_DIR}/launcherbackendtest.xml,xunitxml
++      -o -,txt)
++add_test(NAME launcherbackendtest COMMAND ${testCommand})
++add_custom_target(launcherbackendtest ${testCommand})
++add_executable(launcherbackendtestExec
++    launcherbackendtest.cpp
++    ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsService.cpp
++    ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/backend/launcherbackend.cpp
++    ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/common/quicklistentry.cpp
++    )
++qt5_use_modules(launcherbackendtestExec Test Core DBus)
 === added file 'tests/plugins/Unity/Launcher/abs-icon.desktop'
 --- tests/plugins/Unity/Launcher/abs-icon.desktop	1970-01-01 00:00:00 +0000
 +++ tests/plugins/Unity/Launcher/abs-icon.desktop	2013-08-29 13:56:41 +0000
@@ -0,0 +1,3 @@
++[Desktop Entry]
++Name=Absolute Icon
++Icon=/path/to/icon.png
 === added file 'tests/plugins/Unity/Launcher/launcherbackendtest.cpp'
 --- tests/plugins/Unity/Launcher/launcherbackendtest.cpp	1970-01-01 00:00:00 +0000
 +++ tests/plugins/Unity/Launcher/launcherbackendtest.cpp	2013-08-29 13:56:41 +0000
@@ -0,0 +1,94 @@
++/*
++ * Copyright 2013 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/>.
++ *
++ * Authors:
++ *      Michael Terry <michael.terry@canonical.com>
++ */
++
++#include "launcherbackend.h"
++
++#include <QtTest>
++#include <QDebug>
++
++class LauncherBackendTest : public QObject
++{
++    Q_OBJECT
++
++private Q_SLOTS:
++    void testFileNames()
++    {
++        LauncherBackend backend(false);
++
++        backend.setStoredApplications(QStringList() << "relative.path" << "/full/path");
++        QCOMPARE(backend.storedApplications(), QStringList() << "/usr/share/applications/relative.path" << "/full/path");
++
++        QCOMPARE(backend.desktopFile("one.desktop"), QString("/usr/share/applications/one.desktop"));
++        QCOMPARE(backend.desktopFile("two"), QString("/usr/share/applications/two"));
++        QCOMPARE(backend.desktopFile("/full"), QString("/full"));
++
++        QCOMPARE(backend.desktopFile("/usr/share/applications/one.desktop"), QString("/usr/share/applications/one.desktop"));
++    }
++
++    void testDesktopReading()
++    {
++        LauncherBackend backend(false);
++
++        QCOMPARE(backend.displayName(SRCDIR "/rel-icon.desktop"), QString("Relative Icon"));
++        QCOMPARE(backend.icon(SRCDIR "/rel-icon.desktop"), QString("image://gicon/rel-icon"));
++
++        QCOMPARE(backend.displayName(SRCDIR "/abs-icon.desktop"), QString("Absolute Icon"));
++        QCOMPARE(backend.icon(SRCDIR "/abs-icon.desktop"), QString("/path/to/icon.png"));
++
++        QCOMPARE(backend.displayName(SRCDIR "/no-icon.desktop"), QString("No Icon"));
++        QCOMPARE(backend.icon(SRCDIR "/no-icon.desktop"), QString(""));
++
++        QCOMPARE(backend.displayName(SRCDIR "/no-name.desktop"), QString(""));
++        QCOMPARE(backend.icon(SRCDIR "/no-name.desktop"), QString("image://gicon/no-name"));
++
++        QCOMPARE(backend.displayName(SRCDIR "/no-exist.desktop"), QString(""));
++        QCOMPARE(backend.icon(SRCDIR "/no-exist.desktop"), QString(""));
++    }
++
++    void testPinning()
++    {
++        LauncherBackend backend(false);
++
++        // Confirm that default entries are all pinned
++        auto defaultApps = backend.storedApplications();
++        QVERIFY(defaultApps.size() > 0);
++        for (auto app: defaultApps) {
++            QCOMPARE(backend.isPinned(app), true);
++        }
++
++        backend.setStoredApplications(QStringList() << "one" << "two");
++        QCOMPARE(backend.isPinned("one"), false);
++        QCOMPARE(backend.isPinned("two"), false);
++
++        backend.setPinned("two", true);
++        QCOMPARE(backend.isPinned("two"), true);
++
++        backend.setStoredApplications(QStringList() << "one" << "two" << "three");
++        QCOMPARE(backend.isPinned("two"), true);
++        QCOMPARE(backend.isPinned("three"), false);
++
++        backend.setPinned("three", true);
++        backend.setStoredApplications(QStringList() << "one" << "two");
++        QCOMPARE(backend.isPinned("two"), true);
++        QCOMPARE(backend.isPinned("three"), false); // doesn't exist anymore!
++    }
++};
++
++QTEST_GUILESS_MAIN(LauncherBackendTest)
++#include "launcherbackendtest.moc"
 === added file 'tests/plugins/Unity/Launcher/no-icon.desktop'
 --- tests/plugins/Unity/Launcher/no-icon.desktop	1970-01-01 00:00:00 +0000
 +++ tests/plugins/Unity/Launcher/no-icon.desktop	2013-08-29 13:56:41 +0000
@@ -0,0 +1,2 @@
++[Desktop Entry]
++Name=No Icon
 === added file 'tests/plugins/Unity/Launcher/no-name.desktop'
 --- tests/plugins/Unity/Launcher/no-name.desktop	1970-01-01 00:00:00 +0000
 +++ tests/plugins/Unity/Launcher/no-name.desktop	2013-08-29 13:56:41 +0000
@@ -0,0 +1,2 @@
++[Desktop Entry]
++Icon=no-name
 === added file 'tests/plugins/Unity/Launcher/rel-icon.desktop'
 --- tests/plugins/Unity/Launcher/rel-icon.desktop	1970-01-01 00:00:00 +0000
 +++ tests/plugins/Unity/Launcher/rel-icon.desktop	2013-08-29 13:56:41 +0000
@@ -0,0 +1,3 @@
++[Desktop Entry]
++Name=Relative Icon
++Icon=rel-icon