0093b89 · unity8 · git.iko.soy

git.iko.soy/unity8

Emit signals when gsettings is ready

commit0093b8987aade01b9eb1c47823f4f2de16caaadd authorMichael Terry <michael.terry@canonical.com> dateFri 1 Apr 2016, 16:25 (11 years ago) parent21b7b0d 48443e0

3 files changed+20−6

compare with xenial

unifiedsplit

tests/mocks/GSettings.1.0/fake_gsettings.cpp+7 tests/mocks/GSettings.1.0/fake_gsettings.h+6−6 tests/qmltests/tst_OrientedShell.qml+7

tests/mocks/GSettings.1.0/fake_gsettings.cpp+7

@@ -174,6 +174,13 @@ void GSettingsQml::componentComplete()

174174 this, &GSettingsQml::autohideLauncherChanged);

175175 connect(GSettingsControllerQml::instance(), &GSettingsControllerQml::launcherWidthChanged,

176176 this, &GSettingsQml::launcherWidthChanged);

177+

178+ Q_EMIT pictureUriChanged();

179+ Q_EMIT usageModeChanged();

180+ Q_EMIT lockedOutTimeChanged();

181+ Q_EMIT lifecycleExemptAppidsChanged();

182+ Q_EMIT autohideLauncherChanged();

183+ Q_EMIT launcherWidthChanged();

177184}

178185

179186GSettingsSchemaQml * GSettingsQml::schema() const {

tests/mocks/GSettings.1.0/fake_gsettings.h+6−6

@@ -79,12 +79,12 @@ public:

7979

8080Q_SIGNALS:

8181 void schemaChanged();

82− void pictureUriChanged(const QString&);

83− void usageModeChanged(const QString&);

84− void lockedOutTimeChanged(qint64);

85− void lifecycleExemptAppidsChanged(const QStringList &);

86− void autohideLauncherChanged(bool);

87− void launcherWidthChanged(int launcherWidth);

82+ void pictureUriChanged();

83+ void usageModeChanged();

84+ void lockedOutTimeChanged();

85+ void lifecycleExemptAppidsChanged();

86+ void autohideLauncherChanged();

87+ void launcherWidthChanged();

8888

8989private:

9090 GSettingsSchemaQml* m_schema;

tests/qmltests/tst_OrientedShell.qml+7

@@ -471,6 +471,13 @@ Rectangle {

471471 // kill all (fake) running apps

472472 killApps();

473473

474+ while (miceModel.count > 0)

475+ MockInputDeviceBackend.removeDevice("/mouse" + (miceModel.count - 1));

476+ while (touchpadModel.count > 0)

477+ MockInputDeviceBackend.removeDevice("/touchpad" + (touchpadModel.count - 1));

478+ while (keyboardsModel.count > 0)

479+ MockInputDeviceBackend.removeDevice("/kbd" + (keyboardsModel.count - 1))

480+

474481 spreadRepeaterConnections.target = null;

475482 spreadRepeaterConnections.itemAddedCallback = null;

476483 signalSpy.target = null;