ubuntu-system-settings

Merge lp:~mterry/ubuntu-system-settings/less-ubuntucolors into lp:ubuntu-system-settings

  1. less-ubuntucolors
  2. Merge into trunk
Proposed by Michael Terry
Status: Merged
Approved by: Ken VanDine
Approved revision: 1657
Merged at revision: 1663
Proposed branch: lp:~mterry/ubuntu-system-settings/less-ubuntucolors
Merge into: lp:ubuntu-system-settings
Diff against target: 209 lines (+13/-23)
9 files modified
plugins/background/Components/AddRemove.qml (+0/-2)
plugins/background/Components/HighlightedOverlay.qml (+1/-1)
plugins/cellular/Components/LabelTextField.qml (+1/-1)
plugins/cellular/PageChooseApn.qml (+1/-1)
plugins/phone/CallForwardItem.qml (+2/-6)
plugins/phone/CallForwarding.qml (+1/-1)
plugins/security-privacy/LockSecurity.qml (+1/-2)
plugins/security-privacy/SimPin.qml (+3/-5)
plugins/system-update/PageComponent.qml (+3/-4)
To merge this branch: bzr merge lp:~mterry/ubuntu-system-settings/less-ubuntucolors
Reviewer Review Type Date Requested Status
Ken VanDine Approve
PS Jenkins bot continuous-integration Pending
Review via email: mp+294994@code.launchpad.net

Commit message

Update some button colors to the new theme style

Description of the change

Remove some uses of hardcoded colors, especially ones that are wrong (mostly cases of orange -> green).

But I've also removed some odd (seemingly unnecessary) specified versions of grey when all we want is the default button color.

I haven't removed all uses of UbuntuColors, just the most noticeable ones. Several uses of the various greys exist, etc. But those are less noticeably wrong than orange.

To post a comment you must log in.
Revision history for this message
Ken VanDine (ken-vandine) wrote :

