Ubuntu File Manager App

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

  1. fix-1554621
  2. Merge into trunk
Proposed by Alan Pope 🍺🐧🐱 🦄
Status: Merged
Approved by: Alan Pope 🍺🐧🐱 🦄
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
Stefano Verzegnassi (community) Approve
Ubuntu File Manager Developers Pending
Review via email: mp+291133@code.launchpad.net

Commit message

Remove the blue occurrences.

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

PASSED: Continuous integration, rev:535
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/79/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/855/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/79/rebuild

review: Approve (continuous-integration)
Revision history for this message
Stefano Verzegnassi (verzegnassi-stefano) wrote :

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
Revision history for this message
Stefano Verzegnassi (verzegnassi-stefano) wrote :

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

Revision history for this message
Stefano Verzegnassi (verzegnassi-stefano) wrote :

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
lp:~popey/ubuntu-filemanager-app/fix-1554621 updated
536. By Alan Pope 🍺🐧🐱 🦄

update framework, fix porcelain typo

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

PASSED: Continuous integration, rev:536
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/80/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/859/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/80/rebuild

review: Approve (continuous-integration)
Revision history for this message
Stefano Verzegnassi (verzegnassi-stefano) wrote :

LGTM, thanks!

review: Approve
lp:~popey/ubuntu-filemanager-app/fix-1554621 updated
537. By Alan Pope 🍺🐧🐱 🦄

Correct colours on authentication dialog buttons

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

