Unity 8

Merge lp:~unity-team/unity8/suru-switch into lp:unity8

suru-switch
Merge into trunk

Proposed by Michał Sawicz on 2014-02-24

Status:

Merged

Approved by:

Nick Dedekind on 2014-07-01

Approved revision:

745

Merged at revision:

997

Proposed branch:

lp:~unity-team/unity8/suru-switch

Merge into:

lp:unity8

Diff against target:

358 lines (+34/-100)

13 files modified

cmake/modules/autopilot.cmake (+2/-2)
debian/changelog (+6/-0)
debian/control (+5/-5)
include/paths.h.in (+0/-8)
plugins/Unity/Indicators/qml/MenuItemFactory.qml (+1/-1)
qml/Launcher/LauncherDelegate.qml (+1/-0)
qml/Panel/Indicators/DefaultIndicatorWidget.qml (+14/-30)
qml/Panel/Panel.qml (+1/-1)
run.sh (+0/-6)
src/Panel/Indicators/client/indicatorsclient.cpp (+0/-1)
src/main.cpp (+0/-2)
tests/qmltests/Panel/Indicators/tst_DefaultIndicatorWidget.qml (+4/-42)
tools/scopetool.cpp (+0/-2)

To merge this branch:

bzr merge lp:~unity-team/unity8/suru-switch

Low

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration	2014-02-24	Needs Fixing on 2014-07-01
Nick Dedekind (community)			Approve on 2014-07-01
Albert Astals Cid (community)			Needs Fixing on 2014-04-02
Michael Zanetti (community)			Needs Information on 2014-03-17
Ubuntu Unity PS integration team	packaging	2014-05-23	Pending
Michał Sawicz			Pending
Review via email: mp+207991@code.launchpad.net

This proposal supersedes a proposal from 2014-02-18.

Commit message

switch the default theme to suru

Description of the change

switch the default theme to suru.

This will go with the silo containing the new theme.

* Are there any related MPs required for this MP to build/function as expected? Please list.
https://code.launchpad.net/~saviq/ubuntu-ui-toolkit/suru-switch/+merge/211328
https://code.launchpad.net/~unity-team/ubuntu-settings-components/suru-theme/+merge/220739

* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes.

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
Yes.

* If you changed the UI, has there been a design review?
Yes.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-18: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2336/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-02-19: Posted in a previous version of this proposal

Please follow https://wiki.ubuntu.com/Process/Merges/Checklists/Unity8

Revision history for this message

Michał Sawicz (saviq) wrote on 2014-02-24: Posted in a previous version of this proposal

.bzr/branches/origin/trunk/cmake/modules/autopilot.cmake: COMMAND LANG=C UBUNTU_ICON_THEME=ubuntu-mobile QML2_IMPORT_PATH=${SHELL_INSTALL_QML}/mocks autopilot run ${TEST_SUITE}
.bzr/branches/origin/trunk/include/paths.h.in: ubuntuIconTheme = "ubuntu-mobile";
.bzr/branches/origin/trunk/build: ubuntu-mobile-icons \
.bzr/branches/origin/trunk/run: export UBUNTU_ICON_THEME=ubuntu-mobile

Still some things to update here.

review: Needs Fixing

Revision history for this message

Michał Sawicz (saviq) wrote on 2014-02-24: Posted in a previous version of this proposal

Jeez ignore me please.

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2014-03-17:

The indicators panel doesn't reach the right edge any more. Don't think that's intentional, is it?

http://i.imgur.com/hgVVgxP.png

http://i.imgur.com/OQ9MXHz.png

review: Needs Information

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-17:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2504/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Nick Dedekind (nick-dedekind) wrote on 2014-03-17:

Hm. Indicator icons are all now really small (because of the aspect change). Why did we change to use Icon when it doesn't work yet? Since we're going to have to change it again when we have the correct functionality, why not just add the FIXME to the original code to say "change to use Icon"...

118 + anchors.rightMargin: units.gu(1)

As mzanetti indicated, the menu is now not snug against the right edge.
If you wanted to offset the indicator icons by a rightMargin, you need to apply it only to the IndicatorRow component, not the "Indicators" component (includes the MenuContent).

110 + property real indicatorsMenuWidth: (shell.width > units.gu(60)) ? units.gu(38) : shell.width - units.gu(2)

What is this change for?
This property is overridden in shell, so only change comes in tests. It should probably be replaced with:
indicatorsMenuWidth: width

Revision history for this message

Nick Dedekind (nick-dedekind) on 2014-03-17:

