9b8104c · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

mock the new property

9b8104cMichael Zanetti11 years ago

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

compare with xenial

unifiedsplit

@@ -24,6 +24,7 @@ GSettingsControllerQml::GSettingsControllerQml()

24 : m_usageMode("Staged")

25 , m_autohideLauncher(false)

26 , m_launcherWidth(8)

27+ , m_edgeDragWidth(2)

27{

28{

28}

29}

@@ -116,6 +117,19 @@ void GSettingsControllerQml::setLauncherWidth(int launcherWidth)

116 }

117 }

117}

118}

118

119

120+uint GSettingsControllerQml::edgeDragWidth() const

121+{

122+ return m_edgeDragWidth;

123+}

124+

125+void GSettingsControllerQml::setEdgeDragWidth(uint edgeDragWidth)

126+{

127+ if (m_edgeDragWidth != edgeDragWidth) {

128+ m_edgeDragWidth = edgeDragWidth;

129+ Q_EMIT edgeDragWidthChanged(edgeDragWidth);

130+ }

131+}

132+

119GSettingsSchemaQml::GSettingsSchemaQml(QObject *parent): QObject(parent) {

133GSettingsSchemaQml::GSettingsSchemaQml(QObject *parent): QObject(parent) {

120}

134}

121

135

@@ -161,6 +175,8 @@ GSettingsQml::GSettingsQml(QObject *parent)

161 this, &GSettingsQml::autohideLauncherChanged);

175 this, &GSettingsQml::autohideLauncherChanged);

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

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

163 this, &GSettingsQml::launcherWidthChanged);

177 this, &GSettingsQml::launcherWidthChanged);

178+ connect(GSettingsControllerQml::instance(), &GSettingsControllerQml::edgeDragWidthChanged,

179+ this, &GSettingsQml::edgeDragWidthChanged);

164}

180}

165

181

166GSettingsSchemaQml * GSettingsQml::schema() const {

182GSettingsSchemaQml * GSettingsQml::schema() const {

@@ -242,6 +258,14 @@ int GSettingsQml::launcherWidth() const

242 }

258 }

243}

259}

244

260

261+uint GSettingsQml::edgeDragWidth() const

262+{

263+ if (m_schema->id() == "com.canonical.Unity8") {

264+ return GSettingsControllerQml::instance()->edgeDragWidth();

265+ }

266+ return 0;

267+}

268+

245void GSettingsQml::setLifecycleExemptAppids(const QStringList &appIds)

269void GSettingsQml::setLifecycleExemptAppids(const QStringList &appIds)

246{

270{

247 if (m_schema->id() == "com.canonical.qtmir") {

271 if (m_schema->id() == "com.canonical.qtmir") {

@@ -262,3 +286,10 @@ void GSettingsQml::setLauncherWidth(int launcherWidth)

262 GSettingsControllerQml::instance()->setLauncherWidth(launcherWidth);

286 GSettingsControllerQml::instance()->setLauncherWidth(launcherWidth);

263 }

287 }

264}

288}

289+

290+void GSettingsQml::setEdgeDragWidth(uint edgeDragWidth)

291+{

292+ if (m_schema->id() == "com.canonical.Unity8") {

293+ GSettingsControllerQml::instance()->setEdgeDragWidth(edgeDragWidth);

294+ }

295+}

tests/mocks/GSettings.1.0/fake_gsettings.h+9

@@ -52,6 +52,7 @@ class GSettingsQml: public QObject

52 Q_PROPERTY(QStringList lifecycleExemptAppids READ lifecycleExemptAppids WRITE setLifecycleExemptAppids NOTIFY lifecycleExemptAppidsChanged)

53 Q_PROPERTY(bool autohideLauncher READ autohideLauncher WRITE setAutohideLauncher NOTIFY autohideLauncherChanged)

54 Q_PROPERTY(int launcherWidth READ launcherWidth WRITE setLauncherWidth NOTIFY launcherWidthChanged)

