15b29ef · unity8 · git.iko.soy

plugins/Unity/Launcher/backend/launcherbackend.cpp+5−5

compare with xenial

unifiedsplit

@@ -8,7 +8,7 @@ LauncherBackend::LauncherBackend(QObject *parent):

8

9 // TODO: load default pinned ones from default config, instead of hardcoding here...

10

11− m_favoriteApps <<

11+ m_storedApps <<

12 QLatin1String("phone-app.desktop") <<

13 QLatin1String("camera-app.desktop") <<

14 QLatin1String("gallery-app.desktop") <<

@@ -26,14 +26,14 @@ LauncherBackend::~LauncherBackend()

26

27}

28

29−QStringList LauncherBackend::favoriteApplications() const

29+QStringList LauncherBackend::storedApplications() const

30{

31− return m_favoriteApps;

31+ return m_storedApps;

32}

33

34−void LauncherBackend::setFavoriteApplications(const QStringList &appIds)

34+void LauncherBackend::setStoredApplications(const QStringList &appIds)

35{

36− m_favoriteApps = appIds;

36+ m_storedApps = appIds;

37 // TODO: Cleanup pinned state from settings for apps not in list any more.

38}

39

plugins/Unity/Launcher/backend/launcherbackend.h+5−5

@@ -38,13 +38,13 @@ public:

38 virtual ~LauncherBackend();

39

40 /**

41− * @brief Returns a list of favorite applications.

41+ * @brief Returns a list of stored applications.

42 * @returns A list of application IDs.

43 */

44− QStringList favoriteApplications() const;

44+ QStringList storedApplications() const;

45

46 /**

47− * @brief Set the list of favorite applications.

47+ * @brief Set the list of stored applications.

48 *

49 * Any previously stored information for apps not contained

50 * in the list any more, e.g. the pinned state, will be

@@ -52,7 +52,7 @@ public:

52 *

53 * @param appIds The new list of stored applications.

54 */

55− void setFavoriteApplications(const QStringList &appIds);

55+ void setStoredApplications(const QStringList &appIds);

56

57 /**

58 * @brief Get the user friendly name of an application.

@@ -109,7 +109,7 @@ Q_SIGNALS:

109 void countChanged(const QString &appId, int count);

110

111private:

112− QStringList m_favoriteApps;

112+ QStringList m_storedApps;

113};

114

115#endif // LAUNCHERBACKEND_H

plugins/Unity/Launcher/launchermodel.cpp+8−6

@@ -27,7 +27,7 @@ LauncherModel::LauncherModel(QObject *parent):

27 LauncherModelInterface(parent),

28 m_backend(new LauncherBackend(this))

29{

30− Q_FOREACH (const QString &entry, m_backend->favoriteApplications()) {

30+ Q_FOREACH (const QString &entry, m_backend->storedApplications()) {

31 m_list.append(new LauncherItem(entry, m_backend->displayName(entry), m_backend->icon(entry), this));

32 }

33}

@@ -88,17 +88,19 @@ void LauncherModel::move(int oldIndex, int newIndex)

88 // Store new order

89 QStringList appIds;

90 Q_FOREACH(LauncherItem *item, m_list) {

91+ if (item->favorite() || item->recent()) {

91− appIds << item->desktopFile();

92+ appIds << item->desktopFile();

93+ }

92 }

94 }

93− m_backend->setFavoriteApplications(appIds);

95+ m_backend->setStoredApplications(appIds);

94}

96}

95

97

96void LauncherModel::pin(int index)

98void LauncherModel::pin(int index)

97{

99{

98 QString appId = m_list.at(index)->desktopFile();

100 QString appId = m_list.at(index)->desktopFile();

99− if (!m_backend->favoriteApplications().contains(appId)) {

101+ if (!m_backend->storedApplications().contains(appId)) {

100− QStringList oldList = m_backend->favoriteApplications();

102+ QStringList oldList = m_backend->storedApplications();

101− m_backend->setFavoriteApplications(oldList << appId);

103+ m_backend->setStoredApplications(oldList << appId);

102 }

104 }

103 if (!m_backend->isPinned(appId)) {

105 if (!m_backend->isPinned(appId)) {

104 m_backend->setPinned(appId, true);

106 m_backend->setPinned(appId, true);