Looks great, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'plugins/background/Components/AddRemove.qml'
--- plugins/background/Components/AddRemove.qml 2015-08-10 13:31:45 +0000
+++ plugins/background/Components/AddRemove.qml 2016-05-17 23:31:57 +0000
@@ -76,7 +76,6 @@
76 id: add76 id: add
77 action: selectPeer77 action: selectPeer
78 objectName: "addCustomBackgroundsButton"78 objectName: "addCustomBackgroundsButton"
79 gradient: UbuntuColors.greyGradient
80 text: i18n.tr("Add an image…")79 text: i18n.tr("Add an image…")
81 width: buttonWidth80 width: buttonWidth
82 anchors {81 anchors {
@@ -87,7 +86,6 @@
87 Button {86 Button {
88 id: queue87 id: queue
89 objectName: "removeCustomBackgroundsButton"88 objectName: "removeCustomBackgroundsButton"
90 gradient: UbuntuColors.greyGradient
91 text: i18n.tr("Remove images…")89 text: i18n.tr("Remove images…")
92 width: buttonWidth90 width: buttonWidth
93 anchors {91 anchors {
9492
=== modified file 'plugins/background/Components/HighlightedOverlay.qml'
--- plugins/background/Components/HighlightedOverlay.qml 2015-08-10 13:31:45 +0000
+++ plugins/background/Components/HighlightedOverlay.qml 2016-05-17 23:31:57 +0000
@@ -23,7 +23,7 @@
2323
24Rectangle {24Rectangle {
25 border.width: units.gu(1)25 border.width: units.gu(1)
26 border.color: UbuntuColors.orange26 border.color: theme.palette.selected.baseText
27 width: parent.width + units.gu(2)27 width: parent.width + units.gu(2)
28 height: parent.height + units.gu(2)28 height: parent.height + units.gu(2)
29 anchors.centerIn: parent29 anchors.centerIn: parent
3030
=== modified file 'plugins/cellular/Components/LabelTextField.qml'
--- plugins/cellular/Components/LabelTextField.qml 2015-08-10 13:31:45 +0000
+++ plugins/cellular/Components/LabelTextField.qml 2016-05-17 23:31:57 +0000
@@ -37,7 +37,7 @@
37 property bool error: (field.hasOwnProperty("errorHighlight") &&37 property bool error: (field.hasOwnProperty("errorHighlight") &&
38 field.errorHighlight &&38 field.errorHighlight &&
39 !field.acceptableInput)39 !field.acceptableInput)
40 onErrorChanged: error ? UbuntuColors.orange : color40 onErrorChanged: error ? theme.palette.normal.negative : color
41 color: Theme.palette.selected.background41 color: Theme.palette.selected.background
42 anchors.fill: parent42 anchors.fill: parent
43 visible: field.activeFocus43 visible: field.activeFocus
4444
=== modified file 'plugins/cellular/PageChooseApn.qml'
--- plugins/cellular/PageChooseApn.qml 2016-04-01 15:13:06 +0000
+++ plugins/cellular/PageChooseApn.qml 2016-05-17 23:31:57 +0000
@@ -166,7 +166,7 @@
166166
167 Button {167 Button {
168 text: i18n.tr("Reset")168 text: i18n.tr("Reset")
169 color: UbuntuColors.orange169 color: theme.palette.normal.positive
170 onClicked: {170 onClicked: {
171 Manager.reset();171 Manager.reset();
172 PopupUtils.close(dialogue);172 PopupUtils.close(dialogue);
173173
=== modified file 'plugins/phone/CallForwardItem.qml'
--- plugins/phone/CallForwardItem.qml 2015-11-06 12:22:09 +0000
+++ plugins/phone/CallForwardItem.qml 2016-05-17 23:31:57 +0000
@@ -176,17 +176,13 @@
176 property bool error: (field.hasOwnProperty("errorHighlight") &&176 property bool error: (field.hasOwnProperty("errorHighlight") &&
177 field.errorHighlight &&177 field.errorHighlight &&
178 !field.acceptableInput)178 !field.acceptableInput)
179 onErrorChanged: error ? UbuntuColors.orange : color179 onErrorChanged: error ? theme.palette.normal.negative : color
180 color: Theme.palette.normal.background180 color: Theme.palette.normal.background
181 anchors.fill: parent181 anchors.fill: parent
182 visible: field.activeFocus182 visible: field.activeFocus
183 }183 }
184 }184 }
185185
186 cursorDelegate: Rectangle {
187 width: units.dp(1)
188 color: UbuntuColors.orange
189 }
190 onVisibleChanged:186 onVisibleChanged:
191 if (visible === true) forceActiveFocus()187 if (visible === true) forceActiveFocus()
192 }188 }
@@ -218,7 +214,7 @@
218 height: contentHeight + units.gu(4)214 height: contentHeight + units.gu(4)
219 horizontalAlignment: Text.AlignHCenter215 horizontalAlignment: Text.AlignHCenter
220 verticalAlignment: Text.AlignVCenter216 verticalAlignment: Text.AlignVCenter
221 color: UbuntuColors.red217 color: theme.palette.normal.negative
222 text: i18n.tr("Call forwarding can’t be changed right now.")218 text: i18n.tr("Call forwarding can’t be changed right now.")
223 }219 }
224220
225221
=== modified file 'plugins/phone/CallForwarding.qml'
--- plugins/phone/CallForwarding.qml 2016-03-16 16:26:18 +0000
+++ plugins/phone/CallForwarding.qml 2016-05-17 23:31:57 +0000
@@ -157,7 +157,7 @@
157 visible: false157 visible: false
158 text: i18n.tr("Call forwarding status can’t be checked " +158 text: i18n.tr("Call forwarding status can’t be checked " +
159 "now. Try again later.")159 "now. Try again later.")
160 color: UbuntuColors.red160 color: theme.palette.normal.negative
161 horizontalAlignment: Text.AlignHCenter161 horizontalAlignment: Text.AlignHCenter
162 }162 }
163163
164164
=== modified file 'plugins/security-privacy/LockSecurity.qml'
--- plugins/security-privacy/LockSecurity.qml 2016-02-04 15:28:51 +0000
+++ plugins/security-privacy/LockSecurity.qml 2016-05-17 23:31:57 +0000
@@ -353,7 +353,6 @@
353353
354 Button {354 Button {
355 Layout.fillWidth: true355 Layout.fillWidth: true
356 color: UbuntuColors.lightGrey
357 text: i18n.tr("Cancel")356 text: i18n.tr("Cancel")
358 onClicked: {357 onClicked: {
359 PopupUtils.close(changeSecurityDialog)358 PopupUtils.close(changeSecurityDialog)
@@ -365,7 +364,7 @@
365 Button {364 Button {
366 id: confirmButton365 id: confirmButton
367 Layout.fillWidth: true366 Layout.fillWidth: true
368 color: UbuntuColors.green367 color: theme.palette.normal.positive
369368
370 text: {369 text: {
371 if (changeSecurityDialog.newMethod ===370 if (changeSecurityDialog.newMethod ===
372371
=== modified file 'plugins/security-privacy/SimPin.qml'
--- plugins/security-privacy/SimPin.qml 2016-02-04 15:28:51 +0000
+++ plugins/security-privacy/SimPin.qml 2016-05-17 23:31:57 +0000
@@ -174,7 +174,6 @@
174174
175 Button {175 Button {
176 Layout.fillWidth: true176 Layout.fillWidth: true
177 color: UbuntuColors.lightGrey
178 text: i18n.tr("Cancel")177 text: i18n.tr("Cancel")
179 onClicked: PopupUtils.close(changePinDialog)178 onClicked: PopupUtils.close(changePinDialog)
180 }179 }
@@ -182,7 +181,7 @@
182 Button {181 Button {
183 id: confirmButton182 id: confirmButton
184 Layout.fillWidth: true183 Layout.fillWidth: true
185 color: UbuntuColors.green184 color: theme.palette.normal.positive
186 text: i18n.tr("Change")185 text: i18n.tr("Change")
187 enabled: false186 enabled: false
188 onClicked: {187 onClicked: {
@@ -314,7 +313,6 @@
314 Button {313 Button {
315 objectName: "cancelButton"314 objectName: "cancelButton"
316 Layout.fillWidth: true315 Layout.fillWidth: true
317 color: UbuntuColors.lightGrey
318 text: i18n.tr("Cancel")316 text: i18n.tr("Cancel")
319 onClicked: {317 onClicked: {
320 if (curSim.lockedPins.length < 1)318 if (curSim.lockedPins.length < 1)
@@ -329,7 +327,7 @@
329 id: lockButton327 id: lockButton
330 objectName: "lockButton"328 objectName: "lockButton"
331 Layout.fillWidth: true329 Layout.fillWidth: true
332 color: UbuntuColors.green330 color: theme.palette.normal.positive
333331
334 text: curSim.lockedPins.length > 0 ? i18n.tr("Unlock") : i18n.tr("Lock")332 text: curSim.lockedPins.length > 0 ? i18n.tr("Unlock") : i18n.tr("Lock")
335 enabled: false333 enabled: false
@@ -428,7 +426,7 @@
428 objectName: "unlock"426 objectName: "unlock"
429 enabled: sims[index].simMng.pinRequired !== 'none'427 enabled: sims[index].simMng.pinRequired !== 'none'
430 text: i18n.tr("Unlock…")428 text: i18n.tr("Unlock…")
431 color: UbuntuColors.green429 color: theme.palette.normal.positive
432 onClicked: Connectivity.unlockModem(sims[index].path)430 onClicked: Connectivity.unlockModem(sims[index].path)
433 }431 }
434 }432 }
435433
=== modified file 'plugins/system-update/PageComponent.qml'
--- plugins/system-update/PageComponent.qml 2016-03-02 19:16:55 +0000
+++ plugins/system-update/PageComponent.qml 2016-05-17 23:31:57 +0000
@@ -99,7 +99,7 @@
99 Button {99 Button {
100 text: i18n.tr("Restart & Install")100 text: i18n.tr("Restart & Install")
101 visible: root.batterySafeForUpdate ? true : false101 visible: root.batterySafeForUpdate ? true : false
102 color: UbuntuColors.orange102 color: theme.palette.normal.positive
103 onClicked: {103 onClicked: {
104 installingImageUpdate.visible = true;104 installingImageUpdate.visible = true;
105 UpdateManager.applySystemUpdate();105 UpdateManager.applySystemUpdate();
@@ -108,7 +108,6 @@
108 }108 }
109 Button {109 Button {
110 text: i18n.tr("Cancel")110 text: i18n.tr("Cancel")
111 color: UbuntuColors.warmGrey
112 onClicked: {111 onClicked: {
113 updateList.currentIndex = 0;112 updateList.currentIndex = 0;
114 var item = updateList.currentItem;113 var item = updateList.currentItem;
@@ -133,7 +132,7 @@
133132
134 Button {133 Button {
135 text: i18n.tr("OK")134 text: i18n.tr("OK")
136 color: UbuntuColors.orange135 color: theme.palette.normal.positive
137 onClicked: {136 onClicked: {
138 PopupUtils.close(dialogueError);137 PopupUtils.close(dialogueError);
139 }138 }
@@ -305,7 +304,7 @@
305 i18n.tr("Install %1 update…", "Install %1 updates…", root.updatesAvailable).arg(root.updatesAvailable) :304 i18n.tr("Install %1 update…", "Install %1 updates…", root.updatesAvailable).arg(root.updatesAvailable) :
306 i18n.tr("Install %1 update", "Install %1 updates", root.updatesAvailable).arg(root.updatesAvailable)305 i18n.tr("Install %1 update", "Install %1 updates", root.updatesAvailable).arg(root.updatesAvailable)
307 property string secondaryText: i18n.tr("Pause All")306 property string secondaryText: i18n.tr("Pause All")
308 color: UbuntuColors.orange307 color: theme.palette.normal.positive
309 text: root.installAll ? secondaryText : primaryText308 text: root.installAll ? secondaryText : primaryText
310 width: parent.width - units.gu(4)309 width: parent.width - units.gu(4)
311310

Subscribers

People subscribed via source and target branches