PASSED: Continuous integration, rev:537
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/81/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/861/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/81/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'filemanager.apparmor'
--- filemanager.apparmor 2014-09-08 10:45:41 +0000
+++ filemanager.apparmor 2016-04-08 18:08:53 +0000
@@ -1,5 +1,5 @@
1{1{
2 "policy_version": 1.2,2 "policy_version": 1.3,
3 "template": "unconfined",3 "template": "unconfined",
4 "policy_groups": []4 "policy_groups": []
5}
6\ No newline at end of file5\ No newline at end of file
6}
77
=== modified file 'manifest.json.in'
--- manifest.json.in 2014-12-26 09:48:56 +0000
+++ manifest.json.in 2016-04-08 18:08:53 +0000
@@ -1,6 +1,6 @@
1{1{
2 "description": "File Manager application",2 "description": "File Manager application",
3 "framework": "ubuntu-sdk-14.10",3 "framework": "ubuntu-sdk-15.04.4",
4 "_comment": "Do not change this. Architecture is automatically replaced by cmake",4 "_comment": "Do not change this. Architecture is automatically replaced by cmake",
5 "architecture": "@CLICK_ARCH@",5 "architecture": "@CLICK_ARCH@",
6 "hooks": {6 "hooks": {
77
=== modified file 'src/app/qml/components/FolderIconDelegate.qml'
--- src/app/qml/components/FolderIconDelegate.qml 2016-01-18 10:32:34 +0000
+++ src/app/qml/components/FolderIconDelegate.qml 2016-04-08 18:08:53 +0000
@@ -49,7 +49,7 @@
49 property string fileName: model.fileName49 property string fileName: model.fileName
50 property string filePath: fileView.folder + '/' + fileName50 property string filePath: fileView.folder + '/' + fileName
5151
52 property string text: fileName 52 property string text: fileName
53 property string subText: itemDateAndSize(model)53 property string subText: itemDateAndSize(model)
5454
55 property var icon: fileIcon(filePath, model)55 property var icon: fileIcon(filePath, model)
@@ -99,7 +99,7 @@
99 }99 }
100 color: "white"100 color: "white"
101 radius: height/2101 radius: height/2
102 border.color: UbuntuColors.warmGrey102 border.color: UbuntuColors.slate
103 antialiasing: true103 antialiasing: true
104 opacity: expand ? 1 : 0104 opacity: expand ? 1 : 0
105105
@@ -126,10 +126,7 @@
126 elide: Text.ElideMiddle126 elide: Text.ElideMiddle
127127
128 text: delegate.text128 text: delegate.text
129 color: expand ? UbuntuColors.coolGrey : Theme.palette.selected.backgroundText129 color: UbuntuColors.graphite
130 Behavior on color {
131 ColorAnimation { duration: 200 }
132 }
133 }130 }
134131
135 MouseArea {132 MouseArea {
136133
=== modified file 'src/app/qml/components/PathHistoryRow.qml'
--- src/app/qml/components/PathHistoryRow.qml 2016-02-08 11:15:18 +0000
+++ src/app/qml/components/PathHistoryRow.qml 2016-04-08 18:08:53 +0000
@@ -84,7 +84,7 @@
84 text: i18n.tr("Device")84 text: i18n.tr("Device")
85 fontSize: flickable.textSize85 fontSize: flickable.textSize
86 anchors.verticalCenter: parent.verticalCenter86 anchors.verticalCenter: parent.verticalCenter
87 color: UbuntuColors.darkGrey87 color: UbuntuColors.inkstone
88 clip: true88 clip: true
89 /* Maximum Width = Flickable Width */89 /* Maximum Width = Flickable Width */
90 width: if (contentWidth > flickable.width) { flickable.width }90 width: if (contentWidth > flickable.width) { flickable.width }
@@ -139,7 +139,7 @@
139 text: pathText(folder,index)139 text: pathText(folder,index)
140 fontSize: flickable.textSize140 fontSize: flickable.textSize
141 anchors.verticalCenter: parent.verticalCenter141 anchors.verticalCenter: parent.verticalCenter
142 color: repeater.model === index + 1 ? UbuntuColors.darkGrey : UbuntuColors.darkGrey142 color: repeater.model === index + 1 ? UbuntuColors.inkstone : UbuntuColors.inkstone
143 clip: true143 clip: true
144144
145 /* Maximum Width = Flickable Width */145 /* Maximum Width = Flickable Width */
@@ -153,7 +153,7 @@
153 width: flickable.iconWidth153 width: flickable.iconWidth
154 anchors.verticalCenter: parent.verticalCenter154 anchors.verticalCenter: parent.verticalCenter
155 anchors.right: label.left155 anchors.right: label.left
156 color: UbuntuColors.darkGrey156 color: UbuntuColors.inkstone
157 // clip: true157 // clip: true
158 }158 }
159159
@@ -196,7 +196,7 @@
196 : pathText(repeater.memoryPath,index)196 : pathText(repeater.memoryPath,index)
197 fontSize: flickable.textSize197 fontSize: flickable.textSize
198 anchors.verticalCenter: parent.verticalCenter198 anchors.verticalCenter: parent.verticalCenter
199 color: UbuntuColors.darkGrey199 color: UbuntuColors.inkstone
200 clip: true200 clip: true
201201
202 /* Maximum Width = Flickable Width */202 /* Maximum Width = Flickable Width */
@@ -210,7 +210,7 @@
210 width: flickable.iconWidth210 width: flickable.iconWidth
211 anchors.verticalCenter: parent.verticalCenter211 anchors.verticalCenter: parent.verticalCenter
212 anchors.right: memoryLabel.left212 anchors.right: memoryLabel.left
213 color: UbuntuColors.darkGrey213 color: UbuntuColors.inkstone
214 // clip: true214 // clip: true
215 }215 }
216216
217217
=== modified file 'src/app/qml/components/PlacesSidebar.qml'
--- src/app/qml/components/PlacesSidebar.qml 2016-02-02 00:35:27 +0000
+++ src/app/qml/components/PlacesSidebar.qml 2016-04-08 18:08:53 +0000
@@ -25,7 +25,7 @@
25 id: root25 id: root
2626
27 //color: Qt.rgba(0.5,0.5,0.5,0.3)27 //color: Qt.rgba(0.5,0.5,0.5,0.3)
28 color: "#F5F5F5"28 color: UbuntuColors.porcelain
29 width: expanded ? (collapsed ? units.gu(8) : units.gu(22)) : 029 width: expanded ? (collapsed ? units.gu(8) : units.gu(22)) : 0
3030
31 property bool collapsed: collapsedSidebar31 property bool collapsed: collapsedSidebar
@@ -63,6 +63,7 @@
63 delegate: Standard {63 delegate: Standard {
64 objectName: "place" + folderDisplayName(path).replace(/ /g,'')64 objectName: "place" + folderDisplayName(path).replace(/ /g,'')
65 text: folderDisplayName(path)65 text: folderDisplayName(path)
66 __foregroundColor: "black"
6667
67 Image {68 Image {
68 anchors {69 anchors {
6970
=== modified file 'src/app/qml/ui/AuthenticationDialog.qml'
--- src/app/qml/ui/AuthenticationDialog.qml 2016-01-18 10:32:34 +0000
+++ src/app/qml/ui/AuthenticationDialog.qml 2016-04-08 18:08:53 +0000
@@ -47,6 +47,7 @@
47 objectName: "okButton"47 objectName: "okButton"
4848
49 text: i18n.tr("OK")49 text: i18n.tr("OK")
50 color: UbuntuColors.green
5051
51 onClicked: {52 onClicked: {
52 passwordEntered(passwordField.text)53 passwordEntered(passwordField.text)
@@ -58,18 +59,7 @@
58 id: cancelButton59 id: cancelButton
59 objectName: "cancelButton"60 objectName: "cancelButton"
60 text: i18n.tr("Cancel")61 text: i18n.tr("Cancel")
6162 color: UbuntuColors.red
62 gradient: Gradient {
63 GradientStop {
64 position: 0
65 color: "gray"
66 }
67
68 GradientStop {
69 position: 1
70 color: "lightgray"
71 }
72 }
7363
74 onClicked: {64 onClicked: {
75 PopupUtils.close(root)65 PopupUtils.close(root)
7666
=== modified file 'src/app/qml/ui/FileDetailsPopover.qml'
--- src/app/qml/ui/FileDetailsPopover.qml 2016-01-18 10:32:34 +0000
+++ src/app/qml/ui/FileDetailsPopover.qml 2016-04-08 18:08:53 +0000
@@ -78,7 +78,7 @@
78 anchors.verticalCenter: parent.verticalCenter78 anchors.verticalCenter: parent.verticalCenter
7979
80 text: folderDisplayName(root.path)80 text: folderDisplayName(root.path)
81 color: Theme.palette.normal.overlayText81 color: UbuntuColors.ash
82 font.bold: true82 font.bold: true
83 }83 }
84 }84 }
@@ -89,50 +89,50 @@
8989
90 Label {90 Label {
91 text: i18n.tr("Path:")91 text: i18n.tr("Path:")
92 color: Theme.palette.normal.overlayText92 color: UbuntuColors.ash
93 }93 }
9494
95 Label {95 Label {
96 objectName: "pathLabel"96 objectName: "pathLabel"
97 text: root.path97 text: root.path
98 color: Theme.palette.normal.overlayText98 color: UbuntuColors.ash
99 }99 }
100100
101 Label {101 Label {
102 text: model.isDir ? i18n.tr("Contents:")102 text: model.isDir ? i18n.tr("Contents:")
103 : i18n.tr("Size:")103 : i18n.tr("Size:")
104 color: Theme.palette.normal.overlayText104 color: UbuntuColors.ash
105 }105 }
106 Label {106 Label {
107 text: model.fileSize107 text: model.fileSize
108 color: Theme.palette.normal.overlayText108 color: UbuntuColors.ash
109 }109 }
110110
111 Label {111 Label {
112 text: i18n.tr("Accessed:")112 text: i18n.tr("Accessed:")
113 color: Theme.palette.normal.overlayText113 color: UbuntuColors.ash
114 }114 }
115 Label {115 Label {
116 text: dateTimeFormat(model.accessedDate)116 text: dateTimeFormat(model.accessedDate)
117 color: Theme.palette.normal.overlayText117 color: UbuntuColors.ash
118 }118 }
119119
120 Label {120 Label {
121 text: i18n.tr("Modified:")121 text: i18n.tr("Modified:")
122 color: Theme.palette.normal.overlayText122 color: UbuntuColors.ash
123 }123 }
124 Label {124 Label {
125 text: dateTimeFormat(model.modifiedDate)125 text: dateTimeFormat(model.modifiedDate)
126 color: Theme.palette.normal.overlayText126 color: UbuntuColors.ash
127 }127 }
128128
129 Label {129 Label {
130 text: i18n.tr("Permissions:")130 text: i18n.tr("Permissions:")
131 color: Theme.palette.normal.overlayText131 color: UbuntuColors.ash
132 }132 }
133 Label {133 Label {
134 text: permissionsToString(model)134 text: permissionsToString(model)
135 color: Theme.palette.normal.overlayText135 color: UbuntuColors.ash
136 // This is a a work-around for bug #1354508.136 // This is a a work-around for bug #1354508.
137 // This basically forces all permissions to be on different lines, which looks137 // This basically forces all permissions to be on different lines, which looks
138 // good enough. But a similar issue as described in the bug can happen138 // good enough. But a similar issue as described in the bug can happen
139139
=== modified file 'src/app/qml/ui/FolderListPage.qml'
--- src/app/qml/ui/FolderListPage.qml 2016-01-18 10:32:34 +0000
+++ src/app/qml/ui/FolderListPage.qml 2016-04-08 18:08:53 +0000
@@ -656,7 +656,7 @@
656656
657 Label {657 Label {
658 text: qsTr(i18n.tr("Extracting archive '%1'")).arg(fileName)658 text: qsTr(i18n.tr("Extracting archive '%1'")).arg(fileName)
659 color: UbuntuColors.darkGrey659 color: UbuntuColors.slate
660 anchors.verticalCenter: parent.verticalCenter660 anchors.verticalCenter: parent.verticalCenter
661 width: row.width - loadingSpinner.width - row.spacing661 width: row.width - loadingSpinner.width - row.spacing
662 maximumLineCount: 2662 maximumLineCount: 2
@@ -735,7 +735,7 @@
735 Button {735 Button {
736 id: cancelButton736 id: cancelButton
737 text: i18n.tr("Cancel")737 text: i18n.tr("Cancel")
738 color: UbuntuColors.lightGrey738 color: UbuntuColors.graphite
739 onClicked: {739 onClicked: {
740 PopupUtils.close(dialog)740 PopupUtils.close(dialog)
741 }741 }
@@ -781,7 +781,7 @@
781 }781 }
782782
783 function itemDateAndSize(model) {783 function itemDateAndSize(model) {
784 var strDate = Qt.formatDateTime(model.modifiedDate, Qt.DefaultLocaleShortDate); 784 var strDate = Qt.formatDateTime(model.modifiedDate, Qt.DefaultLocaleShortDate);
785 //local file systems always have date and size for both files and directories785 //local file systems always have date and size for both files and directories
786 //remote file systems may have not size for directories, it comes as "Unknown"786 //remote file systems may have not size for directories, it comes as "Unknown"
787 if (strDate) {787 if (strDate) {
@@ -932,7 +932,7 @@
932 }932 }
933 }933 }
934934
935 function itemClicked(model) { 935 function itemClicked(model) {
936 if (model.isBrowsable) {936 if (model.isBrowsable) {
937 console.log("browsable path="+model.filePath+" isRemote="+model.isRemote+" needsAuthentication="+model.needsAuthentication)937 console.log("browsable path="+model.filePath+" isRemote="+model.isRemote+" needsAuthentication="+model.needsAuthentication)
938 if ((model.isReadable && model.isExecutable) ||938 if ((model.isReadable && model.isExecutable) ||
939939
=== modified file 'src/app/qml/ui/NetAuthenticationDialog.qml'
--- src/app/qml/ui/NetAuthenticationDialog.qml 2016-01-18 10:32:34 +0000
+++ src/app/qml/ui/NetAuthenticationDialog.qml 2016-04-08 18:08:53 +0000
@@ -27,7 +27,7 @@
2727
28 property alias currentPath: authCurrentPath.text28 property alias currentPath: authCurrentPath.text
29 property alias currentUserName: authUserName.text29 property alias currentUserName: authUserName.text
30 property alias currentPassword: authPassword.text 30 property alias currentPassword: authPassword.text
3131
32 signal ok()32 signal ok()
33 signal savePasswordChanged(bool check)33 signal savePasswordChanged(bool check)
@@ -77,7 +77,7 @@
77 Standard {77 Standard {
78 Label {78 Label {
79 text: i18n.tr("Save password")79 text: i18n.tr("Save password")
80 color: Theme.palette.normal.overlayText80 color: UbuntuColors.ash
81 anchors.left: parent.left81 anchors.left: parent.left
82 anchors.verticalCenter: parent.verticalCenter82 anchors.verticalCenter: parent.verticalCenter
83 }83 }
8484
=== modified file 'src/app/qml/ui/PlacesPopover.qml'
--- src/app/qml/ui/PlacesPopover.qml 2016-01-18 10:32:34 +0000
+++ src/app/qml/ui/PlacesPopover.qml 2016-04-08 18:08:53 +0000
@@ -100,7 +100,7 @@
100 anchors.leftMargin: units.gu(8)100 anchors.leftMargin: units.gu(8)
101 anchors.verticalCenter: parent.verticalCenter101 anchors.verticalCenter: parent.verticalCenter
102 text: i18n.tr("Places")102 text: i18n.tr("Places")
103 color: Theme.palette.normal.overlayText103 color: UbuntuColors.ash
104 }104 }
105105
106 onClicked: {106 onClicked: {
@@ -129,7 +129,7 @@
129 anchors.leftMargin: units.gu(8)129 anchors.leftMargin: units.gu(8)
130 anchors.verticalCenter: parent.verticalCenter130 anchors.verticalCenter: parent.verticalCenter
131 text: folderDisplayName(path)131 text: folderDisplayName(path)
132 color: selected ? UbuntuColors.orange : Theme.palette.normal.overlayText132 color: selected ? UbuntuColors.orange : UbuntuColors.ash
133 }133 }
134134
135 iconSource: model.icon || fileIcon(model.path, true)135 iconSource: model.icon || fileIcon(model.path, true)
136136
=== modified file 'src/app/qml/ui/ViewPopover.qml'
--- src/app/qml/ui/ViewPopover.qml 2016-01-18 10:32:34 +0000
+++ src/app/qml/ui/ViewPopover.qml 2016-04-08 18:08:53 +0000
@@ -38,7 +38,7 @@
38 Label {38 Label {
39 text: i18n.tr("Show Hidden Files")39 text: i18n.tr("Show Hidden Files")
40 fontSize: "medium"40 fontSize: "medium"
41 color: Theme.palette.normal.overlayText41 color: UbuntuColors.ash
42 anchors.left: parent.left42 anchors.left: parent.left
43 anchors.leftMargin: units.gu(2)43 anchors.leftMargin: units.gu(2)
44 anchors.verticalCenter: parent.verticalCenter44 anchors.verticalCenter: parent.verticalCenter
@@ -58,7 +58,7 @@
58 Label {58 Label {
59 text: i18n.tr("View As")59 text: i18n.tr("View As")
60 fontSize: "medium"60 fontSize: "medium"
61 color: Theme.palette.normal.overlayText61 color: UbuntuColors.ash
62 anchors.left: parent.left62 anchors.left: parent.left
63 anchors.leftMargin: units.gu(2)63 anchors.leftMargin: units.gu(2)
64 anchors.top: parent.top64 anchors.top: parent.top
@@ -80,7 +80,7 @@
80 Label {80 Label {
81 text: i18n.tr("Sort By")81 text: i18n.tr("Sort By")
82 fontSize: "medium"82 fontSize: "medium"
83 color: Theme.palette.normal.overlayText83 color: UbuntuColors.ash
84 anchors.left: parent.left84 anchors.left: parent.left
85 anchors.leftMargin: units.gu(2)85 anchors.leftMargin: units.gu(2)
86 anchors.top: parent.top86 anchors.top: parent.top
@@ -102,7 +102,7 @@
102 Label {102 Label {
103 text: i18n.tr("Sort Order")103 text: i18n.tr("Sort Order")
104 fontSize: "medium"104 fontSize: "medium"
105 color: Theme.palette.normal.overlayText105 color: UbuntuColors.ash
106 anchors.left: parent.left106 anchors.left: parent.left
107 anchors.leftMargin: units.gu(2)107 anchors.leftMargin: units.gu(2)
108 anchors.top: parent.top108 anchors.top: parent.top
@@ -126,7 +126,7 @@
126 Label {126 Label {
127 text: i18n.tr("Filter")127 text: i18n.tr("Filter")
128 fontSize: "medium"128 fontSize: "medium"
129 color: Theme.palette.normal.overlayText129 color: UbuntuColors.ash
130 anchors.left: parent.left130 anchors.left: parent.left
131 anchors.leftMargin: units.gu(2)131 anchors.leftMargin: units.gu(2)
132 anchors.verticalCenter: parent.verticalCenter132 anchors.verticalCenter: parent.verticalCenter

Subscribers

People subscribed via source and target branches