Merge lp:~popey/ubuntu-filemanager-app/fix-1554621 into lp:ubuntu-filemanager-app

Status: Merged
Approved by: Alan Pope 🍺🐧🐱 πŸ¦„ on 2016-04-11
Approved revision: 537
Merged at revision: 535
Proposed branch: lp:~popey/ubuntu-filemanager-app/fix-1554621
Merge into: lp:ubuntu-filemanager-app
Diff against target: 367 lines (+39/-51)
11 files modified
filemanager.apparmor (+2/-2)
manifest.json.in (+1/-1)
src/app/qml/components/FolderIconDelegate.qml (+3/-6)
src/app/qml/components/PathHistoryRow.qml (+5/-5)
src/app/qml/components/PlacesSidebar.qml (+2/-1)
src/app/qml/ui/AuthenticationDialog.qml (+2/-12)
src/app/qml/ui/FileDetailsPopover.qml (+11/-11)
src/app/qml/ui/FolderListPage.qml (+4/-4)
src/app/qml/ui/NetAuthenticationDialog.qml (+2/-2)
src/app/qml/ui/PlacesPopover.qml (+2/-2)
src/app/qml/ui/ViewPopover.qml (+5/-5)
To merge this branch: bzr merge lp:~popey/ubuntu-filemanager-app/fix-1554621
Reviewer Review Type Date Requested Status
Jenkins Bot continuous-integration Approve on 2016-04-08
Stefano Verzegnassi (community) Approve on 2016-04-07
Ubuntu File Manager Developers 2016-04-06 Pending
Review via email: mp+291133@code.launchpad.net

Commit message

Remove the blue occurrences.

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

I still have to have a better look at the app color palette, anyway there's surely something which needs to be fixed:

$ grep -r "ubuntu-sdk" .
./manifest.json.in: "framework": "ubuntu-sdk-14.10",

The app is still using an old framework version.

Please update it to "ubuntu-sdk-15.04.4", since that's the only target which provides the new colors (e.g. slate, inkstone, graphite, etc.)

review: Needs Fixing

Also, update the AppArmor policy version to "1.3", otherwise the app cannot be launched in a confined environment.

As to the colors, everything is okay except for a typo (see the diff comment).

Sidebar color is not set and it's shown as white, when "#f7f7f7" (porcelain) should be used instead.

review: Needs Fixing
536. By Alan Pope 🍺🐧🐱 πŸ¦„ on 2016-04-07

update framework, fix porcelain typo

review: Approve (continuous-integration)

LGTM, thanks!

review: Approve
537. By Alan Pope 🍺🐧🐱 πŸ¦„ on 2016-04-08

