git.iko.soy/unity8
on xenial help sign in
Remove shell.mode dependency from LightDM.qml
commit8c3166a85842e7261d2f0c2261a3663a1d1e03a1 authorJosh Arenson <joshua.arenson@canonical.com> dateTue 21 Jul 2015, 11:50 (11 years ago) parent3267735
2 files changed+7−3
compare with xenial
unifiedsplit
qml/Greeter/LightDM.qml+2−2 qml/Shell.qml+5−1
qml/Greeter/LightDM.qml+2−2
@@ -24,13 +24,13 @@ import QtQuick 2.3
2424Loader {
2525 id: loader
2626
27+ property bool greeterMode: null
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
31− property string shellMode: shell.mode ? shell.mode : ""
3232
33− source: shellMode === "greeter" ?
33+ source: greeterMode ?
3434 "./FullLightDMImpl.qml" : "./IntegratedLightDMImpl.qml"
3535
3636 QtObject {
qml/Shell.qml+5−1
@@ -166,7 +166,11 @@ Item {
166166 finishStartUpTimer.start();
167167 }
168168
169− LightDM{id: lightDM} // Provide backend access
169+ LightDM{
170+ id: lightDM
171+ greeterMode: shell.mode === "greeter"
172+ }
173+
170174 VolumeControl {
171175 id: volumeControl
172176 }