git.iko.soy/unity8
on xenial help sign in
Merge greeter-apps
775438fMichael Terry
plugins/LightDM/IntegratedLightDM/liblightdm/Greeter.cpp−5
compare with xenial
unifiedsplit
@@ -78,11 +78,6 @@ bool Greeter::showRemoteLoginHint() const
78 return true;
78 return true;
79}
79}
80
80
81−bool Greeter::lockHint () const
82−{
83− return false;
84−}
85−
86QString Greeter::selectUserHint() const
81QString Greeter::selectUserHint() const
87{
82{
88 return QLatin1String("");
83 return QLatin1String("");
plugins/LightDM/IntegratedLightDM/liblightdm/Greeter.h−2
@@ -45,7 +45,6 @@ class Q_DECL_EXPORT Greeter : public QObject
45
45
46 Q_PROPERTY(QString hostname READ hostname CONSTANT)
46 Q_PROPERTY(QString hostname READ hostname CONSTANT)
47 Q_PROPERTY(bool hasGuestAccount READ hasGuestAccountHint CONSTANT)
47 Q_PROPERTY(bool hasGuestAccount READ hasGuestAccountHint CONSTANT)
48− Q_PROPERTY(bool locked READ lockHint CONSTANT)
49
48
50 Q_ENUMS(PromptType MessageType)
49 Q_ENUMS(PromptType MessageType)
51
50
@@ -68,7 +67,6 @@ public:
68 bool hideUsersHint() const;
67 bool hideUsersHint() const;
69 bool showManualLoginHint() const;
68 bool showManualLoginHint() const;
70 bool showRemoteLoginHint() const;
69 bool showRemoteLoginHint() const;
71− bool lockHint () const;
72 bool hasGuestAccountHint() const;
70 bool hasGuestAccountHint() const;
73 QString selectUserHint() const;
71 QString selectUserHint() const;
74 bool selectGuestHint() const;
72 bool selectGuestHint() const;
plugins/LightDM/SessionsModel.cpp+22−16
@@ -47,15 +47,15 @@ void SessionsModel::setIconSearchDirectories(const QList<QUrl> searchDirectories
47 Q_EMIT iconSearchDirectoriesChanged();
47 Q_EMIT iconSearchDirectoriesChanged();
48}
48}
49
49
50−QUrl SessionsModel::iconUrl(const QString sessionName) const
50+QUrl SessionsModel::iconUrl(const QString sessionKey) const
51{
51{
52 Q_FOREACH(const QUrl& searchDirectory, m_iconSearchDirectories)
52 Q_FOREACH(const QUrl& searchDirectory, m_iconSearchDirectories)
53 {
53 {
54 // This is an established icon naming convention
54 // This is an established icon naming convention
55 QString customIconUrl = searchDirectory.toString(QUrl::StripTrailingSlash) +
55 QString customIconUrl = searchDirectory.toString(QUrl::StripTrailingSlash) +
56− "/custom_" + sessionName + "_badge.png";
56+ "/custom_" + sessionKey + "_badge.png";
57 QString iconUrl = searchDirectory.toString(QUrl::StripTrailingSlash) +
57 QString iconUrl = searchDirectory.toString(QUrl::StripTrailingSlash) +
58− "/" + sessionName + "_badge.png";
58+ "/" + sessionKey + "_badge.png";
59
59
60 QFile customIconFile(customIconUrl);
60 QFile customIconFile(customIconUrl);
61 QFile iconFile(iconUrl);
61 QFile iconFile(iconUrl);
@@ -63,29 +63,35 @@ QUrl SessionsModel::iconUrl(const QString sessionName) const
63 return QUrl(customIconUrl);
63 return QUrl(customIconUrl);
64 } else if (iconFile.exists()) {
64 } else if (iconFile.exists()) {
65 return QUrl(iconUrl);
65 return QUrl(iconUrl);
66− } else{
66+ } else {
67 // Search the legacy way
67 // Search the legacy way
68 QString path = searchDirectory.toString(QUrl::StripTrailingSlash) + "/";
68 QString path = searchDirectory.toString(QUrl::StripTrailingSlash) + "/";
69+ bool iconFound = false;
69− if (sessionName == "ubuntu" || sessionName == "ubuntu-2d") {
70+ if (sessionKey == "ubuntu" || sessionKey == "ubuntu-2d") {
70 path += "ubuntu_badge.png";
71 path += "ubuntu_badge.png";
72+ iconFound = true;
71 } else if(
73 } else if(
72− sessionName == "gnome-classic" ||
74+ sessionKey == "gnome-classic" ||
73− sessionName == "gnome-flashback-compiz" ||
75+ sessionKey == "gnome-flashback-compiz" ||
74− sessionName == "gnome-flashback-metacity" ||
76+ sessionKey == "gnome-flashback-metacity" ||
75− sessionName == "gnome-shell" ||
77+ sessionKey == "gnome-shell" ||
76− sessionName == "gnome-wayland" ||
78+ sessionKey == "gnome-wayland" ||
77− sessionName == "gnome"
79+ sessionKey == "gnome"
78 ){
80 ){
79 path += "gnome_badge.png";
81 path += "gnome_badge.png";
82+ iconFound = true;
80− } else if (sessionName == "plasma") {
83+ } else if (sessionKey == "plasma") {
81 path += "kde_badge.png";
84 path += "kde_badge.png";
85+ iconFound = true;
82− } else if (sessionName == "xterm") {
86+ } else if (sessionKey == "xterm") {
83 path += "recovery_console_badge.png";
87 path += "recovery_console_badge.png";
88+ iconFound = true;
84− } else if (sessionName == "remote-login") {
89+ } else if (sessionKey == "remote-login") {
85 path += "remote_login_help.png";
90 path += "remote_login_help.png";
91+ iconFound = true;
86 }
92 }
87
93
88− if (QFile(path).exists()) {
94+ if (QFile(path).exists() && iconFound) {
89 return path;
95 return path;
90 }
96 }
91 }
97 }
@@ -99,7 +105,7 @@ QVariant SessionsModel::data(const QModelIndex& index, int role) const
99{
105{
100 switch (role) {
106 switch (role) {
101 case SessionsModel::IconRole:
107 case SessionsModel::IconRole:
102− return iconUrl(m_model->data(index, Qt::DisplayRole).toString());
108+ return iconUrl(m_model->data(index, QLightDM::SessionsModel::KeyRole).toString());
103 default:
109 default:
104 return m_model->data(index, role);
110 return m_model->data(index, role);
105 }
111 }
plugins/LightDM/plugin.cpp+1−1
@@ -82,7 +82,7 @@ void PLUGIN_CLASSNAME::registerTypes(const char *uri)
82 qRegisterMetaType<QLightDM::Greeter::PromptType>("QLightDM::Greeter::PromptType");
82 qRegisterMetaType<QLightDM::Greeter::PromptType>("QLightDM::Greeter::PromptType");
83
83
84 qmlRegisterSingletonType<SessionsModel>(uri, 0, 1, "Sessions", sessions_provider);
84 qmlRegisterSingletonType<SessionsModel>(uri, 0, 1, "Sessions", sessions_provider);
85− qmlRegisterUncreatableType<SessionsModel>(uri, 0, 1, "SessionRoles", QStringLiteral("Type is not instantiable"));
85+ qmlRegisterUncreatableType<QLightDM::SessionsModel>(uri, 0, 1, "SessionRoles", QStringLiteral("Type is not instantiable"));
86
86
87 qmlRegisterSingletonType<UsersModel>(uri, 0, 1, "Users", users_provider);
87 qmlRegisterSingletonType<UsersModel>(uri, 0, 1, "Users", users_provider);
88 qmlRegisterUncreatableType<QLightDM::UsersModel>(uri, 0, 1, "UserRoles", QStringLiteral("Type is not instantiable"));
88 qmlRegisterUncreatableType<QLightDM::UsersModel>(uri, 0, 1, "UserRoles", QStringLiteral("Type is not instantiable"));
qml/Greeter/FullLightDMImpl.qml+2
@@ -22,6 +22,8 @@ Item{
22
22
23 property var greeter: LightDM.Greeter
23 property var greeter: LightDM.Greeter
24 property var infographic: LightDM.Infographic
24 property var infographic: LightDM.Infographic
25+ property var sessions: LightDM.Sessions
26+ property var sessionRoles: LightDM.SessionRoles
25 property var users: LightDM.Users
27 property var users: LightDM.Users
26 property var userRoles: LightDM.UserRoles
28 property var userRoles: LightDM.UserRoles
27
29
qml/Greeter/Greeter.qml+17−1
@@ -132,6 +132,22 @@ Showable {
132 return d.startUnlock(true /* toTheRight */);
132 return d.startUnlock(true /* toTheRight */);
133 }
133 }
134
134
135+ function sessionToStart() {
136+ for (var i = 0; i < LightDMService.sessions.count; i++) {
137+ var session = LightDMService.sessions.data(i,
138+ LightDMService.sessionRoles.KeyRole);
139+ if (loader.item.sessionToStart === session) {
140+ return session;
141+ }
142+ }
143+
144+ if (loader.item.sessionToStart === LightDMService.greeter.defaultSession) {
145+ return LightDMService.greeter.defaultSession;
146+ } else {
147+ return "ubuntu"; // The default / fallback
148+ }
149+ }
150+
135 QtObject {
151 QtObject {
136 id: d
152 id: d
137
153
@@ -197,7 +213,7 @@ Showable {
197
213
198 function login() {
214 function login() {
199 d.waiting = true;
215 d.waiting = true;
200− if (LightDMService.greeter.startSessionSync()) {
216+ if (LightDMService.greeter.startSessionSync(root.sessionToStart())) {
201 sessionStarted();
217 sessionStarted();
202 hideView();
218 hideView();
203 } else if (loader.item) {
219 } else if (loader.item) {
qml/Greeter/IntegratedLightDMImpl.qml+2−1
@@ -22,7 +22,8 @@ Item{
22
22
23 property var greeter: LightDM.Greeter
23 property var greeter: LightDM.Greeter
24 property var infographic: LightDM.Infographic
24 property var infographic: LightDM.Infographic
25+ property var sessions: LightDM.Sessions
26+ property var sessionRoles: LightDM.SessionRoles
25 property var users: LightDM.Users
27 property var users: LightDM.Users
26 property var userRoles: LightDM.UserRoles
28 property var userRoles: LightDM.UserRoles
27−
28}
29}
qml/Greeter/LightDMService.qml+2
@@ -27,6 +27,8 @@ Loader {
27
27
28 property var greeter: d.valid ? loader.item.greeter : null
28 property var greeter: d.valid ? loader.item.greeter : null
29 property var infographic: d.valid ? loader.item.infographic : null
29 property var infographic: d.valid ? loader.item.infographic : null
30+ property var sessions: d.valid ? loader.item.sessions : null
31+ property var sessionRoles: d.valid ? loader.item.sessionRoles : null
30 property var users: d.valid ? loader.item.users : null
32 property var users: d.valid ? loader.item.users : null
31 property var userRoles: d.valid ? loader.item.userRoles : null
33 property var userRoles: d.valid ? loader.item.userRoles : null
32
34
qml/Greeter/LoginAreaContainer.qmlnew file+38
@@ -0,0 +1,38 @@
1+/*
2+ * Copyright (C) 2015 Canonical, Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+import QtQuick 2.4
18+import Ubuntu.Components 1.3
19+
20+Item {
21+ BorderImage {
22+ anchors {
23+ fill: parent
24+ topMargin: -units.gu(1)
25+ leftMargin: -units.gu(1.5)
26+ rightMargin: -units.gu(1.5)
27+ bottomMargin: -units.gu(1.5)
28+ }
29+ source: "../Stages/graphics/dropshadow2gu.sci"
30+ opacity: 0.35
31+ }
32+
33+ UbuntuShape {
34+ anchors.fill: parent
35+ aspect: UbuntuShape.Flat
36+ backgroundColor: theme.palette.normal.raised
37+ }
38+}
qml/Greeter/LoginList.qml+72−16
@@ -18,6 +18,7 @@ import QtQuick 2.4
18import QtGraphicalEffects 1.0
18import QtGraphicalEffects 1.0
19import Ubuntu.Components 1.3
19import Ubuntu.Components 1.3
20import "../Components"
20import "../Components"
21+import "." 0.1
21
22
22StyledItem {
23StyledItem {
23 id: root
24 id: root
@@ -29,15 +30,20 @@ StyledItem {
29 property bool locked
30 property bool locked
30 property bool waiting
31 property bool waiting
31
32
33+ readonly property alias passwordInput: passwordInput
32 readonly property int numAboveBelow: 4
34 readonly property int numAboveBelow: 4
33 readonly property int cellHeight: units.gu(5)
35 readonly property int cellHeight: units.gu(5)
34 readonly property int highlightedHeight: units.gu(15)
36 readonly property int highlightedHeight: units.gu(15)
35 readonly property int moveDuration: 200
37 readonly property int moveDuration: 200
38+ property string selectedSession
39+ property string currentSession
36 readonly property string currentUser: userList.currentItem.username
40 readonly property string currentUser: userList.currentItem.username
37 property bool wasPrompted: false
41 property bool wasPrompted: false
38
42
39− signal selected(int index)
43+ signal loginListSessionChanged(string session)
40 signal responded(string response)
44 signal responded(string response)
45+ signal selected(int index)
46+ signal sessionChooserButtonClicked()
41
47
42 function tryToUnlock() {
48 function tryToUnlock() {
43 if (wasPrompted) {
49 if (wasPrompted) {
@@ -97,6 +103,7 @@ StyledItem {
97 name: "Ubuntu.Components.Themes.Ambiance"
103 name: "Ubuntu.Components.Themes.Ambiance"
98 }
104 }
99
105
106+ KeyNavigation.tab: sessionChooser
100 Keys.onUpPressed: {
107 Keys.onUpPressed: {
101 selected(currentIndex - 1);
108 selected(currentIndex - 1);
102 event.accepted = true;
109 event.accepted = true;
@@ -114,19 +121,7 @@ StyledItem {
114 userList.currentIndex = currentIndex;
121 userList.currentIndex = currentIndex;
115 }
122 }
116
123
117− BorderImage {
124+ LoginAreaContainer {
118− anchors {
119− fill: highlightItem
120− topMargin: -units.gu(1)
121− leftMargin: -units.gu(1.5)
122− rightMargin: -units.gu(1.5)
123− bottomMargin: -units.gu(1.5)
124− }
125− source: "../Stages/graphics/dropshadow2gu.sci"
126− opacity: 0.35
127− }
128−
129− UbuntuShape {
130 id: highlightItem
125 id: highlightItem
131 anchors {
126 anchors {
132 left: parent.left
127 left: parent.left
@@ -135,9 +130,8 @@ StyledItem {
135 rightMargin: units.gu(2)
130 rightMargin: units.gu(2)
136 verticalCenter: parent.verticalCenter
131 verticalCenter: parent.verticalCenter
137 }
132 }
133+
138 height: root.highlightedHeight
134 height: root.highlightedHeight
139− aspect: UbuntuShape.Flat
140− backgroundColor: theme.palette.normal.raised
141 }
135 }
142
136
143 ListView {
137 ListView {
@@ -173,6 +167,7 @@ StyledItem {
173
167
174 readonly property bool belowHighlight: (userList.currentIndex < 0 && index > 0) || (userList.currentIndex >= 0 && index > userList.currentIndex)
168 readonly property bool belowHighlight: (userList.currentIndex < 0 && index > 0) || (userList.currentIndex >= 0 && index > userList.currentIndex)
175 readonly property int belowOffset: root.highlightedHeight - root.cellHeight
169 readonly property int belowOffset: root.highlightedHeight - root.cellHeight
170+ readonly property string userSession: session
176 readonly property string username: name
171 readonly property string username: name
177
172
178 opacity: {
173 opacity: {
@@ -237,6 +232,67 @@ StyledItem {
237 }
232 }
238 }
233 }
239
234
235+ // Use an AbstractButton due to icon limitations with Button
236+ AbstractButton {
237+ id: sessionChooser
238+ objectName: "sessionChooserButton"
239+
240+ readonly property alias icon: badge.source
241+
242+ visible: LightDMService.sessions.count > 1 &&
243+ !LightDMService.users.data(userList.currentIndex, LightDMService.userRoles.LoggedInRole)
244+
245+ height: units.gu(3.5)
246+ width: units.gu(3.5)
247+
248+ anchors {
249+ right: highlightItem.right
250+ rightMargin: units.gu(2)
251+
252+ top: highlightItem.top
253+ topMargin: units.gu(1.5)
254+ }
255+
256+ Rectangle {
257+ id: badgeHighlight
258+
259+ anchors.fill: parent
260+ visible: parent.activeFocus
261+ color: "transparent"
262+ border.color: theme.palette.normal.focus
263+ border.width: units.dp(1)
264+ radius: 3
265+ }
266+
267+ Icon {
268+ id: badge
269+ anchors.fill: parent
270+ anchors.margins: units.dp(3)
271+ keyColor: "#ffffff" // icon providers give us white icons
272+ color: theme.palette.normal.raisedSecondaryText
273+ source: LightDMService.sessions.iconUrl(root.currentSession)
274+ }
275+
276+ KeyNavigation.tab: passwordInput
277+ Keys.onReturnPressed: {
278+ sessionChooserButtonClicked();
279+ event.accepted = true;
280+ }
281+
282+ onClicked: {
283+ sessionChooserButtonClicked();
284+ }
285+
286+ // Refresh the icon path if looking at different places at runtime
287+ // this is mainly for testing
288+ Connections {
289+ target: LightDMService.sessions
290+ onIconSearchDirectoriesChanged: {
291+ badge.source = LightDMService.sessions.iconUrl(root.currentSession)
292+ }
293+ }
294+ }
295+
240 FadingLabel {
296 FadingLabel {
241 id: infoLabel
297 id: infoLabel
242 objectName: "infoLabel"
298 objectName: "infoLabel"
qml/Greeter/NarrowView.qml+1
@@ -31,6 +31,7 @@ FocusScope {
31 property bool alphanumeric
31 property bool alphanumeric
32 property var userModel // unused
32 property var userModel // unused
33 property alias infographicModel: coverPage.infographicModel
33 property alias infographicModel: coverPage.infographicModel
34+ property string sessionToStart
34 property bool waiting
35 property bool waiting
35 readonly property bool fullyShown: coverPage.showProgress === 1 || lockscreen.shown
36 readonly property bool fullyShown: coverPage.showProgress === 1 || lockscreen.shown
36 readonly property bool required: coverPage.required || lockscreen.required
37 readonly property bool required: coverPage.required || lockscreen.required
qml/Greeter/SessionIcon.qmlnew file+47
@@ -0,0 +1,47 @@
1+/*
2+ * Copyright (C) 2016 Canonical, Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+import QtQuick 2.4
18+
19+Image {
20+ id: root
21+
22+ property color color
23+ readonly property string fragColorShader:
24+ "
25+ varying highp vec2 qt_TexCoord0;
26+ uniform sampler2D source;
27+ uniform lowp vec4 color;
28+ uniform lowp float qt_Opacity;
29+
30+ void main()
31+ {
32+ lowp vec4 sourceColor = texture2D(source, qt_TexCoord0);
33+ gl_FragColor = color * sourceColor.a * qt_Opacity;
34+ }
35+ "
36+
37+ fillMode: Image.PreserveAspectFit
38+ height: sourceSize.height
39+
40+ ShaderEffect {
41+ readonly property color color: root.color
42+ readonly property Image source: parent
43+
44+ height: source.height; width: source.width
45+ fragmentShader: fragColorShader
46+ }
47+}
qml/Greeter/SessionsList.qmlnew file+182
@@ -0,0 +1,182 @@
1+/*
2+ * Copyright (C) 2015 Canonical, Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+import QtQuick 2.4
18+import Ubuntu.Components 1.3
19+import Ubuntu.Components.ListItems 1.3
20+import "." 0.1
21+import "../Components"
22+
23+Item {
24+ id: root
25+ objectName: "sessionsList"
26+
27+ property string initiallySelectedSession
28+ signal sessionSelected(string sessionKey)
29+ signal showLoginList()
30+
31+ onInitiallySelectedSessionChanged: {
32+ sessionsList.currentIndex = getSelectedIndex();
33+ sessionsList.positionViewAtIndex(sessionsList.currentIndex, ListView.Contain);
34+ }
35+
36+ function getSelectedIndex() {
37+ for (var i = 0; i < sessionsList.model.count; i++) {
38+ var key = sessionsList.model.get(i).key
39+ if (key === initiallySelectedSession) {
40+ return i;
41+ }
42+ }
43+ }
44+
45+ function currentKey() {
46+ var session = LightDMService.sessions.data(
47+ sessionsList.currentIndex, LightDMService.sessionRoles.KeyRole)
48+ return session;
49+ }
50+
51+ Keys.onEnterPressed: {
52+ showLoginList(); // Session is already selected
53+ event.accepted = true;
54+ }
55+
56+ Keys.onReturnPressed: {
57+ showLoginList();
58+ event.accepted = true;
59+ }
60+
61+ Keys.onDownPressed: {
62+ if (sessionsList.currentIndex < sessionsList.model.count - 1)
63+ sessionsList.currentIndex++;
64+ sessionSelected(currentKey());
65+ event.accepted = true;
66+ }
67+
68+ Keys.onUpPressed: {
69+ if (sessionsList.currentIndex > 0)
70+ sessionsList.currentIndex--;
71+ sessionSelected(currentKey());
72+ event.accepted = true;
73+ }
74+
75+ LoginAreaContainer {
76+ readonly property real margins: sessionsList.anchors.margins
77+ readonly property real prefferedHeight: {
78+ if (sessionsList.currentItem) {
79+ return ((sessionsList.currentItem.height + margins) *
80+ sessionsList.model.count) + sessionsList.headerItem.height + 2 * margins
81+ } else {
82+ return sessionsList.headerItem.height + 2 * margins
83+ }
84+ }
85+
86+ height: prefferedHeight < parent.height ? prefferedHeight : parent.height - units.gu(4)
87+ width: parent.width
88+
89+ anchors {
90+ left: parent.left
91+ right: parent.right
92+ verticalCenter: parent.verticalCenter
93+ }
94+
95+ UbuntuListView {
96+ id: sessionsList
97+
98+ anchors {
99+ top: parent.top
100+ left: parent.left
101+ right: parent.right
102+ margins: units.gu(2)
103+ }
104+
105+ height: parent.height - headerItem.height
106+
107+ boundsBehavior: Flickable.StopAtBounds
108+
109+ model: LightDMService.sessions
110+ header: ListItemLayout {
111+ id: header
112+
113+ padding.leading: 0 // handled by parent's margins
114+
115+ title.color: theme.palette.normal.raisedText
116+ title.font.pixelSize: units.gu(2.1)
117+ title.text: i18n.tr("Select desktop environment")
118+
119+ Icon {
120+ id: icon
121+ width: units.gu(3)
122+ SlotsLayout.position: SlotsLayout.Leading
123+ name: "go-previous"
124+
125+ MouseArea {
126+ anchors.fill: parent
127+ onClicked: showLoginList()
128+ }
129+ }
130+ }
131+
132+ headerPositioning: ListView.OverlayHeader
133+ highlightFollowsCurrentItem: false
134+
135+ delegate: ListItem {
136+ id: delegate
137+ objectName: "sessionDelegate" + index
138+
139+ divider.visible: false
140+
141+ visible: y > sessionsList.headerItem.y
142+ + sessionsList.headerItem.height
143+ - sessionsList.anchors.margins
144+
145+ MouseArea {
146+ anchors.fill: parent
147+ onClicked: {
148+ sessionsList.currentIndex = index
149+ sessionSelected(key)
150+ showLoginList()
151+ }
152+ }
153+
154+ Rectangle {
155+ height: parent.height
156+ width: parent.width
157+ color: "transparent"
158+ border {
159+ color: theme.palette.normal.positionText
160+ width: units.gu(0.2)
161+ }
162+
163+ visible: index === sessionsList.currentIndex
164+ }
165+
166+ ListItemLayout {
167+ id: layout
168+
169+ SessionIcon {
170+ id: sessionIcon
171+ source: icon_url
172+ SlotsLayout.position: SlotsLayout.Leading
173+ color: theme.palette.normal.raisedSecondaryText
174+ }
175+
176+ title.text: display
177+ title.color: theme.palette.normal.raisedText
178+ }
179+ }
180+ }
181+ }
182+}
qml/Greeter/WideView.qml+102−39
@@ -16,25 +16,27 @@
16
16
17import QtQuick 2.4
17import QtQuick 2.4
18import Ubuntu.Components 1.3
18import Ubuntu.Components 1.3
19+import "." 0.1
19
20
20FocusScope {
21FocusScope {
21 id: root
22 id: root
22 focus: true
23 focus: true
23
24
25+ property alias background: coverPage.background
26+ property alias backgroundTopMargin: coverPage.backgroundTopMargin
24 property alias dragHandleLeftMargin: coverPage.dragHandleLeftMargin
27 property alias dragHandleLeftMargin: coverPage.dragHandleLeftMargin
28+ property alias infographicModel: coverPage.infographicModel
25 property alias launcherOffset: coverPage.launcherOffset
29 property alias launcherOffset: coverPage.launcherOffset
26 property alias currentIndex: loginList.currentIndex
30 property alias currentIndex: loginList.currentIndex
27 property int delayMinutes // TODO
31 property int delayMinutes // TODO
28− property alias backgroundTopMargin: coverPage.backgroundTopMargin
29− property alias background: coverPage.background
30− property bool locked
31 property alias alphanumeric: loginList.alphanumeric
32 property alias alphanumeric: loginList.alphanumeric
32− property alias userModel: loginList.model
33+ property alias locked: loginList.locked
33− property alias infographicModel: coverPage.infographicModel
34+ property alias sessionToStart: loginList.currentSession
34− property bool waiting
35+ property var userModel // Set from outside
36+
37+ readonly property bool animating: coverPage.showAnimation.running || coverPage.hideAnimation.running
35 readonly property bool fullyShown: coverPage.showProgress === 1
38 readonly property bool fullyShown: coverPage.showProgress === 1
36 readonly property bool required: coverPage.required
39 readonly property bool required: coverPage.required
37− readonly property bool animating: coverPage.showAnimation.running || coverPage.hideAnimation.running
38
40
39 // so that it can be replaced in tests with a mock object
41 // so that it can be replaced in tests with a mock object
40 property var inputMethod: Qt.inputMethod
42 property var inputMethod: Qt.inputMethod
@@ -44,38 +46,22 @@ FocusScope {
44 signal tease()
46 signal tease()
45 signal emergencyCall() // unused
47 signal emergencyCall() // unused
46
48
47− function showMessage(html) {
48− loginList.showMessage(html);
49− }
50−
51− function showPrompt(text, isSecret, isDefaultPrompt) {
52− loginList.showPrompt(text, isSecret, isDefaultPrompt);
53− }
54−
55− function showLastChance() {
56− // TODO
57− }
58−
59− function hide() {
60− coverPage.hide();
61− }
62−
63− function notifyAuthenticationSucceeded(showFakePassword) {
64− // Nothing needed
65− }
66−
67 function notifyAuthenticationFailed() {
49 function notifyAuthenticationFailed() {
68 loginList.showError();
50 loginList.showError();
69 }
51 }
70
52
71− function showErrorMessage(msg) {
72− coverPage.showErrorMessage(msg);
73− }
74−
75 function reset() {
53 function reset() {
76 loginList.reset();
54 loginList.reset();
77 }
55 }
78
56
57+ function showMessage(html) {
58+ loginList.showMessage(html);
59+ }
60+
61+ function showPrompt(text, isSecret, isDefaultPrompt) {
62+ loginList.showPrompt(text, isSecret, isDefaultPrompt);
63+ }
64+
79 function tryToUnlock(toTheRight) {
65 function tryToUnlock(toTheRight) {
80 if (root.locked) {
66 if (root.locked) {
81 coverPage.show();
67 coverPage.show();
@@ -92,6 +78,18 @@ FocusScope {
92 }
78 }
93 }
79 }
94
80
81+ function hide() {
82+ coverPage.hide();
83+ }
84+
85+ function notifyAuthenticationSucceeded() {
86+ // Nothing needed
87+ }
88+
89+ function showLastChance() {
90+ // TODO
91+ }
92+
95 Rectangle {
93 Rectangle {
96 anchors.fill: parent
94 anchors.fill: parent
97 color: "black"
95 color: "black"
@@ -104,6 +102,7 @@ FocusScope {
104 height: parent.height
102 height: parent.height
105 width: parent.width
103 width: parent.width
106 draggable: !root.locked && !root.waiting
104 draggable: !root.locked && !root.waiting
105+ state: "LoginList"
107
106
108 infographics {
107 infographics {
109 height: 0.75 * parent.height
108 height: 0.75 * parent.height
@@ -122,21 +121,85 @@ FocusScope {
122 id: loginList
121 id: loginList
123 objectName: "loginList"
122 objectName: "loginList"
124
123
124+ height: inputMethod && inputMethod.visible ?
125+ parent.height - inputMethod.keyboardRectangle.height : parent.height
126+ width: units.gu(40)
125 anchors {
127 anchors {
126 left: parent.left
128 left: parent.left
127 leftMargin: Math.min(parent.width * 0.16, units.gu(20))
129 leftMargin: Math.min(parent.width * 0.16, units.gu(20))
128 top: parent.top
130 top: parent.top
129 }
131 }
130− width: units.gu(40)
131− height: inputMethod && inputMethod.visible ? parent.height - inputMethod.keyboardRectangle.height
132− : parent.height
133− Behavior on height { UbuntuNumberAnimation {} }
134−
135− locked: root.locked
136− waiting: root.waiting
137
132
138− onSelected: root.selected(index)
133+ model: root.userModel
134+ currentSession: LightDMService.greeter.defaultSession
139 onResponded: root.responded(response)
135 onResponded: root.responded(response)
136+ onSelected: root.selected(index)
137+ onSessionChooserButtonClicked: parent.state = "SessionsList"
138+
139+ Keys.forwardTo: [sessionChooserLoader.item]
140 }
140 }
141+
142+ Loader {
143+ id: sessionChooserLoader
144+
145+ height: loginList.height
146+ width: loginList.width
147+ anchors {
148+ left: parent.left
149+ leftMargin: Math.min(parent.width * 0.16, units.gu(20))
150+ top: parent.top
151+ }
152+
153+ active: false
154+
155+ onLoaded: sessionChooserLoader.item.forceActiveFocus();
156+ Binding {
157+ target: sessionChooserLoader.item
158+ property: "initiallySelectedSession"
159+ value: loginList.currentSession
160+ }
161+
162+ Connections {
163+ target: sessionChooserLoader.item
164+ onSessionSelected: loginList.currentSession = sessionKey
165+ onShowLoginList: {
166+ coverPage.state = "LoginList"
167+ loginList.passwordInput.forceActiveFocus();
168+ }
169+ ignoreUnknownSignals: true
170+ }
171+ }
172+
173+ states: [
174+ State {
175+ name: "SessionsList"
176+ PropertyChanges { target: loginList; opacity: 0 }
177+ PropertyChanges { target: sessionChooserLoader;
178+ active: true;
179+ opacity: 1
180+ source: "SessionsList.qml"
181+ }
182+ },
183+
184+ State {
185+ name: "LoginList"
186+ PropertyChanges { target: loginList; opacity: 1 }
187+ PropertyChanges { target: sessionChooserLoader;
188+ active: false;
189+ opacity: 0
190+ source: "";
191+ }
192+ }
193+ ]
194+
195+ transitions: [
196+ Transition {
197+ from: "*"
198+ to: "*"
199+ UbuntuNumberAnimation {
200+ property: "opacity";
201+ }
202+ }
203+ ]
141 }
204 }
142}
205}
qml/Greeter/graphics/session_icons/gnome_badge.pngnew file

Binary file not shown.

qml/Greeter/graphics/session_icons/kde_badge.pngnew file

Binary file not shown.

qml/Greeter/graphics/session_icons/recovery_console_badge.pngnew file

Binary file not shown.

qml/Greeter/graphics/session_icons/ubuntu_badge.pngnew file

Binary file not shown.

qml/Greeter/graphics/session_icons/unknown_badge.pngnew file

Binary file not shown.

tests/mocks/LightDM/IntegratedLightDM/MockSessionsModel.cpp+29
@@ -18,6 +18,23 @@
18#include "MockSessionsModel.h"
18#include "MockSessionsModel.h"
19#include <QLightDM/SessionsModel>
19#include <QLightDM/SessionsModel>
20
20
21+
22+int MockSessionsModel::numSessions() const
23+{
24+ QLightDM::SessionsModel* qSessionsModel =
25+ static_cast<QLightDM::SessionsModel*>(sourceModel());
26+
27+ return qSessionsModel->numSessions();
28+}
29+
30+int MockSessionsModel::numAvailableSessions() const
31+{
32+ QLightDM::SessionsModel* qSessionsModel =
33+ static_cast<QLightDM::SessionsModel*>(sourceModel());
34+
35+ return qSessionsModel->numAvailableSessions();
36+}
37+
21QString MockSessionsModel::testScenario() const
38QString MockSessionsModel::testScenario() const
22{
39{
23 QLightDM::SessionsModel* qSessionsModel =
40 QLightDM::SessionsModel* qSessionsModel =
@@ -26,6 +43,17 @@ QString MockSessionsModel::testScenario() const
26 return qSessionsModel->testScenario();
43 return qSessionsModel->testScenario();
27}
44}
28
45
46+void MockSessionsModel::setNumSessions(const int numSessions)
47+{
48+ QLightDM::SessionsModel* qSessionsModel =
49+ static_cast<QLightDM::SessionsModel*>(sourceModel());
50+
51+ if (qSessionsModel->numSessions() != numSessions) {
52+ qSessionsModel->setNumSessions(numSessions);
53+ Q_EMIT numSessionsChanged();
54+ }
55+}
56+
29void MockSessionsModel::setTestScenario(const QString testScenario)
57void MockSessionsModel::setTestScenario(const QString testScenario)
30{
58{
31 QLightDM::SessionsModel* qSessionsModel =
59 QLightDM::SessionsModel* qSessionsModel =
@@ -33,5 +61,6 @@ void MockSessionsModel::setTestScenario(const QString testScenario)
33
61
34 if (qSessionsModel->testScenario() != testScenario) {
62 if (qSessionsModel->testScenario() != testScenario) {
35 qSessionsModel->setTestScenario(testScenario);
63 qSessionsModel->setTestScenario(testScenario);
64+ Q_EMIT testScenarioChanged();
36 }
65 }
37}
66}
tests/mocks/LightDM/IntegratedLightDM/MockSessionsModel.h+12−2
@@ -24,11 +24,21 @@ class MockSessionsModel : public SessionsModel
24{
24{
25 Q_OBJECT
25 Q_OBJECT
26
26
27+ Q_PROPERTY(int numAvailableSessions READ numAvailableSessions CONSTANT)
28+ Q_PROPERTY(int numSessions READ numSessions WRITE setNumSessions NOTIFY numSessionsChanged)
27− Q_PROPERTY(QString testScenario READ testScenario WRITE setTestScenario)
29+ Q_PROPERTY(QString testScenario READ testScenario WRITE setTestScenario NOTIFY testScenarioChanged)
28
30
29public:
31public:
32+ int numAvailableSessions() const;
33+ int numSessions() const;
30 QString testScenario() const;
34 QString testScenario() const;
35+ void setNumSessions(const int numSessions);
31− void setTestScenario(QString testScenario);
36+ void setTestScenario(const QString testScenario);
37+
38+Q_SIGNALS:
39+ void numSessionsChanged();
40+ void testScenarioChanged();
41+
32};
42};
33
43
34#endif // MOCK_UNITY_SESSIONSMODEL_H
44#endif // MOCK_UNITY_SESSIONSMODEL_H
tests/mocks/LightDM/IntegratedLightDM/liblightdm/Greeter.cpp−5
@@ -69,11 +69,6 @@ bool Greeter::showRemoteLoginHint() const
69 return true;
69 return true;
70}
70}
71
71
72−bool Greeter::lockHint () const
73−{
74− return false;
75−}
76−
77QString Greeter::selectUserHint() const
72QString Greeter::selectUserHint() const
78{
73{
79 Q_D(const Greeter);
74 Q_D(const Greeter);
tests/mocks/LightDM/IntegratedLightDM/liblightdm/Greeter.h−2
@@ -41,7 +41,6 @@ class Q_DECL_EXPORT Greeter : public QObject
41
41
42 Q_PROPERTY(QString hostname READ hostname CONSTANT)
42 Q_PROPERTY(QString hostname READ hostname CONSTANT)
43 Q_PROPERTY(bool hasGuestAccount READ hasGuestAccountHint CONSTANT)
43 Q_PROPERTY(bool hasGuestAccount READ hasGuestAccountHint CONSTANT)
44− Q_PROPERTY(bool locked READ lockHint CONSTANT)
45
44
46 Q_ENUMS(PromptType MessageType)
45 Q_ENUMS(PromptType MessageType)
47
46
@@ -67,7 +66,6 @@ public:
67 bool hideUsersHint() const;
66 bool hideUsersHint() const;
68 bool showManualLoginHint() const;
67 bool showManualLoginHint() const;
69 bool showRemoteLoginHint() const;
68 bool showRemoteLoginHint() const;
70− bool lockHint () const;
71 bool hasGuestAccountHint() const;
69 bool hasGuestAccountHint() const;
72 QString selectUserHint() const;
70 QString selectUserHint() const;
73 void setSelectUserHint(const QString &selectUserHint); // only in mock
71 void setSelectUserHint(const QString &selectUserHint); // only in mock
tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModel.cpp+22
@@ -80,12 +80,34 @@ int SessionsModel::rowCount(const QModelIndex& parent) const
80 }
80 }
81}
81}
82
82
83+int SessionsModel::numSessions() const
84+{
85+ Q_D(const SessionsModel);
86+ return d->numSessions;
87+}
88+
89+int SessionsModel::numAvailableSessions() const
90+{
91+ Q_D(const SessionsModel);
92+ return d->numAvailableSessions();
93+}
94+
83QString SessionsModel::testScenario() const
95QString SessionsModel::testScenario() const
84{
96{
85 Q_D(const SessionsModel);
97 Q_D(const SessionsModel);
86 return d->testScenario;
98 return d->testScenario;
87}
99}
88
100
101+void SessionsModel::setNumSessions(int numSessions)
102+{
103+ Q_D(SessionsModel);
104+
105+ if (d->numSessions != numSessions) {
106+ d->numSessions = numSessions;
107+ d->resetEntries();
108+ }
109+}
110+
89void SessionsModel::setTestScenario(QString testScenario)
111void SessionsModel::setTestScenario(QString testScenario)
90{
112{
91 Q_D(SessionsModel);
113 Q_D(SessionsModel);
tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModel.h+3−3
@@ -31,9 +31,6 @@ class Q_DECL_EXPORT SessionsModel : public QAbstractListModel
31
31
32 Q_ENUMS(SessionModelRoles SessionType)
32 Q_ENUMS(SessionModelRoles SessionType)
33
33
34− // Mock-only API for testing purposes
35− Q_PROPERTY(QString testScenario READ testScenario WRITE setTestScenario)
36−
37 public:
34 public:
38
35
39 enum SessionModelRoles {
36 enum SessionModelRoles {
@@ -57,7 +54,10 @@ class Q_DECL_EXPORT SessionsModel : public QAbstractListModel
57 int rowCount(const QModelIndex& parent) const override;
54 int rowCount(const QModelIndex& parent) const override;
58 QVariant data(const QModelIndex& index, int role) const override;
55 QVariant data(const QModelIndex& index, int role) const override;
59
56
57+ int numSessions() const;
58+ int numAvailableSessions() const;
60 QString testScenario() const;
59 QString testScenario() const;
60+ void setNumSessions(int numSessions);
61 void setTestScenario(QString testScenario);
61 void setTestScenario(QString testScenario);
62
62
63 protected:
63 protected:
tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.cpp+27−17
@@ -16,24 +16,44 @@
16
16
17#include "SessionsModel.h"
17#include "SessionsModel.h"
18#include "SessionsModelPrivate.h"
18#include "SessionsModelPrivate.h"
19−
19+#include <QDebug>
20namespace QLightDM
20namespace QLightDM
21{
21{
22
22
23SessionsModelPrivate::SessionsModelPrivate(SessionsModel* parent)
23SessionsModelPrivate::SessionsModelPrivate(SessionsModel* parent)
24 : testScenario("singleSession")
24 : testScenario("singleSession")
25+ , m_availableSessions(
26+ {
27+ {"ubuntu", "", "Ubuntu", ""},
28+ {"ubuntu-2d", "", "Ubuntu 2D", ""},
29+ {"gnome", "", "GNOME", ""},
30+ {"gnome-classic", "", "GNOME Classic", ""},
31+ {"gnome-flashback-compiz", "", "GNOME Flashback (Compiz)", ""},
32+ {"gnome-flashback-metacity", "", "GNOME Flashback (Metacity)", ""},
33+ {"gnome-wayland", "", "GNOME on Wayland", ""},
34+ {"plasma", "", "Plasma", ""},
35+ {"kde", "", "KDE" , ""},
36+ {"xterm", "", "Recovery Console", ""},
37+ {"", "", "Unknown?", ""}
38+ })
25 , q_ptr(parent)
39 , q_ptr(parent)
26{
40{
41+ numSessions = numAvailableSessions();
27 resetEntries();
42 resetEntries();
28}
43}
29
44
45+int SessionsModelPrivate::numAvailableSessions() const
46+{
47+ return m_availableSessions.length();
48+}
49+
30void SessionsModelPrivate::resetEntries()
50void SessionsModelPrivate::resetEntries()
31{
51{
32 Q_Q(SessionsModel);
52 Q_Q(SessionsModel);
33
53
34 q->beginResetModel();
54 q->beginResetModel();
35 if (testScenario == "multipleSessions") {
55 if (testScenario == "multipleSessions") {
36− resetEntries_multipleSessions();
56+ resetEntries_multipleSessions(numSessions);
37 } else if (testScenario == "noSessions") {
57 } else if (testScenario == "noSessions") {
38 resetEntries_noSessions();
58 resetEntries_noSessions();
39 } else {
59 } else {
@@ -42,22 +62,12 @@ void SessionsModelPrivate::resetEntries()
42 q->endResetModel();
62 q->endResetModel();
43}
63}
44
64
45−void SessionsModelPrivate::resetEntries_multipleSessions()
65+void SessionsModelPrivate::resetEntries_multipleSessions(int numSessions)
46{
66{
47− sessionItems =
67+ sessionItems.clear();
48− {
68+ for (int i = 0; i < numSessions; i++) {
49− {"ubuntu", "", "Ubuntu", ""},
69+ sessionItems.append(m_availableSessions.value(i));
50− {"ubuntu-2d", "", "Ubuntu 2D", ""},
70+ }
51− {"gnome", "", "GNOME", ""},
52− {"gnome-classic", "", "GNOME Classic", ""},
53− {"gnome-flashback-compiz", "", "GNOME Flashback (Compiz)", ""},
54− {"gnome-flashback-metacity", "", "GNOME Flashback (Metacity)", ""},
55− {"gnome-wayland", "", "GNOME on Wayland", ""},
56− {"plasma", "", "Plasma", ""},
57− {"kde", "", "KDE" , ""},
58− {"xterm", "", "Recovery Console", ""},
59− {"", "", "Unknown?", ""}
60− };
61}
71}
62
72
63void SessionsModelPrivate::resetEntries_noSessions()
73void SessionsModelPrivate::resetEntries_noSessions()
tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.h+5−1
@@ -40,7 +40,10 @@ public:
40 explicit SessionsModelPrivate(SessionsModel* parent=0);
40 explicit SessionsModelPrivate(SessionsModel* parent=0);
41 virtual ~SessionsModelPrivate() = default;
41 virtual ~SessionsModelPrivate() = default;
42
42
43+ int numAvailableSessions() const;
44+
43 QList<SessionItem> sessionItems;
45 QList<SessionItem> sessionItems;
46+ int numSessions;
44 QString testScenario;
47 QString testScenario;
45
48
46 void resetEntries();
49 void resetEntries();
@@ -48,7 +51,8 @@ protected:
48 SessionsModel* const q_ptr;
51 SessionsModel* const q_ptr;
49
52
50private:
53private:
54+ const QList<SessionItem> m_availableSessions;
51− void resetEntries_multipleSessions();
55+ void resetEntries_multipleSessions(int numSessions);
52 void resetEntries_noSessions();
56 void resetEntries_noSessions();
53 void resetEntries_singleSession();
57 void resetEntries_singleSession();
54 Q_DECLARE_PUBLIC(SessionsModel)
58 Q_DECLARE_PUBLIC(SessionsModel)
tests/mocks/LightDM/IntegratedLightDM/plugin.cpp+1−1
@@ -72,7 +72,7 @@ void LightDMPlugin::registerTypes(const char *uri)
72 qRegisterMetaType<QLightDM::Greeter::PromptType>("QLightDM::Greeter::PromptType");
72 qRegisterMetaType<QLightDM::Greeter::PromptType>("QLightDM::Greeter::PromptType");
73 qmlRegisterSingletonType<MockGreeter>(uri, 0, 1, "Greeter", greeter_provider);
73 qmlRegisterSingletonType<MockGreeter>(uri, 0, 1, "Greeter", greeter_provider);
74 qmlRegisterSingletonType<MockSessionsModel>(uri, 0, 1, "Sessions", sessions_provider);
74 qmlRegisterSingletonType<MockSessionsModel>(uri, 0, 1, "Sessions", sessions_provider);
75− qmlRegisterUncreatableType<SessionsModel>(uri, 0, 1, "SessionRoles", "Type is not instantiable");
75+ qmlRegisterUncreatableType<QLightDM::SessionsModel>(uri, 0, 1, "SessionRoles", "Type is not instantiable");
76 qmlRegisterSingletonType<MockUsersModel>(uri, 0, 1, "Users", users_provider);
76 qmlRegisterSingletonType<MockUsersModel>(uri, 0, 1, "Users", users_provider);
77 qmlRegisterUncreatableType<QLightDM::UsersModel>(uri, 0, 1, "UserRoles", "Type is not instantiable");
77 qmlRegisterUncreatableType<QLightDM::UsersModel>(uri, 0, 1, "UserRoles", "Type is not instantiable");
78 qmlRegisterSingletonType<UserMetricsOutput::UserMetrics>(uri, 0, 1, "Infographic", infographic_provider);
78 qmlRegisterSingletonType<UserMetricsOutput::UserMetrics>(uri, 0, 1, "Infographic", infographic_provider);
tests/plugins/LightDM/IntegratedLightDM/sessionsmodel.cpp+32
@@ -59,6 +59,38 @@ private Q_SLOTS:
59 }
59 }
60 }
60 }
61
61
62+ void testIconLookupLogic()
63+ {
64+ const QString data[][2] = {
65+ //{SESSION KEY, ICON NAME}
66+ {"gnome-classic", "gnome_badge.png"},
67+ {"gnome-flashback-compiz", "gnome_badge.png"},
68+ {"gnome-flashback-metacity", "gnome_badge.png"},
69+ {"gnome-shell", "gnome_badge.png"},
70+ {"gnome-wayland", "gnome_badge.png"},
71+ {"gnome", "gnome_badge.png"},
72+ {"kde", "kde_badge.png"},
73+ {"plasma", "kde_badge.png"},
74+ {"recovery_console", "recovery_console_badge.png"},
75+ {"ubuntu","ubuntu_badge.png"},
76+ {"ubuntu-2d", "ubuntu_badge.png"},
77+ {"xterm", "recovery_console_badge.png"},
78+ {"made up session", "unknown_badge.png"},
79+ {"", "unknown_badge.png"}
80+ };
81+
82+ const short length = sizeof(data) / sizeof(data[0]);
83+ for (int i = 0; i < length; i++) {
84+ std::string key = data[i][0].toStdString();
85+ std::string icon = data[i][1].toStdString();
86+ std::string url = model->iconUrl(data[i][0]).toString().toStdString();
87+ std::string errorMessage = "Session icon url for " + key +
88+ " should contain " + icon + " but " + url + " was returned";
89+ QVERIFY2(model->iconUrl(data[i][0]).toString().contains(data[i][1]),
90+ errorMessage.c_str());
91+ }
92+ }
93+
62 void testMultipleSessionsCountIsCorrect()
94 void testMultipleSessionsCountIsCorrect()
63 {
95 {
64 sourceModel->setTestScenario("multipleSessions");
96 sourceModel->setTestScenario("multipleSessions");
tests/qmltests/Greeter/tst_WideView.qml+118−2
@@ -24,6 +24,7 @@ import Unity.Test 0.1 as UT
24
24
25StyledItem {
25StyledItem {
26 id: root
26 id: root
27+
27 width: units.gu(120)
28 width: units.gu(120)
28 height: units.gu(80)
29 height: units.gu(80)
29 focus: true
30 focus: true
@@ -111,11 +112,9 @@ StyledItem {
111 color: theme.palette.normal.background
112 color: theme.palette.normal.background
112 width: units.gu(40)
113 width: units.gu(40)
113 height: parent.height
114 height: parent.height
114−
115 Column {
115 Column {
116 anchors { left: parent.left; right: parent.right; top: parent.top; margins: units.gu(1) }
116 anchors { left: parent.left; right: parent.right; top: parent.top; margins: units.gu(1) }
117 spacing: units.gu(1)
117 spacing: units.gu(1)
118−
119 Row {
118 Row {
120 Button {
119 Button {
121 text: "Show Last Chance"
120 text: "Show Last Chance"
@@ -266,6 +265,51 @@ StyledItem {
266 text: "emergency: " + emergencySpy.count
265 text: "emergency: " + emergencySpy.count
267 }
266 }
268 }
267 }
268+ Row {
269+ id: multipleSessions
270+ CheckBox {
271+ id: multipleSessionsCheckbox
272+ onClicked: {
273+ if (checked) {
274+ LightDM.Sessions.testScenario = "multipleSessions"
275+ } else {
276+ LightDM.Sessions.testScenario = "singleSession"
277+ }
278+ }
279+ Connections {
280+ target: LightDM.Sessions
281+ onTestScenarioChanged: {
282+ if (LightDM.Sessions.testScenario === "multipleSessions") {
283+ multipleSessionsCheckbox.checked = true;
284+ } else {
285+ multipleSessionsCheckbox.checked = false;
286+ }
287+ }
288+ }
289+ }
290+ Label {
291+ text: "Multiple Sessions"
292+ }
293+ }
294+ Row {
295+ Slider {
296+ id: numSessionsSlider
297+
298+ width: units.gu(10)
299+ minimumValue: 0
300+ maximumValue: LightDM.Sessions.numAvailableSessions
301+ value: LightDM.Sessions.numSessions
302+ visible: LightDM.Sessions.testScenario === "multipleSessions"
303+ Binding {
304+ target: LightDM.Sessions
305+ property: "numSessions"
306+ value: numSessionsSlider.value
307+ }
308+ }
309+ Label {
310+ text: "Available Sessions"
311+ }
312+ }
269 Row {
313 Row {
270 Button {
314 Button {
271 text: "Reload View"
315 text: "Reload View"
@@ -316,6 +360,7 @@ StyledItem {
316 when: windowShown
360 when: windowShown
317
361
318 property Item view: loader.status === Loader.Ready ? loader.item : null
362 property Item view: loader.status === Loader.Ready ? loader.item : null
363+ property url testIconDirectory: Qt.resolvedUrl("../../../qml/Greeter/graphics/session_icons")
319
364
320 function init() {
365 function init() {
321 selectIndex(0); // break binding with text field
366 selectIndex(0); // break binding with text field
@@ -323,6 +368,7 @@ StyledItem {
323 respondedSpy.clear();
368 respondedSpy.clear();
324 teaseSpy.clear();
369 teaseSpy.clear();
325 emergencySpy.clear();
370 emergencySpy.clear();
371+ LightDM.Sessions.testScenario = "multipleSessions"
326 }
372 }
327
373
328 function cleanup() {
374 function cleanup() {
@@ -378,6 +424,76 @@ StyledItem {
378 {tag: "right", x: view.width, offset: 0, count: 1, locked: false},
424 {tag: "right", x: view.width, offset: 0, count: 1, locked: false},
379 ]
425 ]
380 }
426 }
427+
428+ function test_sessionIconsAreValid() {
429+ LightDM.Sessions.testScenario = "multipleSessions"
430+ var originalDirectories = LightDM.Sessions.iconSearchDirectories
431+ LightDM.Sessions.iconSearchDirectories = [testIconDirectory]
432+
433+ // Test the login list icon is valid
434+ var sessionChooserButton = findChild(view, "sessionChooserButton");
435+ compare(sessionChooserButton.visible, true);
436+
437+ var session = String(view.sessionToStart).toLowerCase();
438+ var icon = String(sessionChooserButton.icon);
439+ compare(icon.indexOf(session) > -1, true);
440+
441+ // Test the session list icons are valid
442+ var coverPage = findChild(view, "coverPage");
443+ coverPage.state = "SessionsList"
444+ var sessionsList = findChild(view, "sessionsList");
445+ tryCompare(sessionsList, "visible", true);
446+ }
447+
448+ function test_choosingNewSessionChangesLoginListIcon() {
449+ // Ensure the default session is selected (Ubuntu)
450+ loader.active = false;
451+ loader.active = true;
452+
453+ LightDM.Sessions.testScenario = "multipleSessions";
454+ var sessionChooserButton = findChild(view, "sessionChooserButton");
455+ var icon = String(sessionChooserButton.icon);
456+ compare(icon.indexOf("ubuntu") > -1, true);
457+
458+ tap(sessionChooserButton)
459+ for(var i = 0; i < LightDM.Sessions.count; i++) {
460+ var delegateName = "sessionDelegate" + String(i);
461+ var currentDelegate = findChild(view, delegateName);
462+ var sessionKey = LightDM.Sessions.data(i,LightDM.SessionRoles.KeyRole);
463+ if (sessionKey === "gnome-classic") {
464+ tap(currentDelegate);
465+ var sessionChooserButton = findChild(view, "sessionChooserButton");
466+ waitForRendering(sessionChooserButton);
467+ var icon = String(sessionChooserButton.icon);
468+ break;
469+ }
470+ }
471+
472+ compare(icon.indexOf("gnome") > -1, true,
473+ "Expected icon to contain gnome but it was " + icon);
474+ }
475+
476+ function test_noSessionsDoesntBreakView() {
477+ LightDM.Sessions.testScenario = "noSessions"
478+ compare(LightDM.Sessions.count, 0)
479+ }
480+
481+ function test_sessionIconNotShownWithOneSession() {
482+ LightDM.Sessions.testScenario = "singleSession"
483+ compare(LightDM.Sessions.count, 1);
484+
485+ var sessionChooserButton = findChild(view, "sessionChooserButton");
486+ tryCompare(sessionChooserButton, "visible", false);
487+ }
488+
489+ function test_sessionIconShownWithMultipleSessions() {
490+ LightDM.Sessions.testScenario = "multipleSessions"
491+ compare(LightDM.Sessions.count > 1, true);
492+
493+ var sessionChooserButton = findChild(view, "sessionChooserButton");
494+ tryCompare(sessionChooserButton, "visible", true);
495+ }
496+
381 function test_tease(data) {
497 function test_tease(data) {
382 view.locked = data.locked;
498 view.locked = data.locked;
383 view.dragHandleLeftMargin = data.offset;
499 view.dragHandleLeftMargin = data.offset;