git.iko.soy/unity8
on xenial help sign in
Move login function to Greeter
commit7f18c1dd6ad3345ac0a212a06edc2b5d83c2097c authorMichael Terry <michael.terry@canonical.com> dateFri 28 Nov 2014, 09:44 (12 years ago) parent06abbb0
2 files changed+15−13
compare with xenial
unifiedsplit
qml/Greeter/Greeter.qml+9 qml/Shell.qml+6−13
qml/Greeter/Greeter.qml+9
@@ -49,6 +49,7 @@ Showable {
4949 signal selected(int uid)
5050 signal unlocked(int uid)
5151 signal tease()
52+ signal sessionStarted()
5253
5354 function hideRight() {
5455 if (shown) {
@@ -69,6 +70,14 @@ Showable {
6970 }
7071 }
7172
73+ function login() {
74+ enabled = false;
75+ if (LightDM.Greeter.startSessionSync()) {
76+ sessionStarted();
77+ }
78+ enabled = true;
79+ }
80+
7281 onRequiredChanged: {
7382 // Reset hide animation to default once we're finished with it
7483 if (required) {
qml/Shell.qml+6−13
@@ -534,8 +534,6 @@ Item {
534534 id: greeter
535535 objectName: "greeter"
536536
537− signal sessionStarted() // helpful for tests
538−
539537 property string lockedApp: ""
540538 property bool hasLockedApp: lockedApp !== ""
541539
@@ -553,6 +551,12 @@ Item {
553551
554552 dragHandleWidth: shell.edgeSize
555553
554+ onSessionStarted: {
555+ hide();
556+ lockscreen.hide();
557+ launcher.hide();
558+ }
559+
556560 function startUnlock() {
557561 if (narrowMode) {
558562 if (!LightDM.Greeter.authenticated) {
@@ -565,17 +569,6 @@ Item {
565569 }
566570 }
567571
568− function login() {
569− enabled = false;
570− if (LightDM.Greeter.startSessionSync()) {
571− sessionStarted();
572− greeter.hide();
573− lockscreen.hide();
574− launcher.hide();
575− }
576− enabled = true;
577− }
578−
579572 onShownChanged: {
580573 if (shown) {
581574 // Disable everything so that user can't swipe greeter or