on xenial help sign in
Refactor TheLightDM to LightDMService
commit9f485d57b302db3b5c3856da4e4f73959a0a43cc authorJosh Arenson <joshua.arenson@canonical.com> dateMon 19 Oct 2015, 17:59 (11 years ago) parent22bbd68
5 files changed+30−30
qml/Components/Dialogs.qml+3−3 qml/Greeter/Greeter.qml+23−23 qml/Greeter/TheLightDM.qml → qml/Greeter/LightDMService.qml qml/Greeter/qmldir+1−1 qml/Shell.qml+3−3
qml/Components/Dialogs.qml+3−3
@@ -78,12 +78,12 @@ Item {
7878
7979 GlobalShortcut { // lock screen
8080 shortcut: Qt.Key_ScreenSaver
81− onTriggered: TheLightDM.greeter.showGreeter()
81+ onTriggered: LightDMService.greeter.showGreeter()
8282 }
8383
8484 GlobalShortcut { // lock screen
8585 shortcut: Qt.ControlModifier|Qt.AltModifier|Qt.Key_L
86− onTriggered: TheLightDM.greeter.showGreeter()
86+ onTriggered: LightDMService.greeter.showGreeter()
8787 }
8888
8989 QtObject {
@@ -115,7 +115,7 @@ Item {
115115 Button {
116116 text: i18n.ctr("Button: Lock the system", "Lock")
117117 onClicked: {
118− TheLightDM.greeter.showGreeter()
118+ LightDMService.greeter.showGreeter()
119119 logoutDialog.hide();
120120 }
121121 }
qml/Greeter/Greeter.qml+23−23
@@ -44,7 +44,7 @@ Showable {
4444 readonly property bool hasLockedApp: lockedApp !== ""
4545
4646 property bool forcedUnlock
47− readonly property bool locked: TheLightDM.greeter.active && !TheLightDM.greeter.authenticated && !forcedUnlock
47+ readonly property bool locked: LightDMService.greeter.active && !LightDMService.greeter.authenticated && !forcedUnlock
4848
4949 property bool tabletMode
5050 property url viewSource // only used for testing
@@ -110,7 +110,7 @@ Showable {
110110 QtObject {
111111 id: d
112112
113− readonly property bool multiUser: TheLightDM.users.count > 1
113+ readonly property bool multiUser: LightDMService.users.count > 1
114114 property int currentIndex
115115 property bool waiting
116116
@@ -134,15 +134,15 @@ Showable {
134134 loader.item.reset();
135135 }
136136 currentIndex = uid;
137− var user = TheLightDM.users.data(uid, TheLightDM.userRoles.NameRole);
137+ var user = LightDMService.users.data(uid, LightDMService.userRoles.NameRole);
138138 AccountsService.user = user;
139139 LauncherModel.setUser(user);
140− TheLightDM.greeter.authenticate(user); // always resets auth state
140+ LightDMService.greeter.authenticate(user); // always resets auth state
141141 }
142142
143143 function login() {
144144 enabled = false;
145− if (TheLightDM.greeter.startSessionSync()) {
145+ if (LightDMService.greeter.startSessionSync()) {
146146 sessionStarted();
147147 if (loader.item) {
148148 loader.item.notifyAuthenticationSucceeded();
@@ -267,7 +267,7 @@ Showable {
267267 root.lockedApp = "";
268268 root.forceActiveFocus();
269269 d.selectUser(d.currentIndex, true);
270− TheLightDM.infographic.readyForDataChange();
270+ LightDMService.infographic.readyForDataChange();
271271 }
272272
273273 Connections {
@@ -277,9 +277,9 @@ Showable {
277277 }
278278 onResponded: {
279279 if (root.locked) {
280− TheLightDM.greeter.respond(response);
280+ LightDMService.greeter.respond(response);
281281 } else {
282− if (TheLightDM.greeter.active && !TheLightDM.greeter.authenticated) { // could happen if forcedUnlock
282+ if (LightDMService.greeter.active && !LightDMService.greeter.authenticated) { // could happen if forcedUnlock
283283 d.login();
284284 }
285285 loader.item.hide();
@@ -345,18 +345,18 @@ Showable {
345345 Binding {
346346 target: loader.item
347347 property: "userModel"
348− value: TheLightDM.users
348+ value: LightDMService.users
349349 }
350350
351351 Binding {
352352 target: loader.item
353353 property: "infographicModel"
354− value: TheLightDM.infographic
354+ value: LightDMService.infographic
355355 }
356356 }
357357
358358 Connections {
359− target: TheLightDM.greeter
359+ target: LightDMService.greeter
360360
361361 onShowGreeter: root.forceShow()
362362
@@ -366,7 +366,7 @@ Showable {
366366 }
367367
368368 onShowMessage: {
369− if (!TheLightDM.greeter.active) {
369+ if (!LightDMService.greeter.active) {
370370 return; // could happen if hideGreeter() comes in before we prompt
371371 }
372372
@@ -385,7 +385,7 @@ Showable {
385385 onShowPrompt: {
386386 d.waiting = false;
387387
388− if (!TheLightDM.greeter.active) {
388+ if (!LightDMService.greeter.active) {
389389 return; // could happen if hideGreeter() comes in before we prompt
390390 }
391391
@@ -395,14 +395,14 @@ Showable {
395395 onAuthenticationComplete: {
396396 d.waiting = false;
397397
398− if (TheLightDM.greeter.authenticated) {
398+ if (LightDMService.greeter.authenticated) {
399399 AccountsService.failedLogins = 0;
400400 d.login();
401− if (!TheLightDM.greeter.promptless) {
401+ if (!LightDMService.greeter.promptless) {
402402 loader.item.hide();
403403 }
404404 } else {
405− if (!TheLightDM.greeter.promptless) {
405+ if (!LightDMService.greeter.promptless) {
406406 AccountsService.failedLogins++;
407407 }
408408
@@ -423,7 +423,7 @@ Showable {
423423 }
424424
425425 loader.item.notifyAuthenticationFailed();
426− if (!TheLightDM.greeter.promptless) {
426+ if (!LightDMService.greeter.promptless) {
427427 d.selectUser(d.currentIndex, false);
428428 }
429429 }
@@ -431,8 +431,8 @@ Showable {
431431
432432 onRequestAuthenticationUser: {
433433 // Find index for requested user, if it exists
434− for (var i = 0; i < TheLightDM.users.count; i++) {
435− if (user === TheLightDM.users.data(i, TheLightDM.userRoles.NameRole)) {
434+ for (var i = 0; i < LightDMService.users.count; i++) {
435+ if (user === LightDMService.users.data(i, LightDMService.userRoles.NameRole)) {
436436 d.selectUser(i, true);
437437 return;
438438 }
@@ -441,19 +441,19 @@ Showable {
441441 }
442442
443443 Binding {
444− target: TheLightDM.greeter
444+ target: LightDMService.greeter
445445 property: "active"
446446 value: root.active
447447 }
448448
449449 Binding {
450− target: TheLightDM.infographic
450+ target: LightDMService.infographic
451451 property: "username"
452− value: AccountsService.statsWelcomeScreen ? TheLightDM.users.data(d.currentIndex, TheLightDM.userRoles.NameRole) : ""
452+ value: AccountsService.statsWelcomeScreen ? LightDMService.users.data(d.currentIndex, LightDMService.userRoles.NameRole) : ""
453453 }
454454
455455 Connections {
456456 target: i18n
457− onLanguageChanged: TheLightDM.infographic.readyForDataChange()
457+ onLanguageChanged: LightDMService.infographic.readyForDataChange()
458458 }
459459}
qml/Greeter/TheLightDM.qml → qml/Greeter/LightDMService.qmlrenamed

The content is the same.

qml/Greeter/qmldir+1−1
@@ -1 +1 @@
1−singleton TheLightDM 0.1 TheLightDM.qml
1+singleton LightDMService 0.1 LightDMService.qml
qml/Shell.qml+3−3
@@ -383,7 +383,7 @@ Item {
383383 // more clever here.
384384 active: usageScenario != "desktop" && AccountsService.demoEdges
385385
386− paused: TheLightDM.greeter.active
386+ paused: LightDMService.greeter.active
387387 launcher: launcher
388388 panel: panel
389389 edgeSize: shell.edgeSize
@@ -509,7 +509,7 @@ Item {
509509
510510 greeter.notifyAboutToFocusApp("unity8-dash");
511511
512− var animate = !TheLightDM.greeter.active && !stages.shown
512+ var animate = !LightDMService.greeter.active && !stages.shown
513513 dash.setCurrentScope(0, animate, false)
514514 ApplicationManager.requestFocusApplication("unity8-dash")
515515 }
@@ -561,7 +561,7 @@ Item {
561561 ApplicationManager.focusedApplicationId &&
562562 ApplicationManager.findApplication(ApplicationManager.focusedApplicationId).fullscreen
563563
564− fullscreenMode: (topmostApplicationIsFullscreen && !TheLightDM.greeter.active && launcher.progress == 0)
564+ fullscreenMode: (topmostApplicationIsFullscreen && !LightDMService.greeter.active && launcher.progress == 0)
565565 || greeter.hasLockedApp
566566 }
567567