← Back to branch summary

~aacid/unity8/gettext_textdomain

« back to all changes in this revision

Viewing changes to plugins/AccountsService/AccountsService.cpp

  • Committer: CI bot
  • Author(s): Michael Terry
  • Date: 2014-08-28 20:06:04 UTC
  • mfrom: (1178.4.5 enable-locked-edges)
  • Revision ID: ps-jenkins@lists.canonical.com-20140828200604-6esohifvlrhifpiz
Reverse default for the user option "allow launcher/panel in greeter when locked." And allow that property to be controlled by an AccountsService property. (LP: #1358340) Fixes: 1358340
Approved by: Albert Astals Cid

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/AccountsService/AccountsService.cpp
26
26
    m_service(new AccountsServiceDBusAdaptor(this)),
27
27
    m_user(qgetenv("USER")),
28
28
    m_demoEdges(false),
 
29
    m_enableLauncherWhileLocked(false),
 
30
    m_enableIndicatorsWhileLocked(false),
29
31
    m_statsWelcomeScreen(false),
30
32
    m_passwordDisplayHint(Keyboard),
31
33
    m_failedLogins(0)
47
49
    Q_EMIT userChanged();
48
50
 
49
51
    updateDemoEdges();
 
52
    updateEnableLauncherWhileLocked();
 
53
    updateEnableIndicatorsWhileLocked();
50
54
    updateBackgroundFile();
51
55
    updateStatsWelcomeScreen();
52
56
    updatePasswordDisplayHint();
64
68
    m_service->setUserProperty(m_user, "com.canonical.unity.AccountsService", "demo-edges", demoEdges);
65
69
}
66
70
 
 
71
bool AccountsService::enableLauncherWhileLocked() const
 
72
{
 
73
    return m_enableLauncherWhileLocked;
 
74
}
 
75
 
 
76
bool AccountsService::enableIndicatorsWhileLocked() const
 
77
{
 
78
    return m_enableIndicatorsWhileLocked;
 
79
}
 
80
 
67
81
QString AccountsService::backgroundFile() const
68
82
{
69
83
    return m_backgroundFile;
88
102
    }
89
103
}
90
104
 
 
105
void AccountsService::updateEnableLauncherWhileLocked()
 
106
{
 
107
    auto enableLauncherWhileLocked = m_service->getUserProperty(m_user, "com.ubuntu.AccountsService.SecurityPrivacy", "EnableLauncherWhileLocked").toBool();
 
108
    if (m_enableLauncherWhileLocked != enableLauncherWhileLocked) {
 
109
        m_enableLauncherWhileLocked = enableLauncherWhileLocked;
 
110
        Q_EMIT enableLauncherWhileLockedChanged();
 
111
    }
 
112
}
 
113
 
 
114
void AccountsService::updateEnableIndicatorsWhileLocked()
 
115
{
 
116
    auto enableIndicatorsWhileLocked = m_service->getUserProperty(m_user, "com.ubuntu.AccountsService.SecurityPrivacy", "EnableIndicatorsWhileLocked").toBool();
 
117
    if (m_enableIndicatorsWhileLocked != enableIndicatorsWhileLocked) {
 
118
        m_enableIndicatorsWhileLocked = enableIndicatorsWhileLocked;
 
119
        Q_EMIT enableIndicatorsWhileLockedChanged();
 
120
    }
 
121
}
 
122
 
91
123
void AccountsService::updateBackgroundFile()
92
124
{
93
125
    auto backgroundFile = m_service->getUserProperty(m_user, "org.freedesktop.Accounts.User", "BackgroundFile").toString();
157
189
        if (changed.contains("PasswordDisplayHint")) {
158
190
            updatePasswordDisplayHint();
159
191
        }
 
192
        if (changed.contains("EnableLauncherWhileLocked")) {
 
193
            updateEnableLauncherWhileLocked();
 
194
        }
 
195
        if (changed.contains("EnableIndicatorsWhileLocked")) {
 
196
            updateEnableIndicatorsWhileLocked();
 
197
        }
160
198
    }
161
199
}
162
200