Merge lp:~fboucault/ubuntu-filemanager-app/migrate_toolkit_13 into lp:ubuntu-filemanager-app

Proposed by Florian Boucault on 2016-01-18
Status: Merged
Approved by: Alan Pope 🍺🐧🐱 πŸ¦„ on 2016-02-02
Approved revision: 522
Merged at revision: 522
Proposed branch: lp:~fboucault/ubuntu-filemanager-app/migrate_toolkit_13
Merge into: lp:ubuntu-filemanager-app
Diff against target: 489 lines (+87/-88)
28 files modified
src/app/qml/components/AutoSpacedGrid.qml (+1/-1)
src/app/qml/components/FolderIconDelegate.qml (+2/-2)
src/app/qml/components/FolderIconView.qml (+4/-4)
src/app/qml/components/FolderListDelegate.qml (+3/-3)
src/app/qml/components/FolderListView.qml (+4/-4)
src/app/qml/components/NetAuthenticationHandler.qml (+2/-2)
src/app/qml/components/PathHistoryRow.qml (+3/-3)
src/app/qml/components/PlacesSidebar.qml (+4/-4)
src/app/qml/components/Sidebar.qml (+3/-3)
src/app/qml/components/VerticalDivider.qml (+4/-4)
src/app/qml/content-hub/FileOpener.qml (+2/-2)
src/app/qml/filemanager.qml (+3/-4)
src/app/qml/ui/AuthenticationDialog.qml (+3/-3)
src/app/qml/ui/ConfirmDialog.qml (+3/-3)
src/app/qml/ui/ConfirmDialogWithInput.qml (+3/-3)
src/app/qml/ui/FileActionDialog.qml (+3/-3)
src/app/qml/ui/FileDetailsPopover.qml (+3/-3)
src/app/qml/ui/FileOperationProgressDialog.qml (+3/-3)
src/app/qml/ui/FolderListPage.qml (+4/-4)
src/app/qml/ui/GoToDialog.qml (+3/-3)
src/app/qml/ui/NetAuthenticationDialog.qml (+4/-4)
src/app/qml/ui/NotifyDialog.qml (+3/-3)
src/app/qml/ui/PlacesPage.qml (+4/-4)
src/app/qml/ui/PlacesPopover.qml (+4/-4)
src/app/qml/ui/SettingsSheet.qml (+4/-4)
src/app/qml/ui/ViewPopover.qml (+4/-4)
src/app/qml/upstream/FakeHeader.qml (+2/-2)
src/app/qml/upstream/PageWithBottomEdge.qml (+2/-2)
To merge this branch: bzr merge lp:~fboucault/ubuntu-filemanager-app/migrate_toolkit_13
Reviewer Review Type Date Requested Status
Jenkins Bot continuous-integration Approve on 2016-02-02
Alan Pope 🍺🐧🐱 πŸ¦„ 2016-01-18 Approve on 2016-01-19
Review via email: mp+282915@code.launchpad.net

Commit message

Migrated to version 1.3 of the Ubuntu UI Toolkit

To post a comment you must log in.
Florian Boucault (fboucault) wrote :

This change was NOT tested. It is proposed for helping with the grunt work of changing the imports.

521. By Florian Boucault on 2016-01-19

Removed deprecated property 'useDeprecatedToolbar'

Tested this and while it works, I'd like to land this along with an update to the colours which is in https://code.launchpad.net/~popey/ubuntu-filemanager-app/update-colours/+merge/283206

522. By Florian Boucault on 2016-01-29

