git.iko.soy/unity8
on xenial help sign in
Fully abstract Greeter/LightDM from shell.mode
commit062fc51f97e1ecc420028b9e29618707da766b6d authorJosh Arenson <joshua.arenson@canonical.com> dateWed 22 Jul 2015, 13:59 (11 years ago) parent7d0fe62
5 files changed+21−5
compare with xenial
unifiedsplit
qml/Components/Dialogs.qml+7−1 qml/Greeter/Greeter.qml+7−1 qml/Greeter/LightDM.qml+2−1 qml/Shell.qml+3 tests/CMakeLists.txt+2−2
qml/Components/Dialogs.qml+7−1
@@ -36,6 +36,8 @@ Item {
3636 }
3737 }
3838
39+ property bool fullLightDM
40+
3941 signal powerOffClicked();
4042
4143 function showPowerDialog() {
@@ -62,7 +64,11 @@ Item {
6264 active: false
6365 }
6466
65− LightDM{id: lightDM} // Provide backend access
67+ LightDM{
68+ id: lightDM
69+ fullLightDM: root.fullLightDM
70+ }
71+
6672 Component {
6773 id: logoutDialogComponent
6874 ShellDialog {
qml/Greeter/Greeter.qml+7−1
@@ -53,6 +53,8 @@ Showable {
5353
5454 readonly property bool animating: loader.item ? loader.item.animating : false
5555
56+ property bool fullLightDM
57+
5658 signal tease()
5759 signal sessionStarted()
5860 signal emergencyCall()
@@ -105,7 +107,11 @@ Showable {
105107 return d.startUnlock(true /* toTheRight */);
106108 }
107109
108− LightDM{id:lightDM} // Provide backend access
110+ LightDM{
111+ id:lightDM
112+ fullLightDM: root.fullLightDM
113+ }
114+
109115 QtObject {
110116 id: d
111117
qml/Greeter/LightDM.qml+2−1
@@ -24,12 +24,13 @@ import QtQuick 2.3
2424Loader {
2525 id: loader
2626
27+ property bool fullLightDM
2728 property var greeter: d.valid ? loader.item.greeter : null
2829 property var infographic: d.valid ? loader.item.infographic : null
2930 property var users: d.valid ? loader.item.users : null
3031 property var userRoles: d.valid ? loader.item.userRoles : null
3132
32− source: shell.mode === "greeter" ?
33+ source: fullLightDM ?
3334 "./FullLightDMImpl.qml" : "./IntegratedLightDMImpl.qml"
3435
3536 QtObject {
qml/Shell.qml+3
@@ -168,6 +168,7 @@ Item {
168168
169169 LightDM{
170170 id: lightDM
171+ fullLightDM: shell.mode === "greeter"
171172 }
172173
173174 VolumeControl {
@@ -438,6 +439,7 @@ Item {
438439 tabletMode: shell.usageScenario != "phone"
439440 launcherOffset: launcher.progress
440441 forcedUnlock: tutorial.running
442+ fullLightDM: shell.mode === "greeter"
441443 background: shell.background
442444
443445 // avoid overlapping with Launcher's edge drag area
@@ -685,6 +687,7 @@ Item {
685687 shutdownFadeOutRectangle.visible = true;
686688 shutdownFadeOut.start();
687689 }
690+ fullLightDM: shell.mode === "greeter"
688691 }
689692
690693 Connections {
tests/CMakeLists.txt+2−2
@@ -123,6 +123,6 @@ endfunction()
123123
124124# Actual test definitions
125125add_subdirectory(libs)
126−#add_subdirectory(plugins)
126+add_subdirectory(plugins)
127127add_subdirectory(qmltests)
128−#add_subdirectory(whitespace)
128+add_subdirectory(whitespace)