Ubuntu File Manager App

Merge lp:~popey/ubuntu-filemanager-app/update-colours into lp:ubuntu-filemanager-app

  1. update-colours
  2. Merge into trunk
Proposed by Alan Pope 🍺🐧🐱 🦄
Status: Rejected
Rejected by: Alan Pope 🍺🐧🐱 🦄
Proposed branch: lp:~popey/ubuntu-filemanager-app/update-colours
Merge into: lp:ubuntu-filemanager-app
Prerequisite: lp:~fboucault/ubuntu-filemanager-app/migrate_toolkit_13
Diff against target: 612 lines (+108/-148)
7 files modified
com.ubuntu.filemanager.desktop.in.in (+2/-0)
po/com.ubuntu.filemanager.pot (+93/-136)
src/app/qml/components/PathHistoryRow.qml (+5/-5)
src/app/qml/components/PlacesSidebar.qml (+1/-0)
src/app/qml/filemanager.qml (+3/-3)
src/app/qml/upstream/FakeHeader.qml (+2/-2)
src/app/qml/upstream/PageWithBottomEdge.qml (+2/-2)
To merge this branch: bzr merge lp:~popey/ubuntu-filemanager-app/update-colours
Reviewer Review Type Date Requested Status
Jenkins Bot continuous-integration Needs Fixing
Ubuntu File Manager Developers Pending
Review via email: mp+283206@code.launchpad.net

Commit message

Change colour theme to match other core apps

Description of the change

Change colour theme to match other core apps

To post a comment you must log in.
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:522
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/146/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/423/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/146/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:522
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/149/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/426/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/149/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Arto Jalkanen (ajalkane) wrote :

Looks fine to me, except that the commit includes changes to .pot file. If I remember correctly these should not be committed.

Then there is of course the issue of autopilot failing...

lp:~popey/ubuntu-filemanager-app/update-colours updated
523. By Alan Pope 🍺🐧🐱 🦄

remove erroneous pot file change

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:523
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/199/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/485/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/199/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

523. By Alan Pope 🍺🐧🐱 🦄

remove erroneous pot file change

522. By Alan Pope 🍺🐧🐱 🦄

Change colour theme to match other core apps

Preview Diff

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

Subscribers

People subscribed via source and target branches