on xenial help sign in
Edge demo fixes
commitf549c4c1264e37d187f9e6161fc4be00190e8ca5 authorMichael Terry <michael.terry@canonical.com> dateTue 25 Mar 2014, 13:37 (13 years ago) parent03de968
3 files changed+4−4
plugins/AccountsService/AccountsService.cpp+3−1 qml/Components/EdgeDemo.qml−1 qml/Greeter/GreeterEdgeDemo.qml+1−2
plugins/AccountsService/AccountsService.cpp+3−1
@@ -59,6 +59,7 @@ bool AccountsService::demoEdges() const
5959void AccountsService::setDemoEdges(bool demoEdges)
6060{
6161 m_demoEdges = demoEdges;
62+ Q_EMIT demoEdgesChanged();
6263 m_service->setUserProperty(m_user, "com.canonical.unity.AccountsService", "demo-edges", demoEdges);
6364}
6465
@@ -70,6 +71,7 @@ bool AccountsService::demoEdgesForCurrentUser() const
7071void AccountsService::setDemoEdgesForCurrentUser(bool demoEdgesForCurrentUser)
7172{
7273 m_demoEdgesForCurrentUser = demoEdgesForCurrentUser;
74+ Q_EMIT demoEdgesForCurrentUserChanged();
7375 m_service->setUserProperty(qgetenv("USER"), "com.canonical.unity.AccountsService", "demo-edges", demoEdgesForCurrentUser);
7476}
7577
@@ -126,7 +128,7 @@ void AccountsService::propertiesChanged(const QString &user, const QString &inte
126128 if (qgetenv("USER") == user) {
127129 updateDemoEdgesForCurrentUser();
128130 }
129− if (m_user != user) {
131+ if (m_user == user) {
130132 updateDemoEdges();
131133 }
132134 }
qml/Components/EdgeDemo.qml−1
@@ -42,7 +42,6 @@ Item {
4242
4343 function hideEdgeDemoInShell() {
4444 AccountsService.demoEdges = false;
45− stopDemo();
4645 }
4746
4847 function stopDemo() {
qml/Greeter/GreeterEdgeDemo.qml+1−2
@@ -36,7 +36,6 @@ Item {
3636
3737 function hideEdgeDemoInGreeter() {
3838 AccountsService.demoEdgesForCurrentUser = false;
39− stopDemo();
4039 }
4140
4241 function hideEdgeDemos() {
@@ -46,7 +45,7 @@ Item {
4645
4746 function startDemo() {
4847 if (!d.overlay) {
49− d.overlay = Qt.createComponent("EdgeDemoOverlay.qml")
48+ d.overlay = Qt.createComponent("../Components/EdgeDemoOverlay.qml")
5049 }
5150 startRightEdgeDemo()
5251 }