Merge lp:~dpniel/ubuntu-filemanager-app/fix-1588252 into lp:ubuntu-filemanager-app

Proposed by Dan Chapman ξƒΏ on 2016-06-05
Status: Merged
Approved by: Alan Pope 🍺🐧🐱 πŸ¦„ on 2016-06-09
Approved revision: 540
Merged at revision: 542
Proposed branch: lp:~dpniel/ubuntu-filemanager-app/fix-1588252
Merge into: lp:ubuntu-filemanager-app
Diff against target: 619 lines (+172/-128)
4 files modified
po/com.ubuntu.filemanager.pot (+141/-98)
src/app/qml/components/FolderIconView.qml (+7/-7)
src/app/qml/components/FolderListView.qml (+23/-22)
src/app/qml/ui/FolderListPage.qml (+1/-1)
To merge this branch: bzr merge lp:~dpniel/ubuntu-filemanager-app/fix-1588252
Reviewer Review Type Date Requested Status
Alan Pope 🍺🐧🐱 πŸ¦„ 2016-06-05 Approve on 2016-06-09
Jenkins Bot continuous-integration Approve on 2016-06-05
Review via email: mp+296498@code.launchpad.net

Commit message

Fix the white gap below the header

This fixes the white gap visible below the header in both
FolderListView and FolderIconView when the sidepanel isn't visible

Description of the change

Fix the white gap below the header

This fixes the white gap visible below the header in both
FolderListView and FolderIconView when the sidepanel isn't visible

To post a comment you must log in.
review: Approve (continuous-integration)

