af4a0e9 · unity8 · git.iko.soy

git.iko.soy/unity8

Add setter for icon search directories

commitaf4a0e90279420a5dd9cccd56e15d389dbeee5d4 authorJosh Arenson <joshua.arenson@canonical.com> dateFri 20 Nov 2015, 09:23 (11 years ago) parent105e096

2 files changed+9−10

compare with xenial

unifiedsplit

plugins/LightDM/SessionsModel.cpp+7−8 plugins/LightDM/SessionsModel.h+2−2

plugins/LightDM/SessionsModel.cpp+7−8

@@ -35,10 +35,14 @@ QList<QUrl> SessionsModel::iconSearchDirectories() const

3535 return m_iconSearchDirectories;

3636}

3737

38−// Allow providing an exteral directories list, mostly for testing

39−QUrl SessionsModel::iconUrl(QString sessionName, QList<QUrl> sessionDirectories) const

38+void SessionsModel::setIconSearchDirectories(QList<QUrl> searchDirectories)

4039{

41− Q_FOREACH(const QUrl& searchDirectory, sessionDirectories)

40+ m_iconSearchDirectories = searchDirectories;

41+}

42+

43+QUrl SessionsModel::iconUrl(QString sessionName) const

44+{

45+ Q_FOREACH(const QUrl& searchDirectory, m_iconSearchDirectories)

4246 {

4347 // This is an established icon naming convention

4448 QString iconUrl = searchDirectory.toString(QUrl::StripTrailingSlash) +

@@ -53,11 +57,6 @@ QUrl SessionsModel::iconUrl(QString sessionName, QList<QUrl> sessionDirectories)

5357 return QUrl("./graphics/session_icons/unknown_badge.png");

5458}

5559

56−QUrl SessionsModel::iconUrl(QString sessionName) const

57−{

58− return iconUrl(sessionName, m_iconSearchDirectories);

59−}

60−

6160QVariant SessionsModel::data(const QModelIndex& index, int role) const

6261{

6362 switch (role) {

plugins/LightDM/SessionsModel.h+2−2

@@ -48,12 +48,12 @@ public:

4848 QVariant data(const QModelIndex& index, int role) const override;

4949 QList<QUrl> iconSearchDirectories() const;

5050 Q_INVOKABLE QUrl iconUrl(QString sessionName) const;

51− Q_INVOKABLE QUrl iconUrl(QString sessionName, QList<QUrl> searchDirectories) const;

5251

52+ void setIconSearchDirectories(QList<QUrl> searchDirectories);

5353private:

5454 QLightDM::SessionsModel* m_model;

5555 QHash<int, QByteArray> m_roleNames;

56− const QList<QUrl> m_iconSearchDirectories{

56+ QList<QUrl> m_iconSearchDirectories{

5757 QUrl("/usr/share/unity8/Greeter/graphics/session_icons"),

5858 QUrl("/usr/local/share/unity-greeter"),

5959 QUrl("/usr/share/unity-greeter/")};