@@ -24,6 +24,18 @@
2424#include <QDir>
2525#include <QDBusArgument>
2626#include <QFileInfo>
27+#include <QGSettings>
28+
29+class LauncherBackendItem
30+{
31+public:
32+ LauncherBackendItem(): pinned(false) {}
33+
34+ QString desktopFile;
35+ QString displayName;
36+ QString icon;
37+ bool pinned;
38+};
2739
2840LauncherBackend::LauncherBackend(bool useStorage, QObject *parent):
2941 QObject(parent),
@@ -32,95 +44,109 @@ LauncherBackend::LauncherBackend(bool useStorage, QObject *parent):
3244 if (useStorage) {
3345 m_accounts = new AccountsService(this);
3446 }
35− setUser(qgetenv("USER"));
47+ m_user = qgetenv("USER");
48+ syncFromAccounts();
3649}
3750
3851LauncherBackend::~LauncherBackend()
3952{
40− clearItems();
41−}
53+ m_storedApps.clear();
4254
43−void LauncherBackend::clearItems()
44−{
45− for (LauncherBackendItem &app: m_storedApps) {
46− delete app.settings;
55+ Q_FOREACH(LauncherBackendItem *item, m_itemCache) {
56+ delete item;
4757 }
48− m_storedApps.clear();
58+ m_itemCache.clear();
4959}
5060
5161QStringList LauncherBackend::storedApplications() const
5262{
53− auto files = QStringList();
54− for (const LauncherBackendItem &app: m_storedApps) {
55− files << app.settings->fileName();
56− }
57− return files;
63+ return m_storedApps;
5864}
5965
6066void LauncherBackend::setStoredApplications(const QStringList &appIds)
6167{
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());
68+ if (appIds.count() < m_storedApps.count()) {
69+ Q_FOREACH(const QString &appId, m_storedApps) {
70+ if (!appIds.contains(appId)) {
71+ delete m_itemCache.take(appId);
72+ }
6773 }
6874 }
69−
70− clearItems();
71−
72− for (const QString &appId: appIds) {
73− loadApp(makeAppDetails(appId, pinnedItems.contains(desktopFile(appId))));
74− }
75−
75+ m_storedApps = appIds;
7676 syncToAccounts();
7777}
7878
7979QString LauncherBackend::desktopFile(const QString &appId) const
8080{
81− QFileInfo fileInfo(QDir("/usr/share/applications"), appId);
82− return fileInfo.absoluteFilePath();
81+ LauncherBackendItem *item = m_itemCache.value(appId);
82+ if (item) {
83+ return item->desktopFile;
84+ }
85+
86+ return findDesktopFile(appId);
8387}
8488
8589QString LauncherBackend::displayName(const QString &appId) const
8690{
87− auto desktopFile = parseDesktopFile(appId);
88− auto displayName = desktopFile->value("Desktop Entry/Name").toString();
89− delete desktopFile;
90− return displayName;
91+ LauncherBackendItem *item = m_itemCache.value(appId);
92+ if (item) {
93+ return item->displayName;
94+ }
95+
96+ QString df = findDesktopFile(appId);
97+ if (!df.isEmpty()) {
98+ LauncherBackendItem *item = parseDesktopFile(df);
99+ m_itemCache.insert(appId, item);
100+ return item->displayName;
101+ }
102+
103+ return QString();
91104}
92105
93106QString LauncherBackend::icon(const QString &appId) const
94107{
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://theme/" + iconName;
108+ QString iconName;
109+ LauncherBackendItem *item = m_itemCache.value(appId);
110+ if (item) {
111+ iconName = item->icon;
112+ } else {
113+ QString df = findDesktopFile(appId);
114+ if (!df.isEmpty()) {
115+ LauncherBackendItem *item = parseDesktopFile(df);
116+ m_itemCache.insert(appId, item);
117+ iconName = item->icon;
103118 }
104119 }
105120
106− return iconName;
121+ QFileInfo info(iconName);
122+ if (info.exists()) {
123+ return info.absoluteFilePath();
124+ }
125+ return "image://theme/" + iconName;
107126}
108127
109128bool LauncherBackend::isPinned(const QString &appId) const
110129{
111− auto index = findItem(appId);
112− if (index < 0) {
113− return false;
114− } else {
115− return m_storedApps[index].pinned;
130+ LauncherBackendItem *item = m_itemCache.value(appId);
131+ if (item) {
132+ return item->pinned;
116133 }
134+ return false;
117135}
118136
119137void LauncherBackend::setPinned(const QString &appId, bool pinned)
120138{
121− auto index = findItem(appId);
122− if (index >= 0 && !m_storedApps[index].pinned) {
123− m_storedApps[index].pinned = pinned;
139+ if (!m_storedApps.contains(appId)) {
140+ return;
141+ }
142+
143+ LauncherBackendItem *item = m_itemCache.value(appId);
144+ if (!item) {
145+ item = new LauncherBackendItem();
146+ m_itemCache.insert(appId, item);
147+ }
148+ if (item->pinned != pinned) {
149+ item->pinned = pinned;
124150 syncToAccounts();
125151 }
126152}
@@ -153,8 +179,10 @@ int LauncherBackend::count(const QString &appId) const
153179
154180void LauncherBackend::setUser(const QString &username)
155181{
156− m_user = username;
157− syncFromAccounts();
182+ if (qgetenv("USER") == "lightdm" && m_user != username) {
183+ m_user = username;
184+ syncFromAccounts();
185+ }
158186}
159187
160188void LauncherBackend::triggerQuickListAction(const QString &appId, const QString &quickListId)
@@ -169,75 +197,118 @@ void LauncherBackend::syncFromAccounts()
169197 QList<QVariantMap> apps;
170198 bool defaults = true;
171199
172− clearItems();
200+ m_storedApps.clear();
173201
174− if (m_user != "" && m_accounts != nullptr) {
175− auto variant = m_accounts->getUserProperty(m_user, "launcher-items");
202+ if (m_accounts && m_user.isEmpty()) {
203+ QVariant variant = m_accounts->getUserProperty(m_user, "launcher-items");
176204 apps = qdbus_cast<QList<QVariantMap>>(variant.value<QDBusArgument>());
177205 defaults = isDefaultsItem(apps);
178206 }
179207
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());
208+ if (m_accounts && defaults) { // Checking accounts as it'll be null when !useStorage
209+ QGSettings gSettings("com.canonical.Unity.Launcher", "/com/canonical/unity/launcher/");
210+ Q_FOREACH(const QString &entry, gSettings.get("favorites").toStringList()) {
211+ if (entry.startsWith("application://")) {
212+ QString appId = entry;
213+ appId.remove("application://");
214+ QString df = findDesktopFile(appId);
215+
216+ if (!df.isEmpty()) {
217+ m_storedApps << appId;
218+
219+ if (!m_itemCache.contains(appId)) {
220+ m_itemCache.insert(appId, parseDesktopFile(df));
221+ }
222+ m_itemCache.value(appId)->pinned = true;
223+ }
224+ }
225+ }
226+ } else {
227+ for (const QVariant &app: apps) {
228+ loadFromVariant(app.toMap());
229+ }
199230 }
200231}
201232
202233void LauncherBackend::syncToAccounts()
203234{
204− if (m_user != "" && m_accounts != nullptr) {
235+ if (m_accounts && !m_user.isEmpty()) {
205236 QList<QVariantMap> items;
206237
207− for (LauncherBackendItem &app: m_storedApps) {
208− items << makeAppDetails(app.settings->fileName(), app.pinned);
238+ Q_FOREACH(const QString &appId, m_storedApps) {
239+ items << itemToVariant(appId);
209240 }
210241
211242 m_accounts->setUserProperty(m_user, "launcher-items", QVariant::fromValue(items));
212243 }
213244}
214245
215−QSettings *LauncherBackend::parseDesktopFile(const QString &appId) const
246+QString LauncherBackend::findDesktopFile(const QString &appId) const
216247{
217− auto fullAppId = desktopFile(appId);
218− return new QSettings(fullAppId, QSettings::IniFormat);
248+ int dashPos = -1;
249+ QString helper = appId;
250+
251+ do {
252+ if (dashPos != -1) {
253+ helper = helper.replace(dashPos, 1, '/');
254+ }
255+
256+ QFileInfo fileInfo(QDir("/usr/share/applications"), helper);
257+ if (fileInfo.exists()) {
258+ return fileInfo.absoluteFilePath();
259+ }
260+
261+ dashPos = helper.indexOf("-");
262+ } while (dashPos != -1);
263+
264+ return QString();
219265}
220266
221−void LauncherBackend::loadApp(const QVariantMap &details)
267+LauncherBackendItem* LauncherBackend::parseDesktopFile(const QString &desktopFile) const
222268{
223− auto appId = details.value("id").toString();
224− auto isPinned = details.value("is-pinned").toBool();
269+ QSettings settings(desktopFile, QSettings::IniFormat);
270+
225271
226− if (appId.isEmpty()) {
272+ LauncherBackendItem* item = new LauncherBackendItem();
273+ item->desktopFile = desktopFile;
274+ item->displayName = settings.value("Desktop Entry/Name").toString();
275+ item->icon = settings.value("Desktop Entry/Icon").toString();
276+ item->pinned = false;
277+ return item;
278+}
279+
280+void LauncherBackend::loadFromVariant(const QVariantMap &details)
281+{
282+ if (!details.contains("id")) {
227283 return;
228284 }
285+ QString appId = details.value("id").toString();
286+
287+ LauncherBackendItem *item = m_itemCache.value(appId);
288+ if (item) {
289+ delete item;
290+ }
291+
292+ item = new LauncherBackendItem();
293+
294+ item->desktopFile = details.value("desktopFile").toString();
295+ item->displayName = details.value("name").toString();
296+ item->icon = details.value("icon").toString();
297+ item->pinned = details.value("is-pinned").toBool();
229298
230− LauncherBackendItem item;
231− item.settings = parseDesktopFile(appId);
232− item.pinned = isPinned;
233− m_storedApps.append(item);
299+ m_itemCache.insert(appId, item);
300+ m_storedApps.append(appId);
234301}
235302
236−QVariantMap LauncherBackend::makeAppDetails(const QString &appId, bool pinned) const
303+QVariantMap LauncherBackend::itemToVariant(const QString &appId) const
237304{
305+ LauncherBackendItem *item = m_itemCache.value(appId);
238306 QVariantMap details;
239307 details.insert("id", appId);
240− details.insert("is-pinned", pinned);
308+ details.insert("name", item->displayName);
309+ details.insert("icon", item->icon);
310+ details.insert("desktopFile", item->desktopFile);
311+ details.insert("is-pinned", item->pinned);
241312 return details;
242313}
243314
@@ -248,14 +319,3 @@ bool LauncherBackend::isDefaultsItem(const QList<QVariantMap> &apps) const
248319 // list of one item with the 'defaults' field set to true.
249320 return (apps.size() == 1 && apps[0].value("defaults").toBool());
250321}
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−}