LGTM! Thanks Dan!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'po/com.ubuntu.filemanager.pot'
2--- po/com.ubuntu.filemanager.pot 2016-03-07 15:06:00 +0000
3+++ po/com.ubuntu.filemanager.pot 2016-06-05 06:36:49 +0000
4@@ -1,6 +1,6 @@
5 # SOME DESCRIPTIVE TITLE.
6 # Copyright (C) YEAR Canonical Ltd.
7-# This file is distributed under the same license as the PACKAGE package.
8+# This file is distributed under the same license as the package.
9 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
10 #
11 #, fuzzy
12@@ -8,7 +8,7 @@
13 msgstr ""
14 "Project-Id-Version: \n"
15 "Report-Msgid-Bugs-To: \n"
16-"POT-Creation-Date: 2015-03-12 21:23+0100\n"
17+"POT-Creation-Date: 2016-06-05 07:23+0100\n"
18 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
19 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
20 "Language-Team: LANGUAGE <LL@li.org>\n"
21@@ -19,7 +19,7 @@
22 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
23
24 #: ../src/app/qml/components/FolderIconView.qml:57
25-#: ../src/app/qml/components/FolderListView.qml:35
26+#: ../src/app/qml/components/FolderListView.qml:36
27 #, qt-format
28 msgid "%1 (%2 file)"
29 msgid_plural "%1 (%2 files)"
30@@ -27,11 +27,11 @@
31 msgstr[1] ""
32
33 #: ../src/app/qml/components/PathHistoryRow.qml:84
34-#: ../src/app/qml/ui/FolderListPage.qml:830
35+#: ../src/app/qml/ui/FolderListPage.qml:845
36 msgid "Device"
37 msgstr ""
38
39-#: ../src/app/qml/components/PlacesSidebar.qml:53
40+#: ../src/app/qml/components/PlacesSidebar.qml:54
41 #: ../src/app/qml/ui/FolderListPage.qml:31 ../src/app/qml/ui/PlacesPage.qml:27
42 #: ../src/app/qml/ui/PlacesPopover.qml:102
43 msgid "Places"
44@@ -41,26 +41,27 @@
45 msgid "Open with"
46 msgstr ""
47
48-#: ../src/app/qml/filemanager.qml:81 ../src/app/qml/ui/FolderListPage.qml:107
49+#: ../src/app/qml/filemanager.qml:80 ../src/app/qml/ui/FolderListPage.qml:107
50 #: ../src/app/qml/ui/SettingsSheet.qml:31
51 msgid "Settings"
52 msgstr ""
53
54-#: ../src/app/qml/filemanager.qml:82
55+#: ../src/app/qml/filemanager.qml:81
56 msgid "Change app settings"
57 msgstr ""
58
59-#: ../src/app/qml/filemanager.qml:259 ../src/app/qml/ui/FolderListPage.qml:365
60+#: ../src/app/qml/filemanager.qml:258 ../src/app/qml/ui/FolderListPage.qml:379
61 #: ../src/app/qml/ui/ViewPopover.qml:70
62 msgid "Icons"
63 msgstr ""
64
65-#: ../src/app/qml/filemanager.qml:259 ../src/app/qml/ui/FolderListPage.qml:381
66+#: ../src/app/qml/filemanager.qml:258 ../src/app/qml/ui/FolderListPage.qml:395
67 #: ../src/app/qml/ui/ViewPopover.qml:71
68 msgid "List"
69 msgstr ""
70
71 #: ../src/app/qml/ui/AuthenticationDialog.qml:25
72+#: ../src/app/qml/ui/NetAuthenticationDialog.qml:26
73 msgid "Authentication required"
74 msgstr ""
75
76@@ -75,19 +76,20 @@
77 #: ../src/app/qml/ui/AuthenticationDialog.qml:49
78 #: ../src/app/qml/ui/ConfirmDialog.qml:31
79 #: ../src/app/qml/ui/ConfirmDialogWithInput.qml:47
80+#: ../src/app/qml/ui/FolderListPage.qml:679
81 #: ../src/app/qml/ui/NotifyDialog.qml:25
82-msgid "Ok"
83+msgid "OK"
84 msgstr ""
85
86-#: ../src/app/qml/ui/AuthenticationDialog.qml:60
87+#: ../src/app/qml/ui/AuthenticationDialog.qml:61
88 #: ../src/app/qml/ui/ConfirmDialog.qml:41
89 #: ../src/app/qml/ui/ConfirmDialogWithInput.qml:57
90 #: ../src/app/qml/ui/FileActionDialog.qml:45
91 #: ../src/app/qml/ui/FileOperationProgressDialog.qml:44
92-#: ../src/app/qml/ui/FolderListPage.qml:343
93-#: ../src/app/qml/ui/FolderListPage.qml:673
94-#: ../src/app/qml/ui/FolderListPage.qml:740
95-#: ../src/app/qml/ui/GoToDialog.qml:67
96+#: ../src/app/qml/ui/FolderListPage.qml:357
97+#: ../src/app/qml/ui/FolderListPage.qml:670
98+#: ../src/app/qml/ui/FolderListPage.qml:737 ../src/app/qml/ui/GoToDialog.qml:67
99+#: ../src/app/qml/ui/NetAuthenticationDialog.qml:108
100 msgid "Cancel"
101 msgstr ""
102
103@@ -165,7 +167,7 @@
104
105 #: ../src/app/qml/ui/FolderListPage.qml:79
106 #: ../src/app/qml/ui/FolderListPage.qml:97
107-#: ../src/app/qml/ui/FolderListPage.qml:610
108+#: ../src/app/qml/ui/FolderListPage.qml:607
109 msgid "Properties"
110 msgstr ""
111
112@@ -185,158 +187,158 @@
113 msgid "Authentication failed"
114 msgstr ""
115
116-#: ../src/app/qml/ui/FolderListPage.qml:206
117+#: ../src/app/qml/ui/FolderListPage.qml:210
118 #, qt-format
119 msgid "%1 file"
120 msgid_plural "%1 files"
121 msgstr[0] ""
122 msgstr[1] ""
123
124-#: ../src/app/qml/ui/FolderListPage.qml:240
125+#: ../src/app/qml/ui/FolderListPage.qml:254
126 msgid "Open in a new tab"
127 msgstr ""
128
129-#: ../src/app/qml/ui/FolderListPage.qml:248
130+#: ../src/app/qml/ui/FolderListPage.qml:262
131 msgid "Close this tab"
132 msgstr ""
133
134-#: ../src/app/qml/ui/FolderListPage.qml:261
135+#: ../src/app/qml/ui/FolderListPage.qml:275
136 msgid "Create folder"
137 msgstr ""
138
139-#: ../src/app/qml/ui/FolderListPage.qml:262
140+#: ../src/app/qml/ui/FolderListPage.qml:276
141 msgid "Enter name for new folder"
142 msgstr ""
143
144-#: ../src/app/qml/ui/FolderListPage.qml:278
145+#: ../src/app/qml/ui/FolderListPage.qml:292
146 msgid "Create file"
147 msgstr ""
148
149-#: ../src/app/qml/ui/FolderListPage.qml:279
150+#: ../src/app/qml/ui/FolderListPage.qml:293
151 msgid "Enter name for new file"
152 msgstr ""
153
154-#: ../src/app/qml/ui/FolderListPage.qml:328
155+#: ../src/app/qml/ui/FolderListPage.qml:342
156 msgid "Select"
157 msgstr ""
158
159-#: ../src/app/qml/ui/FolderListPage.qml:425
160+#: ../src/app/qml/ui/FolderListPage.qml:439
161 msgid "No files"
162 msgstr ""
163
164-#: ../src/app/qml/ui/FolderListPage.qml:445
165-#: ../src/app/qml/ui/FolderListPage.qml:571
166+#: ../src/app/qml/ui/FolderListPage.qml:459
167+#: ../src/app/qml/ui/FolderListPage.qml:568
168 msgid "Delete"
169 msgstr ""
170
171-#: ../src/app/qml/ui/FolderListPage.qml:446
172+#: ../src/app/qml/ui/FolderListPage.qml:460
173 #, qt-format
174 msgid "Are you sure you want to permanently delete '%1'?"
175 msgstr ""
176
177-#: ../src/app/qml/ui/FolderListPage.qml:451
178+#: ../src/app/qml/ui/FolderListPage.qml:465
179 msgid "Deleting files"
180 msgstr ""
181
182-#: ../src/app/qml/ui/FolderListPage.qml:469
183-#: ../src/app/qml/ui/FolderListPage.qml:584
184+#: ../src/app/qml/ui/FolderListPage.qml:483
185+#: ../src/app/qml/ui/FolderListPage.qml:581
186 msgid "Rename"
187 msgstr ""
188
189-#: ../src/app/qml/ui/FolderListPage.qml:470
190+#: ../src/app/qml/ui/FolderListPage.qml:484
191 msgid "Enter a new name"
192 msgstr ""
193
194-#: ../src/app/qml/ui/FolderListPage.qml:479
195+#: ../src/app/qml/ui/FolderListPage.qml:493
196 msgid "Could not rename"
197 msgstr ""
198
199-#: ../src/app/qml/ui/FolderListPage.qml:480
200+#: ../src/app/qml/ui/FolderListPage.qml:494
201 msgid "Insufficient permissions or name already exists?"
202 msgstr ""
203
204-#: ../src/app/qml/ui/FolderListPage.qml:498
205+#: ../src/app/qml/ui/FolderListPage.qml:512
206 msgid "Extract Archive"
207 msgstr ""
208
209-#: ../src/app/qml/ui/FolderListPage.qml:499
210+#: ../src/app/qml/ui/FolderListPage.qml:513
211 #, qt-format
212 msgid "Are you sure you want to extract '%1' here?"
213 msgstr ""
214
215-#: ../src/app/qml/ui/FolderListPage.qml:548
216+#: ../src/app/qml/ui/FolderListPage.qml:545
217 msgid "Cut"
218 msgstr ""
219
220-#: ../src/app/qml/ui/FolderListPage.qml:559
221+#: ../src/app/qml/ui/FolderListPage.qml:556
222 msgid "Copy"
223 msgstr ""
224
225-#: ../src/app/qml/ui/FolderListPage.qml:599
226-#: ../src/app/qml/ui/FolderListPage.qml:720
227+#: ../src/app/qml/ui/FolderListPage.qml:596
228+#: ../src/app/qml/ui/FolderListPage.qml:717
229 msgid "Extract archive"
230 msgstr ""
231
232-#: ../src/app/qml/ui/FolderListPage.qml:630
233+#: ../src/app/qml/ui/FolderListPage.qml:627
234 msgid "File operation error"
235 msgstr ""
236
237-#: ../src/app/qml/ui/FolderListPage.qml:661
238+#: ../src/app/qml/ui/FolderListPage.qml:658
239 #, qt-format
240 msgid "Extracting archive '%1'"
241 msgstr ""
242
243-#: ../src/app/qml/ui/FolderListPage.qml:682
244-msgid "OK"
245-msgstr ""
246-
247-#: ../src/app/qml/ui/FolderListPage.qml:697
248+#: ../src/app/qml/ui/FolderListPage.qml:694
249 msgid "Extracting failed"
250 msgstr ""
251
252-#: ../src/app/qml/ui/FolderListPage.qml:698
253+#: ../src/app/qml/ui/FolderListPage.qml:695
254 #, qt-format
255 msgid "Extracting the archive '%1' failed."
256 msgstr ""
257
258-#: ../src/app/qml/ui/FolderListPage.qml:712
259+#: ../src/app/qml/ui/FolderListPage.qml:709
260 msgid "Archive file"
261 msgstr ""
262
263-#: ../src/app/qml/ui/FolderListPage.qml:713
264+#: ../src/app/qml/ui/FolderListPage.qml:710
265 msgid "Do you want to extract the archive here?"
266 msgstr ""
267
268-#: ../src/app/qml/ui/FolderListPage.qml:730
269+#: ../src/app/qml/ui/FolderListPage.qml:727
270 msgid "Open with another app"
271 msgstr ""
272
273-#: ../src/app/qml/ui/FolderListPage.qml:798
274+#: ../src/app/qml/ui/FolderListPage.qml:811
275 msgid "~/Desktop"
276 msgstr ""
277
278-#: ../src/app/qml/ui/FolderListPage.qml:808
279+#: ../src/app/qml/ui/FolderListPage.qml:821
280 msgid "~/Public"
281 msgstr ""
282
283-#: ../src/app/qml/ui/FolderListPage.qml:810
284+#: ../src/app/qml/ui/FolderListPage.qml:823
285 msgid "~/Programs"
286 msgstr ""
287
288-#: ../src/app/qml/ui/FolderListPage.qml:812
289+#: ../src/app/qml/ui/FolderListPage.qml:825
290 msgid "~/Templates"
291 msgstr ""
292
293-#: ../src/app/qml/ui/FolderListPage.qml:828
294+#: ../src/app/qml/ui/FolderListPage.qml:843
295 msgid "Home"
296 msgstr ""
297
298-#: ../src/app/qml/ui/FolderListPage.qml:898
299+#: ../src/app/qml/ui/FolderListPage.qml:847
300+msgid "Network"
301+msgstr ""
302+
303+#: ../src/app/qml/ui/FolderListPage.qml:948
304 msgid "Folder not accessible"
305 msgstr ""
306
307 #. TRANSLATORS: this refers to a folder name
308-#: ../src/app/qml/ui/FolderListPage.qml:900
309+#: ../src/app/qml/ui/FolderListPage.qml:950
310 #, qt-format
311 msgid "Can not access %1"
312 msgstr ""
313@@ -359,6 +361,22 @@
314 msgid "Go"
315 msgstr ""
316
317+#: ../src/app/qml/ui/NetAuthenticationDialog.qml:55
318+msgid "User"
319+msgstr ""
320+
321+#: ../src/app/qml/ui/NetAuthenticationDialog.qml:66
322+msgid "Password"
323+msgstr ""
324+
325+#: ../src/app/qml/ui/NetAuthenticationDialog.qml:79
326+msgid "Save password"
327+msgstr ""
328+
329+#: ../src/app/qml/ui/NetAuthenticationDialog.qml:98
330+msgid "Ok"
331+msgstr ""
332+
333 #: ../src/app/qml/ui/SettingsSheet.qml:34
334 msgid "Close"
335 msgstr ""
336@@ -403,111 +421,136 @@
337 msgid "Filter"
338 msgstr ""
339
340-#: ../src/plugin/folderlistmodel/dirmodel.cpp:418
341+#: ../src/plugin/folderlistmodel/dirmodel.cpp:376
342+msgid "Unknown"
343+msgstr ""
344+
345+#: ../src/plugin/folderlistmodel/dirmodel.cpp:491
346 msgid "path or url may not exist or cannot be read"
347 msgstr ""
348
349-#: ../src/plugin/folderlistmodel/dirmodel.cpp:585
350+#: ../src/plugin/folderlistmodel/dirmodel.cpp:682
351 msgid "Rename error"
352 msgstr ""
353
354-#: ../src/plugin/folderlistmodel/dirmodel.cpp:610
355+#: ../src/plugin/folderlistmodel/dirmodel.cpp:703
356 msgid "Error creating new folder"
357 msgstr ""
358
359-#: ../src/plugin/folderlistmodel/dirmodel.cpp:1252
360+#: ../src/plugin/folderlistmodel/dirmodel.cpp:1351
361 msgid "items"
362 msgstr ""
363
364-#: ../src/plugin/folderlistmodel/filesystemaction.cpp:263
365+#: ../src/plugin/folderlistmodel/filesystemaction.cpp:327
366 msgid "File or Directory does not exist"
367 msgstr ""
368
369-#: ../src/plugin/folderlistmodel/filesystemaction.cpp:264
370+#: ../src/plugin/folderlistmodel/filesystemaction.cpp:328
371 msgid " does not exist"
372 msgstr ""
373
374-#: ../src/plugin/folderlistmodel/filesystemaction.cpp:590
375+#: ../src/plugin/folderlistmodel/filesystemaction.cpp:334
376+msgid "Cannot access File or Directory"
377+msgstr ""
378+
379+#: ../src/plugin/folderlistmodel/filesystemaction.cpp:335
380+msgid " it needs Authentication"
381+msgstr ""
382+
383+#: ../src/plugin/folderlistmodel/filesystemaction.cpp:366
384+msgid "Cannot copy/move items"
385+msgstr ""
386+
387+#: ../src/plugin/folderlistmodel/filesystemaction.cpp:367
388+#: ../src/plugin/folderlistmodel/filesystemaction.cpp:1626
389+msgid "no write permission on folder "
390+msgstr ""
391+
392+#: ../src/plugin/folderlistmodel/filesystemaction.cpp:692
393 msgid "Could not remove the item "
394 msgstr ""
395
396-#: ../src/plugin/folderlistmodel/filesystemaction.cpp:631
397+#: ../src/plugin/folderlistmodel/filesystemaction.cpp:733
398 msgid "Could not find a suitable name to backup"
399 msgstr ""
400
401-#: ../src/plugin/folderlistmodel/filesystemaction.cpp:685
402+#: ../src/plugin/folderlistmodel/filesystemaction.cpp:791
403 msgid "Could not create the directory"
404 msgstr ""
405
406-#: ../src/plugin/folderlistmodel/filesystemaction.cpp:694
407+#: ../src/plugin/folderlistmodel/filesystemaction.cpp:800
408 msgid "Could not create link to"
409 msgstr ""
410
411-#: ../src/plugin/folderlistmodel/filesystemaction.cpp:706
412+#: ../src/plugin/folderlistmodel/filesystemaction.cpp:812
413 msgid "Could not set permissions to dir"
414 msgstr ""
415
416-#: ../src/plugin/folderlistmodel/filesystemaction.cpp:720
417+#: ../src/plugin/folderlistmodel/filesystemaction.cpp:826
418 msgid "Could not open file"
419 msgstr ""
420
421-#: ../src/plugin/folderlistmodel/filesystemaction.cpp:739
422-msgid "There is no space on disk to copy"
423+#: ../src/plugin/folderlistmodel/filesystemaction.cpp:845
424+msgid "There is no space to copy"
425 msgstr ""
426
427-#: ../src/plugin/folderlistmodel/filesystemaction.cpp:749
428+#: ../src/plugin/folderlistmodel/filesystemaction.cpp:855
429 msgid "Could not create file"
430 msgstr ""
431
432-#: ../src/plugin/folderlistmodel/filesystemaction.cpp:813
433+#: ../src/plugin/folderlistmodel/filesystemaction.cpp:920
434 msgid "Could not remove the directory/file "
435 msgstr ""
436
437-#: ../src/plugin/folderlistmodel/filesystemaction.cpp:829
438+#: ../src/plugin/folderlistmodel/filesystemaction.cpp:936
439 msgid "Could not move the directory/file "
440 msgstr ""
441
442-#: ../src/plugin/folderlistmodel/filesystemaction.cpp:863
443-msgid "Cannot copy items"
444-msgstr ""
445-
446-#: ../src/plugin/folderlistmodel/filesystemaction.cpp:864
447-#: ../src/plugin/folderlistmodel/filesystemaction.cpp:883
448-msgid "no write permission on folder "
449-msgstr ""
450-
451-#: ../src/plugin/folderlistmodel/filesystemaction.cpp:882
452-msgid "Cannot move items"
453-msgstr ""
454-
455-#: ../src/plugin/folderlistmodel/filesystemaction.cpp:888
456-msgid "origin and destination folders are the same"
457-msgstr ""
458-
459-#: ../src/plugin/folderlistmodel/filesystemaction.cpp:1104
460+#: ../src/plugin/folderlistmodel/filesystemaction.cpp:1196
461 msgid "Write error in "
462 msgstr ""
463
464-#: ../src/plugin/folderlistmodel/filesystemaction.cpp:1120
465+#: ../src/plugin/folderlistmodel/filesystemaction.cpp:1212
466 msgid "Read error in "
467 msgstr ""
468
469-#: ../src/plugin/folderlistmodel/filesystemaction.cpp:1354
470+#: ../src/plugin/folderlistmodel/filesystemaction.cpp:1450
471 msgid " Copy"
472 msgstr ""
473
474-#: ../src/plugin/folderlistmodel/filesystemaction.cpp:1410
475+#: ../src/plugin/folderlistmodel/filesystemaction.cpp:1510
476 msgid "Set permissions error in "
477 msgstr ""
478
479-#: ../src/plugin/folderlistmodel/filesystemaction.cpp:1494
480+#: ../src/plugin/folderlistmodel/filesystemaction.cpp:1579
481 msgid "Could not create trash info file"
482 msgstr ""
483
484-#: ../src/plugin/folderlistmodel/filesystemaction.cpp:1507
485+#: ../src/plugin/folderlistmodel/filesystemaction.cpp:1592
486 msgid "Could not remove the trash info file"
487 msgstr ""
488
489+#: ../src/plugin/folderlistmodel/filesystemaction.cpp:1617
490+#: ../src/plugin/folderlistmodel/filesystemaction.cpp:1625
491+msgid "Cannot move items"
492+msgstr ""
493+
494+#: ../src/plugin/folderlistmodel/filesystemaction.cpp:1619
495+msgid "origin and destination folders are the same"
496+msgstr ""
497+
498+#: ../src/plugin/folderlistmodel/filesystemaction.cpp:1663
499+msgid "There is no space to download"
500+msgstr ""
501+
502+#: ../src/plugin/folderlistmodel/smb/qsambaclient/src/smbusershare.cpp:72
503+msgid "net tool not found, check samba installation"
504+msgstr ""
505+
506+#: ../src/plugin/folderlistmodel/smb/qsambaclient/src/smbusershare.cpp:80
507+msgid "cannot write in "
508+msgstr ""
509+
510 #: com.ubuntu.filemanager.desktop.in.in.h:1
511 msgid "File Manager"
512 msgstr ""
513
514=== modified file 'src/app/qml/components/FolderIconView.qml'
515--- src/app/qml/components/FolderIconView.qml 2016-01-18 10:32:34 +0000
516+++ src/app/qml/components/FolderIconView.qml 2016-06-05 06:36:49 +0000
517@@ -32,12 +32,7 @@
518 Flickable {
519 id: flickable
520 clip: true
521- anchors {
522- top: parent.top
523- left: parent.left
524- right: parent.right
525- bottom: parent.bottom
526- }
527+ anchors.fill: parent
528
529 contentWidth: width
530 contentHeight: column.height
531@@ -45,7 +40,12 @@
532 Column {
533 id: column
534
535- width: flickable.contentWidth
536+ anchors {
537+ left: parent.left
538+ top: parent.top
539+ right: parent.right
540+ }
541+
542 // This must be visible so Autopilot can see it
543 ListItem.Header {
544 anchors {
545
546=== modified file 'src/app/qml/components/FolderListView.qml'
547--- src/app/qml/components/FolderListView.qml 2016-01-18 10:32:34 +0000
548+++ src/app/qml/components/FolderListView.qml 2016-06-05 06:36:49 +0000
549@@ -17,34 +17,35 @@
550 */
551 import QtQuick 2.4
552 import Ubuntu.Components 1.3
553-import Ubuntu.Components.ListItems 1.3
554+import Ubuntu.Components.ListItems 1.3 as OldListItems
555 import Ubuntu.Components.Popups 1.3
556 import org.nemomobile.folderlistmodel 1.0
557
558-ListView {
559- id: root
560-
561+Item {
562 property FolderListModel folderListModel
563 property string folderPath: folderListModel.path
564- model: folderListModel
565 property bool smallMode: !wideAspect
566-
567- // This must be visible so Autopilot can see it
568- header: Header {
569- objectName: "listViewSmallHeader"
570- text: i18n.tr("%1 (%2 file)", "%1 (%2 files)", root.count).arg(root.folderPath).arg(root.count)
571- height: smallMode ? units.gu(4) : 0
572- clip: true
573- }
574-
575- delegate: FolderListDelegate {
576- id: delegate
577-
578- onClicked: itemClicked(model)
579-
580- onPressAndHold: itemLongPress(delegate, model)
581- }
582-
583+ property Flickable flickable: root
584+ ListView {
585+ id: root
586+ anchors.fill: parent
587+ model: folderListModel
588+ // This must be visible so Autopilot can see it
589+ header: OldListItems.Header {
590+ objectName: "listViewSmallHeader"
591+ text: i18n.tr("%1 (%2 file)", "%1 (%2 files)", root.count).arg(folderPath).arg(root.count)
592+ height: smallMode ? units.gu(4) : 0
593+ clip: true
594+ }
595+
596+ delegate: FolderListDelegate {
597+ id: delegate
598+
599+ onClicked: itemClicked(model)
600+
601+ onPressAndHold: itemLongPress(delegate, model)
602+ }
603+ }
604 Scrollbar {
605 flickableItem: root
606 align: Qt.AlignTrailing
607
608=== modified file 'src/app/qml/ui/FolderListPage.qml'
609--- src/app/qml/ui/FolderListPage.qml 2016-04-06 14:51:26 +0000
610+++ src/app/qml/ui/FolderListPage.qml 2016-06-05 06:36:49 +0000
611@@ -143,7 +143,7 @@
612 }
613 ]
614 flickable: !sidebar.expanded ?
615- (folderListView.visible ? folderListView : folderIconView.flickable) : null
616+ (folderListView.visible ? folderListView.flickable : folderIconView.flickable) : null
617
618 property variant fileView: folderListPage
619 property bool showHiddenFiles: false

Subscribers

People subscribed via source and target branches