git.iko.soy/unity8
on xenial help sign in
[CHECKPOINT COMMIT] add button to enable multiple sessions
commitc4f95c4d41d6afa139b6640eec793e0327c3e883 authorJosh Arenson <joshua.arenson@canonical.com> dateFri 20 Nov 2015, 16:58 (11 years ago) parentc376512
3 files changed+55−7
compare with xenial
unifiedsplit
qml/Greeter/LoginList.qml+1−1 qml/Greeter/SessionsList.qml+9 tests/qmltests/Greeter/tst_WideView.qml+45−6
qml/Greeter/LoginList.qml+1−1
@@ -109,7 +109,7 @@ Item {
109109 id: sessionChooser
110110 objectName: "sessionChooserButton"
111111
112− readonly property alias imageSource: badge.source
112+ readonly property alias icon: badge.source
113113
114114 visible: LightDMService.sessions.count > 1
115115
qml/Greeter/SessionsList.qml+9
@@ -37,6 +37,8 @@ Item {
3737
3838 ItemSelector {
3939 id: sessionsList
40+ objectName: "sessionsList"
41+
4042 property color originalBackground
4143 anchors.centerIn: parent
4244 width: parent.width - units.gu(1)
@@ -45,9 +47,16 @@ Item {
4547
4648 model: LightDMService.sessions
4749 delegate: OptionSelectorDelegate {
50+ objectName: "sessionDelegate" + index
4851 iconSource: icon_url
4952 text: display
5053 selected: display.toLowerCase() === initiallySelectedSession.toLowerCase()
54+ Component.onCompleted: {
55+ console.log("ADDED A SESSION DELEGATE: " + display)
56+ if (text === "Plasma") {
57+ console.log("PLASMA PLASMA PLASMA PLASMA!!!!!")
58+ }
59+ }
5160 }
5261
5362 Component.onCompleted: {
tests/qmltests/Greeter/tst_WideView.qml+45−6
@@ -110,7 +110,6 @@ Item {
110110 Column {
111111 anchors { left: parent.left; right: parent.right; top: parent.top; margins: units.gu(1) }
112112 spacing: units.gu(1)
113−
114113 Row {
115114 Button {
116115 text: "Show Last Chance"
@@ -261,6 +260,21 @@ Item {
261260 text: "emergency: " + emergencySpy.count
262261 }
263262 }
263+ Row {
264+ CheckBox {
265+ id: multipleSessions
266+ onClicked: {
267+ if (checked) {
268+ LightDM.Sessions.testScenario = "multipleSessions"
269+ } else {
270+ LightDM.Sessions.testScenario = "singleSession"
271+ }
272+ }
273+ }
274+ Label {
275+ text: "Multiple sessions"
276+ }
277+ }
264278 Row {
265279 Button {
266280 text: "Reload View"
@@ -377,16 +391,41 @@ Item {
377391 }
378392
379393 function test_sessionIconsAreValid() {
394+ /*LightDM.Sessions.testScenario = "multipleSessions"
380395 var originalDirectories = LightDM.Sessions.iconSearchDirectories
381− var sessionChooserButton = findChild(view, "sessionChooserButton")
382− LightDM.Sessions.testScenario = "multipleSessions"
383− console.log("FIRST JOSH: " + sessionChooserButton.imageSource)
384396 LightDM.Sessions.iconSearchDirectories = [testIconDirectory]
385397
398+ // Test the login list icon is valid
386399 var sessionChooserButton = findChild(view, "sessionChooserButton")
387400 compare(sessionChooserButton.visible, true)
388− console.log("JOSH: " + sessionChooserButton.imageSource)
389− compare(true, false)
401+
402+ var session = String(view.sessionToStart).toLowerCase()
403+ var icon = String(sessionChooserButton.icon)
404+ compare(icon.indexOf(session) > -1, true)*/
405+ // Test the session list icons are valid
406+ //mouseClick(sessionChooserButton)
407+ //view.loginListShown = false
408+ view.testThing = false
409+ sleep(50000)
410+ console.log("\n\n\n\n\n\n\n\n\n\n\n\n\n")
411+ loader.active = false
412+ loader.active = true
413+ view.loginListShown = false
414+ var sessionList = findChild(view, "sessionsList");
415+ compare(sessionList.expanded, true)
416+ compare(sessionList.visible, true)
417+
418+
419+ //compare(true, false)
420+
421+/* for (var i = 0; i < LightDM.Sessions.count; i++) {
422+ var delegateName = "sessionDelegate" + String(i);
423+ var currentDelegate = findChild(view, delegateName)
424+ var session = String(currentDelegate.text).toLowerCase()
425+ console.log("\n\n SESSION NAME: " + session)
426+ var icon = String(currentDelegate.iconSource)
427+ compare(icon.indexOf(session) > -1, true)
428+ } */
390429 }
391430
392431 function test_noSessionsDoesntBreakView() {