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

Status: Merged
Approved by: Alan Pope 🍺🐧🐱 πŸ¦„ on 2016-02-01
Approved revision: 521
Merged at revision: 523
Proposed branch: lp:~popey/ubuntu-filemanager-app/update-colours2
Merge into: lp:ubuntu-filemanager-app
Prerequisite: lp:~fboucault/ubuntu-filemanager-app/migrate_toolkit_13
Diff against target: 196 lines (+29/-27)
6 files modified
com.ubuntu.filemanager.desktop.in.in (+2/-0)
src/app/qml/components/PathHistoryRow.qml (+8/-8)
src/app/qml/components/PlacesSidebar.qml (+5/-4)
src/app/qml/filemanager.qml (+6/-7)
src/app/qml/upstream/FakeHeader.qml (+4/-4)
src/app/qml/upstream/PageWithBottomEdge.qml (+4/-4)
To merge this branch: bzr merge lp:~popey/ubuntu-filemanager-app/update-colours2
Reviewer Review Type Date Requested Status
Jenkins Bot continuous-integration Approve on 2016-02-02
Arto Jalkanen 2016-01-28 Approve on 2016-01-29
Review via email: mp+284345@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 - this time without the pot file.

To post a comment you must log in.
Arto Jalkanen (ajalkane) :
review: Approve
review: Needs Fixing (continuous-integration)
review: Needs Fixing (continuous-integration)
review: Approve (continuous-integration)

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 21:01:03 +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 'src/app/qml/components/PathHistoryRow.qml'
12--- src/app/qml/components/PathHistoryRow.qml 2014-10-24 03:00:16 +0000
13+++ src/app/qml/components/PathHistoryRow.qml 2016-01-28 21:01:03 +0000
14@@ -15,9 +15,9 @@
15 *
16 * Authored by: Akiva
17 */
18-import QtQuick 2.3
19-import Ubuntu.Components 1.1
20-import Ubuntu.Components.ListItems 1.0
21+import QtQuick 2.4
22+import Ubuntu.Components 1.3
23+import Ubuntu.Components.ListItems 1.3
24
25 /* Full path of your current folder and recent history, that you can jump to by clicking its members */
26 Flickable {
27@@ -84,7 +84,7 @@
28 text: i18n.tr("Device")
29 fontSize: flickable.textSize
30 anchors.verticalCenter: parent.verticalCenter
31- color: folder === "/" ? "white" : UbuntuColors.warmGrey
32+ color: UbuntuColors.darkGrey
33 clip: true
34 /* Maximum Width = Flickable Width */
35 width: if (contentWidth > flickable.width) { flickable.width }
36@@ -139,7 +139,7 @@
37 text: pathText(folder,index)
38 fontSize: flickable.textSize
39 anchors.verticalCenter: parent.verticalCenter
40- color: repeater.model === index + 1 ? "white" : UbuntuColors.warmGrey
41+ color: repeater.model === index + 1 ? UbuntuColors.darkGrey : UbuntuColors.darkGrey
42 clip: true
43
44 /* Maximum Width = Flickable Width */
45@@ -153,7 +153,7 @@
46 width: flickable.iconWidth
47 anchors.verticalCenter: parent.verticalCenter
48 anchors.right: label.left
49- color: "white"
50+ color: UbuntuColors.darkGrey
51 // clip: true
52 }
53
54@@ -196,7 +196,7 @@
55 : pathText(repeater.memoryPath,index)
56 fontSize: flickable.textSize
57 anchors.verticalCenter: parent.verticalCenter
58- color: UbuntuColors.warmGrey
59+ color: UbuntuColors.darkGrey
60 clip: true
61
62 /* Maximum Width = Flickable Width */
63@@ -210,7 +210,7 @@
64 width: flickable.iconWidth
65 anchors.verticalCenter: parent.verticalCenter
66 anchors.right: memoryLabel.left
67- color: "white"
68+ color: UbuntuColors.darkGrey
69 // clip: true
70 }
71
72
73=== modified file 'src/app/qml/components/PlacesSidebar.qml'
74--- src/app/qml/components/PlacesSidebar.qml 2015-09-06 00:11:02 +0000
75+++ src/app/qml/components/PlacesSidebar.qml 2016-01-28 21:01:03 +0000
76@@ -15,16 +15,17 @@
77 *
78 * Authored by: Michael Spencer <sonrisesoftware@gmail.com>
79 */
80-import QtQuick 2.3
81+import QtQuick 2.4
82 import QtGraphicalEffects 1.0
83-import Ubuntu.Components 1.1
84-import Ubuntu.Components.ListItems 1.0
85-import Ubuntu.Components.Popups 1.0
86+import Ubuntu.Components 1.3
87+import Ubuntu.Components.ListItems 1.3
88+import Ubuntu.Components.Popups 1.3
89
90 Sidebar {
91 id: root
92
93 //color: Qt.rgba(0.5,0.5,0.5,0.3)
94+ color: "#F5F5F5"
95 width: expanded ? (collapsed ? units.gu(8) : units.gu(22)) : 0
96
97 property bool collapsed: collapsedSidebar
98
99=== modified file 'src/app/qml/filemanager.qml'
100--- src/app/qml/filemanager.qml 2015-11-02 18:01:09 +0000
101+++ src/app/qml/filemanager.qml 2016-01-28 21:01:03 +0000
102@@ -15,10 +15,10 @@
103 *
104 * Authored by: Arto Jalkanen <ajalkane@gmail.com>
105 */
106-import QtQuick 2.3
107-import Ubuntu.Components 1.1
108+import QtQuick 2.4
109+import Ubuntu.Components 1.3
110 import org.nemomobile.folderlistmodel 1.0
111-import Ubuntu.Components.Popups 1.0
112+import Ubuntu.Components.Popups 1.3
113 import Ubuntu.Unity.Action 1.1 as UnityActions
114 import U1db 1.0 as U1db
115 import Ubuntu.Content 0.1
116@@ -32,7 +32,6 @@
117 // objectName for functional testing purposes (autopilot-qt5)
118 objectName: "filemanager"
119 applicationName: "com.ubuntu.filemanager"
120- useDeprecatedToolbar: false
121
122 width: phone ? units.gu(40) : units.gu(100)
123 height: units.gu(75)
124@@ -51,9 +50,9 @@
125
126 property bool showSidebar: width >= units.gu(50)
127
128- headerColor: "#464646"
129- backgroundColor: "#464646"
130- footerColor: "#464646"
131+ headerColor: "#F5F5F5"
132+ backgroundColor: "#F5F5F5"
133+ footerColor: "#F5F5F5"
134
135 QtObject {
136 id: fileSelector
137
138=== modified file 'src/app/qml/upstream/FakeHeader.qml'
139--- src/app/qml/upstream/FakeHeader.qml 2014-10-23 20:54:30 +0000
140+++ src/app/qml/upstream/FakeHeader.qml 2016-01-28 21:01:03 +0000
141@@ -14,8 +14,8 @@
142 * along with this program. If not, see <http://www.gnu.org/licenses/>.
143 */
144
145-import QtQuick 2.3
146-import Ubuntu.Components 1.1
147+import QtQuick 2.4
148+import Ubuntu.Components 1.3
149
150 Column {
151 id: fakeHeader
152@@ -25,9 +25,9 @@
153 Rectangle {
154 height: units.gu(7)
155 width: parent.width
156- color: "#464646"
157+ color: "#F5F5F5"
158 }
159-
160+
161 Rectangle {
162 color: Qt.rgba(0.2,0.2,0.2,0.97)
163 height: units.gu(2)
164
165=== modified file 'src/app/qml/upstream/PageWithBottomEdge.qml'
166--- src/app/qml/upstream/PageWithBottomEdge.qml 2014-10-24 03:00:16 +0000
167+++ src/app/qml/upstream/PageWithBottomEdge.qml 2016-01-28 21:01:03 +0000
168@@ -62,8 +62,8 @@
169
170 */
171
172-import QtQuick 2.2
173-import Ubuntu.Components 1.1
174+import QtQuick 2.4
175+import Ubuntu.Components 1.3
176
177 Page {
178 id: page
179@@ -176,7 +176,7 @@
180 z: 1
181 width: tipLabel.paintedWidth + units.gu(6)
182 height: bottomEdge.tipHeight + units.gu(1)
183- color: "#464646"
184+ color: "#F5F5F5"
185 Label {
186 id: tipLabel
187
188@@ -292,7 +292,7 @@
189 readonly property int pageStartY: fakeHeader.height
190
191 z: 1
192- color: "#606060" // "#797979" // Qt.rgba(0.2,0.2,0.2,0.97)
193+ color: "#F5F5F5" // "#606060" // "#797979" // Qt.rgba(0.2,0.2,0.2,0.97)
194 // color: Theme.palette.normal.background
195 clip: true
196 anchors {

Subscribers

People subscribed via source and target branches