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

Proposed by Michael Terry on 2016-05-17
Status: Merged
Approved by: Ken VanDine on 2016-06-07
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 2016-05-17 Approve on 2016-06-07
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.
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
1=== modified file 'plugins/background/Components/AddRemove.qml'
2--- plugins/background/Components/AddRemove.qml 2015-08-10 13:31:45 +0000
3+++ plugins/background/Components/AddRemove.qml 2016-05-17 23:31:57 +0000
4@@ -76,7 +76,6 @@
5 id: add
6 action: selectPeer
7 objectName: "addCustomBackgroundsButton"
8- gradient: UbuntuColors.greyGradient
9 text: i18n.tr("Add an image…")
10 width: buttonWidth
11 anchors {
12@@ -87,7 +86,6 @@
13 Button {
14 id: queue
15 objectName: "removeCustomBackgroundsButton"
16- gradient: UbuntuColors.greyGradient
17 text: i18n.tr("Remove images…")
18 width: buttonWidth
19 anchors {
20
21=== modified file 'plugins/background/Components/HighlightedOverlay.qml'
22--- plugins/background/Components/HighlightedOverlay.qml 2015-08-10 13:31:45 +0000
23+++ plugins/background/Components/HighlightedOverlay.qml 2016-05-17 23:31:57 +0000
24@@ -23,7 +23,7 @@
25
26 Rectangle {
27 border.width: units.gu(1)
28- border.color: UbuntuColors.orange
29+ border.color: theme.palette.selected.baseText
30 width: parent.width + units.gu(2)
31 height: parent.height + units.gu(2)
32 anchors.centerIn: parent
33
34=== modified file 'plugins/cellular/Components/LabelTextField.qml'
35--- plugins/cellular/Components/LabelTextField.qml 2015-08-10 13:31:45 +0000
36+++ plugins/cellular/Components/LabelTextField.qml 2016-05-17 23:31:57 +0000
37@@ -37,7 +37,7 @@
38 property bool error: (field.hasOwnProperty("errorHighlight") &&
39 field.errorHighlight &&
40 !field.acceptableInput)
41- onErrorChanged: error ? UbuntuColors.orange : color
42+ onErrorChanged: error ? theme.palette.normal.negative : color
43 color: Theme.palette.selected.background
44 anchors.fill: parent
45 visible: field.activeFocus
46
47=== modified file 'plugins/cellular/PageChooseApn.qml'
48--- plugins/cellular/PageChooseApn.qml 2016-04-01 15:13:06 +0000
49+++ plugins/cellular/PageChooseApn.qml 2016-05-17 23:31:57 +0000
50@@ -166,7 +166,7 @@
51
52 Button {
53 text: i18n.tr("Reset")
54- color: UbuntuColors.orange
55+ color: theme.palette.normal.positive
56 onClicked: {
57 Manager.reset();
58 PopupUtils.close(dialogue);
59
60=== modified file 'plugins/phone/CallForwardItem.qml'
61--- plugins/phone/CallForwardItem.qml 2015-11-06 12:22:09 +0000
62+++ plugins/phone/CallForwardItem.qml 2016-05-17 23:31:57 +0000
63@@ -176,17 +176,13 @@
64 property bool error: (field.hasOwnProperty("errorHighlight") &&
65 field.errorHighlight &&
66 !field.acceptableInput)
67- onErrorChanged: error ? UbuntuColors.orange : color
68+ onErrorChanged: error ? theme.palette.normal.negative : color
69 color: Theme.palette.normal.background
70 anchors.fill: parent
71 visible: field.activeFocus
72 }
73 }
74
75- cursorDelegate: Rectangle {
76- width: units.dp(1)
77- color: UbuntuColors.orange
78- }
79 onVisibleChanged:
80 if (visible === true) forceActiveFocus()
81 }
82@@ -218,7 +214,7 @@
83 height: contentHeight + units.gu(4)
84 horizontalAlignment: Text.AlignHCenter
85 verticalAlignment: Text.AlignVCenter
86- color: UbuntuColors.red
87+ color: theme.palette.normal.negative
88 text: i18n.tr("Call forwarding can’t be changed right now.")
89 }
90
91
92=== modified file 'plugins/phone/CallForwarding.qml'
93--- plugins/phone/CallForwarding.qml 2016-03-16 16:26:18 +0000
94+++ plugins/phone/CallForwarding.qml 2016-05-17 23:31:57 +0000
95@@ -157,7 +157,7 @@
96 visible: false
97 text: i18n.tr("Call forwarding status can’t be checked " +
98 "now. Try again later.")
99- color: UbuntuColors.red
100+ color: theme.palette.normal.negative
101 horizontalAlignment: Text.AlignHCenter
102 }
103
104
105=== modified file 'plugins/security-privacy/LockSecurity.qml'
106--- plugins/security-privacy/LockSecurity.qml 2016-02-04 15:28:51 +0000
107+++ plugins/security-privacy/LockSecurity.qml 2016-05-17 23:31:57 +0000
108@@ -353,7 +353,6 @@
109
110 Button {
111 Layout.fillWidth: true
112- color: UbuntuColors.lightGrey
113 text: i18n.tr("Cancel")
114 onClicked: {
115 PopupUtils.close(changeSecurityDialog)
116@@ -365,7 +364,7 @@
117 Button {
118 id: confirmButton
119 Layout.fillWidth: true
120- color: UbuntuColors.green
121+ color: theme.palette.normal.positive
122
123 text: {
124 if (changeSecurityDialog.newMethod ===
125
126=== modified file 'plugins/security-privacy/SimPin.qml'
127--- plugins/security-privacy/SimPin.qml 2016-02-04 15:28:51 +0000
128+++ plugins/security-privacy/SimPin.qml 2016-05-17 23:31:57 +0000
129@@ -174,7 +174,6 @@
130
131 Button {
132 Layout.fillWidth: true
133- color: UbuntuColors.lightGrey
134 text: i18n.tr("Cancel")
135 onClicked: PopupUtils.close(changePinDialog)
136 }
137@@ -182,7 +181,7 @@
138 Button {
139 id: confirmButton
140 Layout.fillWidth: true
141- color: UbuntuColors.green
142+ color: theme.palette.normal.positive
143 text: i18n.tr("Change")
144 enabled: false
145 onClicked: {
146@@ -314,7 +313,6 @@
147 Button {
148 objectName: "cancelButton"
149 Layout.fillWidth: true
150- color: UbuntuColors.lightGrey
151 text: i18n.tr("Cancel")
152 onClicked: {
153 if (curSim.lockedPins.length < 1)
154@@ -329,7 +327,7 @@
155 id: lockButton
156 objectName: "lockButton"
157 Layout.fillWidth: true
158- color: UbuntuColors.green
159+ color: theme.palette.normal.positive
160
161 text: curSim.lockedPins.length > 0 ? i18n.tr("Unlock") : i18n.tr("Lock")
162 enabled: false
163@@ -428,7 +426,7 @@
164 objectName: "unlock"
165 enabled: sims[index].simMng.pinRequired !== 'none'
166 text: i18n.tr("Unlock…")
167- color: UbuntuColors.green
168+ color: theme.palette.normal.positive
169 onClicked: Connectivity.unlockModem(sims[index].path)
170 }
171 }
172
173=== modified file 'plugins/system-update/PageComponent.qml'
174--- plugins/system-update/PageComponent.qml 2016-03-02 19:16:55 +0000
175+++ plugins/system-update/PageComponent.qml 2016-05-17 23:31:57 +0000
176@@ -99,7 +99,7 @@
177 Button {
178 text: i18n.tr("Restart & Install")
179 visible: root.batterySafeForUpdate ? true : false
180- color: UbuntuColors.orange
181+ color: theme.palette.normal.positive
182 onClicked: {
183 installingImageUpdate.visible = true;
184 UpdateManager.applySystemUpdate();
185@@ -108,7 +108,6 @@
186 }
187 Button {
188 text: i18n.tr("Cancel")
189- color: UbuntuColors.warmGrey
190 onClicked: {
191 updateList.currentIndex = 0;
192 var item = updateList.currentItem;
193@@ -133,7 +132,7 @@
194
195 Button {
196 text: i18n.tr("OK")
197- color: UbuntuColors.orange
198+ color: theme.palette.normal.positive
199 onClicked: {
200 PopupUtils.close(dialogueError);
201 }
202@@ -305,7 +304,7 @@
203 i18n.tr("Install %1 update…", "Install %1 updates…", root.updatesAvailable).arg(root.updatesAvailable) :
204 i18n.tr("Install %1 update", "Install %1 updates", root.updatesAvailable).arg(root.updatesAvailable)
205 property string secondaryText: i18n.tr("Pause All")
206- color: UbuntuColors.orange
207+ color: theme.palette.normal.positive
208 text: root.installAll ? secondaryText : primaryText
209 width: parent.width - units.gu(4)
210

Subscribers

People subscribed via source and target branches