Reverted changes to po/com.ubuntu.filemanager.pot

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/app/qml/components/AutoSpacedGrid.qml'
2--- src/app/qml/components/AutoSpacedGrid.qml 2014-09-20 10:49:51 +0000
3+++ src/app/qml/components/AutoSpacedGrid.qml 2016-01-29 07:30:41 +0000
4@@ -16,7 +16,7 @@
5 * You should have received a copy of the GNU General Public License *
6 * along with this program. If not, see <http://www.gnu.org/licenses/>. *
7 ***************************************************************************/
8-import QtQuick 2.3
9+import QtQuick 2.4
10
11 Item {
12 id: root
13
14=== modified file 'src/app/qml/components/FolderIconDelegate.qml'
15--- src/app/qml/components/FolderIconDelegate.qml 2015-10-01 00:04:00 +0000
16+++ src/app/qml/components/FolderIconDelegate.qml 2016-01-29 07:30:41 +0000
17@@ -15,9 +15,9 @@
18 *
19 * Authored by: Michael Spencer <sonrisesoftware@gmail.com>
20 */
21-import QtQuick 2.3
22+import QtQuick 2.4
23 import QtGraphicalEffects 1.0
24-import Ubuntu.Components 1.1
25+import Ubuntu.Components 1.3
26
27 Item {
28 id: delegate
29
30=== modified file 'src/app/qml/components/FolderIconView.qml'
31--- src/app/qml/components/FolderIconView.qml 2015-01-06 23:24:33 +0000
32+++ src/app/qml/components/FolderIconView.qml 2016-01-29 07:30:41 +0000
33@@ -15,10 +15,10 @@
34 *
35 * Authored by: Michael Spencer <sonrisesoftware@gmail.com>
36 */
37-import QtQuick 2.3
38-import Ubuntu.Components 1.1
39-import Ubuntu.Components.Popups 1.0
40-import Ubuntu.Components.ListItems 1.0 as ListItem
41+import QtQuick 2.4
42+import Ubuntu.Components 1.3
43+import Ubuntu.Components.Popups 1.3
44+import Ubuntu.Components.ListItems 1.3 as ListItem
45
46 Item {
47 id: root
48
49=== modified file 'src/app/qml/components/FolderListDelegate.qml'
50--- src/app/qml/components/FolderListDelegate.qml 2015-10-01 00:04:00 +0000
51+++ src/app/qml/components/FolderListDelegate.qml 2016-01-29 07:30:41 +0000
52@@ -15,9 +15,9 @@
53 *
54 * Authored by: Arto Jalkanen <ajalkane@gmail.com>
55 */
56-import QtQuick 2.3
57-import Ubuntu.Components 1.1
58-import Ubuntu.Components.ListItems 1.0 as ListItem
59+import QtQuick 2.4
60+import Ubuntu.Components 1.3
61+import Ubuntu.Components.ListItems 1.3 as ListItem
62 import org.nemomobile.folderlistmodel 1.0
63
64 ListItem.Subtitled {
65
66=== modified file 'src/app/qml/components/FolderListView.qml'
67--- src/app/qml/components/FolderListView.qml 2015-01-06 23:24:33 +0000
68+++ src/app/qml/components/FolderListView.qml 2016-01-29 07:30:41 +0000
69@@ -15,10 +15,10 @@
70 *
71 * Authored by: Arto Jalkanen <ajalkane@gmail.com>
72 */
73-import QtQuick 2.3
74-import Ubuntu.Components 1.1
75-import Ubuntu.Components.ListItems 1.0
76-import Ubuntu.Components.Popups 1.0
77+import QtQuick 2.4
78+import Ubuntu.Components 1.3
79+import Ubuntu.Components.ListItems 1.3
80+import Ubuntu.Components.Popups 1.3
81 import org.nemomobile.folderlistmodel 1.0
82
83 ListView {
84
85=== modified file 'src/app/qml/components/NetAuthenticationHandler.qml'
86--- src/app/qml/components/NetAuthenticationHandler.qml 2015-09-07 20:37:16 +0000
87+++ src/app/qml/components/NetAuthenticationHandler.qml 2016-01-29 07:30:41 +0000
88@@ -1,5 +1,5 @@
89-import QtQuick 2.3
90-import Ubuntu.Components 1.1
91+import QtQuick 2.4
92+import Ubuntu.Components 1.3
93 import "../ui"
94
95 Item {
96
97=== modified file 'src/app/qml/components/PathHistoryRow.qml'
98--- src/app/qml/components/PathHistoryRow.qml 2014-10-24 03:00:16 +0000
99+++ src/app/qml/components/PathHistoryRow.qml 2016-01-29 07:30:41 +0000
100@@ -15,9 +15,9 @@
101 *
102 * Authored by: Akiva
103 */
104-import QtQuick 2.3
105-import Ubuntu.Components 1.1
106-import Ubuntu.Components.ListItems 1.0
107+import QtQuick 2.4
108+import Ubuntu.Components 1.3
109+import Ubuntu.Components.ListItems 1.3
110
111 /* Full path of your current folder and recent history, that you can jump to by clicking its members */
112 Flickable {
113
114=== modified file 'src/app/qml/components/PlacesSidebar.qml'
115--- src/app/qml/components/PlacesSidebar.qml 2015-09-06 00:11:02 +0000
116+++ src/app/qml/components/PlacesSidebar.qml 2016-01-29 07:30:41 +0000
117@@ -15,11 +15,11 @@
118 *
119 * Authored by: Michael Spencer <sonrisesoftware@gmail.com>
120 */
121-import QtQuick 2.3
122+import QtQuick 2.4
123 import QtGraphicalEffects 1.0
124-import Ubuntu.Components 1.1
125-import Ubuntu.Components.ListItems 1.0
126-import Ubuntu.Components.Popups 1.0
127+import Ubuntu.Components 1.3
128+import Ubuntu.Components.ListItems 1.3
129+import Ubuntu.Components.Popups 1.3
130
131 Sidebar {
132 id: root
133
134=== modified file 'src/app/qml/components/Sidebar.qml'
135--- src/app/qml/components/Sidebar.qml 2014-09-20 10:49:51 +0000
136+++ src/app/qml/components/Sidebar.qml 2016-01-29 07:30:41 +0000
137@@ -17,9 +17,9 @@
138 * You should have received a copy of the GNU General Public License *
139 * along with this program. If not, see <http://www.gnu.org/licenses/>. *
140 ***************************************************************************/
141-import QtQuick 2.3
142-import Ubuntu.Components 1.1
143-import Ubuntu.Components.ListItems 1.0
144+import QtQuick 2.4
145+import Ubuntu.Components 1.3
146+import Ubuntu.Components.ListItems 1.3
147
148 /*!
149 \qmltype Sidebar
150
151=== modified file 'src/app/qml/components/VerticalDivider.qml'
152--- src/app/qml/components/VerticalDivider.qml 2014-09-20 10:49:51 +0000
153+++ src/app/qml/components/VerticalDivider.qml 2016-01-29 07:30:41 +0000
154@@ -17,10 +17,10 @@
155 * You should have received a copy of the GNU General Public License *
156 * along with this program. If not, see <http://www.gnu.org/licenses/>. *
157 ***************************************************************************/
158-import QtQuick 2.3
159-import Ubuntu.Components 1.1
160-import Ubuntu.Components.ListItems 1.0
161-import QtQuick 2.3
162+import QtQuick 2.4
163+import Ubuntu.Components 1.3
164+import Ubuntu.Components.ListItems 1.3
165+import QtQuick 2.4
166
167 Item {
168 property string mode: "left" // or right
169
170=== modified file 'src/app/qml/content-hub/FileOpener.qml'
171--- src/app/qml/content-hub/FileOpener.qml 2014-10-24 12:27:12 +0000
172+++ src/app/qml/content-hub/FileOpener.qml 2016-01-29 07:30:41 +0000
173@@ -15,8 +15,8 @@
174 *
175 * Authored by: Arto Jalkanen <ajalkane@gmail.com>
176 */
177-import QtQuick 2.0
178-import Ubuntu.Components 1.1
179+import QtQuick 2.4
180+import Ubuntu.Components 1.3
181
182 import Ubuntu.Content 0.1
183
184
185=== modified file 'src/app/qml/filemanager.qml'
186--- src/app/qml/filemanager.qml 2015-11-02 18:01:09 +0000
187+++ src/app/qml/filemanager.qml 2016-01-29 07:30:41 +0000
188@@ -15,10 +15,10 @@
189 *
190 * Authored by: Arto Jalkanen <ajalkane@gmail.com>
191 */
192-import QtQuick 2.3
193-import Ubuntu.Components 1.1
194+import QtQuick 2.4
195+import Ubuntu.Components 1.3
196 import org.nemomobile.folderlistmodel 1.0
197-import Ubuntu.Components.Popups 1.0
198+import Ubuntu.Components.Popups 1.3
199 import Ubuntu.Unity.Action 1.1 as UnityActions
200 import U1db 1.0 as U1db
201 import Ubuntu.Content 0.1
202@@ -32,7 +32,6 @@
203 // objectName for functional testing purposes (autopilot-qt5)
204 objectName: "filemanager"
205 applicationName: "com.ubuntu.filemanager"
206- useDeprecatedToolbar: false
207
208 width: phone ? units.gu(40) : units.gu(100)
209 height: units.gu(75)
210
211=== modified file 'src/app/qml/ui/AuthenticationDialog.qml'
212--- src/app/qml/ui/AuthenticationDialog.qml 2015-08-30 14:15:41 +0000
213+++ src/app/qml/ui/AuthenticationDialog.qml 2016-01-29 07:30:41 +0000
214@@ -15,9 +15,9 @@
215 *
216 * Authored by: Arto Jalkanen <ajalkane@gmail.com>
217 */
218-import QtQuick 2.3
219-import Ubuntu.Components 1.1
220-import Ubuntu.Components.Popups 1.0
221+import QtQuick 2.4
222+import Ubuntu.Components 1.3
223+import Ubuntu.Components.Popups 1.3
224
225 Dialog {
226 id: root
227
228=== modified file 'src/app/qml/ui/ConfirmDialog.qml'
229--- src/app/qml/ui/ConfirmDialog.qml 2015-08-30 14:15:41 +0000
230+++ src/app/qml/ui/ConfirmDialog.qml 2016-01-29 07:30:41 +0000
231@@ -15,9 +15,9 @@
232 *
233 * Authored by: Arto Jalkanen <ajalkane@gmail.com>
234 */
235-import QtQuick 2.3
236-import Ubuntu.Components 1.1
237-import Ubuntu.Components.Popups 1.0
238+import QtQuick 2.4
239+import Ubuntu.Components 1.3
240+import Ubuntu.Components.Popups 1.3
241
242 Dialog {
243 id: root
244
245=== modified file 'src/app/qml/ui/ConfirmDialogWithInput.qml'
246--- src/app/qml/ui/ConfirmDialogWithInput.qml 2015-08-30 14:15:41 +0000
247+++ src/app/qml/ui/ConfirmDialogWithInput.qml 2016-01-29 07:30:41 +0000
248@@ -15,9 +15,9 @@
249 *
250 * Authored by: Arto Jalkanen <ajalkane@gmail.com>
251 */
252-import QtQuick 2.3
253-import Ubuntu.Components 1.1
254-import Ubuntu.Components.Popups 1.0
255+import QtQuick 2.4
256+import Ubuntu.Components 1.3
257+import Ubuntu.Components.Popups 1.3
258
259 Dialog {
260 id: root
261
262=== modified file 'src/app/qml/ui/FileActionDialog.qml'
263--- src/app/qml/ui/FileActionDialog.qml 2015-11-02 18:01:09 +0000
264+++ src/app/qml/ui/FileActionDialog.qml 2016-01-29 07:30:41 +0000
265@@ -15,9 +15,9 @@
266 *
267 * Authored by: Arto Jalkanen <ajalkane@gmail.com>
268 */
269-import QtQuick 2.3
270-import Ubuntu.Components 1.1
271-import Ubuntu.Components.Popups 1.0
272+import QtQuick 2.4
273+import Ubuntu.Components 1.3
274+import Ubuntu.Components.Popups 1.3
275 import org.nemomobile.folderlistmodel 1.0
276
277 Dialog {
278
279=== modified file 'src/app/qml/ui/FileDetailsPopover.qml'
280--- src/app/qml/ui/FileDetailsPopover.qml 2015-07-16 20:04:05 +0000
281+++ src/app/qml/ui/FileDetailsPopover.qml 2016-01-29 07:30:41 +0000
282@@ -15,9 +15,9 @@
283 *
284 * Authored by: Arto Jalkanen <ajalkane@gmail.com>
285 */
286-import QtQuick 2.3
287-import Ubuntu.Components 1.1
288-import Ubuntu.Components.Popups 1.0
289+import QtQuick 2.4
290+import Ubuntu.Components 1.3
291+import Ubuntu.Components.Popups 1.3
292
293 Popover {
294 id: root
295
296=== modified file 'src/app/qml/ui/FileOperationProgressDialog.qml'
297--- src/app/qml/ui/FileOperationProgressDialog.qml 2014-10-06 12:27:18 +0000
298+++ src/app/qml/ui/FileOperationProgressDialog.qml 2016-01-29 07:30:41 +0000
299@@ -15,9 +15,9 @@
300 *
301 * Authored by: Arto Jalkanen <ajalkane@gmail.com>
302 */
303-import QtQuick 2.3
304-import Ubuntu.Components 1.1
305-import Ubuntu.Components.Popups 1.0
306+import QtQuick 2.4
307+import Ubuntu.Components 1.3
308+import Ubuntu.Components.Popups 1.3
309 import org.nemomobile.folderlistmodel 1.0
310
311 Dialog {
312
313=== modified file 'src/app/qml/ui/FolderListPage.qml'
314--- src/app/qml/ui/FolderListPage.qml 2015-11-02 18:01:09 +0000
315+++ src/app/qml/ui/FolderListPage.qml 2016-01-29 07:30:41 +0000
316@@ -16,10 +16,10 @@
317 * Authored by: Arto Jalkanen <ajalkane@gmail.com>
318 * Niklas Wenzel <nikwen.developer@gmail.com>
319 */
320-import QtQuick 2.3
321-import Ubuntu.Components 1.1
322-import Ubuntu.Components.Popups 1.0
323-import Ubuntu.Components.ListItems 1.0
324+import QtQuick 2.4
325+import Ubuntu.Components 1.3
326+import Ubuntu.Components.Popups 1.3
327+import Ubuntu.Components.ListItems 1.3
328 import org.nemomobile.folderlistmodel 1.0
329 import com.ubuntu.Archives 0.1
330 import "../components"
331
332=== modified file 'src/app/qml/ui/GoToDialog.qml'
333--- src/app/qml/ui/GoToDialog.qml 2015-10-20 10:03:51 +0000
334+++ src/app/qml/ui/GoToDialog.qml 2016-01-29 07:30:41 +0000
335@@ -15,9 +15,9 @@
336 *
337 * Authored by: Michael Spencer <sonrisesoftware@gmail.com>
338 */
339-import QtQuick 2.3
340-import Ubuntu.Components 1.1
341-import Ubuntu.Components.Popups 1.0
342+import QtQuick 2.4
343+import Ubuntu.Components 1.3
344+import Ubuntu.Components.Popups 1.3
345
346 Dialog {
347 id: root
348
349=== modified file 'src/app/qml/ui/NetAuthenticationDialog.qml'
350--- src/app/qml/ui/NetAuthenticationDialog.qml 2015-09-07 20:37:16 +0000
351+++ src/app/qml/ui/NetAuthenticationDialog.qml 2016-01-29 07:30:41 +0000
352@@ -15,10 +15,10 @@
353 *
354 * Authored by: Carlos Jose Mazieri <carlos.mazieri@gmail.com>
355 */
356-import QtQuick 2.3
357-import Ubuntu.Components 1.1
358-import Ubuntu.Components.Popups 1.0
359-import Ubuntu.Components.ListItems 1.0
360+import QtQuick 2.4
361+import Ubuntu.Components 1.3
362+import Ubuntu.Components.Popups 1.3
363+import Ubuntu.Components.ListItems 1.3
364
365 Dialog {
366 id: authenticationDialog
367
368=== modified file 'src/app/qml/ui/NotifyDialog.qml'
369--- src/app/qml/ui/NotifyDialog.qml 2015-08-30 14:15:41 +0000
370+++ src/app/qml/ui/NotifyDialog.qml 2016-01-29 07:30:41 +0000
371@@ -15,9 +15,9 @@
372 *
373 * Authored by: Arto Jalkanen <ajalkane@gmail.com>
374 */
375-import QtQuick 2.3
376-import Ubuntu.Components 1.1
377-import Ubuntu.Components.Popups 1.0
378+import QtQuick 2.4
379+import Ubuntu.Components 1.3
380+import Ubuntu.Components.Popups 1.3
381
382 Dialog {
383 id: root
384
385=== modified file 'src/app/qml/ui/PlacesPage.qml'
386--- src/app/qml/ui/PlacesPage.qml 2015-10-20 10:03:51 +0000
387+++ src/app/qml/ui/PlacesPage.qml 2016-01-29 07:30:41 +0000
388@@ -15,10 +15,10 @@
389 *
390 * Authored by: Arto Jalkanen <ajalkane@gmail.com>
391 */
392-import QtQuick 2.3
393-import Ubuntu.Components 1.1
394-import Ubuntu.Components.Popups 1.0
395-import Ubuntu.Components.ListItems 1.0
396+import QtQuick 2.4
397+import Ubuntu.Components 1.3
398+import Ubuntu.Components.Popups 1.3
399+import Ubuntu.Components.ListItems 1.3
400 import org.nemomobile.folderlistmodel 1.0
401
402 Page {
403
404=== modified file 'src/app/qml/ui/PlacesPopover.qml'
405--- src/app/qml/ui/PlacesPopover.qml 2015-10-19 12:39:27 +0000
406+++ src/app/qml/ui/PlacesPopover.qml 2016-01-29 07:30:41 +0000
407@@ -15,10 +15,10 @@
408 *
409 * Authored by: Michael Spencer <sonrisesoftware@gmail.com>
410 */
411-import QtQuick 2.3
412-import Ubuntu.Components 1.1
413-import Ubuntu.Components.Popups 1.0
414-import Ubuntu.Components.ListItems 1.0
415+import QtQuick 2.4
416+import Ubuntu.Components 1.3
417+import Ubuntu.Components.Popups 1.3
418+import Ubuntu.Components.ListItems 1.3
419
420 Popover {
421 id: root
422
423=== modified file 'src/app/qml/ui/SettingsSheet.qml'
424--- src/app/qml/ui/SettingsSheet.qml 2014-10-18 00:35:24 +0000
425+++ src/app/qml/ui/SettingsSheet.qml 2016-01-29 07:30:41 +0000
426@@ -15,10 +15,10 @@
427 *
428 * Authored by: Michael Spencer <sonrisesoftware@gmail.com>
429 */
430-import QtQuick 2.3
431-import Ubuntu.Components 1.1
432-import Ubuntu.Components.ListItems 1.0
433-import Ubuntu.Components.Popups 1.0
434+import QtQuick 2.4
435+import Ubuntu.Components 1.3
436+import Ubuntu.Components.ListItems 1.3
437+import Ubuntu.Components.Popups 1.3
438
439 /*
440 * The Settings page holds global settings/preferences.
441
442=== modified file 'src/app/qml/ui/ViewPopover.qml'
443--- src/app/qml/ui/ViewPopover.qml 2015-10-20 10:03:51 +0000
444+++ src/app/qml/ui/ViewPopover.qml 2016-01-29 07:30:41 +0000
445@@ -15,10 +15,10 @@
446 *
447 * Authored by: Michael Spencer <sonrisesoftware@gmail.com>
448 */
449-import QtQuick 2.3
450-import Ubuntu.Components 1.1
451-import Ubuntu.Components.Popups 1.0
452-import Ubuntu.Components.ListItems 1.0
453+import QtQuick 2.4
454+import Ubuntu.Components 1.3
455+import Ubuntu.Components.Popups 1.3
456+import Ubuntu.Components.ListItems 1.3
457
458 Popover {
459 id: root
460
461=== modified file 'src/app/qml/upstream/FakeHeader.qml'
462--- src/app/qml/upstream/FakeHeader.qml 2014-10-23 20:54:30 +0000
463+++ src/app/qml/upstream/FakeHeader.qml 2016-01-29 07:30:41 +0000
464@@ -14,8 +14,8 @@
465 * along with this program. If not, see <http://www.gnu.org/licenses/>.
466 */
467
468-import QtQuick 2.3
469-import Ubuntu.Components 1.1
470+import QtQuick 2.4
471+import Ubuntu.Components 1.3
472
473 Column {
474 id: fakeHeader
475
476=== modified file 'src/app/qml/upstream/PageWithBottomEdge.qml'
477--- src/app/qml/upstream/PageWithBottomEdge.qml 2014-10-24 03:00:16 +0000
478+++ src/app/qml/upstream/PageWithBottomEdge.qml 2016-01-29 07:30:41 +0000
479@@ -62,8 +62,8 @@
480
481 */
482
483-import QtQuick 2.2
484-import Ubuntu.Components 1.1
485+import QtQuick 2.4
486+import Ubuntu.Components 1.3
487
488 Page {
489 id: page

Subscribers

People subscribed via source and target branches