git.iko.soy/unity8
on xenial help sign in
Switch to x, not t
commit8f763f03d1f66cec54afa7e8812d343e1e77c490 authorMichael Terry <michael.terry@canonical.com> dateWed 19 Aug 2015, 17:45 (11 years ago) parenta142f21
5 files changed+26−30
compare with xenial
unifiedsplit
data/com.canonical.Unity8.gschema.xml+1−1 qml/Greeter/Greeter.qml+5−1 tests/mocks/GSettings.1.0/fake_gsettings.cpp+9−13 tests/mocks/GSettings.1.0/fake_gsettings.h+10−14 tests/qmltests/Greeter/tst_Greeter.qml+1−1
data/com.canonical.Unity8.gschema.xml+1−1
@@ -14,7 +14,7 @@
1414 </schema>
1515
1616 <schema path="/com/canonical/unity8/greeter/" id="com.canonical.Unity8.Greeter" gettext-domain="unity8">
17− <key type="t" name="locked-out-time">
17+ <key type="x" name="locked-out-time">
1818 <default>0</default>
1919 <summary>When the greeter was last locked.</summary>
2020 <description>If too many unsuccessful login attempts have been made in a row, the greeter locks you out for a while. This unix timestamp indicates when you were locked out, so unity8 knows when to let you back in.</description>
qml/Greeter/Greeter.qml+5−1
@@ -185,7 +185,11 @@ Showable {
185185 GSettings {
186186 id: greeterSettings
187187 schema.id: "com.canonical.Unity8.Greeter"
188− onLockedOutTimeChanged: forcedDelayTimer.checkForForcedDelay()
188+ onChanged: {
189+ if (key === "locked-out-time") {
190+ forcedDelayTimer.checkForForcedDelay();
191+ }
192+ }
189193 }
190194
191195 Timer {
tests/mocks/GSettings.1.0/fake_gsettings.cpp+9−13
@@ -45,7 +45,7 @@ void GSettingsControllerQml::setPictureUri(const QString &str)
4545{
4646 if (str != m_pictureUri) {
4747 m_pictureUri = str;
48− Q_EMIT pictureUriChanged(m_pictureUri);
48+ Q_EMIT changed("picture-uri", QVariant(m_pictureUri));
4949 }
5050}
5151
@@ -58,20 +58,20 @@ void GSettingsControllerQml::setUsageMode(const QString &usageMode)
5858{
5959 if (usageMode != m_usageMode) {
6060 m_usageMode = usageMode;
61− Q_EMIT usageModeChanged(m_usageMode);
61+ Q_EMIT changed("usage-mode", QVariant(m_usageMode));
6262 }
6363}
6464
65−quint64 GSettingsControllerQml::lockedOutTime() const
65+qint64 GSettingsControllerQml::lockedOutTime() const
6666{
6767 return m_lockedOutTime;
6868}
6969
70−void GSettingsControllerQml::setLockedOutTime(quint64 timestamp)
70+void GSettingsControllerQml::setLockedOutTime(qint64 timestamp)
7171{
7272 if (m_lockedOutTime != timestamp) {
7373 m_lockedOutTime = timestamp;
74− Q_EMIT lockedOutTimeChanged(m_lockedOutTime);
74+ Q_EMIT changed("locked-out-time", QVariant(m_lockedOutTime));
7575 }
7676}
7777
@@ -108,12 +108,8 @@ GSettingsQml::GSettingsQml(QObject *parent)
108108 : QObject(parent)
109109{
110110 m_schema = new GSettingsSchemaQml(this);
111− connect(GSettingsControllerQml::instance(), SIGNAL(pictureUriChanged(const QString &)),
112− this, SIGNAL(pictureUriChanged(const QString &)));
113− connect(GSettingsControllerQml::instance(), SIGNAL(usageModeChanged(const QString &)),
114− this, SIGNAL(usageModeChanged(const QString &)));
115− connect(GSettingsControllerQml::instance(), SIGNAL(lockedOutTimeChanged(quint64)),
116− this, SIGNAL(lockedOutTimeChanged(quint64)));
111+ connect(GSettingsControllerQml::instance(), SIGNAL(changed(const QString &, const QVariant &)),
112+ this, SIGNAL(changed(const QString &, const QVariant &)));
117113}
118114
119115GSettingsSchemaQml * GSettingsQml::schema() const {
@@ -152,7 +148,7 @@ void GSettingsQml::setUsageMode(const QString &usageMode)
152148 }
153149}
154150
155−quint64 GSettingsQml::lockedOutTime() const
151+qint64 GSettingsQml::lockedOutTime() const
156152{
157153 if (m_schema->id() == "com.canonical.Unity8.Greeter") {
158154 return GSettingsControllerQml::instance()->lockedOutTime();
@@ -161,7 +157,7 @@ quint64 GSettingsQml::lockedOutTime() const
161157 }
162158}
163159
164−void GSettingsQml::setLockedOutTime(quint64 timestamp)
160+void GSettingsQml::setLockedOutTime(qint64 timestamp)
165161{
166162 if (m_schema->id() == "com.canonical.Unity8.Greeter") {
167163 GSettingsControllerQml::instance()->setLockedOutTime(timestamp);
tests/mocks/GSettings.1.0/fake_gsettings.h+10−14
@@ -45,9 +45,9 @@ class GSettingsQml: public QObject
4545 Q_OBJECT
4646
4747 Q_PROPERTY(GSettingsSchemaQml* schema READ schema NOTIFY schemaChanged)
48− Q_PROPERTY(QString pictureUri READ pictureUri WRITE setPictureUri NOTIFY pictureUriChanged)
49− Q_PROPERTY(QString usageMode READ usageMode WRITE setUsageMode NOTIFY usageModeChanged)
50− Q_PROPERTY(quint64 lockedOutTime READ lockedOutTime WRITE setLockedOutTime NOTIFY lockedOutTimeChanged)
48+ Q_PROPERTY(QString pictureUri READ pictureUri WRITE setPictureUri NOTIFY changed)
49+ Q_PROPERTY(QString usageMode READ usageMode WRITE setUsageMode NOTIFY changed)
50+ Q_PROPERTY(qint64 lockedOutTime READ lockedOutTime WRITE setLockedOutTime NOTIFY changed)
5151
5252public:
5353 GSettingsQml(QObject *parent = nullptr);
@@ -55,17 +55,15 @@ public:
5555 GSettingsSchemaQml * schema() const;
5656 QString pictureUri() const;
5757 QString usageMode() const;
58− quint64 lockedOutTime() const;
58+ qint64 lockedOutTime() const;
5959
6060 void setPictureUri(const QString &str);
6161 void setUsageMode(const QString &usageMode);
62− void setLockedOutTime(quint64 timestamp);
62+ void setLockedOutTime(qint64 timestamp);
6363
6464Q_SIGNALS:
6565 void schemaChanged();
66− void pictureUriChanged(const QString&);
67− void usageModeChanged(const QString&);
68− void lockedOutTimeChanged(quint64);
66+ void changed(const QString &key, const QVariant &value);
6967
7068private:
7169 GSettingsSchemaQml* m_schema;
@@ -87,20 +85,18 @@ public:
8785 QString usageMode() const;
8886 Q_INVOKABLE void setUsageMode(const QString &usageMode);
8987
90− quint64 lockedOutTime() const;
91− Q_INVOKABLE void setLockedOutTime(quint64 timestamp);
88+ qint64 lockedOutTime() const;
89+ Q_INVOKABLE void setLockedOutTime(qint64 timestamp);
9290
9391Q_SIGNALS:
94− void pictureUriChanged(const QString&);
95− void usageModeChanged(const QString&);
96− void lockedOutTimeChanged(quint64 timestamp);
92+ void changed(const QString&, const QVariant&);
9793
9894private:
9995 GSettingsControllerQml();
10096
10197 QString m_pictureUri;
10298 QString m_usageMode;
103− quint64 m_lockedOutTime;
99+ qint64 m_lockedOutTime;
104100
105101 static GSettingsControllerQml* s_controllerInstance;
106102 QList<GSettingsQml *> m_registeredGSettings;
tests/qmltests/Greeter/tst_Greeter.qml+1−1
@@ -447,7 +447,7 @@ Item {
447447 view.responded("wr0ng p4ssw0rd");
448448
449449 var timestamp = new Date().getTime();
450− verify(Math.abs(greeterSettings.lockedOutTime - timestamp) < 3);
450+ verify(Math.abs(greeterSettings.lockedOutTime - timestamp) < 2000);
451451 }
452452
453453 function test_forcedDelayFromGSettings() {