55+ Q_PROPERTY(uint edgeDragWidth READ edgeDragWidth WRITE setEdgeDragWidth NOTIFY edgeDragWidthChanged)

56public:

57public:

57 GSettingsQml(QObject *parent = nullptr);

58 GSettingsQml(QObject *parent = nullptr);

@@ -63,6 +64,7 @@ public:

63 QStringList lifecycleExemptAppids() const;

64 QStringList lifecycleExemptAppids() const;

64 bool autohideLauncher() const;

65 bool autohideLauncher() const;

65 int launcherWidth() const;

66 int launcherWidth() const;

67+ uint edgeDragWidth() const;

67 void setPictureUri(const QString &str);

69 void setPictureUri(const QString &str);

68 void setUsageMode(const QString &usageMode);

70 void setUsageMode(const QString &usageMode);

@@ -70,6 +72,7 @@ public:

70 void setLifecycleExemptAppids(const QStringList &appIds);

72 void setLifecycleExemptAppids(const QStringList &appIds);

71 void setAutohideLauncher(bool autohideLauncher);

73 void setAutohideLauncher(bool autohideLauncher);

72 void setLauncherWidth(int launcherWidth);

74 void setLauncherWidth(int launcherWidth);

75+ void setEdgeDragWidth(uint edgeDragWidth);

74Q_SIGNALS:

77Q_SIGNALS:

75 void schemaChanged();

78 void schemaChanged();

@@ -79,6 +82,7 @@ Q_SIGNALS:

79 void lifecycleExemptAppidsChanged(const QStringList &);

82 void lifecycleExemptAppidsChanged(const QStringList &);

80 void autohideLauncherChanged(bool);

83 void autohideLauncherChanged(bool);

81 void launcherWidthChanged(int launcherWidth);

84 void launcherWidthChanged(int launcherWidth);

85+ void edgeDragWidthChanged(uint edgeDragWidth);

83private:

87private:

84 GSettingsSchemaQml* m_schema;

88 GSettingsSchemaQml* m_schema;

@@ -112,6 +116,9 @@ public:

112 int launcherWidth() const;

116 int launcherWidth() const;

113 Q_INVOKABLE void setLauncherWidth(int launcherWidth);

117 Q_INVOKABLE void setLauncherWidth(int launcherWidth);

114

118

119+ uint edgeDragWidth() const;

120+ Q_INVOKABLE void setEdgeDragWidth(uint edgeDragWidth);

121+

115Q_SIGNALS:

122Q_SIGNALS:

116 void pictureUriChanged(const QString&);

123 void pictureUriChanged(const QString&);

117 void usageModeChanged(const QString&);

124 void usageModeChanged(const QString&);

@@ -119,6 +126,7 @@ Q_SIGNALS:

119 void lifecycleExemptAppidsChanged(const QStringList&);

126 void lifecycleExemptAppidsChanged(const QStringList&);

120 void autohideLauncherChanged(bool autohideLauncher);

127 void autohideLauncherChanged(bool autohideLauncher);

121 void launcherWidthChanged(int launcherWidth);

128 void launcherWidthChanged(int launcherWidth);

129+ void edgeDragWidthChanged(uint edgeDragWidth);

122

130

123private:

131private:

124 GSettingsControllerQml();

132 GSettingsControllerQml();

@@ -129,6 +137,7 @@ private:

129 QStringList m_lifecycleExemptAppids;

137 QStringList m_lifecycleExemptAppids;

130 bool m_autohideLauncher;

138 bool m_autohideLauncher;

131 int m_launcherWidth;

139 int m_launcherWidth;

140+ uint m_edgeDragWidth;

132

141

133 static GSettingsControllerQml* s_controllerInstance;

142 static GSettingsControllerQml* s_controllerInstance;

134 QList<GSettingsQml *> m_registeredGSettings;

143 QList<GSettingsQml *> m_registeredGSettings;