git.iko.soy/unity8
on xenial help sign in
make the launcher model update on dconf changes
eb180d1Michael Zanetti
plugins/Unity/Launcher/desktopfilehandler.cpp+2−1
compare with xenial
unifiedsplit
@@ -24,6 +24,7 @@
24#include <QDir>
24#include <QDir>
25#include <QSettings>
25#include <QSettings>
26#include <QLocale>
26#include <QLocale>
27+#include <QDebug>
27
28
28#include <libintl.h>
29#include <libintl.h>
29
30
@@ -70,7 +71,7 @@ void DesktopFileHandler::load()
70
71
71 QStringList searchDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation);
72 QStringList searchDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation);
72#ifdef LAUNCHER_TESTING
73#ifdef LAUNCHER_TESTING
73− searchDirs << "";
74+ searchDirs << ".";
74#endif
75#endif
75
76
76 QString path;
77 QString path;
plugins/Unity/Launcher/gsettings.cpp+11−7
@@ -19,22 +19,20 @@
19
19
20#include "gsettings.h"
20#include "gsettings.h"
21
21
22−#include <QGSettings>
23#include <QVariant>
22#include <QVariant>
24
23
25GSettings::GSettings(QObject *parent):
24GSettings::GSettings(QObject *parent):
26 QObject(parent)
25 QObject(parent)
27{
26{
28−
27+ m_gSettings = new QGSettings("com.canonical.Unity.Launcher", "/com/canonical/unity/launcher/", this);
28+ connect(m_gSettings, &QGSettings::changed, this, &GSettings::settingsChanged);
29}
29}
30
30
31QStringList GSettings::storedApplications() const
31QStringList GSettings::storedApplications() const
32{
32{
33 QStringList storedApps;
33 QStringList storedApps;
34
34
35− QGSettings gSettings("com.canonical.Unity.Launcher", "/com/canonical/unity/launcher/");
36−
37− Q_FOREACH(const QString &entry, gSettings.get("items").toStringList()) {
35+ Q_FOREACH(const QString &entry, m_gSettings->get("items").toStringList()) {
38 if (entry.startsWith("application:///")) {
36 if (entry.startsWith("application:///")) {
39 // convert legacy entries to new world appids
37 // convert legacy entries to new world appids
40 QString appId = entry;
38 QString appId = entry;
@@ -57,10 +55,16 @@ QStringList GSettings::storedApplications() const
57
55
58void GSettings::setStoredApplications(const QStringList &storedApplications)
56void GSettings::setStoredApplications(const QStringList &storedApplications)
59{
57{
60− QGSettings gSettings("com.canonical.Unity.Launcher", "/com/canonical/unity/launcher/");
61 QStringList gSettingsList;
58 QStringList gSettingsList;
62 Q_FOREACH(const QString &entry, storedApplications) {
59 Q_FOREACH(const QString &entry, storedApplications) {
63 gSettingsList << QString("appid://%1").arg(entry);
60 gSettingsList << QString("appid://%1").arg(entry);
64 }
61 }
65− gSettings.set("items", gSettingsList);
62+ m_gSettings->set("items", gSettingsList);
63+}
64+
65+void GSettings::settingsChanged(const QString &key)
66+{
67+ if (key == "items") {
68+ Q_EMIT changed();
69+ }
66}
70}
plugins/Unity/Launcher/gsettings.h+10−1
@@ -22,7 +22,7 @@
22
22
23#include <QObject>
23#include <QObject>
24#include <QStringList>
24#include <QStringList>
25−
25+#include <QGSettings>
26
26
27class GSettings: public QObject
27class GSettings: public QObject
28{
28{
@@ -32,6 +32,15 @@ public:
32
32
33 QStringList storedApplications() const;
33 QStringList storedApplications() const;
34 void setStoredApplications(const QStringList &storedApplications);
34 void setStoredApplications(const QStringList &storedApplications);
35+
36+Q_SIGNALS:
37+ void changed();
38+
39+private Q_SLOTS:
40+ void settingsChanged(const QString &key);
41+
42+private:
43+ QGSettings *m_gSettings;
35};
44};
36
45
37#endif
46#endif
plugins/Unity/Launcher/launchermodel.cpp+54−14
@@ -40,20 +40,9 @@ LauncherModel::LauncherModel(QObject *parent):
40 connect(m_dbusIface, &DBusInterface::countVisibleChanged, this, &LauncherModel::countVisibleChanged);
40 connect(m_dbusIface, &DBusInterface::countVisibleChanged, this, &LauncherModel::countVisibleChanged);
41 connect(m_dbusIface, &DBusInterface::refreshCalled, this, &LauncherModel::refresh);
41 connect(m_dbusIface, &DBusInterface::refreshCalled, this, &LauncherModel::refresh);
42
42
43− Q_FOREACH (const QString &entry, m_settings->storedApplications()) {
43+ connect(m_settings, &GSettings::changed, this, &LauncherModel::refresh);
44− DesktopFileHandler desktopFile(entry);
45− if (!desktopFile.isValid()) {
46− qWarning() << "Couldn't find a .desktop file for" << entry << ". Skipping...";
47− continue;
48− }
49
44
50− LauncherItem *item = new LauncherItem(entry,
45+ refresh();
51− desktopFile.displayName(),
52− desktopFile.icon(),
53− this);
54− item->setPinned(true);
55− m_list.append(item);
56− }
57}
46}
58
47
59LauncherModel::~LauncherModel()
48LauncherModel::~LauncherModel()
@@ -320,7 +309,6 @@ void LauncherModel::progressChanged(const QString &appId, int progress)
320 }
309 }
321}
310}
322
311
323−
324void LauncherModel::countChanged(const QString &appId, int count)
312void LauncherModel::countChanged(const QString &appId, int count)
325{
313{
326 int idx = findApplication(appId);
314 int idx = findApplication(appId);
@@ -362,10 +350,15 @@ void LauncherModel::countVisibleChanged(const QString &appId, int countVisible)
362
350
363void LauncherModel::refresh()
351void LauncherModel::refresh()
364{
352{
353+ // First walk through all the existing items and see if we need to remove something
365 QList<LauncherItem*> toBeRemoved;
354 QList<LauncherItem*> toBeRemoved;
366 Q_FOREACH (LauncherItem* item, m_list) {
355 Q_FOREACH (LauncherItem* item, m_list) {
367 DesktopFileHandler desktopFile(item->appId());
356 DesktopFileHandler desktopFile(item->appId());
368 if (!desktopFile.isValid()) {
357 if (!desktopFile.isValid()) {
358+ // Desktop file not available for this app => drop it!
359+ toBeRemoved << item;
360+ } else if (!m_settings->storedApplications().contains(item->appId())) {
361+ // Item not in settings any more => drop it!
369 toBeRemoved << item;
362 toBeRemoved << item;
370 } else {
363 } else {
371 int idx = m_list.indexOf(item);
364 int idx = m_list.indexOf(item);
@@ -378,6 +371,53 @@ void LauncherModel::refresh()
378 Q_FOREACH (LauncherItem* item, toBeRemoved) {
371 Q_FOREACH (LauncherItem* item, toBeRemoved) {
379 requestRemove(item->appId());
372 requestRemove(item->appId());
380 }
373 }
374+
375+ // This brings the Launcher into sync with the settings backend again. There's an issue though:
376+ // If we can't find a .desktop file for an entry we need to skip it. That makes our settingsIndex
377+ // go out of sync with the actual index of items. So let's also use an addedIndex which reflects
378+ // the settingsIndex minus the skipped items.
379+ int addedIndex = 0;
380+
381+ // Now walk through settings and see if we need to add something
382+ for (int settingsIndex = 0; settingsIndex < m_settings->storedApplications().count(); ++settingsIndex) {
383+ QString entry = m_settings->storedApplications().at(settingsIndex);
384+ int itemIndex = -1;
385+ for (int i = 0; i < m_list.count(); ++i) {
386+ if (m_list.at(i)->appId() == entry) {
387+ itemIndex = i;
388+ break;
389+ }
390+ }
391+
392+ if (itemIndex == -1) {
393+ // Need to add it. Just add it into the addedIndex to keep same ordering as the list
394+ // in the settings.
395+ DesktopFileHandler desktopFile(entry);
396+ if (!desktopFile.isValid()) {
397+ qWarning() << "Couldn't find a .desktop file for" << entry << ". Skipping...";
398+ continue;
399+ }
400+
401+ LauncherItem *item = new LauncherItem(entry,
402+ desktopFile.displayName(),
403+ desktopFile.icon(),
404+ this);
405+ item->setPinned(true);
406+ beginInsertRows(QModelIndex(), addedIndex, addedIndex);
407+ m_list.insert(addedIndex, item);
408+ endInsertRows();
409+ } else if (itemIndex != addedIndex) {
410+ // The item is already there, but it is in a different place then in the settings.
411+ // Move it to the addedIndex
412+ beginMoveRows(QModelIndex(), itemIndex, itemIndex, QModelIndex(), addedIndex);
413+ m_list.move(itemIndex, addedIndex);
414+ endMoveRows();
415+ }
416+
417+ // Just like settingsIndex, this will increase with every item, except the ones we
418+ // skipped with the "continue" call above.
419+ addedIndex++;
420+ }
381}
421}
382
422
383void LauncherModel::applicationAdded(const QModelIndex &parent, int row)
423void LauncherModel::applicationAdded(const QModelIndex &parent, int row)
plugins/Unity/Launcher/launchermodel.h+2
@@ -79,6 +79,8 @@ private:
79 DBusInterface *m_dbusIface;
79 DBusInterface *m_dbusIface;
80
80
81 ApplicationManagerInterface *m_appManager;
81 ApplicationManagerInterface *m_appManager;
82+
83+ friend class LauncherModelTest;
82};
84};
83
85
84#endif // LAUNCHERMODEL_H
86#endif // LAUNCHERMODEL_H
tests/plugins/Unity/Launcher/gsettings.cpp+3−4
@@ -19,8 +19,6 @@
19
19
20#include "gsettings.h"
20#include "gsettings.h"
21
21
22−#include <QDebug>
23−
24// This is a mock implementation to not touch GSettings for real during tests
22// This is a mock implementation to not touch GSettings for real during tests
25
23
26GSettings::GSettings(QObject *parent):
24GSettings::GSettings(QObject *parent):
@@ -31,10 +29,11 @@ GSettings::GSettings(QObject *parent):
31
29
32QStringList GSettings::storedApplications() const
30QStringList GSettings::storedApplications() const
33{
31{
34− return QStringList();
32+ return m_entries;
35}
33}
36
34
37void GSettings::setStoredApplications(const QStringList &storedApplications)
35void GSettings::setStoredApplications(const QStringList &storedApplications)
38{
36{
39− Q_UNUSED(storedApplications)
37+ m_entries = storedApplications;
38+ Q_EMIT changed();
40}
39}
tests/plugins/Unity/Launcher/gsettings.h+6
@@ -33,6 +33,12 @@ public:
33
33
34 QStringList storedApplications() const;
34 QStringList storedApplications() const;
35 void setStoredApplications(const QStringList &storedApplications);
35 void setStoredApplications(const QStringList &storedApplications);
36+
37+Q_SIGNALS:
38+ void changed();
39+
40+private:
41+ QStringList m_entries;
36};
42};
37
43
38#endif
44#endif
tests/plugins/Unity/Launcher/launchermodeltest.cpp+93−11
@@ -24,6 +24,7 @@
24#include "launcheritem.h"
24#include "launcheritem.h"
25#include "launchermodel.h"
25#include "launchermodel.h"
26#include "dbusinterface.h"
26#include "dbusinterface.h"
27+#include "gsettings.h"
27
28
28#include <QtTest>
29#include <QtTest>
29#include <QDBusInterface>
30#include <QDBusInterface>
@@ -81,7 +82,15 @@ public:
81 return nullptr;
82 return nullptr;
82 }
83 }
83 unity::shell::application::ApplicationInfoInterface *startApplication(const QString &, const QStringList &) { return nullptr; }
84 unity::shell::application::ApplicationInfoInterface *startApplication(const QString &, const QStringList &) { return nullptr; }
84− bool stopApplication(const QString &) { return false; }
85+ bool stopApplication(const QString &appId) {
86+ Q_FOREACH(MockApp* app, m_list) {
87+ if (app->appId() == appId) {
88+ removeApplication(m_list.indexOf(app));
89+ return true;
90+ }
91+ }
92+ return false;
93+ }
85 bool focusApplication(const QString &appId) {
94 bool focusApplication(const QString &appId) {
86 Q_FOREACH(MockApp* app, m_list) {
95 Q_FOREACH(MockApp* app, m_list) {
87 app->setFocused(app->appId() == appId);
96 app->setFocused(app->appId() == appId);
@@ -135,6 +144,8 @@ private Q_SLOTS:
135
144
136 appManager->addApplication(new MockApp("no-icon"));
145 appManager->addApplication(new MockApp("no-icon"));
137 QCOMPARE(launcherModel->rowCount(QModelIndex()), 2);
146 QCOMPARE(launcherModel->rowCount(QModelIndex()), 2);
147+
148+ launcherModel->m_settings->setStoredApplications(QStringList());
138 }
149 }
139
150
140 // Removing apps from appmanager and launcher as pinned ones would stick
151 // Removing apps from appmanager and launcher as pinned ones would stick
@@ -170,14 +181,15 @@ private Q_SLOTS:
170 launcherModel->pin(launcherModel->get(0)->appId());
181 launcherModel->pin(launcherModel->get(0)->appId());
171 QCOMPARE(launcherModel->get(0)->pinned(), true);
182 QCOMPARE(launcherModel->get(0)->pinned(), true);
172 QCOMPARE(launcherModel->get(1)->pinned(), false);
183 QCOMPARE(launcherModel->get(1)->pinned(), false);
173− QCOMPARE(spy.count(), 1);
184+ QCOMPARE(spy.count() > 0, true);
174 QCOMPARE(spy.at(0).at(2).value<QVector<int>>().first(), (int)LauncherModelInterface::RolePinned);
185 QCOMPARE(spy.at(0).at(2).value<QVector<int>>().first(), (int)LauncherModelInterface::RolePinned);
175
186
187+ spy.clear();
176 launcherModel->requestRemove(launcherModel->get(0)->appId());
188 launcherModel->requestRemove(launcherModel->get(0)->appId());
177 QCOMPARE(launcherModel->get(0)->pinned(), false);
189 QCOMPARE(launcherModel->get(0)->pinned(), false);
178 QCOMPARE(launcherModel->get(1)->pinned(), false);
190 QCOMPARE(launcherModel->get(1)->pinned(), false);
179− QCOMPARE(spy.count(), 2);
191+ QCOMPARE(spy.count(), 1);
180− QCOMPARE(spy.at(1).at(2).value<QVector<int>>().first(), (int)LauncherModelInterface::RolePinned);
192+ QCOMPARE(spy.at(0).at(2).value<QVector<int>>().first(), (int)LauncherModelInterface::RolePinned);
181 }
193 }
182
194
183 void testRemove_data() {
195 void testRemove_data() {
@@ -186,7 +198,7 @@ private Q_SLOTS:
186 QTest::addColumn<bool>("running");
198 QTest::addColumn<bool>("running");
187
199
188 QTest::newRow("non-pinned, running") << false << true;
200 QTest::newRow("non-pinned, running") << false << true;
189− QTest::newRow("pinned, running") << true << false;
201+ QTest::newRow("pinned, running") << true << true;
190 QTest::newRow("pinned, non-running") << true << false;
202 QTest::newRow("pinned, non-running") << true << false;
191 }
203 }
192
204
@@ -199,23 +211,24 @@ private Q_SLOTS:
199
211
200 // pin one if required
212 // pin one if required
201 if (pinned) {
213 if (pinned) {
202− launcherModel->pin(launcherModel->get(1)->appId());
214+ launcherModel->pin("abs-icon");
203 }
215 }
204
216
205 // stop it if required
217 // stop it if required
206 if (!running) {
218 if (!running) {
207− appManager->removeApplication(1);
219+ appManager->stopApplication("abs-icon");
208 }
220 }
209
221
210 // Now remove it
222 // Now remove it
211− launcherModel->requestRemove(launcherModel->get(1)->appId());
223+ launcherModel->requestRemove("abs-icon");
212
224
213 if (running) {
225 if (running) {
214 // both apps are running, both apps must still be here
226 // both apps are running, both apps must still be here
215 QCOMPARE(launcherModel->rowCount(QModelIndex()), 2);
227 QCOMPARE(launcherModel->rowCount(QModelIndex()), 2);
216
228
217 // Item must be unpinned now
229 // Item must be unpinned now
230+ int index = launcherModel->findApplication("abs-icon");
218− QCOMPARE(launcherModel->get(1)->pinned(), false);
231+ QCOMPARE(launcherModel->get(index)->pinned(), false);
219
232
220 } else if (pinned) {
233 } else if (pinned) {
221 // Item 1 must go away, item 0 is here to stay
234 // Item 1 must go away, item 0 is here to stay
@@ -224,7 +237,7 @@ private Q_SLOTS:
224
237
225 // done our checks. now stop the app if was still running
238 // done our checks. now stop the app if was still running
226 if (running) {
239 if (running) {
227− appManager->removeApplication(1);
240+ appManager->stopApplication("abs-icon");
228 }
241 }
229
242
230 // It needs to go away in any case now
243 // It needs to go away in any case now
@@ -369,12 +382,81 @@ private Q_SLOTS:
369 QCOMPARE(launcherModel->get(index)->count(), 55);
382 QCOMPARE(launcherModel->get(index)->count(), 55);
370 }
383 }
371
384
372− void testRefresh() {
385+ void testRefreshAfterDeletedDesktopFiles_data() {
386+ QTest::addColumn<bool>("deleted");
387+ QTest::newRow("have .desktop files") << false;
388+ QTest::newRow("deleted .desktop files") << true;
389+ }
390+
391+ void testRefreshAfterDeletedDesktopFiles() {
392+ QFETCH(bool, deleted);
393+
394+ // pin both apps
395+ launcherModel->pin("abs-icon");
396+ launcherModel->pin("no-icon");
397+ // close both apps
398+ appManager->removeApplication(0);
399+ appManager->removeApplication(0);
400+
401+ // "delete" the .desktop files
402+ QString oldCurrent = QDir::currentPath();
403+ if (deleted) {
404+ // In testing mode, the launcher searches the current dir for the sample .desktop file
405+ // We can make that fail by changing the current dir
406+ QDir::setCurrent("..");
407+ }
408+
409+ // Call refresh
373 QDBusInterface interface("com.canonical.Unity.Launcher", "/com/canonical/Unity/Launcher", "com.canonical.Unity.Launcher");
410 QDBusInterface interface("com.canonical.Unity.Launcher", "/com/canonical/Unity/Launcher", "com.canonical.Unity.Launcher");
374 QDBusReply<void> reply = interface.call("Refresh");
411 QDBusReply<void> reply = interface.call("Refresh");
375
412
376 // Make sure the call to Refresh returned without error.
413 // Make sure the call to Refresh returned without error.
377 QCOMPARE(reply.isValid(), true);
414 QCOMPARE(reply.isValid(), true);
415+
416+ QCOMPARE(launcherModel->rowCount(), deleted ? 0 : 2);
417+
418+ // Restoring current dir
419+ QDir::setCurrent(oldCurrent);
420+ }
421+
422+ void testSettings_data() {
423+ QTest::addColumn<QStringList>("storedList");
424+
425+ QTest::newRow("2 stored") << (QStringList() << "abs-icon" << "no-icon");
426+ QTest::newRow("1 stored") << (QStringList() << "abs-icon");
427+ }
428+
429+ void testSettings() {
430+ GSettings *settings = launcherModel->m_settings;
431+
432+ // Nothing pinned at startup
433+ QCOMPARE(settings->storedApplications().count(), 0);
434+
435+ // pin both apps
436+ launcherModel->pin("abs-icon");
437+ launcherModel->pin("no-icon");
438+
439+ // Now settings should have 2 apps
440+ QCOMPARE(settings->storedApplications().count(), 2);
441+
442+ // close both apps
443+ appManager->removeApplication(0);
444+ appManager->removeApplication(0);
445+
446+ // Now settings should have 2 apps
447+ QCOMPARE(settings->storedApplications().count(), 2);
448+
449+ // Now remove 1 app through the backend, make sure one is still there
450+ settings->setStoredApplications(QStringList() << "abs-icon");
451+ QCOMPARE(settings->storedApplications().count(), 1);
452+
453+ // Check if it disappeared from the frontend too
454+ QCOMPARE(launcherModel->rowCount(), 1);
455+
456+ // Add them back:
457+ settings->setStoredApplications(QStringList() << "abs-icon" << "no-icon");
458+ QCOMPARE(launcherModel->rowCount(), 2);
459+
378 }
460 }
379};
461};
380
462