review: Needs Fixing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-17:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2507/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Michał Sawicz (saviq) wrote on 2014-03-17:

Icon is used to allow for colourizing, that works. Only real problem with it is aspect ratio, which was design-approved for the time being.

Fixed the margin issues.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-17:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2513/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-17:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2517/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-25:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2626/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-04-02:

Text conflict in debian/control

review: Needs Fixing

Revision history for this message

Michał Sawicz (saviq) wrote on 2014-04-17:

Tasks still needed for this to land: https://blueprints.launchpad.net/unity8/+spec/suru-icon-switch

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-01:

FAILED: Continuous integration, rev:743
http://jenkins.qa.ubuntu.com/job/unity8-ci/3272/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1375/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/276/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/366/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/366/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/366/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2312/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/3272/rebuild

review: Needs Fixing (continuous-integration)

lp:~unity-team/unity8/suru-switch updated on 2014-07-01

742. By Michał Sawicz on 2014-07-01: Use StatusIcon from settings components.
743. By Michał Sawicz on 2014-07-01: Drop old tests.
744. By Michał Sawicz on 2014-07-01: Use actions, too.

Revision history for this message

Nick Dedekind (nick-dedekind) wrote on 2014-07-01:

Small fix. Otherwise fine.

review: Needs Fixing

lp:~unity-team/unity8/suru-switch updated on 2014-07-01

745. By Michał Sawicz on 2014-07-01: paintedWidth deprecated.

Revision history for this message

Nick Dedekind (nick-dedekind) wrote on 2014-07-01:

* Did you perform an exploratory manual test run of the code change and any related functionality?
Yes

* Did CI run pass? If not, please explain why.
No. Required package deps

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-01:

FAILED: Continuous integration, rev:744
http://jenkins.qa.ubuntu.com/job/unity8-ci/3287/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1408/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/291/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/381/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/381/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/381/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2358/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/3287/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Mohammad Rakibul Hasan

Unity Team

