Ubuntu File Manager App

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

  1. update-colours2
  2. Merge into trunk
Proposed by Alan Pope 🍺🐧🐱 🦄
Status: Merged
Approved by: Alan Pope 🍺🐧🐱 🦄
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
Arto Jalkanen Approve
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.
Revision history for this message
Arto Jalkanen (ajalkane) :
review: Approve
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

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

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

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

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

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

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'com.ubuntu.filemanager.desktop.in.in'
--- com.ubuntu.filemanager.desktop.in.in 2014-08-13 08:36:53 +0000
+++ com.ubuntu.filemanager.desktop.in.in 2016-01-28 21:01:03 +0000
@@ -7,3 +7,5 @@
7_Name=File Manager7_Name=File Manager
8X-Ubuntu-Touch=true8X-Ubuntu-Touch=true
9X-Ubuntu-Default-Department-ID=accessories9X-Ubuntu-Default-Department-ID=accessories
10X-Ubuntu-Splash-Show-Header=true
11X-Ubuntu-Splash-Color=#F5F5F5
1012
=== modified file 'src/app/qml/components/PathHistoryRow.qml'
--- src/app/qml/components/PathHistoryRow.qml 2014-10-24 03:00:16 +0000
+++ src/app/qml/components/PathHistoryRow.qml 2016-01-28 21:01:03 +0000
@@ -15,9 +15,9 @@
15 *15 *
16 * Authored by: Akiva16 * Authored by: Akiva
17 */17 */
18import QtQuick 2.318import QtQuick 2.4
19import Ubuntu.Components 1.119import Ubuntu.Components 1.3
20import Ubuntu.Components.ListItems 1.020import Ubuntu.Components.ListItems 1.3
2121
22/* Full path of your current folder and recent history, that you can jump to by clicking its members */22/* Full path of your current folder and recent history, that you can jump to by clicking its members */
23Flickable {23Flickable {
@@ -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: folder === "/" ? "white" : UbuntuColors.warmGrey87 color: UbuntuColors.darkGrey
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 ? "white" : UbuntuColors.warmGrey142 color: repeater.model === index + 1 ? UbuntuColors.darkGrey : UbuntuColors.darkGrey
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: "white"156 color: UbuntuColors.darkGrey
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.warmGrey199 color: UbuntuColors.darkGrey
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: "white"213 color: UbuntuColors.darkGrey
214 // clip: true214 // clip: true
215 }215 }
216216
217217
=== modified file 'src/app/qml/components/PlacesSidebar.qml'
--- src/app/qml/components/PlacesSidebar.qml 2015-09-06 00:11:02 +0000
+++ src/app/qml/components/PlacesSidebar.qml 2016-01-28 21:01:03 +0000
@@ -15,16 +15,17 @@
15 *15 *
16 * Authored by: Michael Spencer <sonrisesoftware@gmail.com>16 * Authored by: Michael Spencer <sonrisesoftware@gmail.com>
17 */17 */
18import QtQuick 2.318import QtQuick 2.4
19import QtGraphicalEffects 1.019import QtGraphicalEffects 1.0
20import Ubuntu.Components 1.120import Ubuntu.Components 1.3
21import Ubuntu.Components.ListItems 1.021import Ubuntu.Components.ListItems 1.3
22import Ubuntu.Components.Popups 1.022import Ubuntu.Components.Popups 1.3
2323
24Sidebar {24Sidebar {
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 width: expanded ? (collapsed ? units.gu(8) : units.gu(22)) : 029 width: expanded ? (collapsed ? units.gu(8) : units.gu(22)) : 0
2930
30 property bool collapsed: collapsedSidebar31 property bool collapsed: collapsedSidebar
3132
=== modified file 'src/app/qml/filemanager.qml'
--- src/app/qml/filemanager.qml 2015-11-02 18:01:09 +0000
+++ src/app/qml/filemanager.qml 2016-01-28 21:01:03 +0000
@@ -15,10 +15,10 @@
15 *15 *
16 * Authored by: Arto Jalkanen <ajalkane@gmail.com>16 * Authored by: Arto Jalkanen <ajalkane@gmail.com>
17 */17 */
18import QtQuick 2.318import QtQuick 2.4
19import Ubuntu.Components 1.119import Ubuntu.Components 1.3
20import org.nemomobile.folderlistmodel 1.020import org.nemomobile.folderlistmodel 1.0
21import Ubuntu.Components.Popups 1.021import Ubuntu.Components.Popups 1.3
22import Ubuntu.Unity.Action 1.1 as UnityActions22import Ubuntu.Unity.Action 1.1 as UnityActions
23import U1db 1.0 as U1db23import U1db 1.0 as U1db
24import Ubuntu.Content 0.124import Ubuntu.Content 0.1
@@ -32,7 +32,6 @@
32 // objectName for functional testing purposes (autopilot-qt5)32 // objectName for functional testing purposes (autopilot-qt5)
33 objectName: "filemanager"33 objectName: "filemanager"
34 applicationName: "com.ubuntu.filemanager"34 applicationName: "com.ubuntu.filemanager"
35 useDeprecatedToolbar: false
3635
37 width: phone ? units.gu(40) : units.gu(100)36 width: phone ? units.gu(40) : units.gu(100)
38 height: units.gu(75)37 height: units.gu(75)
@@ -51,9 +50,9 @@
5150
52 property bool showSidebar: width >= units.gu(50)51 property bool showSidebar: width >= units.gu(50)
5352
54 headerColor: "#464646"53 headerColor: "#F5F5F5"
55 backgroundColor: "#464646"54 backgroundColor: "#F5F5F5"
56 footerColor: "#464646"55 footerColor: "#F5F5F5"
5756
58 QtObject {57 QtObject {
59 id: fileSelector58 id: fileSelector
6059
=== modified file 'src/app/qml/upstream/FakeHeader.qml'
--- src/app/qml/upstream/FakeHeader.qml 2014-10-23 20:54:30 +0000
+++ src/app/qml/upstream/FakeHeader.qml 2016-01-28 21:01:03 +0000
@@ -14,8 +14,8 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.317import QtQuick 2.4
18import Ubuntu.Components 1.118import Ubuntu.Components 1.3
1919
20Column {20Column {
21 id: fakeHeader21 id: fakeHeader
@@ -25,9 +25,9 @@
25 Rectangle {25 Rectangle {
26 height: units.gu(7)26 height: units.gu(7)
27 width: parent.width27 width: parent.width
28 color: "#464646"28 color: "#F5F5F5"
29 }29 }
30 30
31 Rectangle {31 Rectangle {
32 color: Qt.rgba(0.2,0.2,0.2,0.97)32 color: Qt.rgba(0.2,0.2,0.2,0.97)
33 height: units.gu(2)33 height: units.gu(2)
3434
=== modified file 'src/app/qml/upstream/PageWithBottomEdge.qml'
--- src/app/qml/upstream/PageWithBottomEdge.qml 2014-10-24 03:00:16 +0000
+++ src/app/qml/upstream/PageWithBottomEdge.qml 2016-01-28 21:01:03 +0000
@@ -62,8 +62,8 @@
6262
63*/63*/
6464
65import QtQuick 2.265import QtQuick 2.4
66import Ubuntu.Components 1.166import Ubuntu.Components 1.3
6767
68Page {68Page {
69 id: page69 id: page
@@ -176,7 +176,7 @@
176 z: 1176 z: 1
177 width: tipLabel.paintedWidth + units.gu(6)177 width: tipLabel.paintedWidth + units.gu(6)
178 height: bottomEdge.tipHeight + units.gu(1)178 height: bottomEdge.tipHeight + units.gu(1)
179 color: "#464646"179 color: "#F5F5F5"
180 Label {180 Label {
181 id: tipLabel181 id: tipLabel
182182
@@ -292,7 +292,7 @@
292 readonly property int pageStartY: fakeHeader.height292 readonly property int pageStartY: fakeHeader.height
293293
294 z: 1294 z: 1
295 color: "#606060" // "#797979" // Qt.rgba(0.2,0.2,0.2,0.97)295 color: "#F5F5F5" // "#606060" // "#797979" // Qt.rgba(0.2,0.2,0.2,0.97)
296 // color: Theme.palette.normal.background296 // color: Theme.palette.normal.background
297 clip: true297 clip: true
298 anchors {298 anchors {

Subscribers

People subscribed via source and target branches