git.iko.soy/unity8
on xenial help sign in
Merge
commit8633fc752be52252d11f6773d40fbcdff493422b authorJosh Arenson <joshua.arenson@canonical.com> dateFri 20 Nov 2015, 09:29 (11 years ago) parent4ff894caf4a0e9
10 files changed+23−3
compare with xenial
unifiedsplit
plugins/LightDM/SessionsModel.cpp+5 plugins/LightDM/SessionsModel.h+5−3 tests/mocks/LightDM/IntegratedLightDM/MockSessionsModel.cpp+6 tests/mocks/LightDM/IntegratedLightDM/MockSessionsModel.h+1 tests/qmltests/Greeter/test_session_badges/gnome_badge.png tests/qmltests/Greeter/test_session_badges/plasma_badge.png tests/qmltests/Greeter/test_session_badges/recovery_console_badge.png tests/qmltests/Greeter/test_session_badges/ubuntu_badge.png tests/qmltests/Greeter/test_session_badges/unknown_badge.png tests/qmltests/Greeter/tst_WideView.qml+6
plugins/LightDM/SessionsModel.cpp+5
@@ -35,6 +35,11 @@ QList<QUrl> SessionsModel::iconSearchDirectories() const
3535 return m_iconSearchDirectories;
3636}
3737
38+void SessionsModel::setIconSearchDirectories(QList<QUrl> searchDirectories)
39+{
40+ m_iconSearchDirectories = searchDirectories;
41+}
42+
3843QUrl SessionsModel::iconUrl(QString sessionName) const
3944{
4045 Q_FOREACH(const QUrl& searchDirectory, m_iconSearchDirectories)
plugins/LightDM/SessionsModel.h+5−3
@@ -49,12 +49,14 @@ public:
4949 QList<QUrl> iconSearchDirectories() const;
5050 Q_INVOKABLE QUrl iconUrl(QString sessionName) const;
5151
52+ void setIconSearchDirectories(QList<QUrl> searchDirectories);
5253private:
5354 QLightDM::SessionsModel* m_model;
5455 QHash<int, QByteArray> m_roleNames;
55− const QList<QUrl> m_iconSearchDirectories{QUrl("/usr/share/unity8/Greeter/graphics/session_icons"),
56− QUrl("/usr/local/share/unity-greeter"),
57− QUrl("/usr/share/unity-greeter/")};
56+ QList<QUrl> m_iconSearchDirectories{
57+ QUrl("/usr/share/unity8/Greeter/graphics/session_icons"),
58+ QUrl("/usr/local/share/unity-greeter"),
59+ QUrl("/usr/share/unity-greeter/")};
5860
5961};
6062
tests/mocks/LightDM/IntegratedLightDM/MockSessionsModel.cpp+6
@@ -17,6 +17,12 @@
1717
1818#include "MockSessionsModel.h"
1919#include <QLightDM/SessionsModel>
20+#include <QDebug>
21+QUrl MockSessionsModel::iconUrl(QString sessionName) const
22+{
23+ qDebug() << "JOSH INSIDE THE MOCK ICONURL";
24+ return QUrl();
25+}
2026
2127QString MockSessionsModel::testScenario() const
2228{
tests/mocks/LightDM/IntegratedLightDM/MockSessionsModel.h+1
@@ -27,6 +27,7 @@ class MockSessionsModel : public SessionsModel
2727 Q_PROPERTY(QString testScenario READ testScenario WRITE setTestScenario)
2828
2929public:
30+ QUrl iconUrl(QString sessionName) const override;
3031 QString testScenario() const;
3132 void setTestScenario(QString testScenario);
3233};
tests/qmltests/Greeter/test_session_badges/gnome_badge.pngnew file

Binary file not shown.

tests/qmltests/Greeter/test_session_badges/plasma_badge.pngnew file

Binary file not shown.

tests/qmltests/Greeter/test_session_badges/recovery_console_badge.pngnew file

Binary file not shown.

tests/qmltests/Greeter/test_session_badges/ubuntu_badge.pngnew file

Binary file not shown.

tests/qmltests/Greeter/test_session_badges/unknown_badge.pngnew file

Binary file not shown.

tests/qmltests/Greeter/tst_WideView.qml+6
@@ -375,6 +375,12 @@ Item {
375375 ]
376376 }
377377
378+ function test_sessionIconsAreValid() {
379+ LightDM.Sessions.testScenario = "multipleSessions"
380+ console.log("THE URL IS: " + LightDM.Sessions.iconUrl("Ubuntu"));
381+ compare(false, true);
382+ }
383+
378384 function test_noSessionsDoesntBreakView() {
379385 LightDM.Sessions.testScenario = "noSessions"
380386 compare(LightDM.Sessions.count, 0)