Merge lp:~kissiel/checkbox/ppa-packaging-touch2converged-trusty into lp:checkbox
- ppa-packaging-touch2converged-trusty
- Merge into trunk
Status: | Superseded |
---|---|
Proposed branch: | lp:~kissiel/checkbox/ppa-packaging-touch2converged-trusty |
Merge into: | lp:checkbox |
Diff against target: |
1537 lines (+1460/-0) 15 files modified
debian/changelog (+64/-0) debian/checkbox-converged.desktop (+8/-0) debian/clean (+2/-0) debian/compat (+1/-0) debian/control (+23/-0) debian/copyright (+21/-0) debian/install (+8/-0) debian/links (+3/-0) debian/patches/components_1.3_removal.diff (+1129/-0) debian/patches/series (+1/-0) debian/rules (+11/-0) debian/settings.json (+15/-0) debian/source/format (+1/-0) debian/tick.svg (+154/-0) debian/window-close.svg (+19/-0) |
To merge this branch: | bzr merge lp:~kissiel/checkbox/ppa-packaging-touch2converged-trusty |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Checkbox Developers | Pending | ||
Review via email: mp+307164@code.launchpad.net |
This proposal has been superseded by a proposal from 2016-09-29.
Commit message
Description of the change
This MR updates packaging with new Checkbox-Converged files layout (Trusty).
Unmerged revisions
- 22. By Maciej Kisielewski
-
use new file and dir names (converged instead of touch)
- 21. By Sylvain Pineau
-
debian/
patches/ components_ 1.3_removal. diff: Refresh And add components/
DialogMgr. qml to the patch - 20. By Pierre Equoy
-
"Release_
2016_Week30 [r=pierre- equoy][ bug=][author= checkbox- dev]" - 19. By Sylvain Pineau
-
debian/
patches/ components_ 1.3_removal. diff: Refresh - 18. By Sylvain Pineau
-
"Release_
2016_Week28 [r=sylvain- pineau] [bug=][ author= checkbox- dev]" - 17. By Sylvain Pineau
-
Revert the transition to ubuntu compoents 1.3 as a patch (making the package non native)
- 16. By Pierre Equoy
-
"Release_
2016_Week25 [r=pierre- equoy][ bug=][author= checkbox- dev]" - 15. By Pierre Equoy
-
Automatic merge
- 14. By Pierre Equoy
-
"automatic merge of lp:~pierre-equoy/checkbox/ppa-packaging-checkbox-converged-trusty_fix-1563763/ by tarmac [r=sylvain-pineau][bug=1563763][author=
pierre- equoy]" - 13. By Pierre Equoy
-
"Release_
2016_Week12 [r=pierre- equoy][ bug=][author= checkbox- dev]"
Preview Diff
1 | === added directory 'debian' |
2 | === added file 'debian/changelog' |
3 | --- debian/changelog 1970-01-01 00:00:00 +0000 |
4 | +++ debian/changelog 2016-09-29 12:03:24 +0000 |
5 | @@ -0,0 +1,64 @@ |
6 | +checkbox-converged (1.5) UNRELEASED; urgency=medium |
7 | + |
8 | + * Open for development (remove this message before releasing) |
9 | + |
10 | + -- Pierre Equoy <pierre.equoy@canonical.com> Mon, 25 Jul 2016 10:57:42 +0800 |
11 | + |
12 | +checkbox-converged (1.4.1) unstable; urgency=medium |
13 | + |
14 | + [ Sylvain Pineau ] |
15 | + |
16 | + [ Pierre Equoy ] |
17 | + * New upstream release |
18 | + |
19 | + -- Pierre Equoy <pierre.equoy@canonical.com> Mon, 25 Jul 2016 10:57:31 +0800 |
20 | + |
21 | +checkbox-converged (1.4) unstable; urgency=medium |
22 | + |
23 | + [ Pierre Equoy ] |
24 | + |
25 | + [ Sylvain Pineau ] |
26 | + * New upstream release |
27 | + |
28 | + -- Sylvain Pineau <sylvain.pineau@canonical.com> Tue, 12 Jul 2016 23:06:00 +0200 |
29 | + |
30 | +checkbox-converged (1.3) unstable; urgency=medium |
31 | + |
32 | + * New upstream release |
33 | + |
34 | + -- Pierre Equoy <pierre.equoy@canonical.com> Mon, 20 Jun 2016 10:02:10 +0800 |
35 | + |
36 | +checkbox-converged (1.2.6) unstable; urgency=medium |
37 | + |
38 | + * Update dependencies minimum version to avoid issues in Xenial (Fix lp:1563763) |
39 | + * New upstream release |
40 | + |
41 | + -- Pierre Equoy <pierre.equoy@canonical.com> Tue, 19 Apr 2016 14:13:08 +0800 |
42 | + |
43 | +checkbox-converged (1.2.5) unstable; urgency=medium |
44 | + |
45 | + * New upstream release |
46 | + |
47 | + -- Pierre Equoy <pierre.equoy@canonical.com> Mon, 21 Mar 2016 11:13:29 +0800 |
48 | + |
49 | +checkbox-converged (1.2.4) unstable; urgency=medium |
50 | + |
51 | + [ Sylvain Pineau ] |
52 | + |
53 | + [ Pierre Equoy ] |
54 | + * New upstream release |
55 | + |
56 | + -- Pierre Equoy <pierre.equoy@canonical.com> Tue, 15 Dec 2015 10:28:28 +0800 |
57 | + |
58 | +checkbox-converged (1.2.3) unstable; urgency=medium |
59 | + |
60 | + * New upstream release |
61 | + |
62 | + -- Sylvain Pineau <sylvain.pineau@canonical.com> Mon, 16 Nov 2015 21:13:12 +0100 |
63 | + |
64 | +checkbox-converged (1.2.0-2~ppa3) trusty; urgency=medium |
65 | + |
66 | + * Initial trusty release. |
67 | + |
68 | + -- Sylvain Pineau <sylvain.pineau@canonical.com> Thu, 23 Jul 2015 18:45:28 +0200 |
69 | + |
70 | |
71 | === added file 'debian/checkbox-converged.desktop' |
72 | --- debian/checkbox-converged.desktop 1970-01-01 00:00:00 +0000 |
73 | +++ debian/checkbox-converged.desktop 2016-09-29 12:03:24 +0000 |
74 | @@ -0,0 +1,8 @@ |
75 | +[Desktop Entry] |
76 | +Name=Checkbox Converged |
77 | +Comment=System testing utility for Ubuntu |
78 | +Exec=env LD_LIBRARY_PATH=/opt/qt-5.4/usr/lib/x86_64-linux-gnu qmlscene -qt=5.4 --settings=/usr/share/checkbox-converged/settings.json $@ /usr/share/checkbox-converged/checkbox-converged.qml |
79 | +Icon=checkbox-converged.svg |
80 | +Terminal=false |
81 | +Type=Application |
82 | +X-Ubuntu-Touch=true |
83 | |
84 | === added file 'debian/clean' |
85 | --- debian/clean 1970-01-01 00:00:00 +0000 |
86 | +++ debian/clean 2016-09-29 12:03:24 +0000 |
87 | @@ -0,0 +1,2 @@ |
88 | +converged/py/__pycache__/*.pyc |
89 | + |
90 | |
91 | === added file 'debian/compat' |
92 | --- debian/compat 1970-01-01 00:00:00 +0000 |
93 | +++ debian/compat 2016-09-29 12:03:24 +0000 |
94 | @@ -0,0 +1,1 @@ |
95 | +9 |
96 | |
97 | === added file 'debian/control' |
98 | --- debian/control 1970-01-01 00:00:00 +0000 |
99 | +++ debian/control 2016-09-29 12:03:24 +0000 |
100 | @@ -0,0 +1,23 @@ |
101 | +Source: checkbox-converged |
102 | +Section: utils |
103 | +Priority: optional |
104 | +Maintainer: Checkbox Developers <checkbox-dev@lists.launchpad.net> |
105 | +Uploaders: Sylvain Pineau <sylvain.pineau@canonical.com>, |
106 | + Zygmunt Krynicki <zygmunt.krynicki@canonical.com>, |
107 | + Debian Python Modules Team <python-modules-team@lists.alioth.debian.org> |
108 | +Build-Depends: debhelper (>= 9) |
109 | +Standards-Version: 3.9.6 |
110 | +Homepage: http://launchpad.net/checkbox |
111 | + |
112 | +Package: checkbox-converged |
113 | +Architecture: amd64 |
114 | +Depends: pyotherside, |
115 | + python3, |
116 | + python3-plainbox (>= 0.27~), |
117 | + qt (>= 5.4) | qml-module-qtquick-layouts, |
118 | + qtdeclarative5-test-plugin, |
119 | + qtdeclarative5-ubuntu-ui-toolkit-plugin, |
120 | + suru-icon-theme |
121 | + ${misc:Depends} |
122 | +Description: testing tool for all Ubuntu devices |
123 | + This tool helps to test devices ranging from servers to phones. |
124 | |
125 | === added file 'debian/copyright' |
126 | --- debian/copyright 1970-01-01 00:00:00 +0000 |
127 | +++ debian/copyright 2016-09-29 12:03:24 +0000 |
128 | @@ -0,0 +1,21 @@ |
129 | +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ |
130 | +Upstream-Name: checkbox-converged |
131 | +Source: https://launchpad.net/checkbox |
132 | + |
133 | +Files: * |
134 | +Copyright: Copyright 2012-2015 Canonical Ltd. |
135 | +License: GPL-3 |
136 | + This program is free software: you can redistribute it and/or modify |
137 | + it under the terms of the GNU General Public License version 3, |
138 | + as published by the Free Software Foundation. |
139 | + . |
140 | + This program is distributed in the hope that it will be useful, |
141 | + but WITHOUT ANY WARRANTY; without even the implied warranty of |
142 | + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
143 | + GNU General Public License for more details. |
144 | + . |
145 | + You should have received a copy of the GNU General Public License |
146 | + along with this program. If not, see <http://www.gnu.org/licenses/>. |
147 | + . |
148 | + On Debian-based systems the full text of the GPL, version 3, can be found at |
149 | + /usr/share/common-licenses/GPL-3. |
150 | |
151 | === added file 'debian/install' |
152 | --- debian/install 1970-01-01 00:00:00 +0000 |
153 | +++ debian/install 2016-09-29 12:03:24 +0000 |
154 | @@ -0,0 +1,8 @@ |
155 | +converged/checkbox-converged.qml usr/share/checkbox-converged/ |
156 | +converged/checkbox-converged.svg usr/share/icons/hicolor/scalable/apps/ |
157 | +converged/components usr/share/checkbox-converged/ |
158 | +converged/py usr/share/checkbox-converged/ |
159 | +debian/checkbox-converged.desktop usr/share/applications |
160 | +debian/settings.json usr/share/checkbox-converged/ |
161 | +debian/tick.svg usr/share/icons/suru/actions/scalable/ |
162 | +debian/window-close.svg usr/share/icons/suru/actions/scalable/ |
163 | |
164 | === added file 'debian/links' |
165 | --- debian/links 1970-01-01 00:00:00 +0000 |
166 | +++ debian/links 2016-09-29 12:03:24 +0000 |
167 | @@ -0,0 +1,3 @@ |
168 | +/usr/lib/x86_64-linux-gnu/qt5/qml/io /opt/qt-5.4/usr/lib/x86_64-linux-gnu/qt5/qml/io |
169 | +/usr/lib/x86_64-linux-gnu/qt5/qml/jbQuick /opt/qt-5.4/usr/lib/x86_64-linux-gnu/qt5/qml/jbQuick |
170 | +/opt/qt-5.4/usr/share/qtchooser/qt5-x86_64-linux-gnu.conf /etc/xdg/qtchooser/5.4.conf |
171 | |
172 | === added directory 'debian/patches' |
173 | === added file 'debian/patches/components_1.3_removal.diff' |
174 | --- debian/patches/components_1.3_removal.diff 1970-01-01 00:00:00 +0000 |
175 | +++ debian/patches/components_1.3_removal.diff 2016-09-29 12:03:24 +0000 |
176 | @@ -0,0 +1,1129 @@ |
177 | +diff --git b/converged/checkbox-converged.qml a/converged/checkbox-converged.qml |
178 | +index cb896ef..c6c3b93 100644 |
179 | +--- b/converged/checkbox-converged.qml |
180 | ++++ a/converged/checkbox-converged.qml |
181 | +@@ -20,8 +20,8 @@ |
182 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. |
183 | + */ |
184 | + import QtQuick 2.0 |
185 | +-import Ubuntu.Components 1.3 |
186 | +-import Ubuntu.Components.Popups 1.3 |
187 | ++import Ubuntu.Components 1.1 |
188 | ++import Ubuntu.Components.Popups 0.1 |
189 | + import QtQuick.Layouts 1.1 |
190 | + import io.thp.pyotherside 1.4 |
191 | + import "components" |
192 | +@@ -48,6 +48,8 @@ MainView { |
193 | + width: units.gu(100) |
194 | + height: units.gu(75) |
195 | + |
196 | ++ useDeprecatedToolbar: false |
197 | ++ |
198 | + // appSettings serves as application-wide storage for global variables |
199 | + // it has to have at least one entry to be constructed |
200 | + property var appSettings: { |
201 | +@@ -483,6 +485,7 @@ to rerun last test, continue to the next test, or start a new session?") |
202 | + CommandOutputPage { |
203 | + id: commandOutputPage |
204 | + visible: false |
205 | ++ __customHeaderContents: progressHeader; |
206 | + } |
207 | + /* |
208 | + * Create a page from a Component defined in `url` with a common |
209 | +@@ -499,6 +502,8 @@ to rerun last test, continue to the next test, or start a new session?") |
210 | + var pageObject = pageComponent.createObject(); |
211 | + if (test) { |
212 | + pageObject.test = test; |
213 | ++ pageObject.__customHeaderContents = progressHeader; |
214 | ++ progressHeader.update(test) |
215 | + } |
216 | + return pageObject; |
217 | + } |
218 | +diff --git b/converged/components/AboutPage.qml a/converged/components/AboutPage.qml |
219 | +index bb0f50e..d3de734 100644 |
220 | +--- b/converged/components/AboutPage.qml |
221 | ++++ a/converged/components/AboutPage.qml |
222 | +@@ -24,7 +24,7 @@ |
223 | + This page shows version information and contents of AUTHORS file located in top chekckbox-converged directory |
224 | + */ |
225 | + import QtQuick 2.0 |
226 | +-import Ubuntu.Components 1.3 |
227 | ++import Ubuntu.Components 1.1 |
228 | + import QtQuick.Layouts 1.1 |
229 | + |
230 | + Page { |
231 | +@@ -36,17 +36,12 @@ Page { |
232 | + |
233 | + onVersionInfoChanged: body.generateVersionText() |
234 | + |
235 | +- header: PageHeader { |
236 | +- title: i18n.tr("About") |
237 | +- } |
238 | ++ title: i18n.tr("About") |
239 | + |
240 | + ColumnLayout { |
241 | + spacing: units.gu(3) |
242 | + anchors { |
243 | +- top: header.bottom |
244 | +- bottom: aboutPage.bottom |
245 | +- right: aboutPage.right |
246 | +- left: aboutPage.left |
247 | ++ fill: parent |
248 | + topMargin: units.gu(3) |
249 | + bottomMargin: units.gu(3) |
250 | + leftMargin: units.gu(1) |
251 | +diff --git b/converged/components/AutomatedTestPage.qml a/converged/components/AutomatedTestPage.qml |
252 | +index 49e9ba2..7102aa9 100644 |
253 | +--- b/converged/components/AutomatedTestPage.qml |
254 | ++++ a/converged/components/AutomatedTestPage.qml |
255 | +@@ -20,7 +20,7 @@ |
256 | + */ |
257 | + |
258 | + import QtQuick 2.0 |
259 | +-import Ubuntu.Components 1.3 |
260 | ++import Ubuntu.Components 1.1 |
261 | + import QtQuick.Layouts 1.1 |
262 | + |
263 | + /*! \brief Page for Automated Test |
264 | +@@ -36,13 +36,9 @@ Page { |
265 | + |
266 | + property var test: { "name": "", "description": "", "test_number": 0, "tests_count": 0} |
267 | + |
268 | +- visible: false |
269 | ++ title: i18n.tr("Automated test") |
270 | + |
271 | +- header: ProgressHeader { |
272 | +- value: test['test_number'] |
273 | +- maximumValue: test['tests_count'] |
274 | +- title: i18n.tr("Automated test") |
275 | +- } |
276 | ++ visible: false |
277 | + |
278 | + TestPageBody { |
279 | + header: test["name"] |
280 | +diff --git b/converged/components/CbtDialog.qml a/converged/components/CbtDialog.qml |
281 | +index a7e36c3..ab3f281 100644 |
282 | +--- b/converged/components/CbtDialog.qml |
283 | ++++ a/converged/components/CbtDialog.qml |
284 | +@@ -19,8 +19,8 @@ |
285 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. |
286 | + */ |
287 | + import QtQuick 2.0 |
288 | +-import Ubuntu.Components 1.3 |
289 | +-import Ubuntu.Components.Popups 1.3 |
290 | ++import Ubuntu.Components 1.1 |
291 | ++import Ubuntu.Components.Popups 0.1 |
292 | + import QtQuick.Layouts 1.1 |
293 | + |
294 | + /*! \brief Common dialog popup. |
295 | +diff --git b/converged/components/CheckboxConvergedApplication.qml a/converged/components/CheckboxConvergedApplication.qml |
296 | +index 2aa8df3..46b92b4 100644 |
297 | +--- b/converged/components/CheckboxConvergedApplication.qml |
298 | ++++ a/converged/components/CheckboxConvergedApplication.qml |
299 | +@@ -21,6 +21,7 @@ |
300 | + */ |
301 | + |
302 | + import QtQuick 2.0 |
303 | ++import Ubuntu.Components 1.1 |
304 | + |
305 | + PythonObjectRef { |
306 | + id: app |
307 | +diff --git b/converged/components/CommandOutputPage.qml a/converged/components/CommandOutputPage.qml |
308 | +index 52a534f..144c4d0 100644 |
309 | +--- b/converged/components/CommandOutputPage.qml |
310 | ++++ a/converged/components/CommandOutputPage.qml |
311 | +@@ -24,8 +24,8 @@ |
312 | + */ |
313 | + |
314 | + import QtQuick 2.0 |
315 | +-import Ubuntu.Components 1.3 |
316 | +-import Ubuntu.Components.Popups 1.3 |
317 | ++import Ubuntu.Components 1.1 |
318 | ++import Ubuntu.Components.Popups 0.1 |
319 | + import QtQuick.Layouts 1.1 |
320 | + |
321 | + Page { |
322 | +@@ -43,21 +43,18 @@ Page { |
323 | + textArea.text = ""; |
324 | + } |
325 | + |
326 | +- header: PageHeader { |
327 | +- title: i18n.tr("Command output") |
328 | +- trailingActionBar { |
329 | +- objectName: 'trailingActionBar' |
330 | +- actions: [ |
331 | +- Action { |
332 | +- id: copyAction |
333 | +- objectName: "copyOutputAction" |
334 | +- iconName: "edit-copy" |
335 | +- // TRANSLATORS: a verb (call to action) |
336 | +- text: i18n.tr("Copy") |
337 | +- onTriggered: Clipboard.push(mimeData) |
338 | +- } |
339 | +- ] |
340 | +- } |
341 | ++ title: i18n.tr("Command output") |
342 | ++ head { |
343 | ++ actions: [ |
344 | ++ Action { |
345 | ++ id: skipAction |
346 | ++ objectName: "copyOutputAction" |
347 | ++ iconName: "edit-copy" |
348 | ++ // TRANSLATORS: a verb (call to action) |
349 | ++ text: i18n.tr("Copy") |
350 | ++ onTriggered: Clipboard.push(mimeData) |
351 | ++ } |
352 | ++ ] |
353 | + } |
354 | + |
355 | + Timer { |
356 | +diff --git b/converged/components/CommentsDialog.qml a/converged/components/CommentsDialog.qml |
357 | +index 3323788..8dc1b6c 100644 |
358 | +--- b/converged/components/CommentsDialog.qml |
359 | ++++ a/converged/components/CommentsDialog.qml |
360 | +@@ -19,8 +19,8 @@ |
361 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. |
362 | + */ |
363 | + import QtQuick 2.0 |
364 | +-import Ubuntu.Components 1.3 |
365 | +-import Ubuntu.Components.Popups 1.3 |
366 | ++import Ubuntu.Components 1.1 |
367 | ++import Ubuntu.Components.Popups 0.1 |
368 | + |
369 | + /*! \brief Comment addition dialog. |
370 | + \inherits Item |
371 | +diff --git b/converged/components/ConfirmationDialog.qml a/converged/components/ConfirmationDialog.qml |
372 | +index 25e8734..44e8963 100644 |
373 | +--- b/converged/components/ConfirmationDialog.qml |
374 | ++++ a/converged/components/ConfirmationDialog.qml |
375 | +@@ -19,8 +19,8 @@ |
376 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. |
377 | + */ |
378 | + import QtQuick 2.0 |
379 | +-import Ubuntu.Components 1.3 |
380 | +-import Ubuntu.Components.Popups 1.3 |
381 | ++import Ubuntu.Components 1.1 |
382 | ++import Ubuntu.Components.Popups 0.1 |
383 | + |
384 | + /*! \brief Skip-confirmation dialog. |
385 | + \inherits Item |
386 | +diff --git b/converged/components/ErrorDialog.qml a/converged/components/ErrorDialog.qml |
387 | +index edbcc1a..688e68a 100644 |
388 | +--- b/converged/components/ErrorDialog.qml |
389 | ++++ a/converged/components/ErrorDialog.qml |
390 | +@@ -19,8 +19,8 @@ |
391 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. |
392 | + */ |
393 | + import QtQuick 2.0 |
394 | +-import Ubuntu.Components 1.3 |
395 | +-import Ubuntu.Components.Popups 1.3 |
396 | ++import Ubuntu.Components 1.1 |
397 | ++import Ubuntu.Components.Popups 0.1 |
398 | + |
399 | + /*! \brief Error message popup. |
400 | + \inherits Item |
401 | +diff --git b/converged/components/InputDialog.qml a/converged/components/InputDialog.qml |
402 | +index a9d9776..99fa4c5 100644 |
403 | +--- b/converged/components/InputDialog.qml |
404 | ++++ a/converged/components/InputDialog.qml |
405 | +@@ -19,8 +19,8 @@ |
406 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. |
407 | + */ |
408 | + import QtQuick 2.0 |
409 | +-import Ubuntu.Components 1.3 |
410 | +-import Ubuntu.Components.Popups 1.3 |
411 | ++import Ubuntu.Components 1.1 |
412 | ++import Ubuntu.Components.Popups 0.1 |
413 | + |
414 | + /*! \brief Simple input dialog. |
415 | + \inherits Item |
416 | +diff --git b/converged/components/InteractIntroPage.qml a/converged/components/InteractIntroPage.qml |
417 | +index 01e285b..d62965f 100644 |
418 | +--- b/converged/components/InteractIntroPage.qml |
419 | ++++ a/converged/components/InteractIntroPage.qml |
420 | +@@ -27,8 +27,8 @@ |
421 | + */ |
422 | + |
423 | + import QtQuick 2.0 |
424 | +-import Ubuntu.Components 1.3 |
425 | +-import Ubuntu.Components.Popups 1.3 |
426 | ++import Ubuntu.Components 1.1 |
427 | ++import Ubuntu.Components.Popups 0.1 |
428 | + import QtQuick.Layouts 1.1 |
429 | + import "actions" |
430 | + |
431 | +@@ -45,26 +45,16 @@ Page { |
432 | + startTestButton.unlatch() |
433 | + } |
434 | + |
435 | +- onTestChanged: { |
436 | +- header.value = test['test_number'] |
437 | +- header.maximumValue = test['tests_count'] |
438 | +- } |
439 | +- header: ProgressHeader { |
440 | +- value: test['test_number'] |
441 | +- maximumValue: test['tests_count'] |
442 | +- title: i18n.tr("Test Description") |
443 | +- leadingActionBar { actions: [] } |
444 | +- trailingActionBar { |
445 | +- objectName: 'trailingActionBar' |
446 | +- actions: [ |
447 | +- AddCommentAction { |
448 | +- id: addCommentAction |
449 | +- }, |
450 | +- SkipAction { |
451 | +- id: skipAction |
452 | +- } |
453 | +- ] |
454 | +- } |
455 | ++ title: i18n.tr("Test Description") |
456 | ++ head { |
457 | ++ actions: [ |
458 | ++ AddCommentAction { |
459 | ++ id: addCommentAction |
460 | ++ }, |
461 | ++ SkipAction { |
462 | ++ id: skipAction |
463 | ++ } |
464 | ++ ] |
465 | + } |
466 | + |
467 | + state: "idle" |
468 | +diff --git b/converged/components/LatchButton.qml a/converged/components/LatchButton.qml |
469 | +index 8fe9252..b1ea81b 100644 |
470 | +--- b/converged/components/LatchButton.qml |
471 | ++++ a/converged/components/LatchButton.qml |
472 | +@@ -20,7 +20,7 @@ |
473 | + */ |
474 | + |
475 | + import QtQuick 2.0 |
476 | +-import Ubuntu.Components 1.3 |
477 | ++import Ubuntu.Components 1.1 |
478 | + |
479 | + /*! \brief Latch button. |
480 | + \inherits Button |
481 | +diff --git b/converged/components/ListItemWrappable.qml a/converged/components/ListItemWrappable.qml |
482 | +index e9297bf..a380ea2 100644 |
483 | +--- b/converged/components/ListItemWrappable.qml |
484 | ++++ a/converged/components/ListItemWrappable.qml |
485 | +@@ -19,7 +19,7 @@ |
486 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. |
487 | + */ |
488 | + import QtQuick 2.0 |
489 | +-import Ubuntu.Components 1.3 |
490 | ++import Ubuntu.Components 1.1 |
491 | + import Ubuntu.Components.ListItems 1.0 |
492 | + |
493 | + /*! \brief ListItemWrappable |
494 | +diff --git b/converged/components/ManualIntroPage.qml a/converged/components/ManualIntroPage.qml |
495 | +index 0fce6f5..afe007a 100644 |
496 | +--- b/converged/components/ManualIntroPage.qml |
497 | ++++ a/converged/components/ManualIntroPage.qml |
498 | +@@ -26,9 +26,9 @@ |
499 | + */ |
500 | + |
501 | + import QtQuick 2.0 |
502 | +-import Ubuntu.Components 1.3 |
503 | ++import Ubuntu.Components 1.1 |
504 | + import QtQuick.Layouts 1.1 |
505 | +-import Ubuntu.Components.Popups 1.3 |
506 | ++import Ubuntu.Components.Popups 0.1 |
507 | + import "actions" |
508 | + |
509 | + Page { |
510 | +@@ -39,26 +39,16 @@ Page { |
511 | + signal continueClicked(); |
512 | + signal testDone(var test); |
513 | + |
514 | +- onTestChanged: { |
515 | +- header.value = test['test_number'] |
516 | +- header.maximumValue = test['tests_count'] |
517 | +- } |
518 | +- header: ProgressHeader { |
519 | +- value: test['test_number'] |
520 | +- maximumValue: test['tests_count'] |
521 | +- title: i18n.tr("Test Description") |
522 | +- leadingActionBar { actions: [] } |
523 | +- trailingActionBar { |
524 | +- objectName: 'trailingActionBar' |
525 | +- actions: [ |
526 | +- AddCommentAction { |
527 | +- id: addCommentAction |
528 | +- }, |
529 | +- SkipAction { |
530 | +- id: skipAction |
531 | +- } |
532 | +- ] |
533 | +- } |
534 | ++ title: i18n.tr("Test Description") |
535 | ++ head { |
536 | ++ actions: [ |
537 | ++ AddCommentAction { |
538 | ++ id: addCommentAction |
539 | ++ }, |
540 | ++ SkipAction { |
541 | ++ id: skipAction |
542 | ++ } |
543 | ++ ] |
544 | + } |
545 | + |
546 | + TestPageBody { |
547 | +diff --git b/converged/components/PasswordDialog.qml a/converged/components/PasswordDialog.qml |
548 | +index dea1b0f..c3931bc 100644 |
549 | +--- b/converged/components/PasswordDialog.qml |
550 | ++++ a/converged/components/PasswordDialog.qml |
551 | +@@ -19,8 +19,8 @@ |
552 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. |
553 | + */ |
554 | + import QtQuick 2.0 |
555 | +-import Ubuntu.Components 1.3 |
556 | +-import Ubuntu.Components.Popups 1.3 |
557 | ++import Ubuntu.Components 1.1 |
558 | ++import Ubuntu.Components.Popups 0.1 |
559 | + |
560 | + /*! \brief Password prompt dialog. |
561 | + \inherits Item |
562 | +diff --git b/converged/components/ProgressBox.qml a/converged/components/ProgressBox.qml |
563 | +index b9fc720..a2b5d05 100644 |
564 | +--- b/converged/components/ProgressBox.qml |
565 | ++++ a/converged/components/ProgressBox.qml |
566 | +@@ -20,7 +20,7 @@ |
567 | + */ |
568 | + |
569 | + import QtQuick 2.0 |
570 | +-import Ubuntu.Components 1.3 |
571 | ++import Ubuntu.Components 1.1 |
572 | + import QtQuick.Layouts 1.1 |
573 | + |
574 | + /*! \brief Progress Box. |
575 | +diff --git b/converged/components/ProgressHeader.qml a/converged/components/ProgressHeader.qml |
576 | +deleted file mode 100644 |
577 | +index a7db263..0000000 |
578 | +--- b/converged/components/ProgressHeader.qml |
579 | ++++ /dev/null |
580 | +@@ -1,59 +0,0 @@ |
581 | +-/* |
582 | +- * This file is part of Checkbox |
583 | +- * |
584 | +- * Copyright 2016 Canonical Ltd. |
585 | +- * |
586 | +- * Authors: |
587 | +- * - Maciej Kisielewski <maciej.kisielewski@canonical.com> |
588 | +- * |
589 | +- * This program is free software; you can redistribute it and/or modify |
590 | +- * it under the terms of the GNU General Public License as published by |
591 | +- * the Free Software Foundation; version 3. |
592 | +- * |
593 | +- * This program is distributed in the hope that it will be useful, |
594 | +- * but WITHOUT ANY WARRANTY; without even the implied warranty of |
595 | +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
596 | +- * GNU General Public License for more details. |
597 | +- * |
598 | +- * You should have received a copy of the GNU General Public License |
599 | +- * along with this program. If not, see <http://www.gnu.org/licenses/>. |
600 | +- */ |
601 | +-/*! |
602 | +- \brief Header with embedded progress bar |
603 | +-*/ |
604 | +-import Ubuntu.Components 1.3 |
605 | +-import QtQuick.Layouts 1.1 |
606 | +-import QtQuick 2.2 |
607 | +- |
608 | +-PageHeader { |
609 | +- id: header |
610 | +- property alias progressText: _progressText.text |
611 | +- property alias value: _progressBar.value |
612 | +- property alias maximumValue: _progressBar.maximumValue |
613 | +- |
614 | +- ColumnLayout{ |
615 | +- anchors { |
616 | +- fill: parent |
617 | +- verticalCenter: parent.verticalCenter |
618 | +- bottomMargin: units.gu(0.5) |
619 | +- rightMargin: units.gu(2) |
620 | +- leftMargin: units.gu(5) |
621 | +- } |
622 | +- Label { |
623 | +- id: _progressText |
624 | +- fontSize: "x-small" |
625 | +- font.weight: Font.Light |
626 | +- anchors.right: _progressBar.right |
627 | +- anchors.bottom: parent.bottom |
628 | +- anchors.bottomMargin: units.gu(0.5) |
629 | +- text : Number(_progressBar.value / _progressBar.maximumValue * 100.0).toFixed(0) + "% (" + _progressBar.value + "/" + _progressBar.maximumValue + ")"; |
630 | +- } |
631 | +- ProgressBox { |
632 | +- id: _progressBar |
633 | +- value: 0 |
634 | +- maximumValue: 1 |
635 | +- implicitWidth: parent.width - trailingActionBar.width |
636 | +- anchors.bottom: parent.bottom |
637 | +- } |
638 | +- } |
639 | +-} |
640 | +diff --git b/converged/components/QmlConfinedPage.qml a/converged/components/QmlConfinedPage.qml |
641 | +index 0c8f773..527525f 100644 |
642 | +--- b/converged/components/QmlConfinedPage.qml |
643 | ++++ a/converged/components/QmlConfinedPage.qml |
644 | +@@ -23,8 +23,8 @@ |
645 | + */ |
646 | + |
647 | + import QtQuick 2.0 |
648 | +-import Ubuntu.Components 1.3 |
649 | +-import Ubuntu.Components.Popups 1.3 |
650 | ++import Ubuntu.Components 1.1 |
651 | ++import Ubuntu.Components.Popups 0.1 |
652 | + import QtQuick.Layouts 1.1 |
653 | + import Ubuntu.Content 1.1 |
654 | + import "actions" |
655 | +@@ -37,6 +37,7 @@ Page { |
656 | + signal testDone(var test); |
657 | + |
658 | + objectName: "qmlNativePage" |
659 | ++ title: i18n.tr("Test Description") |
660 | + |
661 | + /* testingShell serves as the interface to the external world from the |
662 | + * qml-test. */ |
663 | +@@ -74,26 +75,15 @@ Page { |
664 | + } |
665 | + } |
666 | + |
667 | +- onTestChanged: { |
668 | +- header.value = test['test_number'] |
669 | +- header.maximumValue = test['tests_count'] |
670 | +- } |
671 | +- header: ProgressHeader { |
672 | +- value: test['test_number'] |
673 | +- maximumValue: test['tests_count'] |
674 | +- title: i18n.tr("Test Description") |
675 | +- leadingActionBar { actions: [] } |
676 | +- trailingActionBar { |
677 | +- objectName: 'trailingActionBar' |
678 | +- actions: [ |
679 | +- AddCommentAction { |
680 | +- id: addCommentAction |
681 | +- }, |
682 | +- SkipAction { |
683 | +- id: skipAction |
684 | +- } |
685 | +- ] |
686 | +- } |
687 | ++ head { |
688 | ++ actions: [ |
689 | ++ AddCommentAction { |
690 | ++ id: addCommentAction |
691 | ++ }, |
692 | ++ SkipAction { |
693 | ++ id: skipAction |
694 | ++ } |
695 | ++ ] |
696 | + } |
697 | + |
698 | + TestPageBody { |
699 | +diff --git b/converged/components/QmlNativePage.qml a/converged/components/QmlNativePage.qml |
700 | +index 8928f60..a33a883 100644 |
701 | +--- b/converged/components/QmlNativePage.qml |
702 | ++++ a/converged/components/QmlNativePage.qml |
703 | +@@ -23,8 +23,8 @@ |
704 | + */ |
705 | + |
706 | + import QtQuick 2.0 |
707 | +-import Ubuntu.Components 1.3 |
708 | +-import Ubuntu.Components.Popups 1.3 |
709 | ++import Ubuntu.Components 1.1 |
710 | ++import Ubuntu.Components.Popups 0.1 |
711 | + import QtQuick.Layouts 1.1 |
712 | + import "actions" |
713 | + |
714 | +@@ -35,6 +35,7 @@ Page { |
715 | + signal testDone(var test); |
716 | + |
717 | + objectName: "qmlNativePage" |
718 | ++ title: i18n.tr("Test Description") |
719 | + |
720 | + Object { |
721 | + id: testingShell |
722 | +@@ -47,26 +48,15 @@ Page { |
723 | + } |
724 | + } |
725 | + |
726 | +- onTestChanged: { |
727 | +- header.value = test['test_number'] |
728 | +- header.maximumValue = test['tests_count'] |
729 | +- } |
730 | +- header: ProgressHeader { |
731 | +- value: test['test_number'] |
732 | +- maximumValue: test['tests_count'] |
733 | +- title: i18n.tr("Test Description") |
734 | +- leadingActionBar { actions: [] } |
735 | +- trailingActionBar { |
736 | +- objectName: 'trailingActionBar' |
737 | +- actions: [ |
738 | +- AddCommentAction { |
739 | +- id: addCommentAction |
740 | +- }, |
741 | +- SkipAction { |
742 | +- id: skipAction |
743 | +- } |
744 | +- ] |
745 | +- } |
746 | ++ head { |
747 | ++ actions: [ |
748 | ++ AddCommentAction { |
749 | ++ id: addCommentAction |
750 | ++ }, |
751 | ++ SkipAction { |
752 | ++ id: skipAction |
753 | ++ } |
754 | ++ ] |
755 | + } |
756 | + |
757 | + TestPageBody { |
758 | +diff --git b/converged/components/ResultsPage.qml a/converged/components/ResultsPage.qml |
759 | +index 35fdcd1..ca6d567 100644 |
760 | +--- b/converged/components/ResultsPage.qml |
761 | ++++ a/converged/components/ResultsPage.qml |
762 | +@@ -26,10 +26,11 @@ |
763 | + */ |
764 | + |
765 | + import QtQuick 2.0 |
766 | +-import Ubuntu.Components 1.3 |
767 | ++import Ubuntu.Components 1.1 |
768 | + import QtQuick.Layouts 1.1 |
769 | + |
770 | + Page { |
771 | ++ title: i18n.tr("Test Results") |
772 | + visible: false |
773 | + |
774 | + objectName: "resultsPage" |
775 | +@@ -45,27 +46,22 @@ Page { |
776 | + submitResultsButton.unlatch(); |
777 | + } |
778 | + |
779 | +- header: PageHeader { |
780 | +- title: i18n.tr("Test Results") |
781 | +- leadingActionBar { actions: [] } |
782 | +- trailingActionBar { |
783 | +- objectName: 'trailingActionBar' |
784 | +- actions: [ |
785 | +- Action { |
786 | +- iconName: "close" |
787 | +- text: i18n.tr("Close") |
788 | +- onTriggered: endTesting(); |
789 | +- }, |
790 | +- Action { |
791 | +- id: rerunAction |
792 | +- objectName: "rerunAction" |
793 | +- iconName: "view-refresh" |
794 | +- text: i18n.tr("Rerun") |
795 | +- onTriggered: rerunTests(); |
796 | +- visible: rerunEnabled |
797 | +- } |
798 | +- ] |
799 | +- } |
800 | ++ head { |
801 | ++ actions: [ |
802 | ++ Action { |
803 | ++ id: rerunAction |
804 | ++ objectName: "rerunAction" |
805 | ++ iconName: "view-refresh" |
806 | ++ text: i18n.tr("Rerun") |
807 | ++ onTriggered: rerunTests(); |
808 | ++ visible: rerunEnabled |
809 | ++ }, |
810 | ++ Action { |
811 | ++ iconName: "close" |
812 | ++ text: i18n.tr("Close") |
813 | ++ onTriggered: endTesting(); |
814 | ++ } |
815 | ++ ] |
816 | + } |
817 | + |
818 | + onResultsChanged: { |
819 | +@@ -88,10 +84,7 @@ Page { |
820 | + ColumnLayout { |
821 | + spacing: units.gu(2) |
822 | + anchors { |
823 | +- top: parent.header.bottom |
824 | +- right: parent.right |
825 | +- left: parent.left |
826 | +- bottom: parent.bottom |
827 | ++ fill: parent |
828 | + topMargin: units.gu(3) |
829 | + bottomMargin: units.gu(3) |
830 | + leftMargin: units.gu(1) |
831 | +diff --git b/converged/components/ResumeSessionPage.qml a/converged/components/ResumeSessionPage.qml |
832 | +index cbfbb59..ad57715 100644 |
833 | +--- b/converged/components/ResumeSessionPage.qml |
834 | ++++ a/converged/components/ResumeSessionPage.qml |
835 | +@@ -26,7 +26,7 @@ |
836 | + */ |
837 | + |
838 | + import QtQuick 2.0 |
839 | +-import Ubuntu.Components 1.3 |
840 | ++import Ubuntu.Components 1.1 |
841 | + import QtQuick.Layouts 1.1 |
842 | + |
843 | + Page { |
844 | +@@ -39,21 +39,14 @@ Page { |
845 | + signal deleteIncomplete(); |
846 | + |
847 | + objectName: "resumeSessionPage" |
848 | ++ title: i18n.tr("Resume session") |
849 | + visible: false |
850 | + |
851 | +- header: PageHeader { |
852 | +- leadingActionBar { actions: [] } |
853 | +- title: i18n.tr("Resume session") |
854 | +- } |
855 | +- |
856 | + ColumnLayout { |
857 | + id: columnLayout |
858 | + spacing: units.gu(3) |
859 | + anchors { |
860 | +- top: parent.header.bottom |
861 | +- bottom: parent.bottom |
862 | +- right: parent.right |
863 | +- left: parent.left |
864 | ++ fill: parent |
865 | + topMargin: units.gu(3) |
866 | + bottomMargin: units.gu(3) |
867 | + leftMargin: units.gu(1) |
868 | +diff --git b/converged/components/SelectionPage.qml a/converged/components/SelectionPage.qml |
869 | +index 6df9cb1..fbc2e75 100644 |
870 | +--- b/converged/components/SelectionPage.qml |
871 | ++++ a/converged/components/SelectionPage.qml |
872 | +@@ -21,7 +21,7 @@ |
873 | + |
874 | + import QtQuick 2.0 |
875 | + import QtQuick.Layouts 1.1 |
876 | +-import Ubuntu.Components 1.3 |
877 | ++import Ubuntu.Components 1.1 |
878 | + import Ubuntu.Components.ListItems 0.1 as ListItem |
879 | + |
880 | + /*! \brief Selection page |
881 | +@@ -32,15 +32,13 @@ import Ubuntu.Components.ListItems 0.1 as ListItem |
882 | + */ |
883 | + |
884 | + Page { |
885 | +- id: root |
886 | + signal selectionDone(var selected_id_list) |
887 | + property string continueText: i18n.tr("Continue") |
888 | + readonly property alias model: selectionModel |
889 | + property alias keys: keysDelegator |
890 | + property bool onlyOneAllowed: false |
891 | + property bool emptyAllowed: false |
892 | + property bool largeBuffer: false |
893 | +- property string title: '' |
894 | + |
895 | + visible: false |
896 | + flickable: null |
897 | +@@ -126,42 +124,40 @@ Page { |
898 | + } |
899 | + } |
900 | + |
901 | +- header: PageHeader { |
902 | +- title: root.title |
903 | +- trailingActionBar { |
904 | +- objectName: 'trailingActionBar' |
905 | +- actions: [ |
906 | +- Action { |
907 | +- id: toggleSelection |
908 | +- objectName: "toggleSelectionAction" |
909 | +- iconName: "select" |
910 | +- text: i18n.tr("Toggle selection") |
911 | +- visible: !onlyOneAllowed |
912 | +- onTriggered: { |
913 | +- if (state === "empty selection" || state == "disabled only selection") { |
914 | +- if (!onlyOneAllowed) // still reachable via key shortcut |
915 | +- selectAll(); |
916 | +- } |
917 | +- else if (state === "nonempty selection") { |
918 | +- deselectAll(); |
919 | +- } |
920 | +- } |
921 | +- }, |
922 | +- Action { |
923 | +- id: findAction |
924 | +- text: i18n.tr("Find") |
925 | +- iconName: 'find' |
926 | +- onTriggered: { |
927 | +- if (!searchBox.visible) { |
928 | +- searchBox.visible = true; |
929 | +- searchBox.forceActiveFocus(); |
930 | +- } else { |
931 | +- searchBox.visible = false; |
932 | +- } |
933 | +- } |
934 | +- } |
935 | +- ] |
936 | +- } |
937 | ++ head { |
938 | ++ actions: [ |
939 | ++ Action { |
940 | ++ id: toggleSelection |
941 | ++ objectName: "toggleSelectionAction" |
942 | ++ iconName: "select" |
943 | ++ text: i18n.tr("Toggle selection") |
944 | ++ visible: !onlyOneAllowed |
945 | ++ onTriggered: { |
946 | ++ if (state === "empty selection" || state == "disabled only selection") { |
947 | ++ if (!onlyOneAllowed) // still reachable via key shortcut |
948 | ++ selectAll(); |
949 | ++ } |
950 | ++ else if (state === "nonempty selection") { |
951 | ++ deselectAll(); |
952 | ++ } |
953 | ++ |
954 | ++ } |
955 | ++ }, |
956 | ++ Action { |
957 | ++ id: findAction |
958 | ++ text: i18n.tr("Find") |
959 | ++ iconName: 'find' |
960 | ++ onTriggered: { |
961 | ++ if (!searchBox.visible) { |
962 | ++ searchBox.visible = true; |
963 | ++ searchBox.forceActiveFocus(); |
964 | ++ } else { |
965 | ++ searchBox.visible = false; |
966 | ++ } |
967 | ++ } |
968 | ++ } |
969 | ++ ] |
970 | ++ } |
971 | + } |
972 | + |
973 | + states: [ |
974 | +@@ -209,11 +205,8 @@ Page { |
975 | + ColumnLayout { |
976 | + spacing: units.gu(3) |
977 | + anchors { |
978 | +- top: parent.header.bottom |
979 | +- bottom: parent.bottom |
980 | +- right: parent.right |
981 | +- left: parent.left |
982 | +- topMargin: units.gu(1) |
983 | ++ fill: parent |
984 | ++ topMargin: units.gu(3) |
985 | + bottomMargin: units.gu(3) |
986 | + leftMargin: units.gu(1) |
987 | + rightMargin: units.gu(1) |
988 | +diff --git b/converged/components/TestPageBody.qml a/converged/components/TestPageBody.qml |
989 | +index 73832e2..9693dae 100644 |
990 | +--- b/converged/components/TestPageBody.qml |
991 | ++++ a/converged/components/TestPageBody.qml |
992 | +@@ -25,8 +25,8 @@ |
993 | + |
994 | + import QtQuick 2.0 |
995 | + import QtQuick.Layouts 1.1 |
996 | +-import Ubuntu.Components 1.3 |
997 | +-import Ubuntu.Components.Popups 1.3 |
998 | ++import Ubuntu.Components 1.1 |
999 | ++import Ubuntu.Components.Popups 0.1 |
1000 | + |
1001 | + ColumnLayout { |
1002 | + /* this property is the text to be shown in the top label */ |
1003 | +@@ -45,10 +45,7 @@ ColumnLayout { |
1004 | + |
1005 | + spacing: units.gu(3) |
1006 | + anchors { |
1007 | +- top: parent.header.bottom |
1008 | +- right: parent.right |
1009 | +- left: parent.left |
1010 | +- bottom: parent.bottom |
1011 | ++ fill: parent |
1012 | + topMargin: units.gu(3) |
1013 | + bottomMargin: units.gu(3) |
1014 | + leftMargin: units.gu(1) |
1015 | +diff --git b/converged/components/TestVerificationPage.qml a/converged/components/TestVerificationPage.qml |
1016 | +index 2178ffb..ad86d85 100644 |
1017 | +--- b/converged/components/TestVerificationPage.qml |
1018 | ++++ a/converged/components/TestVerificationPage.qml |
1019 | +@@ -26,9 +26,9 @@ |
1020 | + */ |
1021 | + |
1022 | + import QtQuick 2.0 |
1023 | +-import Ubuntu.Components 1.3 |
1024 | ++import Ubuntu.Components 1.1 |
1025 | + import QtQuick.Layouts 1.1 |
1026 | +-import Ubuntu.Components.Popups 1.3 |
1027 | ++import Ubuntu.Components.Popups 0.1 |
1028 | + import "actions" |
1029 | + |
1030 | + Page { |
1031 | +@@ -38,26 +38,17 @@ Page { |
1032 | + signal testDone(var test); |
1033 | + |
1034 | + objectName: "testVerificationPage" |
1035 | ++ title: i18n.tr("Verification") |
1036 | + |
1037 | +- onTestChanged: { |
1038 | +- header.value = test['test_number'] |
1039 | +- header.maximumValue = test['tests_count'] |
1040 | +- } |
1041 | +- header: ProgressHeader { |
1042 | +- value: test['test_number'] |
1043 | +- maximumValue: test['tests_count'] |
1044 | +- title: i18n.tr("Verification") |
1045 | +- trailingActionBar { |
1046 | +- objectName: 'trailingActionBar' |
1047 | +- actions: [ |
1048 | +- AddCommentAction { |
1049 | +- id: addCommentAction |
1050 | +- }, |
1051 | +- SkipAction { |
1052 | +- id: skipAction |
1053 | +- } |
1054 | +- ] |
1055 | +- } |
1056 | ++ head { |
1057 | ++ actions: [ |
1058 | ++ AddCommentAction { |
1059 | ++ id: addCommentAction |
1060 | ++ }, |
1061 | ++ SkipAction { |
1062 | ++ id: skipAction |
1063 | ++ } |
1064 | ++ ] |
1065 | + } |
1066 | + |
1067 | + TestPageBody { |
1068 | +diff --git b/converged/components/UserInteractSummaryPage.qml a/converged/components/UserInteractSummaryPage.qml |
1069 | +index 8f3ca06..2dc286d 100644 |
1070 | +--- b/converged/components/UserInteractSummaryPage.qml |
1071 | ++++ a/converged/components/UserInteractSummaryPage.qml |
1072 | +@@ -26,8 +26,8 @@ |
1073 | + */ |
1074 | + |
1075 | + import QtQuick 2.0 |
1076 | +-import Ubuntu.Components 1.3 |
1077 | +-import Ubuntu.Components.Popups 1.3 |
1078 | ++import Ubuntu.Components 1.1 |
1079 | ++import Ubuntu.Components.Popups 0.1 |
1080 | + import QtQuick.Layouts 1.1 |
1081 | + import "actions" |
1082 | + |
1083 | +@@ -38,25 +38,17 @@ Page { |
1084 | + |
1085 | + signal testDone(var test); |
1086 | + |
1087 | +- onTestChanged: { |
1088 | +- header.value = test['test_number'] |
1089 | +- header.maximumValue = test['tests_count'] |
1090 | +- } |
1091 | +- header: ProgressHeader { |
1092 | +- value: test['test_number'] |
1093 | +- maximumValue: test['tests_count'] |
1094 | +- title: i18n.tr("Verification") |
1095 | +- trailingActionBar { |
1096 | +- objectName: 'trailingActionBar' |
1097 | +- actions: [ |
1098 | +- AddCommentAction { |
1099 | +- id: addCommentAction |
1100 | +- }, |
1101 | +- SkipAction { |
1102 | +- id: skipAction |
1103 | +- } |
1104 | +- ] |
1105 | +- } |
1106 | ++ title: i18n.tr("Verification") |
1107 | ++ |
1108 | ++ head { |
1109 | ++ actions: [ |
1110 | ++ AddCommentAction { |
1111 | ++ id: addCommentAction |
1112 | ++ }, |
1113 | ++ SkipAction { |
1114 | ++ id: skipAction |
1115 | ++ } |
1116 | ++ ] |
1117 | + } |
1118 | + |
1119 | + TestPageBody { |
1120 | +diff --git b/converged/components/WebViewer.qml a/converged/components/WebViewer.qml |
1121 | +index 0348919..7b5ef78 100644 |
1122 | +--- b/converged/components/WebViewer.qml |
1123 | ++++ a/converged/components/WebViewer.qml |
1124 | +@@ -21,7 +21,7 @@ |
1125 | + |
1126 | + import QtQuick 2.0 |
1127 | + import Ubuntu.Web 0.2 |
1128 | +-import Ubuntu.Components 1.3 |
1129 | ++import Ubuntu.Components 1.1 |
1130 | + |
1131 | + |
1132 | + Page { |
1133 | +diff --git b/converged/components/WelcomePage.qml a/converged/components/WelcomePage.qml |
1134 | +index a310e41..cf328d0 100644 |
1135 | +--- b/converged/components/WelcomePage.qml |
1136 | ++++ a/converged/components/WelcomePage.qml |
1137 | +@@ -21,7 +21,7 @@ |
1138 | + */ |
1139 | + |
1140 | + import QtQuick 2.0 |
1141 | +-import Ubuntu.Components 1.3 |
1142 | ++import Ubuntu.Components 1.1 |
1143 | + |
1144 | + Page { |
1145 | + id: welcomePage |
1146 | +@@ -39,24 +39,17 @@ Page { |
1147 | + startTestButton.unlatch(); |
1148 | + state = "loaded"; |
1149 | + } |
1150 | +- header: PageHeader { |
1151 | +- Component.onCompleted: { |
1152 | +- console.log('DEPTH: ', pageStack.depth) |
1153 | +- } |
1154 | +- leadingActionBar { actions: [] } |
1155 | +- trailingActionBar { |
1156 | +- actions: [ |
1157 | +- Action { |
1158 | +- id: continueAction |
1159 | +- iconName: "info" |
1160 | +- text: i18n.tr("About") |
1161 | +- onTriggered: aboutClicked() |
1162 | +- } |
1163 | +- ] |
1164 | +- } |
1165 | ++ head { |
1166 | ++ actions: [ |
1167 | ++ Action { |
1168 | ++ id: continueAction |
1169 | ++ iconName: "info" |
1170 | ++ text: i18n.tr("About") |
1171 | ++ onTriggered: aboutClicked() |
1172 | ++ } |
1173 | ++ ] |
1174 | + } |
1175 | + |
1176 | +- |
1177 | + Label { |
1178 | + id: welcomeText |
1179 | + |
1180 | +diff --git b/converged/components/actions/AddCommentAction.qml a/converged/components/actions/AddCommentAction.qml |
1181 | +index b3977ce..d7daf53 100644 |
1182 | +--- b/converged/components/actions/AddCommentAction.qml |
1183 | ++++ a/converged/components/actions/AddCommentAction.qml |
1184 | +@@ -22,8 +22,8 @@ |
1185 | + /*! \brief Action component for adding a comment. */ |
1186 | + |
1187 | + import QtQuick 2.0 |
1188 | +-import Ubuntu.Components 1.3 |
1189 | +-import Ubuntu.Components.Popups 1.3 |
1190 | ++import Ubuntu.Components 1.1 |
1191 | ++import Ubuntu.Components.Popups 0.1 |
1192 | + |
1193 | + Action { |
1194 | + id: addCommentAction |
1195 | +diff --git b/converged/components/actions/SkipAction.qml a/converged/components/actions/SkipAction.qml |
1196 | +index 124c7dd..712d746 100644 |
1197 | +--- b/converged/components/actions/SkipAction.qml |
1198 | ++++ a/converged/components/actions/SkipAction.qml |
1199 | +@@ -22,8 +22,8 @@ |
1200 | + /*! \brief Action component for skipping a test. */ |
1201 | + |
1202 | + import QtQuick 2.0 |
1203 | +-import Ubuntu.Components 1.3 |
1204 | +-import Ubuntu.Components.Popups 1.3 |
1205 | ++import Ubuntu.Components 1.1 |
1206 | ++import Ubuntu.Components.Popups 0.1 |
1207 | + |
1208 | + Action { |
1209 | + id: skipAction |
1210 | +diff --git b/converged/tests/autopilot/checkbox_converged/__init__.py a/converged/tests/autopilot/checkbox_converged/__init__.py |
1211 | +index 547ab73..77e5220 100644 |
1212 | +--- b/converged/tests/autopilot/checkbox_converged/__init__.py |
1213 | ++++ a/converged/tests/autopilot/checkbox_converged/__init__.py |
1214 | +@@ -87,7 +87,7 @@ class ClickAppTestCase(base.UbuntuUIToolkitAppTestCase): |
1215 | + self.pointing_device.click_object(continue_btn) |
1216 | + category_page = self.app.wait_select_single( |
1217 | + objectName='categorySelectionPage', visible=True) |
1218 | +- self._click_action_button('trailingActionBar', 'toggleSelectionAction') |
1219 | ++ self.main_view.get_header().click_action_button('toggleSelectionAction') |
1220 | + list_item = category_page.wait_select_single( |
1221 | + objectName='listItem', item_mod_id=category_id) |
1222 | + self.pointing_device.click_object(list_item) |
1223 | +@@ -96,7 +96,7 @@ class ClickAppTestCase(base.UbuntuUIToolkitAppTestCase): |
1224 | + self.pointing_device.click_object(continue_btn) |
1225 | + test_selection_page = self.app.wait_select_single( |
1226 | + objectName='testSelectionPage', visible=True) |
1227 | +- self._click_action_button('trailingActionBar', 'toggleSelectionAction') |
1228 | ++ self.main_view.get_header().click_action_button('toggleSelectionAction') |
1229 | + # lists are built dynamically, so there is a chance that proxies for |
1230 | + # qml objects for list items that are down below are not yet present. |
1231 | + # To make sure everything is loaded and ready, scroll to the bottom |
1232 | +@@ -217,11 +217,6 @@ class ClickAppTestCase(base.UbuntuUIToolkitAppTestCase): |
1233 | + return os.path.join(self._get_path_to_app_source(), 'lib', 'py', |
1234 | + 'plainbox', 'data', 'plainbox-qml-modules') |
1235 | + |
1236 | +- def _click_action_button(self, bar_name, actionName): |
1237 | +- action_bar = self.app.wait_select_single( |
1238 | +- objectName=bar_name, visible=True) |
1239 | +- action_bar.click_action_button(actionName) |
1240 | +- |
1241 | + def _launch_application_from_phablet(self): |
1242 | + # On phablet, we only run the tests against the installed click |
1243 | + # package. |
1244 | +diff --git b/converged/tests/autopilot/checkbox_converged/test_checkbox_converged.py a/converged/tests/autopilot/checkbox_converged/test_checkbox_converged.py |
1245 | +index e9fe916..c0bf6a3 100644 |
1246 | +--- b/converged/tests/autopilot/checkbox_converged/test_checkbox_converged.py |
1247 | ++++ a/converged/tests/autopilot/checkbox_converged/test_checkbox_converged.py |
1248 | +@@ -19,7 +19,7 @@ class TestCheckboxConverged(checkbox_converged.ClickAppTestCase): |
1249 | + if selectable_object_name is not None: |
1250 | + self.app.wait_select_single( |
1251 | + objectName=selectable_object_name, visible=True) |
1252 | +- self._click_action_button('trailingActionBar', 'skip') |
1253 | ++ self.main_view.get_header().click_action_button('skip') |
1254 | + dialog = self.app.wait_select_single(objectName='dialog') |
1255 | + yes_btn = dialog.select_single(objectName='yesButton') |
1256 | + self.pointing_device.click_object(yes_btn) |
1257 | +@@ -62,7 +62,7 @@ class TestCheckboxConverged(checkbox_converged.ClickAppTestCase): |
1258 | + self.pointing_device.click_object(continue_btn) |
1259 | + category_page = self.app.wait_select_single( |
1260 | + objectName='categorySelectionPage', visible=True) |
1261 | +- self._click_action_button('trailingActionBar', 'toggleSelectionAction') |
1262 | ++ self.main_view.get_header().click_action_button('toggleSelectionAction') |
1263 | + category_id = '2015.com.canonical.certification::normal' |
1264 | + list_item = category_page.wait_select_single( |
1265 | + objectName='listItem', item_mod_id=category_id) |
1266 | +@@ -299,7 +299,7 @@ class RerunTests(checkbox_converged.ClickAppTestCase): |
1267 | + self.process_sequence_of_clicks_on_pages(next_steps) |
1268 | + results_page = self.app.wait_select_single( |
1269 | + objectName='resultsPage', visible=True) |
1270 | +- self._click_action_button('trailingActionBar', 'rerunAction') |
1271 | ++ self.main_view.get_header().click_action_button('rerunAction') |
1272 | + # we now should see a re-run screen; let's select the only test |
1273 | + rerun_page = self.app.wait_select_single( |
1274 | + objectName='rerunSelectionPage', visible=True) |
1275 | +@@ -313,7 +313,7 @@ class RerunTests(checkbox_converged.ClickAppTestCase): |
1276 | + self.process_sequence_of_clicks_on_pages(next_steps) |
1277 | + results_page = self.app.wait_select_single( |
1278 | + objectName='resultsPage', visible=True) |
1279 | +- self._click_action_button('trailingActionBar', 'rerunAction') |
1280 | ++ self.main_view.get_header().click_action_button('rerunAction') |
1281 | + # we should see the re-run screen again |
1282 | + rerun_page = self.app.wait_select_single( |
1283 | + objectName='rerunSelectionPage', visible=True) |
1284 | +@@ -333,7 +333,7 @@ class RerunTests(checkbox_converged.ClickAppTestCase): |
1285 | + self.process_sequence_of_clicks_on_pages(next_steps) |
1286 | + results_page = self.app.wait_select_single( |
1287 | + objectName='resultsPage', visible=True) |
1288 | +- self._click_action_button('trailingActionBar', 'rerunAction') |
1289 | ++ self.main_view.get_header().click_action_button('rerunAction') |
1290 | + # we now should see a re-run screen; let's select the only test |
1291 | + rerun_page = self.app.wait_select_single( |
1292 | + objectName='rerunSelectionPage', visible=True) |
1293 | +--- a/converged/components/DialogMgr.qml |
1294 | ++++ b/converged/components/DialogMgr.qml |
1295 | +@@ -19,8 +19,8 @@ |
1296 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1297 | + */ |
1298 | + import QtQuick 2.0 |
1299 | +-import Ubuntu.Components 1.3 |
1300 | +-import Ubuntu.Components.Popups 1.3 |
1301 | ++import Ubuntu.Components 1.1 |
1302 | ++import Ubuntu.Components.Popups 0.1 |
1303 | + |
1304 | + Item { |
1305 | + function showDialog(caller, message, buttons) { |
1306 | |
1307 | === added file 'debian/patches/series' |
1308 | --- debian/patches/series 1970-01-01 00:00:00 +0000 |
1309 | +++ debian/patches/series 2016-09-29 12:03:24 +0000 |
1310 | @@ -0,0 +1,1 @@ |
1311 | +components_1.3_removal.diff |
1312 | |
1313 | === added file 'debian/rules' |
1314 | --- debian/rules 1970-01-01 00:00:00 +0000 |
1315 | +++ debian/rules 2016-09-29 12:03:24 +0000 |
1316 | @@ -0,0 +1,11 @@ |
1317 | +#!/usr/bin/make -f |
1318 | +export LANG= |
1319 | +export LANGUAGE= |
1320 | +export http_proxy=http://127.0.0.1:9 |
1321 | +PPA_DISPLACEMENT=converged |
1322 | + |
1323 | +%: |
1324 | + dh $@ --sourcedirectory=$(PPA_DISPLACEMENT) |
1325 | + |
1326 | +override_dh_auto_test: |
1327 | + : |
1328 | |
1329 | === added file 'debian/settings.json' |
1330 | --- debian/settings.json 1970-01-01 00:00:00 +0000 |
1331 | +++ debian/settings.json 2016-09-29 12:03:24 +0000 |
1332 | @@ -0,0 +1,15 @@ |
1333 | +{ |
1334 | + "_comment": "file generated automatically with build-me", |
1335 | + "clickBuildDate": "2015-07-05", |
1336 | + "providersDir": "providers", |
1337 | + "revision": "1.2.0", |
1338 | + "testplan": "", |
1339 | + "submission": { |
1340 | + "type": "c3", |
1341 | + "name": "Certification site", |
1342 | + "input": [{ |
1343 | + "paramName": "secure_id", |
1344 | + "prompt": "Enter the Secure ID for the system-under-test:" |
1345 | + }] |
1346 | + } |
1347 | +} |
1348 | |
1349 | === added directory 'debian/source' |
1350 | === added file 'debian/source/format' |
1351 | --- debian/source/format 1970-01-01 00:00:00 +0000 |
1352 | +++ debian/source/format 2016-09-29 12:03:24 +0000 |
1353 | @@ -0,0 +1,1 @@ |
1354 | +3.0 (quilt) |
1355 | |
1356 | === added file 'debian/tick.svg' |
1357 | --- debian/tick.svg 1970-01-01 00:00:00 +0000 |
1358 | +++ debian/tick.svg 2016-09-29 12:03:24 +0000 |
1359 | @@ -0,0 +1,154 @@ |
1360 | +<?xml version="1.0" encoding="UTF-8" standalone="no"?> |
1361 | +<!-- Created with Inkscape (http://www.inkscape.org/) --> |
1362 | + |
1363 | +<svg |
1364 | + xmlns:dc="http://purl.org/dc/elements/1.1/" |
1365 | + xmlns:cc="http://creativecommons.org/ns#" |
1366 | + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" |
1367 | + xmlns:svg="http://www.w3.org/2000/svg" |
1368 | + xmlns="http://www.w3.org/2000/svg" |
1369 | + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" |
1370 | + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" |
1371 | + width="90" |
1372 | + height="90" |
1373 | + id="svg4874" |
1374 | + version="1.1" |
1375 | + inkscape:version="0.48+devel r" |
1376 | + viewBox="0 0 90 90.000001" |
1377 | + sodipodi:docname="check02.svg"> |
1378 | + <defs |
1379 | + id="defs4876" /> |
1380 | + <sodipodi:namedview |
1381 | + id="base" |
1382 | + pagecolor="#ffffff" |
1383 | + bordercolor="#666666" |
1384 | + borderopacity="1.0" |
1385 | + inkscape:pageopacity="0.0" |
1386 | + inkscape:pageshadow="2" |
1387 | + inkscape:zoom="4.0745363" |
1388 | + inkscape:cx="6.0865817" |
1389 | + inkscape:cy="88.3168" |
1390 | + inkscape:document-units="px" |
1391 | + inkscape:current-layer="g1311" |
1392 | + showgrid="true" |
1393 | + showborder="true" |
1394 | + fit-margin-top="0" |
1395 | + fit-margin-left="0" |
1396 | + fit-margin-right="0" |
1397 | + fit-margin-bottom="0" |
1398 | + inkscape:snap-bbox="true" |
1399 | + inkscape:bbox-paths="true" |
1400 | + inkscape:bbox-nodes="true" |
1401 | + inkscape:snap-bbox-edge-midpoints="true" |
1402 | + inkscape:snap-bbox-midpoints="true" |
1403 | + inkscape:object-paths="true" |
1404 | + inkscape:snap-intersection-paths="true" |
1405 | + inkscape:object-nodes="true" |
1406 | + inkscape:snap-smooth-nodes="true" |
1407 | + inkscape:snap-midpoints="true" |
1408 | + inkscape:snap-object-midpoints="true" |
1409 | + inkscape:snap-center="true" |
1410 | + showguides="true" |
1411 | + inkscape:guide-bbox="true"> |
1412 | + <inkscape:grid |
1413 | + type="xygrid" |
1414 | + id="grid5451" |
1415 | + empspacing="6" /> |
1416 | + <sodipodi:guide |
1417 | + orientation="1,0" |
1418 | + position="6,77" |
1419 | + id="guide4063" /> |
1420 | + <sodipodi:guide |
1421 | + orientation="1,0" |
1422 | + position="3,78" |
1423 | + id="guide4065" /> |
1424 | + <sodipodi:guide |
1425 | + orientation="0,1" |
1426 | + position="55,84" |
1427 | + id="guide4067" /> |
1428 | + <sodipodi:guide |
1429 | + orientation="0,1" |
1430 | + position="53,87" |
1431 | + id="guide4069" /> |
1432 | + <sodipodi:guide |
1433 | + orientation="0,1" |
1434 | + position="20,3" |
1435 | + id="guide4071" /> |
1436 | + <sodipodi:guide |
1437 | + orientation="0,1" |
1438 | + position="20,6" |
1439 | + id="guide4073" /> |
1440 | + <sodipodi:guide |
1441 | + orientation="1,0" |
1442 | + position="87,7" |
1443 | + id="guide4075" /> |
1444 | + <sodipodi:guide |
1445 | + orientation="1,0" |
1446 | + position="84,7" |
1447 | + id="guide4077" /> |
1448 | + <sodipodi:guide |
1449 | + orientation="0,1" |
1450 | + position="58,81" |
1451 | + id="guide4074" /> |
1452 | + <sodipodi:guide |
1453 | + orientation="1,0" |
1454 | + position="9,74" |
1455 | + id="guide4076" /> |
1456 | + <sodipodi:guide |
1457 | + orientation="0,1" |
1458 | + position="21,9" |
1459 | + id="guide4078" /> |
1460 | + <sodipodi:guide |
1461 | + orientation="1,0" |
1462 | + position="81,4" |
1463 | + id="guide4080" /> |
1464 | + </sodipodi:namedview> |
1465 | + <metadata |
1466 | + id="metadata4879"> |
1467 | + <rdf:RDF> |
1468 | + <cc:Work |
1469 | + rdf:about=""> |
1470 | + <dc:format>image/svg+xml</dc:format> |
1471 | + <dc:type |
1472 | + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> |
1473 | + <dc:title></dc:title> |
1474 | + </cc:Work> |
1475 | + </rdf:RDF> |
1476 | + </metadata> |
1477 | + <g |
1478 | + inkscape:label="Layer 1" |
1479 | + inkscape:groupmode="layer" |
1480 | + id="layer1" |
1481 | + transform="translate(67.857146,-84.50504)"> |
1482 | + <g |
1483 | + transform="matrix(0,-1,-1,0,373.50506,516.50504)" |
1484 | + id="g4845" |
1485 | + style="display:inline"> |
1486 | + <g |
1487 | + transform="matrix(0,-1,-1,0,567.36222,615.36221)" |
1488 | + id="g1311" |
1489 | + inkscape:export-filename="envelope02.png" |
1490 | + inkscape:export-xdpi="90" |
1491 | + inkscape:export-ydpi="90"> |
1492 | + <g |
1493 | + id="g1313" |
1494 | + transform="matrix(1.875,0,0,1.875,-366,-1657.8169)"> |
1495 | + <rect |
1496 | + transform="translate(0,804.3622)" |
1497 | + y="152" |
1498 | + x="288" |
1499 | + height="48" |
1500 | + width="48" |
1501 | + id="rect1315" |
1502 | + style="opacity:0.21171169;fill:none;stroke:none" /> |
1503 | + </g> |
1504 | + <path |
1505 | + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#808080;fill-opacity:1;stroke:none" |
1506 | + d="m 256.82022,151.04429 -47.05336,42.21417 -27.13214,-24.27339 -5.57027,6.29782 32.69198,34.39726 L 261,155.75985 Z" |
1507 | + id="path4041-9" |
1508 | + inkscape:connector-curvature="0" |
1509 | + sodipodi:nodetypes="ccccccc" /> |
1510 | + </g> |
1511 | + </g> |
1512 | + </g> |
1513 | +</svg> |
1514 | |
1515 | === added file 'debian/window-close.svg' |
1516 | --- debian/window-close.svg 1970-01-01 00:00:00 +0000 |
1517 | +++ debian/window-close.svg 2016-09-29 12:03:24 +0000 |
1518 | @@ -0,0 +1,19 @@ |
1519 | +<?xml version="1.0" encoding="UTF-8" standalone="no"?> |
1520 | +<!-- Created with Inkscape (http://www.inkscape.org/) --> |
1521 | +<svg id="svg7384" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"> |
1522 | + <title id="title9167">Gnome Symbolic Icon Theme</title> |
1523 | + <metadata id="metadata90"> |
1524 | + <rdf:RDF> |
1525 | + <cc:Work rdf:about=""> |
1526 | + <dc:format>image/svg+xml</dc:format> |
1527 | + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> |
1528 | + <dc:title>Gnome Symbolic Icon Theme</dc:title> |
1529 | + </cc:Work> |
1530 | + </rdf:RDF> |
1531 | + </metadata> |
1532 | + <g id="layer12" transform="translate(-60,-518)"> |
1533 | + <g id="layer4-4-1" transform="translate(19,-242)"> |
1534 | + <path id="path10839-9" style="block-progression:tb;text-indent:0;color:#bebebe;enable-background:new;text-transform:none;fill:#bebebe" d="m45 764h1c0.01037-0.00012 0.02079-0.00046 0.03125 0 0.25495 0.0112 0.50987 0.12858 0.6875 0.3125l2.281 2.28 2.312-2.28c0.266-0.23 0.447-0.3 0.688-0.31h1v1c0 0.28647-0.03434 0.55065-0.25 0.75l-2.2812 2.2812 2.25 2.25c0.188 0.19 0.281 0.45 0.281 0.72v1h-1c-0.2653-0.00001-0.53059-0.0931-0.71875-0.28125l-2.281-2.28-2.281 2.28c-0.188 0.19-0.454 0.28-0.719 0.28h-1v-1c-0.000003-0.26529 0.09306-0.53058 0.28125-0.71875l2.2812-2.25-2.281-2.28c-0.21-0.19-0.303-0.47-0.281-0.75v-1z"/> |
1535 | + </g> |
1536 | + </g> |
1537 | +</svg> |