f0d81d5 · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

Drop mock property points for cleanliness

f0d81d5Michael Terry11 years ago

qml/OrientedShell.qml+18−10

compare with xenial

unifiedsplit

@@ -57,9 +57,17 @@ Rectangle {

57 invertedPortrait: deviceConfiguration.invertedPortraitOrientation

58 }

59 }

60− // to be overwritten by tests

60+

61+ GSettings {

62+ id: unity8Settings

61− property var unity8Settings: GSettings { schema.id: "com.canonical.Unity8" }

63+ schema.id: "com.canonical.Unity8"

64+ }

65+

66+ GSettings {

67+ id: oskSettings

68+ objectName: "oskSettings"

62− property var oskSettings: GSettings { schema.id: "com.canonical.keyboard.maliit" }

69+ schema.id: "com.canonical.keyboard.maliit"

70+ }

64 property int physicalOrientation: Screen.orientation

72 property int physicalOrientation: Screen.orientation

65 property bool orientationLocked: OrientationLock.enabled

73 property bool orientationLocked: OrientationLock.enabled

@@ -93,24 +101,24 @@ Rectangle {

93 onPointerInputDevicesChanged: calculateUsageMode()

101 onPointerInputDevicesChanged: calculateUsageMode()

102

95 function calculateUsageMode() {

103 function calculateUsageMode() {

96− if (root.unity8Settings.usageMode === undefined)

104+ if (unity8Settings.usageMode === undefined)

97 return; // gsettings isn't loaded yet, we'll try again in Component.onCompleted

105 return; // gsettings isn't loaded yet, we'll try again in Component.onCompleted

106

99− console.log("Pointer input devices changed:", pointerInputDevices, "current mode:", root.unity8Settings.usageMode, "old device count", miceModel.oldCount + touchPadModel.oldCount)

107+ console.log("Pointer input devices changed:", pointerInputDevices, "current mode:", unity8Settings.usageMode, "old device count", miceModel.oldCount + touchPadModel.oldCount)

100− if (root.unity8Settings.usageMode === "Windowed") {

108+ if (unity8Settings.usageMode === "Windowed") {

101 if (pointerInputDevices === 0) {

109 if (pointerInputDevices === 0) {

102 // All pointer devices have been unplugged. Move to staged.

110 // All pointer devices have been unplugged. Move to staged.

103− root.unity8Settings.usageMode = "Staged";

111+ unity8Settings.usageMode = "Staged";

104 }

112 }

105 } else {

113 } else {

106 var longEdgeWidth = Math.max(root.width, root.height)

114 var longEdgeWidth = Math.max(root.width, root.height)

107 if (longEdgeWidth > units.gu(90)){

115 if (longEdgeWidth > units.gu(90)){

108 if (pointerInputDevices > 0 && pointerInputDevices > miceModel.oldCount + touchPadModel.oldCount) {

116 if (pointerInputDevices > 0 && pointerInputDevices > miceModel.oldCount + touchPadModel.oldCount) {

109− root.unity8Settings.usageMode = "Windowed";

117+ unity8Settings.usageMode = "Windowed";

110 }

118 }

111 } else {

119 } else {

112 // Make sure we initialize to something sane

120 // Make sure we initialize to something sane

113− root.unity8Settings.usageMode = "Staged";

121+ unity8Settings.usageMode = "Staged";

114 }

122 }

115 }

123 }

116 miceModel.oldCount = miceModel.count;

124 miceModel.oldCount = miceModel.count;

@@ -256,7 +264,7 @@ Rectangle {

256 forceOSKEnabled

264 forceOSKEnabled

257

265

258 usageScenario: {

266 usageScenario: {

259− if (root.unity8Settings.usageMode === "Windowed") {

267+ if (unity8Settings.usageMode === "Windowed") {

260 return "desktop";

268 return "desktop";

261 } else {

269 } else {

262 if (deviceConfiguration.category === "phone") {

270 if (deviceConfiguration.category === "phone") {

tests/mocks/GSettings.1.0/fake_gsettings.cpp+36−1

@@ -21,7 +21,8 @@

21GSettingsControllerQml* GSettingsControllerQml::s_controllerInstance = 0;

23GSettingsControllerQml::GSettingsControllerQml()

24+ : m_disableHeight(false)

24− : m_usageMode("Staged")

25+ , m_usageMode("Staged")

25 , m_autohideLauncher(false)

26 , m_autohideLauncher(false)

26 , m_launcherWidth(8)

27 , m_launcherWidth(8)

27{

28{

@@ -38,6 +39,19 @@ GSettingsControllerQml* GSettingsControllerQml::instance() {

38 return s_controllerInstance;

39 return s_controllerInstance;

39}

40}

42+bool GSettingsControllerQml::disableHeight() const

43+{

44+ return m_disableHeight;

45+}

46+

47+void GSettingsControllerQml::setDisableHeight(bool val)

48+{

49+ if (val != m_disableHeight) {

50+ m_disableHeight = val;

51+ Q_EMIT disableHeightChanged();

52+ }

53+}

54+

41QString GSettingsControllerQml::pictureUri() const

55QString GSettingsControllerQml::pictureUri() const

42{

56{

43 return m_pictureUri;

57 return m_pictureUri;

@@ -162,6 +176,10 @@ void GSettingsQml::componentComplete()

162 // values until we are completed loading.

176 // values until we are completed loading.

163 m_valid = true;

177 m_valid = true;

164

178

179+ // FIXME: We should make this dynamic, instead of hard-coding all possible

180+ // properties in one object. We should create properties based on the schema.

181+ connect(GSettingsControllerQml::instance(), &GSettingsControllerQml::disableHeightChanged,

182+ this, &GSettingsQml::disableHeightChanged);

165 connect(GSettingsControllerQml::instance(), &GSettingsControllerQml::pictureUriChanged,

183 connect(GSettingsControllerQml::instance(), &GSettingsControllerQml::pictureUriChanged,

166 this, &GSettingsQml::pictureUriChanged);

184 this, &GSettingsQml::pictureUriChanged);

167 connect(GSettingsControllerQml::instance(), &GSettingsControllerQml::usageModeChanged,

185 connect(GSettingsControllerQml::instance(), &GSettingsControllerQml::usageModeChanged,

@@ -175,6 +193,7 @@ void GSettingsQml::componentComplete()

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

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

176 this, &GSettingsQml::launcherWidthChanged);

194 this, &GSettingsQml::launcherWidthChanged);

177

195

196+ Q_EMIT disableHeightChanged();

178 Q_EMIT pictureUriChanged();

197 Q_EMIT pictureUriChanged();

179 Q_EMIT usageModeChanged();

198 Q_EMIT usageModeChanged();

180 Q_EMIT lockedOutTimeChanged();

199 Q_EMIT lockedOutTimeChanged();

@@ -187,6 +206,22 @@ GSettingsSchemaQml * GSettingsQml::schema() const {

187 return m_schema;

206 return m_schema;

188}

207}

189

208

209+QVariant GSettingsQml::disableHeight() const

210+{

211+ if (m_valid && m_schema->id() == "com.canonical.keyboard.maliit") {

212+ return GSettingsControllerQml::instance()->disableHeight();

213+ } else {

214+ return QVariant();

215+ }

216+}

217+

218+void GSettingsQml::setDisableHeight(const QVariant &val)

219+{

220+ if (m_valid && m_schema->id() == "com.canonical.keyboard.maliit") {

221+ GSettingsControllerQml::instance()->setDisableHeight(val.toBool());

222+ }

223+}

224+

190QVariant GSettingsQml::pictureUri() const

225QVariant GSettingsQml::pictureUri() const

191{

226{

192 if (m_valid && m_schema->id() == "org.gnome.desktop.background") {

227 if (m_valid && m_schema->id() == "org.gnome.desktop.background") {

tests/mocks/GSettings.1.0/fake_gsettings.h+10−1

@@ -49,6 +49,7 @@ class GSettingsQml: public QObject, public QQmlParserStatus

49 Q_INTERFACES(QQmlParserStatus)

51 Q_PROPERTY(GSettingsSchemaQml* schema READ schema NOTIFY schemaChanged)

52+ Q_PROPERTY(QVariant disableHeight READ disableHeight WRITE setDisableHeight NOTIFY disableHeightChanged)

52 Q_PROPERTY(QVariant pictureUri READ pictureUri WRITE setPictureUri NOTIFY pictureUriChanged)

53 Q_PROPERTY(QVariant pictureUri READ pictureUri WRITE setPictureUri NOTIFY pictureUriChanged)

53 Q_PROPERTY(QVariant usageMode READ usageMode WRITE setUsageMode NOTIFY usageModeChanged)

54 Q_PROPERTY(QVariant usageMode READ usageMode WRITE setUsageMode NOTIFY usageModeChanged)

54 Q_PROPERTY(QVariant lockedOutTime READ lockedOutTime WRITE setLockedOutTime NOTIFY lockedOutTimeChanged)

55 Q_PROPERTY(QVariant lockedOutTime READ lockedOutTime WRITE setLockedOutTime NOTIFY lockedOutTimeChanged)

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

63 void componentComplete();

64 void componentComplete();

65 GSettingsSchemaQml * schema() const;

66 GSettingsSchemaQml * schema() const;

67+ QVariant disableHeight() const;

66 QVariant pictureUri() const;

68 QVariant pictureUri() const;

67 QVariant usageMode() const;

69 QVariant usageMode() const;

68 QVariant lockedOutTime() const;

70 QVariant lockedOutTime() const;

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

70 QVariant autohideLauncher() const;

72 QVariant autohideLauncher() const;

71 QVariant launcherWidth() const;

73 QVariant launcherWidth() const;

75+ void setDisableHeight(const QVariant &val);

73 void setPictureUri(const QVariant &str);

76 void setPictureUri(const QVariant &str);

74 void setUsageMode(const QVariant &usageMode);

77 void setUsageMode(const QVariant &usageMode);

75 void setLockedOutTime(const QVariant &timestamp);

78 void setLockedOutTime(const QVariant &timestamp);

@@ -78,6 +81,7 @@ public:

78 void setLauncherWidth(const QVariant &launcherWidth);

81 void setLauncherWidth(const QVariant &launcherWidth);

80Q_SIGNALS:

83Q_SIGNALS:

84+ void disableHeightChanged();

81 void schemaChanged();

85 void schemaChanged();

82 void pictureUriChanged();

86 void pictureUriChanged();

83 void usageModeChanged();

87 void usageModeChanged();

@@ -101,6 +105,9 @@ public:

101 static GSettingsControllerQml* instance();

105 static GSettingsControllerQml* instance();

102 ~GSettingsControllerQml();

106 ~GSettingsControllerQml();

103

107

108+ bool disableHeight() const;

109+ Q_INVOKABLE void setDisableHeight(bool val);

110+

104 QString pictureUri() const;

111 QString pictureUri() const;

105 Q_INVOKABLE void setPictureUri(const QString &str);

112 Q_INVOKABLE void setPictureUri(const QString &str);

106

113

@@ -120,8 +127,9 @@ public:

120 Q_INVOKABLE void setLauncherWidth(int launcherWidth);

127 Q_INVOKABLE void setLauncherWidth(int launcherWidth);

121

128

122Q_SIGNALS:

129Q_SIGNALS:

130+ void disableHeightChanged();

123 void pictureUriChanged(const QString&);

131 void pictureUriChanged(const QString&);

124− void usageModeChanged(const QString &usageMode);

132+ void usageModeChanged(const QString&);

125 void lockedOutTimeChanged(qint64 timestamp);

133 void lockedOutTimeChanged(qint64 timestamp);

126 void lifecycleExemptAppidsChanged(const QStringList&);

134 void lifecycleExemptAppidsChanged(const QStringList&);

127 void autohideLauncherChanged(bool autohideLauncher);

135 void autohideLauncherChanged(bool autohideLauncher);

@@ -130,6 +138,7 @@ Q_SIGNALS:

130private:

138private:

131 GSettingsControllerQml();

139 GSettingsControllerQml();

132

140

141+ bool m_disableHeight;

133 QString m_pictureUri;

142 QString m_pictureUri;

134 QString m_usageMode;

143 QString m_usageMode;

135 qint64 m_lockedOutTime;

144 qint64 m_lockedOutTime;

tests/qmltests/tst_OrientedShell.qml+9−16

@@ -45,17 +45,17 @@ Rectangle {

45 property int savedOrientation

46 }

48− Connections {

48+ GSettings {

49− target: GSettingsController

49+ id: unity8Settings

50+ schema.id: "com.canonical.Unity8"

50 onUsageModeChanged: {

51 onUsageModeChanged: {

51 usageModeSelector.selectedIndex = usageModeSelector.model.indexOf(usageMode)

52 usageModeSelector.selectedIndex = usageModeSelector.model.indexOf(usageMode)

52 }

53 }

54 }

55− QtObject{

56+ GSettings {

56− id: mockOskSettings

57+ id: oskSettings

57− property bool stayHidden: false

58+ schema.id: "com.canonical.keyboard.maliit"

58− property bool disableHeight: false

59 }

61 InputDeviceModel {

@@ -157,7 +157,6 @@ Rectangle {

157 sourceComponent: Component {

158 OrientedShell {

159 anchors.fill: parent

160− oskSettings: mockOskSettings

161 physicalOrientation: root.physicalOrientation0

160 physicalOrientation: root.physicalOrientation0

162 orientationLocked: orientationLockedCheckBox.checked

161 orientationLocked: orientationLockedCheckBox.checked

163 orientationLock: mockOrientationLock

162 orientationLock: mockOrientationLock

@@ -1087,7 +1086,7 @@ Rectangle {

1087

1086

1088 tryCompare(shell, "usageScenario", "phone");

1087 tryCompare(shell, "usageScenario", "phone");

1089 tryCompare(inputMethod, "enabled", true);

1088 tryCompare(inputMethod, "enabled", true);

1090− tryCompare(mockOskSettings, "disableHeight", false);

1089+ tryCompare(oskSettings, "disableHeight", false);

1091

1090

1092 if (data.kbd) {

1091 if (data.kbd) {

1093 MockInputDeviceBackend.addMockDevice("/kbd0", InputInfo.Keyboard);

1092 MockInputDeviceBackend.addMockDevice("/kbd0", InputInfo.Keyboard);

@@ -1098,14 +1097,7 @@ Rectangle {

1098

1097

1099 tryCompare(shell, "usageScenario", data.expectedMode);

1098 tryCompare(shell, "usageScenario", data.expectedMode);

1100 tryCompare(inputMethod, "enabled", data.oskExpected);

1099 tryCompare(inputMethod, "enabled", data.oskExpected);

1101− tryCompare(mockOskSettings, "disableHeight", data.expectedMode == "desktop" || data.kbd);

1100+ tryCompare(oskSettings, "disableHeight", data.expectedMode == "desktop" || data.kbd);

1102−

1103− if (data.kbd) {

1104− MockInputDeviceBackend.removeDevice("/kbd0");

1105− }

1106− if (data.mouse) {

1107− MockInputDeviceBackend.removeDevice("/mouse0");

1108− }

1109

1101

1110 // Restore width

1102 // Restore width

1111 orientedShellLoader.width = oldWidth;

1103 orientedShellLoader.width = oldWidth;

@@ -1154,6 +1146,7 @@ Rectangle {

1154 // Load shell, and have it pick desktop

1146 // Load shell, and have it pick desktop

1155 loadShell("desktop");

1147 loadShell("desktop");

1156 compare(shell.usageScenario, "desktop");

1148 compare(shell.usageScenario, "desktop");

1149+ compare(unity8Settings.usageMode, "Windowed");

1157 }

1150 }

1158

1151

1159 function test_overrideWindowed() {

1152 function test_overrideWindowed() {