1	=== modified file 'cmake/modules/autopilot.cmake'
2	--- cmake/modules/autopilot.cmake 2014-02-22 00:12:49 +0000
3	+++ cmake/modules/autopilot.cmake 2014-07-01 13:57:03 +0000
4	@@ -2,7 +2,7 @@
5
6	function(declare_autopilot_test TEST_NAME TEST_SUITE WORKING_DIR)
7	add_custom_target(autopilot-${TEST_NAME}
8	- COMMAND LANG=C UBUNTU_ICON_THEME=ubuntu-mobile QML2_IMPORT_PATH=${SHELL_INSTALL_QML}/mocks python3 -m autopilot.run run ${TEST_SUITE}
9	+ COMMAND LANG=C QML2_IMPORT_PATH=${SHELL_INSTALL_QML}/mocks python3 -m autopilot.run run ${TEST_SUITE}
10	WORKING_DIRECTORY ${WORKING_DIR}
11	DEPENDS fake_install
12	)
13	@@ -14,7 +14,7 @@
14	add_dependencies(autopilot autopilot-${TEST_NAME})
15
16	add_custom_target(autopilot2-${TEST_NAME}
17	- COMMAND LANG=C UBUNTU_ICON_THEME=ubuntu-mobile QML2_IMPORT_PATH=${SHELL_INSTALL_QML}/mocks python2 -m autopilot.run run ${TEST_SUITE}
18	+ COMMAND LANG=C QML2_IMPORT_PATH=${SHELL_INSTALL_QML}/mocks python2 -m autopilot.run run ${TEST_SUITE}
19	WORKING_DIRECTORY ${WORKING_DIR}
20	DEPENDS fake_install
21	)
22
23	=== modified file 'debian/changelog'
24	--- debian/changelog 2014-06-27 08:47:58 +0000
25	+++ debian/changelog 2014-07-01 13:57:03 +0000
26	@@ -1,3 +1,9 @@
27	+unity8 (7.90-0ubuntu1) UNRELEASED; urgency=medium
28	+
29	+ * Adapt to suru theme.
30	+
31	+ -- Michał Sawicz <michal.sawicz@canonical.com> Fri, 23 May 2014 10:32:08 +0200
32	+
33	unity8 (7.89+14.10.20140627-0ubuntu1) utopic; urgency=low
34
35	[ Michael Terry ]
36
37	=== modified file 'debian/control'
38	--- debian/control 2014-06-27 08:28:18 +0000
39	+++ debian/control 2014-07-01 13:57:03 +0000
40	@@ -37,8 +37,8 @@
41	qtdeclarative5-dev-tools,
42	qtdeclarative5-private-dev (>= 5.2.1),
43	qtdeclarative5-qtmultimedia-plugin,
44	- qtdeclarative5-ubuntu-settings-components,
45	- qtdeclarative5-ubuntu-ui-toolkit-plugin,
46	+ qtdeclarative5-ubuntu-settings-components (>= 0.2),
47	+ qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.48),
48	ttf-ubuntu-font-family,
49	Standards-Version: 3.9.4
50	Homepage: http://launchpad.net/unity
51	@@ -51,7 +51,7 @@
52	Package: indicators-client
53	Architecture: amd64 armhf i386
54	Depends: qmenumodel-qml (>= 0.2.7),
55	- qtdeclarative5-ubuntu-ui-toolkit-plugin,
56	+ qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.48),
57	unity8 (= ${binary:Version}),
58	${misc:Depends},
59	${shlibs:Depends},
60	@@ -78,7 +78,7 @@
61	qmenumodel-qml (>= 0.2.7),
62	qml-module-qtquick-xmllistmodel,
63	qtdeclarative5-gsettings1.0,
64	- qtdeclarative5-ubuntu-settings-components,
65	+ qtdeclarative5-ubuntu-settings-components (>= 0.2),
66	unity-launcher-impl-3,
67	unity8-common (= ${source:Version}),
68	unity8-private (= ${binary:Version}),
69	@@ -99,7 +99,7 @@
70	Package: unity8-common
71	Architecture: all
72	Depends: qtdeclarative5-ubuntu-thumbnailer0.1 \| ubuntu-thumbnailer-impl,
73	- qtdeclarative5-ubuntu-ui-toolkit-plugin,
74	+ qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.48),
75	qtdeclarative5-unity-notifications-plugin \| unity-notifications-impl,
76	ubuntu-thumbnailer-impl-0,
77	unity-application-impl-2,
78
79	=== modified file 'include/paths.h.in'
80	--- include/paths.h.in 2014-04-02 11:19:54 +0000
81	+++ include/paths.h.in 2014-07-01 13:57:03 +0000
82	@@ -127,12 +127,4 @@
83	engine->setImportPathList(importPathList);
84	}
85
86	-inline void resolveIconTheme() {
87	- const char *ubuntuIconTheme = getenv("UBUNTU_ICON_THEME");
88	- if (ubuntuIconTheme == NULL) {
89	- ubuntuIconTheme = "ubuntu-mobile";
90	- }
91	- QIcon::setThemeName(ubuntuIconTheme);
92	-}
93	-
94	#endif
95
96	=== modified file 'plugins/Unity/Indicators/qml/MenuItemFactory.qml'
97	--- plugins/Unity/Indicators/qml/MenuItemFactory.qml 2014-05-01 14:25:18 +0000
98	+++ plugins/Unity/Indicators/qml/MenuItemFactory.qml 2014-07-01 13:57:03 +0000
99	@@ -165,7 +165,7 @@
100
101	Component {
102	id: standardMenu;
103	- ListItems.Standard {
104	+ Menus.StandardMenu {
105	objectName: "standardMenu"
106	property QtObject menuData: null
107	property int menuIndex: -1
108
109	=== modified file 'qml/Launcher/LauncherDelegate.qml'
110	--- qml/Launcher/LauncherDelegate.qml 2013-10-16 11:33:26 +0000
111	+++ qml/Launcher/LauncherDelegate.qml 2014-07-01 13:57:03 +0000
112	@@ -63,6 +63,7 @@
113	id: iconImage
114	sourceSize.width: iconShape.width
115	sourceSize.height: iconShape.height
116	+ fillMode: Image.PreserveAspectCrop
117	source: root.iconName
118	}
119	}
120
121	=== modified file 'qml/Panel/Indicators/DefaultIndicatorWidget.qml'
122	--- qml/Panel/Indicators/DefaultIndicatorWidget.qml 2013-12-12 09:55:17 +0000
123	+++ qml/Panel/Indicators/DefaultIndicatorWidget.qml 2014-07-01 13:57:03 +0000
124	@@ -19,12 +19,13 @@
125
126	import QtQuick 2.0
127	import Ubuntu.Components 0.1
128	+import Ubuntu.Settings.Components 0.1
129	import Unity.Indicators 0.1 as Indicators
130
131	Indicators.IndicatorBase {
132	id: indicatorWidget
133
134	- property int iconSize: height
135	+ property int iconSize: units.gu(2)
136	property alias leftLabel: itemLeftLabel.text
137	property alias rightLabel: itemRightLabel.text
138	property var icons: undefined
139	@@ -34,7 +35,6 @@
140
141	Row {
142	id: itemRow
143	- width: childrenRect.width
144	objectName: "itemRow"
145	anchors {
146	top: parent.top
147	@@ -44,7 +44,7 @@
148
149	Label {
150	id: itemLeftLabel
151	- width: guRoundUp(implicitWidth)
152	+ width: contentWidth + units.gu(1)
153	objectName: "leftLabel"
154	color: Theme.palette.selected.backgroundText
155	opacity: 0.8
156	@@ -52,10 +52,10 @@
157	fontSize: "medium"
158	anchors.verticalCenter: parent.verticalCenter
159	visible: text != ""
160	+ horizontalAlignment: Text.AlignHCenter
161	}
162
163	Row {
164	- width: childrenRect.width
165	anchors {
166	top: parent.top
167	bottom: parent.bottom
168	@@ -65,22 +65,16 @@
169	model: indicatorWidget.icons
170
171	Item {
172	- width: guRoundUp(itemImage.width)
173	- height: indicatorWidget.iconSize
174	+ width: itemImage.width + units.gu(1)
175	+ anchors { top: parent.top; bottom: parent.bottom }
176
177	- Image {
178	+ StatusIcon {
179	id: itemImage
180	- objectName: "itemImage"
181	- visible: source != ""
182	+ height: indicatorWidget.iconSize
183	+ anchors.centerIn: parent
184	source: modelData
185	- height: parent.height
186	- anchors.horizontalCenter: parent.horizontalCenter
187	- fillMode: Image.PreserveAspectFit
188	-
189	- sourceSize {
190	- width: indicatorWidget.iconSize
191	- height: indicatorWidget.iconSize
192	- }
193	+ sets: ["status", "actions"]
194	+ color: "#CCCCCC"
195	}
196	}
197	}
198	@@ -88,7 +82,7 @@
199
200	Label {
201	id: itemRightLabel
202	- width: guRoundUp(implicitWidth)
203	+ width: contentWidth + units.gu(1)
204	objectName: "rightLabel"
205	color: Theme.palette.selected.backgroundText
206	opacity: 0.8
207	@@ -96,18 +90,8 @@
208	fontSize: "medium"
209	anchors.verticalCenter: parent.verticalCenter
210	visible: text != ""
211	- }
212	- }
213	-
214	- // TODO: Use toolkit function https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1242575
215	- function guRoundUp(width) {
216	- if (width == 0) {
217	- return 0;
218	- }
219	- var gu1 = units.gu(1.0);
220	- var mod = (width % gu1);
221	-
222	- return mod == 0 ? width : width + (gu1 - mod);
223	+ horizontalAlignment: Text.AlignHCenter
224	+ }
225	}
226
227	onRootActionStateChanged: {
228
229	=== modified file 'qml/Panel/Panel.qml'
230	--- qml/Panel/Panel.qml 2014-04-02 15:00:40 +0000
231	+++ qml/Panel/Panel.qml 2014-07-01 13:57:03 +0000
232	@@ -21,7 +21,7 @@
233	Item {
234	id: root
235	readonly property real panelHeight: units.gu(3) + units.dp(2)
236	- property real indicatorsMenuWidth: (shell.width > units.gu(60)) ? units.gu(40) : shell.width
237	+ property real indicatorsMenuWidth: width
238	property alias indicators: indicatorsMenu
239	property bool fullscreenMode: false
240	property bool searchVisible: true
241
242	=== modified file 'run.sh'
243	--- run.sh 2014-06-11 15:36:51 +0000
244	+++ run.sh 2014-07-01 13:57:03 +0000
245	@@ -57,12 +57,6 @@
246	export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/libusermetrics:$PWD/builddir/tests/mocks/LightDM/single-passphrase
247	fi
248
249	-# Force icon theme if running on the desktop, otherwise gnome theme (if running
250	-# on Ubuntu Desktop) will be used and icons won't be found
251	-if [ -n "$DESKTOP_SESSION" ]; then
252	- export UBUNTU_ICON_THEME=ubuntu-mobile
253	-fi
254	-
255	QML_PHONE_SHELL_ARGS=""
256	if $MOUSE_TOUCH; then
257	QML_PHONE_SHELL_ARGS="$QML_PHONE_SHELL_ARGS -mousetouch"
258
259	=== modified file 'src/Panel/Indicators/client/indicatorsclient.cpp'
260	--- src/Panel/Indicators/client/indicatorsclient.cpp 2014-03-19 15:29:35 +0000
261	+++ src/Panel/Indicators/client/indicatorsclient.cpp 2014-07-01 13:57:03 +0000
262	@@ -32,7 +32,6 @@
263	m_view(0)
264	{
265	m_application = new QApplication(argc, argv);
266	- resolveIconTheme();
267
268	QStringList args = m_application->arguments();
269
270
271	=== modified file 'src/main.cpp'
272	--- src/main.cpp 2014-06-20 17:04:02 +0000
273	+++ src/main.cpp 2014-07-01 13:57:03 +0000
274	@@ -96,8 +96,6 @@
275	indicatorProfile = "phone";
276	}
277
278	- resolveIconTheme();
279	-
280	ApplicationArguments qmlArgs;
281	if (parser.isSet(windowGeometryOption) &&
282	parser.value(windowGeometryOption).split('x').size() == 2)
283
284	=== modified file 'tests/qmltests/Panel/Indicators/tst_DefaultIndicatorWidget.qml'
285	--- tests/qmltests/Panel/Indicators/tst_DefaultIndicatorWidget.qml 2013-12-17 16:04:47 +0000
286	+++ tests/qmltests/Panel/Indicators/tst_DefaultIndicatorWidget.qml 2014-07-01 13:57:03 +0000
287	@@ -41,12 +41,6 @@
288
289	iconSize: units.gu(3.2)
290	height: units.gu(3)
291	-
292	- rootActionState {
293	- icons: [ "image://theme/audio-volume-high", "image://theme/audio-volume-low" ]
294	- leftLabel: "left"
295	- rightLabel: "right"
296	- }
297	}
298
299	UT.UnityTestCase {
300	@@ -57,41 +51,9 @@
301	widget.rootActionState.icons = [];
302	widget.rootActionState.leftLabel = "";
303	widget.rootActionState.rightLabel = "";
304	- wait(50);
305	- }
306	-
307	- function test_guRoundedWidth_data() {
308	- return [
309	- { tag: "empty", icons: [], leftLabel: "", rightLabel: "" },
310	- { tag: "1-icon-no-label", icons: [ "image://theme/audio-volume-high" ], leftLabel: "", rightLabel: "" },
311	- { tag: "2-icon-no-label", icons: [ "image://theme/audio-volume-high", "image://theme/audio-volume-low" ], leftLabel: "", rightLabel: "" },
312	- { tag: "no-icon-l-label", icons: [], leftLabel: "left", rightLabel: "" },
313	- { tag: "no-icon-lr-label", icons: [], leftLabel: "left", rightLabel: "right" },
314	- { tag: "1-icon-l-label", icons: [ "image://theme/audio-volume-high" ], leftLabel: "left", rightLabel: "" },
315	- { tag: "1-icon-lr-label", icons: [ "image://theme/audio-volume-high" ], leftLabel: "left", rightLabel: "right" },
316	- { tag: "2-icon-l-label", icons: [ "image://theme/audio-volume-high", "image://theme/audio-volume-low" ], leftLabel: "left", rightLabel: "" },
317	- { tag: "2-icon-lr-label", icons: [ "image://theme/audio-volume-high", "image://theme/audio-volume-low" ], leftLabel: "left", rightLabel: "right" }
318	- ];
319	- }
320	-
321	- function test_guRoundedWidth(data) {
322	- widget.rootActionState.icons = data.icons
323	- widget.rootActionState.leftLabel = data.leftLabel;
324	- widget.rootActionState.rightLabel = data.rightLabel;
325	- wait(50);
326	-
327	- compare(widget.width, guRoundUp(widget.width));
328	- }
329	- }
330	-
331	- // TODO: Use toolkit function https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1242575
332	- function guRoundUp(width) {
333	- if (width == 0) {
334	- return 0;
335	- }
336	- var gu1 = units.gu(1.0);
337	- var mod = (width % gu1);
338	-
339	- return mod == 0 ? width : width + (gu1 - mod);
340	+ waitForRendering(widget)
341	+ }
342	+
343	+ // FIXME: add tests
344	}
345	}
346
347	=== modified file 'tools/scopetool.cpp'
348	--- tools/scopetool.cpp 2014-04-03 08:37:51 +0000
349	+++ tools/scopetool.cpp 2014-07-01 13:57:03 +0000
350	@@ -77,8 +77,6 @@
351	tracker.reset(new RegistryTracker(extraScopes, systemScopes, serverScopes));
352	}
353
354	- resolveIconTheme();
355	-
356	bindtextdomain("unity8", translationDirectory().toUtf8().data());
357
358	QQuickView* view = new QQuickView();