ubuntu-touch-coreapps-reviewers team mailing list archive
-
ubuntu-touch-coreapps-reviewers team
-
Mailing list archive
-
Message #09241
[Merge] lp:~popey/ubuntu-filemanager-app/fix-1554621 into lp:ubuntu-filemanager-app
Alan Pope has proposed merging lp:~popey/ubuntu-filemanager-app/fix-1554621 into lp:ubuntu-filemanager-app.
Commit message:
Remove the blue occurrences.
Requested reviews:
Ubuntu File Manager Developers (ubuntu-filemanager-dev)
For more details, see:
https://code.launchpad.net/~popey/ubuntu-filemanager-app/fix-1554621/+merge/291133
--
Your team Ubuntu File Manager Developers is requested to review the proposed merge of lp:~popey/ubuntu-filemanager-app/fix-1554621 into lp:ubuntu-filemanager-app.
=== 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-06 14:58:24 +0000
@@ -49,7 +49,7 @@
property string fileName: model.fileName
property string filePath: fileView.folder + '/' + fileName
- property string text: fileName
+ property string text: fileName
property string subText: itemDateAndSize(model)
property var icon: fileIcon(filePath, model)
@@ -99,7 +99,7 @@
}
color: "white"
radius: height/2
- border.color: UbuntuColors.warmGrey
+ border.color: UbuntuColors.slate
antialiasing: true
opacity: expand ? 1 : 0
@@ -126,10 +126,7 @@
elide: Text.ElideMiddle
text: delegate.text
- color: expand ? UbuntuColors.coolGrey : Theme.palette.selected.backgroundText
- Behavior on color {
- ColorAnimation { duration: 200 }
- }
+ color: UbuntuColors.graphite
}
MouseArea {
=== 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-06 14:58:24 +0000
@@ -84,7 +84,7 @@
text: i18n.tr("Device")
fontSize: flickable.textSize
anchors.verticalCenter: parent.verticalCenter
- color: UbuntuColors.darkGrey
+ color: UbuntuColors.inkstone
clip: true
/* Maximum Width = Flickable Width */
width: if (contentWidth > flickable.width) { flickable.width }
@@ -139,7 +139,7 @@
text: pathText(folder,index)
fontSize: flickable.textSize
anchors.verticalCenter: parent.verticalCenter
- color: repeater.model === index + 1 ? UbuntuColors.darkGrey : UbuntuColors.darkGrey
+ color: repeater.model === index + 1 ? UbuntuColors.inkstone : UbuntuColors.inkstone
clip: true
/* Maximum Width = Flickable Width */
@@ -153,7 +153,7 @@
width: flickable.iconWidth
anchors.verticalCenter: parent.verticalCenter
anchors.right: label.left
- color: UbuntuColors.darkGrey
+ color: UbuntuColors.inkstone
// clip: true
}
@@ -196,7 +196,7 @@
: pathText(repeater.memoryPath,index)
fontSize: flickable.textSize
anchors.verticalCenter: parent.verticalCenter
- color: UbuntuColors.darkGrey
+ color: UbuntuColors.inkstone
clip: true
/* Maximum Width = Flickable Width */
@@ -210,7 +210,7 @@
width: flickable.iconWidth
anchors.verticalCenter: parent.verticalCenter
anchors.right: memoryLabel.left
- color: UbuntuColors.darkGrey
+ color: UbuntuColors.inkstone
// clip: true
}
=== 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-06 14:58:24 +0000
@@ -25,7 +25,7 @@
id: root
//color: Qt.rgba(0.5,0.5,0.5,0.3)
- color: "#F5F5F5"
+ color: UbuntuColors.Porcelain
width: expanded ? (collapsed ? units.gu(8) : units.gu(22)) : 0
property bool collapsed: collapsedSidebar
=== 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-06 14:58:24 +0000
@@ -78,7 +78,7 @@
anchors.verticalCenter: parent.verticalCenter
text: folderDisplayName(root.path)
- color: Theme.palette.normal.overlayText
+ color: UbuntuColors.ash
font.bold: true
}
}
@@ -89,50 +89,50 @@
Label {
text: i18n.tr("Path:")
- color: Theme.palette.normal.overlayText
+ color: UbuntuColors.ash
}
Label {
objectName: "pathLabel"
text: root.path
- color: Theme.palette.normal.overlayText
+ color: UbuntuColors.ash
}
Label {
text: model.isDir ? i18n.tr("Contents:")
: i18n.tr("Size:")
- color: Theme.palette.normal.overlayText
+ color: UbuntuColors.ash
}
Label {
text: model.fileSize
- color: Theme.palette.normal.overlayText
+ color: UbuntuColors.ash
}
Label {
text: i18n.tr("Accessed:")
- color: Theme.palette.normal.overlayText
+ color: UbuntuColors.ash
}
Label {
text: dateTimeFormat(model.accessedDate)
- color: Theme.palette.normal.overlayText
+ color: UbuntuColors.ash
}
Label {
text: i18n.tr("Modified:")
- color: Theme.palette.normal.overlayText
+ color: UbuntuColors.ash
}
Label {
text: dateTimeFormat(model.modifiedDate)
- color: Theme.palette.normal.overlayText
+ color: UbuntuColors.ash
}
Label {
text: i18n.tr("Permissions:")
- color: Theme.palette.normal.overlayText
+ color: UbuntuColors.ash
}
Label {
text: permissionsToString(model)
- color: Theme.palette.normal.overlayText
+ color: UbuntuColors.ash
// This is a a work-around for bug #1354508.
// This basically forces all permissions to be on different lines, which looks
// good enough. But a similar issue as described in the bug can happen
=== 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-06 14:58:24 +0000
@@ -656,7 +656,7 @@
Label {
text: qsTr(i18n.tr("Extracting archive '%1'")).arg(fileName)
- color: UbuntuColors.darkGrey
+ color: UbuntuColors.slate
anchors.verticalCenter: parent.verticalCenter
width: row.width - loadingSpinner.width - row.spacing
maximumLineCount: 2
@@ -735,7 +735,7 @@
Button {
id: cancelButton
text: i18n.tr("Cancel")
- color: UbuntuColors.lightGrey
+ color: UbuntuColors.graphite
onClicked: {
PopupUtils.close(dialog)
}
@@ -781,7 +781,7 @@
}
function itemDateAndSize(model) {
- var strDate = Qt.formatDateTime(model.modifiedDate, Qt.DefaultLocaleShortDate);
+ var strDate = Qt.formatDateTime(model.modifiedDate, Qt.DefaultLocaleShortDate);
//local file systems always have date and size for both files and directories
//remote file systems may have not size for directories, it comes as "Unknown"
if (strDate) {
@@ -932,7 +932,7 @@
}
}
- function itemClicked(model) {
+ function itemClicked(model) {
if (model.isBrowsable) {
console.log("browsable path="+model.filePath+" isRemote="+model.isRemote+" needsAuthentication="+model.needsAuthentication)
if ((model.isReadable && model.isExecutable) ||
=== 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-06 14:58:24 +0000
@@ -27,7 +27,7 @@
property alias currentPath: authCurrentPath.text
property alias currentUserName: authUserName.text
- property alias currentPassword: authPassword.text
+ property alias currentPassword: authPassword.text
signal ok()
signal savePasswordChanged(bool check)
@@ -77,7 +77,7 @@
Standard {
Label {
text: i18n.tr("Save password")
- color: Theme.palette.normal.overlayText
+ color: UbuntuColors.ash
anchors.left: parent.left
anchors.verticalCenter: parent.verticalCenter
}
=== 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-06 14:58:24 +0000
@@ -100,7 +100,7 @@
anchors.leftMargin: units.gu(8)
anchors.verticalCenter: parent.verticalCenter
text: i18n.tr("Places")
- color: Theme.palette.normal.overlayText
+ color: UbuntuColors.ash
}
onClicked: {
@@ -129,7 +129,7 @@
anchors.leftMargin: units.gu(8)
anchors.verticalCenter: parent.verticalCenter
text: folderDisplayName(path)
- color: selected ? UbuntuColors.orange : Theme.palette.normal.overlayText
+ color: selected ? UbuntuColors.orange : UbuntuColors.ash
}
iconSource: model.icon || fileIcon(model.path, true)
=== 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-06 14:58:24 +0000
@@ -38,7 +38,7 @@
Label {
text: i18n.tr("Show Hidden Files")
fontSize: "medium"
- color: Theme.palette.normal.overlayText
+ color: UbuntuColors.ash
anchors.left: parent.left
anchors.leftMargin: units.gu(2)
anchors.verticalCenter: parent.verticalCenter
@@ -58,7 +58,7 @@
Label {
text: i18n.tr("View As")
fontSize: "medium"
- color: Theme.palette.normal.overlayText
+ color: UbuntuColors.ash
anchors.left: parent.left
anchors.leftMargin: units.gu(2)
anchors.top: parent.top
@@ -80,7 +80,7 @@
Label {
text: i18n.tr("Sort By")
fontSize: "medium"
- color: Theme.palette.normal.overlayText
+ color: UbuntuColors.ash
anchors.left: parent.left
anchors.leftMargin: units.gu(2)
anchors.top: parent.top
@@ -102,7 +102,7 @@
Label {
text: i18n.tr("Sort Order")
fontSize: "medium"
- color: Theme.palette.normal.overlayText
+ color: UbuntuColors.ash
anchors.left: parent.left
anchors.leftMargin: units.gu(2)
anchors.top: parent.top
@@ -126,7 +126,7 @@
Label {
text: i18n.tr("Filter")
fontSize: "medium"
- color: Theme.palette.normal.overlayText
+ color: UbuntuColors.ash
anchors.left: parent.left
anchors.leftMargin: units.gu(2)
anchors.verticalCenter: parent.verticalCenter
References
