062fc51 · unity8 · git.iko.soy

qml/Components/Dialogs.qml+7−1

compare with xenial

unifiedsplit

@@ -36,6 +36,8 @@ Item {

36 }

37 }

38

39+ property bool fullLightDM

40+

39 signal powerOffClicked();

41 signal powerOffClicked();

40

42

41 function showPowerDialog() {

43 function showPowerDialog() {

@@ -62,7 +64,11 @@ Item {

62 active: false

64 active: false

63 }

65 }

64

66

67+ LightDM{

65− LightDM{id: lightDM} // Provide backend access

68+ id: lightDM

69+ fullLightDM: root.fullLightDM

70+ }

71+

66 Component {

72 Component {

67 id: logoutDialogComponent

73 id: logoutDialogComponent

68 ShellDialog {

74 ShellDialog {

qml/Greeter/Greeter.qml+7−1

@@ -53,6 +53,8 @@ Showable {

53

54 readonly property bool animating: loader.item ? loader.item.animating : false

55

56+ property bool fullLightDM

57+

56 signal tease()

58 signal tease()

57 signal sessionStarted()

59 signal sessionStarted()

58 signal emergencyCall()

60 signal emergencyCall()

@@ -105,7 +107,11 @@ Showable {

105 return d.startUnlock(true /* toTheRight */);

107 return d.startUnlock(true /* toTheRight */);

106 }

108 }

107

109

110+ LightDM{

108− LightDM{id:lightDM} // Provide backend access

111+ id:lightDM

112+ fullLightDM: root.fullLightDM

113+ }

114+

109 QtObject {

115 QtObject {

110 id: d

116 id: d

111

117

qml/Greeter/LightDM.qml+2−1

@@ -24,12 +24,13 @@ import QtQuick 2.3

24Loader {

25 id: loader

26

27+ property bool fullLightDM

27 property var greeter: d.valid ? loader.item.greeter : null

28 property var greeter: d.valid ? loader.item.greeter : null

28 property var infographic: d.valid ? loader.item.infographic : null

29 property var infographic: d.valid ? loader.item.infographic : null

29 property var users: d.valid ? loader.item.users : null

30 property var users: d.valid ? loader.item.users : null

30 property var userRoles: d.valid ? loader.item.userRoles : null

31 property var userRoles: d.valid ? loader.item.userRoles : null

31

32

32− source: shell.mode === "greeter" ?

33+ source: fullLightDM ?

33 "./FullLightDMImpl.qml" : "./IntegratedLightDMImpl.qml"

34 "./FullLightDMImpl.qml" : "./IntegratedLightDMImpl.qml"

34

35

35 QtObject {

36 QtObject {

qml/Shell.qml+3

@@ -168,6 +168,7 @@ Item {

168

169 LightDM{

170 id: lightDM

171+ fullLightDM: shell.mode === "greeter"

171 }

172 }

172

173

173 VolumeControl {

174 VolumeControl {

@@ -438,6 +439,7 @@ Item {

438 tabletMode: shell.usageScenario != "phone"

439 tabletMode: shell.usageScenario != "phone"

439 launcherOffset: launcher.progress

440 launcherOffset: launcher.progress

440 forcedUnlock: tutorial.running

441 forcedUnlock: tutorial.running

442+ fullLightDM: shell.mode === "greeter"

441 background: shell.background

443 background: shell.background

442

444

443 // avoid overlapping with Launcher's edge drag area

445 // avoid overlapping with Launcher's edge drag area

@@ -685,6 +687,7 @@ Item {

685 shutdownFadeOutRectangle.visible = true;

687 shutdownFadeOutRectangle.visible = true;

686 shutdownFadeOut.start();

688 shutdownFadeOut.start();

687 }

689 }

690+ fullLightDM: shell.mode === "greeter"

688 }

691 }

689

692

690 Connections {

693 Connections {

tests/CMakeLists.txt+2−2

@@ -123,6 +123,6 @@ endfunction()

123

124# Actual test definitions

125add_subdirectory(libs)

126−#add_subdirectory(plugins)

126+add_subdirectory(plugins)

127add_subdirectory(qmltests)

128−#add_subdirectory(whitespace)

128+add_subdirectory(whitespace)