@@ -2,6 +2,7 @@
22 * Copyright (C) 2013 Canonical, Ltd.
33 *
44 * Authors:
5+ * Michael Terry <michael.terry@canonical.com>
56 * Michael Zanetti <michael.zanetti@canonical.com>
67 *
78 * This program is free software; you can redistribute it and/or modify
@@ -17,104 +18,111 @@
1718 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1819 */
1920
21+#include "AccountsService.h"
2022#include "launcherbackend.h"
2123
22−#include <QHash>
24+#include <QDir>
25+#include <QDBusArgument>
26+#include <QFileInfo>
2327
24−LauncherBackend::LauncherBackend(QObject *parent):
25− QObject(parent)
28+LauncherBackend::LauncherBackend(bool useStorage, QObject *parent):
29+ QObject(parent),
30+ m_accounts(nullptr)
2631{
27−
28− // TODO: load default pinned ones from default config, instead of hardcoding here...
29−
30− m_storedApps <<
31− QLatin1String("dialer-app.desktop") <<
32− QLatin1String("messaging-app.desktop") <<
33− QLatin1String("address-book-app.desktop") <<
34− QLatin1String("camera-app.desktop") <<
35− QLatin1String("gallery-app.desktop") <<
36− QLatin1String("facebook-webapp.desktop") <<
37− QLatin1String("webbrowser-app.desktop") <<
38− QLatin1String("twitter-webapp.desktop") <<
39− QLatin1String("gmail-webapp.desktop") <<
40− QLatin1String("ubuntu-weather-app.desktop") <<
41− QLatin1String("notes-app.desktop") <<
42− QLatin1String("calendar-app.desktop");
43−
44− // TODO: get stuff from desktop files instead this hardcoded map
45− m_displayNameMap.insert("dialer-app.desktop", "Dialer");
46− m_displayNameMap.insert("messaging-app.desktop", "Messaging");
47− m_displayNameMap.insert("address-book-app.desktop", "Contacts");
48− m_displayNameMap.insert("camera-app.desktop", "Camera");
49− m_displayNameMap.insert("gallery-app.desktop", "Gallery");
50− m_displayNameMap.insert("facebook-webapp.desktop", "Facebook");
51− m_displayNameMap.insert("webbrowser-app.desktop", "Browser");
52− m_displayNameMap.insert("twitter-webapp.desktop", "Twitter");
53− m_displayNameMap.insert("gmail-webapp.desktop", "GMail");
54− m_displayNameMap.insert("ubuntu-weather-app.desktop", "Weather");
55− m_displayNameMap.insert("notes-app.desktop", "Notes");
56− m_displayNameMap.insert("calendar-app.desktop", "Calendar");
57−
58− // TODO: get stuff from desktop files instead this hardcoded map
59− m_iconMap.insert("dialer-app.desktop", "phone-app");
60− m_iconMap.insert("messaging-app.desktop", "messages-app");
61− m_iconMap.insert("address-book-app.desktop", "contacts-app");
62− m_iconMap.insert("camera-app.desktop", "camera");
63− m_iconMap.insert("gallery-app.desktop", "gallery");
64− m_iconMap.insert("facebook-webapp.desktop", "facebook");
65− m_iconMap.insert("webbrowser-app.desktop", "browser");
66− m_iconMap.insert("twitter-webapp.desktop", "twitter");
67− m_iconMap.insert("gmail-webapp.desktop", "gmail");
68− m_iconMap.insert("ubuntu-weather-app.desktop", "weather");
69− m_iconMap.insert("notes-app.desktop", "notepad");
70− m_iconMap.insert("calendar-app.desktop", "calendar");
71−
32+ if (useStorage) {
33+ m_accounts = new AccountsService(this);
34+ }
35+ setUser(qgetenv("USER"));
7236}
7337
7438LauncherBackend::~LauncherBackend()
7539{
40+ clearItems();
41+}
7642
43+void LauncherBackend::clearItems()
44+{
45+ for (LauncherBackendItem &app: m_storedApps) {
46+ delete app.settings;
47+ }
48+ m_storedApps.clear();
7749}
7850
7951QStringList LauncherBackend::storedApplications() const
8052{
81− return m_storedApps;
53+ auto files = QStringList();
54+ for (const LauncherBackendItem &app: m_storedApps) {
55+ files << app.settings->fileName();
56+ }
57+ return files;
8258}
8359
8460void LauncherBackend::setStoredApplications(const QStringList &appIds)
8561{
86− m_storedApps = appIds;
87− // TODO: Cleanup pinned state from settings for apps not in list any more.
62+ // Record all existing pinned apps, so we can notice them in new list
63+ auto pinnedItems = QStringList();
64+ for (LauncherBackendItem &app: m_storedApps) {
65+ if (app.pinned) {
66+ pinnedItems.append(app.settings->fileName());
67+ }
68+ }
69+
70+ clearItems();
71+
72+ for (const QString &appId: appIds) {
73+ loadApp(makeAppDetails(appId, pinnedItems.contains(desktopFile(appId))));
74+ }
75+
76+ syncToAccounts();
8877}
8978
9079QString LauncherBackend::desktopFile(const QString &appId) const
9180{
92− // TODO: return real path instead of this hardcoded one
93− return QLatin1String("/usr/share/applications/") + appId;
81+ QFileInfo fileInfo(QDir("/usr/share/applications"), appId);
82+ return fileInfo.absoluteFilePath();
9483}
9584
9685QString LauncherBackend::displayName(const QString &appId) const
9786{
98− return m_displayNameMap.value(appId);
87+ auto desktopFile = parseDesktopFile(appId);
88+ auto displayName = desktopFile->value("Desktop Entry/Name").toString();
89+ delete desktopFile;
90+ return displayName;
9991}
10092
10193QString LauncherBackend::icon(const QString &appId) const
10294{
103− return m_iconMap.value(appId);
95+ auto desktopFile = parseDesktopFile(appId);
96+ auto iconName = desktopFile->value("Desktop Entry/Icon").toString();
97+ delete desktopFile;
98+
99+ if (!iconName.isEmpty()) {
100+ QFileInfo iconFileInfo(iconName);
101+ if (iconFileInfo.isRelative()) {
102+ iconName = "image://gicon/" + iconName;
103+ }
104+ }
105+
106+ return iconName;
104107}
105108
106109bool LauncherBackend::isPinned(const QString &appId) const
107110{
108− // TODO: return app's pinned state from settings
109− Q_UNUSED(appId)
110− return false;
111+ auto index = findItem(appId);
112+ if (index < 0) {
113+ return false;
114+ } else {
115+ return m_storedApps[index].pinned;
116+ }
111117}
112118
113119void LauncherBackend::setPinned(const QString &appId, bool pinned)
114120{
115− // TODO: Store pinned state in settings.
116− Q_UNUSED(appId)
117− Q_UNUSED(pinned)
121+ auto index = findItem(appId);
122+ if (index >= 0 && !m_storedApps[index].pinned) {
123+ m_storedApps[index].pinned = pinned;
124+ syncToAccounts();
125+ }
118126}
119127
120128QList<QuickListEntry> LauncherBackend::quickList(const QString &appId) const
@@ -143,9 +151,111 @@ int LauncherBackend::count(const QString &appId) const
143151 return 0;
144152}
145153
154+void LauncherBackend::setUser(const QString &username)
155+{
156+ m_user = username;
157+ syncFromAccounts();
158+}
159+
146160void LauncherBackend::triggerQuickListAction(const QString &appId, const QString &quickListId)
147161{
148162 // TODO: execute the given quicklist action
149163 Q_UNUSED(appId)
150164 Q_UNUSED(quickListId)
151165}
166+
167+void LauncherBackend::syncFromAccounts()
168+{
169+ QList<QVariantMap> apps;
170+ bool defaults = true;
171+
172+ clearItems();
173+
174+ if (m_user != "" && m_accounts != nullptr) {
175+ auto variant = m_accounts->getUserProperty(m_user, "launcher-items");
176+ apps = qdbus_cast<QList<QVariantMap>>(variant.value<QDBusArgument>());
177+ defaults = isDefaultsItem(apps);
178+ }
179+
180+ // TODO: load default pinned ones from default config, instead of hardcoding here...
181+ if (defaults) {
182+ apps <<
183+ makeAppDetails("dialer-app.desktop", true) <<
184+ makeAppDetails("messaging-app.desktop", true) <<
185+ makeAppDetails("address-book-app.desktop", true) <<
186+ makeAppDetails("camera-app.desktop", true) <<
187+ makeAppDetails("gallery-app.desktop", true) <<
188+ makeAppDetails("facebook-webapp.desktop", true) <<
189+ makeAppDetails("webbrowser-app.desktop", true) <<
190+ makeAppDetails("twitter-webapp.desktop", true) <<
191+ makeAppDetails("gmail-webapp.desktop", true) <<
192+ makeAppDetails("ubuntu-weather-app.desktop", true) <<
193+ makeAppDetails("notes-app.desktop", true) <<
194+ makeAppDetails("calendar-app.desktop", true);
195+ }
196+
197+ for (const QVariant &app: apps) {
198+ loadApp(app.toMap());
199+ }
200+}
201+
202+void LauncherBackend::syncToAccounts()
203+{
204+ if (m_user != "" && m_accounts != nullptr) {
205+ QList<QVariantMap> items;
206+
207+ for (LauncherBackendItem &app: m_storedApps) {
208+ items << makeAppDetails(app.settings->fileName(), app.pinned);
209+ }
210+
211+ m_accounts->setUserProperty(m_user, "launcher-items", QVariant::fromValue(items));
212+ }
213+}
214+
215+QSettings *LauncherBackend::parseDesktopFile(const QString &appId) const
216+{
217+ auto fullAppId = desktopFile(appId);
218+ return new QSettings(fullAppId, QSettings::IniFormat);
219+}
220+
221+void LauncherBackend::loadApp(const QVariantMap &details)
222+{
223+ auto appId = details.value("id").toString();
224+ auto isPinned = details.value("is-pinned").toBool();
225+
226+ if (appId.isEmpty()) {
227+ return;
228+ }
229+
230+ LauncherBackendItem item;
231+ item.settings = parseDesktopFile(appId);
232+ item.pinned = isPinned;
233+ m_storedApps.append(item);
234+}
235+
236+QVariantMap LauncherBackend::makeAppDetails(const QString &appId, bool pinned) const
237+{
238+ QVariantMap details;
239+ details.insert("id", appId);
240+ details.insert("is-pinned", pinned);
241+ return details;
242+}
243+
244+bool LauncherBackend::isDefaultsItem(const QList<QVariantMap> &apps) const
245+{
246+ // To differentiate between an empty list and a list that hasn't been set
247+ // yet (and should thus be populated with the defaults), we use a special
248+ // list of one item with the 'defaults' field set to true.
249+ return (apps.size() == 1 && apps[0].value("defaults").toBool());
250+}
251+
252+int LauncherBackend::findItem(const QString &appId) const
253+{
254+ auto fullAppId = desktopFile(appId);
255+ for (int i = 0; i < m_storedApps.size(); ++i) {
256+ if (m_storedApps[i].settings->fileName() == fullAppId) {
257+ return i;
258+ }
259+ }
260+ return -1;
261+}