f549c4c · unity8 · git.iko.soy

plugins/AccountsService/AccountsService.cpp+3−1

compare with xenial

unifiedsplit

@@ -59,6 +59,7 @@ bool AccountsService::demoEdges() const

59void AccountsService::setDemoEdges(bool demoEdges)

60{

61 m_demoEdges = demoEdges;

62+ Q_EMIT demoEdgesChanged();

62 m_service->setUserProperty(m_user, "com.canonical.unity.AccountsService", "demo-edges", demoEdges);

63 m_service->setUserProperty(m_user, "com.canonical.unity.AccountsService", "demo-edges", demoEdges);

63}

64}

64

65

@@ -70,6 +71,7 @@ bool AccountsService::demoEdgesForCurrentUser() const

70void AccountsService::setDemoEdgesForCurrentUser(bool demoEdgesForCurrentUser)

71void AccountsService::setDemoEdgesForCurrentUser(bool demoEdgesForCurrentUser)

71{

72{

72 m_demoEdgesForCurrentUser = demoEdgesForCurrentUser;

73 m_demoEdgesForCurrentUser = demoEdgesForCurrentUser;

74+ Q_EMIT demoEdgesForCurrentUserChanged();

73 m_service->setUserProperty(qgetenv("USER"), "com.canonical.unity.AccountsService", "demo-edges", demoEdgesForCurrentUser);

75 m_service->setUserProperty(qgetenv("USER"), "com.canonical.unity.AccountsService", "demo-edges", demoEdgesForCurrentUser);

74}

76}

75

77

@@ -126,7 +128,7 @@ void AccountsService::propertiesChanged(const QString &user, const QString &inte

126 if (qgetenv("USER") == user) {

128 if (qgetenv("USER") == user) {

127 updateDemoEdgesForCurrentUser();

129 updateDemoEdgesForCurrentUser();

128 }

130 }

129− if (m_user != user) {

131+ if (m_user == user) {

130 updateDemoEdges();

132 updateDemoEdges();

131 }

133 }

132 }

134 }

qml/Components/EdgeDemo.qml−1

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

42

43 function hideEdgeDemoInShell() {

44 AccountsService.demoEdges = false;

45− stopDemo();

46 }

45 }

47

46

48 function stopDemo() {

47 function stopDemo() {

qml/Greeter/GreeterEdgeDemo.qml+1−2

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

36

37 function hideEdgeDemoInGreeter() {

38 AccountsService.demoEdgesForCurrentUser = false;

39− stopDemo();

40 }

39 }

41

40

42 function hideEdgeDemos() {

41 function hideEdgeDemos() {

@@ -46,7 +45,7 @@ Item {

46

45

47 function startDemo() {

46 function startDemo() {

48 if (!d.overlay) {

47 if (!d.overlay) {

49− d.overlay = Qt.createComponent("EdgeDemoOverlay.qml")

48+ d.overlay = Qt.createComponent("../Components/EdgeDemoOverlay.qml")

50 }

49 }

51 startRightEdgeDemo()

50 startRightEdgeDemo()

52 }

51 }