Correct colours on authentication dialog buttons

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'filemanager.apparmor'
2--- filemanager.apparmor 2014-09-08 10:45:41 +0000
3+++ filemanager.apparmor 2016-04-08 18:08:53 +0000
4@@ -1,5 +1,5 @@
5 {
6- "policy_version": 1.2,
7+ "policy_version": 1.3,
8 "template": "unconfined",
9 "policy_groups": []
10-}
11\ No newline at end of file
12+}
13
14=== modified file 'manifest.json.in'
15--- manifest.json.in 2014-12-26 09:48:56 +0000
16+++ manifest.json.in 2016-04-08 18:08:53 +0000
17@@ -1,6 +1,6 @@
18 {
19 "description": "File Manager application",
20- "framework": "ubuntu-sdk-14.10",
21+ "framework": "ubuntu-sdk-15.04.4",
22 "_comment": "Do not change this. Architecture is automatically replaced by cmake",
23 "architecture": "@CLICK_ARCH@",
24 "hooks": {
25
26=== modified file 'src/app/qml/components/FolderIconDelegate.qml'
27--- src/app/qml/components/FolderIconDelegate.qml 2016-01-18 10:32:34 +0000
28+++ src/app/qml/components/FolderIconDelegate.qml 2016-04-08 18:08:53 +0000
29@@ -49,7 +49,7 @@
30 property string fileName: model.fileName
31 property string filePath: fileView.folder + '/' + fileName
32
33- property string text: fileName
34+ property string text: fileName
35 property string subText: itemDateAndSize(model)
36
37 property var icon: fileIcon(filePath, model)
38@@ -99,7 +99,7 @@
39 }
40 color: "white"
41 radius: height/2
42- border.color: UbuntuColors.warmGrey
43+ border.color: UbuntuColors.slate
44 antialiasing: true
45 opacity: expand ? 1 : 0
46
47@@ -126,10 +126,7 @@
48 elide: Text.ElideMiddle
49
50 text: delegate.text
51- color: expand ? UbuntuColors.coolGrey : Theme.palette.selected.backgroundText
52- Behavior on color {
53- ColorAnimation { duration: 200 }
54- }
55+ color: UbuntuColors.graphite
56 }
57
58 MouseArea {
59
60=== modified file 'src/app/qml/components/PathHistoryRow.qml'
61--- src/app/qml/components/PathHistoryRow.qml 2016-02-08 11:15:18 +0000
62+++ src/app/qml/components/PathHistoryRow.qml 2016-04-08 18:08:53 +0000
63@@ -84,7 +84,7 @@
64 text: i18n.tr("Device")
65 fontSize: flickable.textSize
66 anchors.verticalCenter: parent.verticalCenter
67- color: UbuntuColors.darkGrey
68+ color: UbuntuColors.inkstone
69 clip: true
70 /* Maximum Width = Flickable Width */
71 width: if (contentWidth > flickable.width) { flickable.width }
72@@ -139,7 +139,7 @@
73 text: pathText(folder,index)
74 fontSize: flickable.textSize
75 anchors.verticalCenter: parent.verticalCenter
76- color: repeater.model === index + 1 ? UbuntuColors.darkGrey : UbuntuColors.darkGrey
77+ color: repeater.model === index + 1 ? UbuntuColors.inkstone : UbuntuColors.inkstone
78 clip: true
79
80 /* Maximum Width = Flickable Width */
81@@ -153,7 +153,7 @@
82 width: flickable.iconWidth
83 anchors.verticalCenter: parent.verticalCenter
84 anchors.right: label.left
85- color: UbuntuColors.darkGrey
86+ color: UbuntuColors.inkstone
87 // clip: true
88 }
89
90@@ -196,7 +196,7 @@
91 : pathText(repeater.memoryPath,index)
92 fontSize: flickable.textSize
93 anchors.verticalCenter: parent.verticalCenter
94- color: UbuntuColors.darkGrey
95+ color: UbuntuColors.inkstone
96 clip: true
97
98 /* Maximum Width = Flickable Width */
99@@ -210,7 +210,7 @@
100 width: flickable.iconWidth
101 anchors.verticalCenter: parent.verticalCenter
102 anchors.right: memoryLabel.left
103- color: UbuntuColors.darkGrey
104+ color: UbuntuColors.inkstone
105 // clip: true
106 }
107
108
109=== modified file 'src/app/qml/components/PlacesSidebar.qml'
110--- src/app/qml/components/PlacesSidebar.qml 2016-02-02 00:35:27 +0000
111+++ src/app/qml/components/PlacesSidebar.qml 2016-04-08 18:08:53 +0000
112@@ -25,7 +25,7 @@
113 id: root
114
115 //color: Qt.rgba(0.5,0.5,0.5,0.3)
116- color: "#F5F5F5"
117+ color: UbuntuColors.porcelain
118 width: expanded ? (collapsed ? units.gu(8) : units.gu(22)) : 0
119
120 property bool collapsed: collapsedSidebar
121@@ -63,6 +63,7 @@
122 delegate: Standard {
123 objectName: "place" + folderDisplayName(path).replace(/ /g,'')
124 text: folderDisplayName(path)
125+ __foregroundColor: "black"
126
127 Image {
128 anchors {
129
130=== modified file 'src/app/qml/ui/AuthenticationDialog.qml'
131--- src/app/qml/ui/AuthenticationDialog.qml 2016-01-18 10:32:34 +0000
132+++ src/app/qml/ui/AuthenticationDialog.qml 2016-04-08 18:08:53 +0000
133@@ -47,6 +47,7 @@
134 objectName: "okButton"
135
136 text: i18n.tr("OK")
137+ color: UbuntuColors.green
138
139 onClicked: {
140 passwordEntered(passwordField.text)
141@@ -58,18 +59,7 @@
142 id: cancelButton
143 objectName: "cancelButton"
144 text: i18n.tr("Cancel")
145-
146- gradient: Gradient {
147- GradientStop {
148- position: 0
149- color: "gray"
150- }
151-
152- GradientStop {
153- position: 1
154- color: "lightgray"
155- }
156- }
157+ color: UbuntuColors.red
158
159 onClicked: {
160 PopupUtils.close(root)
161
162=== modified file 'src/app/qml/ui/FileDetailsPopover.qml'
163--- src/app/qml/ui/FileDetailsPopover.qml 2016-01-18 10:32:34 +0000
164+++ src/app/qml/ui/FileDetailsPopover.qml 2016-04-08 18:08:53 +0000
165@@ -78,7 +78,7 @@
166 anchors.verticalCenter: parent.verticalCenter
167
168 text: folderDisplayName(root.path)
169- color: Theme.palette.normal.overlayText
170+ color: UbuntuColors.ash
171 font.bold: true
172 }
173 }
174@@ -89,50 +89,50 @@
175
176 Label {
177 text: i18n.tr("Path:")
178- color: Theme.palette.normal.overlayText
179+ color: UbuntuColors.ash
180 }
181
182 Label {
183 objectName: "pathLabel"
184 text: root.path
185- color: Theme.palette.normal.overlayText
186+ color: UbuntuColors.ash
187 }
188
189 Label {
190 text: model.isDir ? i18n.tr("Contents:")
191 : i18n.tr("Size:")
192- color: Theme.palette.normal.overlayText
193+ color: UbuntuColors.ash
194 }
195 Label {
196 text: model.fileSize
197- color: Theme.palette.normal.overlayText
198+ color: UbuntuColors.ash
199 }
200
201 Label {
202 text: i18n.tr("Accessed:")
203- color: Theme.palette.normal.overlayText
204+ color: UbuntuColors.ash
205 }
206 Label {
207 text: dateTimeFormat(model.accessedDate)
208- color: Theme.palette.normal.overlayText
209+ color: UbuntuColors.ash
210 }
211
212 Label {
213 text: i18n.tr("Modified:")
214- color: Theme.palette.normal.overlayText
215+ color: UbuntuColors.ash
216 }
217 Label {
218 text: dateTimeFormat(model.modifiedDate)
219- color: Theme.palette.normal.overlayText
220+ color: UbuntuColors.ash
221 }
222
223 Label {
224 text: i18n.tr("Permissions:")
225- color: Theme.palette.normal.overlayText
226+ color: UbuntuColors.ash
227 }
228 Label {
229 text: permissionsToString(model)
230- color: Theme.palette.normal.overlayText
231+ color: UbuntuColors.ash
232 // This is a a work-around for bug #1354508.
233 // This basically forces all permissions to be on different lines, which looks
234 // good enough. But a similar issue as described in the bug can happen
235
236=== modified file 'src/app/qml/ui/FolderListPage.qml'
237--- src/app/qml/ui/FolderListPage.qml 2016-01-18 10:32:34 +0000
238+++ src/app/qml/ui/FolderListPage.qml 2016-04-08 18:08:53 +0000
239@@ -656,7 +656,7 @@
240
241 Label {
242 text: qsTr(i18n.tr("Extracting archive '%1'")).arg(fileName)
243- color: UbuntuColors.darkGrey
244+ color: UbuntuColors.slate
245 anchors.verticalCenter: parent.verticalCenter
246 width: row.width - loadingSpinner.width - row.spacing
247 maximumLineCount: 2
248@@ -735,7 +735,7 @@
249 Button {
250 id: cancelButton
251 text: i18n.tr("Cancel")
252- color: UbuntuColors.lightGrey
253+ color: UbuntuColors.graphite
254 onClicked: {
255 PopupUtils.close(dialog)
256 }
257@@ -781,7 +781,7 @@
258 }
259
260 function itemDateAndSize(model) {
261- var strDate = Qt.formatDateTime(model.modifiedDate, Qt.DefaultLocaleShortDate);
262+ var strDate = Qt.formatDateTime(model.modifiedDate, Qt.DefaultLocaleShortDate);
263 //local file systems always have date and size for both files and directories
264 //remote file systems may have not size for directories, it comes as "Unknown"
265 if (strDate) {
266@@ -932,7 +932,7 @@
267 }
268 }
269
270- function itemClicked(model) {
271+ function itemClicked(model) {
272 if (model.isBrowsable) {
273 console.log("browsable path="+model.filePath+" isRemote="+model.isRemote+" needsAuthentication="+model.needsAuthentication)
274 if ((model.isReadable && model.isExecutable) ||
275
276=== modified file 'src/app/qml/ui/NetAuthenticationDialog.qml'
277--- src/app/qml/ui/NetAuthenticationDialog.qml 2016-01-18 10:32:34 +0000
278+++ src/app/qml/ui/NetAuthenticationDialog.qml 2016-04-08 18:08:53 +0000
279@@ -27,7 +27,7 @@
280
281 property alias currentPath: authCurrentPath.text
282 property alias currentUserName: authUserName.text
283- property alias currentPassword: authPassword.text
284+ property alias currentPassword: authPassword.text
285
286 signal ok()
287 signal savePasswordChanged(bool check)
288@@ -77,7 +77,7 @@
289 Standard {
290 Label {
291 text: i18n.tr("Save password")
292- color: Theme.palette.normal.overlayText
293+ color: UbuntuColors.ash
294 anchors.left: parent.left
295 anchors.verticalCenter: parent.verticalCenter
296 }
297
298=== modified file 'src/app/qml/ui/PlacesPopover.qml'
299--- src/app/qml/ui/PlacesPopover.qml 2016-01-18 10:32:34 +0000
300+++ src/app/qml/ui/PlacesPopover.qml 2016-04-08 18:08:53 +0000
301@@ -100,7 +100,7 @@
302 anchors.leftMargin: units.gu(8)
303 anchors.verticalCenter: parent.verticalCenter
304 text: i18n.tr("Places")
305- color: Theme.palette.normal.overlayText
306+ color: UbuntuColors.ash
307 }
308
309 onClicked: {
310@@ -129,7 +129,7 @@
311 anchors.leftMargin: units.gu(8)
312 anchors.verticalCenter: parent.verticalCenter
313 text: folderDisplayName(path)
314- color: selected ? UbuntuColors.orange : Theme.palette.normal.overlayText
315+ color: selected ? UbuntuColors.orange : UbuntuColors.ash
316 }
317
318 iconSource: model.icon || fileIcon(model.path, true)
319
320=== modified file 'src/app/qml/ui/ViewPopover.qml'
321--- src/app/qml/ui/ViewPopover.qml 2016-01-18 10:32:34 +0000
322+++ src/app/qml/ui/ViewPopover.qml 2016-04-08 18:08:53 +0000
323@@ -38,7 +38,7 @@
324 Label {
325 text: i18n.tr("Show Hidden Files")
326 fontSize: "medium"
327- color: Theme.palette.normal.overlayText
328+ color: UbuntuColors.ash
329 anchors.left: parent.left
330 anchors.leftMargin: units.gu(2)
331 anchors.verticalCenter: parent.verticalCenter
332@@ -58,7 +58,7 @@
333 Label {
334 text: i18n.tr("View As")
335 fontSize: "medium"
336- color: Theme.palette.normal.overlayText
337+ color: UbuntuColors.ash
338 anchors.left: parent.left
339 anchors.leftMargin: units.gu(2)
340 anchors.top: parent.top
341@@ -80,7 +80,7 @@
342 Label {
343 text: i18n.tr("Sort By")
344 fontSize: "medium"
345- color: Theme.palette.normal.overlayText
346+ color: UbuntuColors.ash
347 anchors.left: parent.left
348 anchors.leftMargin: units.gu(2)
349 anchors.top: parent.top
350@@ -102,7 +102,7 @@
351 Label {
352 text: i18n.tr("Sort Order")
353 fontSize: "medium"
354- color: Theme.palette.normal.overlayText
355+ color: UbuntuColors.ash
356 anchors.left: parent.left
357 anchors.leftMargin: units.gu(2)
358 anchors.top: parent.top
359@@ -126,7 +126,7 @@
360 Label {
361 text: i18n.tr("Filter")
362 fontSize: "medium"
363- color: Theme.palette.normal.overlayText
364+ color: UbuntuColors.ash
365 anchors.left: parent.left
366 anchors.leftMargin: units.gu(2)
367 anchors.verticalCenter: parent.verticalCenter

Subscribers

People subscribed via source and target branches