Merge lp:~mterry/reminders-app/no-ubuntucolors into lp:reminders-app

Proposed by Michael Terry on 2016-05-23
Status: Merged
Approved by: Michael Zanetti on 2016-06-06
Approved revision: 563
Merged at revision: 565
Proposed branch: lp:~mterry/reminders-app/no-ubuntucolors
Merge into: lp:reminders-app
Diff against target: 327 lines (+25/-34)
16 files modified
src/app/qml/Reminders.qml (+3/-5)
src/app/qml/components/BouncingProgressBar.qml (+1/-1)
src/app/qml/components/EditTagsDialog.qml (+4/-6)
src/app/qml/components/ListItemWithActions.qml (+5/-6)
src/app/qml/components/NoteHeader.qml (+1/-1)
src/app/qml/components/NotebooksDelegate.qml (+0/-1)
src/app/qml/components/NotesDelegate.qml (+0/-1)
src/app/qml/components/PageWithBottomEdge.qml (+2/-2)
src/app/qml/components/RemindersDelegate.qml (+0/-1)
src/app/qml/components/ResolveConflictConfirmationDialog.qml (+2/-2)
src/app/qml/components/RtfButton.qml (+1/-1)
src/app/qml/components/TagsDelegate.qml (+0/-1)
src/app/qml/ui/AccountSelectorPage.qml (+1/-1)
src/app/qml/ui/EditNoteView.qml (+1/-1)
src/app/qml/ui/NoteView.qml (+2/-2)
src/app/qml/ui/SetReminderView.qml (+2/-2)
To merge this branch: bzr merge lp:~mterry/reminders-app/no-ubuntucolors
Reviewer Review Type Date Requested Status
Jenkins Bot continuous-integration Approve on 2016-06-06
Alan Pope 🍺🐧🐱 πŸ¦„ 2016-05-23 Approve on 2016-06-06
Review via email: mp+295460@code.launchpad.net

Commit message

Use theme colors instead of hard-coded ones.

Description of the change

Use theme colors instead of hard-coded ones.

To post a comment you must log in.

LGTM!

review: Approve
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/app/qml/Reminders.qml'
2--- src/app/qml/Reminders.qml 2016-04-30 20:03:57 +0000
3+++ src/app/qml/Reminders.qml 2016-05-23 12:37:55 +0000
4@@ -515,7 +515,7 @@
5 shown: text
6 text: EvernoteConnection.error || NotesStore.error
7 iconName: "sync-error"
8- iconColor: UbuntuColors.red
9+ iconColor: theme.palette.normal.negative
10 showCancelButton: true
11
12 onCancel: {
13@@ -737,7 +737,7 @@
14 Button {
15 objectName: "openAccountButton"
16 text: i18n.tr("Set Up…")
17- color: UbuntuColors.green
18+ color: theme.palette.normal.positive
19 onClicked: setup.exec()
20 Layout.fillWidth: true
21 }
22@@ -763,17 +763,15 @@
23 Button {
24 text: i18n.tr("Create new note")
25 onClicked: importDialog.accepted(true)
26- color: UbuntuColors.green
27+ color: theme.palette.normal.positive
28 }
29 Button {
30 text: i18n.tr("Attach to existing note")
31 onClicked: importDialog.accepted(false);
32- color: UbuntuColors.blue
33 }
34 Button {
35 text: i18n.tr("Cancel import")
36 onClicked: importDialog.rejected();
37- color: UbuntuColors.red
38 }
39 }
40 }
41
42=== modified file 'src/app/qml/components/BouncingProgressBar.qml'
43--- src/app/qml/components/BouncingProgressBar.qml 2015-09-15 14:50:55 +0000
44+++ src/app/qml/components/BouncingProgressBar.qml 2016-05-23 12:37:55 +0000
45@@ -28,7 +28,7 @@
46 Rectangle {
47 id: rectangle
48 anchors.fill: parent
49- color: UbuntuColors.orange
50+ color: theme.palette.normal.activity
51 visible: animation.running // Avoid to show the orange bar before animation starts
52 }
53
54
55=== modified file 'src/app/qml/components/EditTagsDialog.qml'
56--- src/app/qml/components/EditTagsDialog.qml 2016-04-30 16:34:08 +0000
57+++ src/app/qml/components/EditTagsDialog.qml 2016-05-23 12:37:55 +0000
58@@ -98,9 +98,9 @@
59 top: textField.bottom
60 right: textField.right
61 }
62- color: "white"
63+ color: theme.palette.normal.background
64 border.width: units.dp(1)
65- border.color: "black"
66+ border.color: theme.palette.normal.backgroundText
67 height: Math.min(5, tagsListView.count) * units.gu(4)
68 visible: (textField.text.length > 0 || textField.inputMethodComposing) && (textField.focus || tagsListView.focus)
69
70@@ -121,7 +121,7 @@
71 property bool used: root.note ? root.note.tagGuids.indexOf(model.guid) !== -1 : false
72 Label {
73 text: model.name
74- color: textField.text === model.name ? UbuntuColors.orange : "black"
75+ color: textField.text === model.name ? theme.palette.normal.positionText : theme.palette.normal.backgroundText
76 Layout.fillHeight: true
77 Layout.fillWidth: true
78 }
79@@ -144,7 +144,7 @@
80 Button {
81 id: okButton
82 text: i18n.tr("OK")
83- color: UbuntuColors.orange
84+ color: theme.palette.normal.positive
85 enabled: textField.text.replace(/\s+/g, '') !== '' || textField.inputMethodComposing === true; // Not only whitespaces!
86 onClicked: textField.accept()
87 }
88@@ -197,8 +197,6 @@
89 Layout.preferredWidth: parent.width - units.gu(2)
90 Layout.alignment: Qt.AlignHCenter
91
92- color: UbuntuColors.orange
93-
94 text: i18n.tr("Close")
95
96 onClicked: {
97
98=== modified file 'src/app/qml/components/ListItemWithActions.qml'
99--- src/app/qml/components/ListItemWithActions.qml 2015-09-15 14:50:55 +0000
100+++ src/app/qml/components/ListItemWithActions.qml 2016-05-23 12:37:55 +0000
101@@ -29,9 +29,8 @@
102 property Action activeAction: null
103 property var activeItem: null
104 property bool triggerActionOnMouseRelease: false
105- property color color: Theme.palette.normal.background
106- property color selectedColor: "#E6E6E6"
107- property color selectedRightActionColor: UbuntuColors.lightAubergine
108+ property color color: theme.palette.normal.background
109+ property color selectedRightActionColor: theme.palette.normal.positive
110 property bool selected: false
111 property bool selectionMode: false
112 property alias showDivider: divider.visible
113@@ -185,7 +184,7 @@
114 }
115 width: root.leftActionWidth + actionThreshold
116 visible: leftSideAction
117- color: UbuntuColors.red
118+ color: theme.palette.normal.negative
119
120 Icon {
121 anchors {
122@@ -193,7 +192,7 @@
123 horizontalCenterOffset: actionThreshold / 2
124 }
125 name: leftSideAction && _showActions ? leftSideAction.iconName : ""
126- color: Theme.palette.selected.field
127+ color: theme.palette.normal.negativeText
128 height: units.gu(3)
129 width: units.gu(3)
130 }
131@@ -244,7 +243,7 @@
132 height: units.gu(3)
133 source: modelData.iconSource ? modelData.iconSource : ''
134 name: modelData.iconName ? modelData.iconName : ''
135- color: root.activeAction === modelData || !root.triggerActionOnMouseRelease ? root.selectedRightActionColor : UbuntuColors.lightGrey
136+ color: root.activeAction === modelData || !root.triggerActionOnMouseRelease ? root.selectedRightActionColor : theme.palette.normal.backgroundSecondaryText
137 }
138 Rectangle {
139 id: underscore
140
141=== modified file 'src/app/qml/components/NoteHeader.qml'
142--- src/app/qml/components/NoteHeader.qml 2015-11-02 20:26:37 +0000
143+++ src/app/qml/components/NoteHeader.qml 2016-05-23 12:37:55 +0000
144@@ -117,7 +117,7 @@
145 iconName: root.note && root.note.reminder ? "reminder" : "reminder-new"
146 height: parent.height
147 width: height
148- iconColor: root.note && note.reminder ? UbuntuColors.blue : Qt.rgba(0.0, 0.0, 0.0, 0.0)
149+ iconColor: root.note && note.reminder ? theme.palette.normal.positive : Qt.rgba(0.0, 0.0, 0.0, 0.0)
150 visible: index == notebookSelector.selectedIndex
151 onClicked: {
152 Qt.inputMethod.hide();
153
154=== modified file 'src/app/qml/components/NotebooksDelegate.qml'
155--- src/app/qml/components/NotebooksDelegate.qml 2015-09-15 14:50:55 +0000
156+++ src/app/qml/components/NotebooksDelegate.qml 2016-05-23 12:37:55 +0000
157@@ -39,7 +39,6 @@
158 }
159 }
160
161- selectedRightActionColor: UbuntuColors.green
162 triggerActionOnMouseRelease: true
163 rightSideActions: [
164 Action {
165
166=== modified file 'src/app/qml/components/NotesDelegate.qml'
167--- src/app/qml/components/NotesDelegate.qml 2016-04-28 15:53:23 +0000
168+++ src/app/qml/components/NotesDelegate.qml 2016-05-23 12:37:55 +0000
169@@ -56,7 +56,6 @@
170 }
171 }
172
173- selectedRightActionColor: UbuntuColors.green
174 triggerActionOnMouseRelease: true
175 rightSideActions: root.conflicting ? conflictActions : enabledRightSideActions
176 property list<Action> conflictActions: [
177
178=== modified file 'src/app/qml/components/PageWithBottomEdge.qml'
179--- src/app/qml/components/PageWithBottomEdge.qml 2015-09-15 14:50:55 +0000
180+++ src/app/qml/components/PageWithBottomEdge.qml 2016-05-23 12:37:55 +0000
181@@ -165,7 +165,7 @@
182 visible: bottomEdgeLabelVisible
183
184 z: 1
185- color: Theme.palette.normal.background
186+ color: theme.palette.normal.background
187 parent: page
188 anchors {
189 left: parent.left
190@@ -205,7 +205,7 @@
191
192 width: tipLabel.paintedWidth + units.gu(6)
193 height: bottomEdge.tipHeight + units.gu(1)
194- color: Theme.palette.normal.overlay
195+ color: theme.palette.normal.overlay
196 Label {
197 id: tipLabel
198
199
200=== modified file 'src/app/qml/components/RemindersDelegate.qml'
201--- src/app/qml/components/RemindersDelegate.qml 2015-09-15 14:50:55 +0000
202+++ src/app/qml/components/RemindersDelegate.qml 2016-05-23 12:37:55 +0000
203@@ -41,7 +41,6 @@
204 }
205 }
206
207- selectedRightActionColor: UbuntuColors.green
208 triggerActionOnMouseRelease: true
209 rightSideActions: [
210 Action {
211
212=== modified file 'src/app/qml/components/ResolveConflictConfirmationDialog.qml'
213--- src/app/qml/components/ResolveConflictConfirmationDialog.qml 2015-09-15 14:50:55 +0000
214+++ src/app/qml/components/ResolveConflictConfirmationDialog.qml 2016-05-23 12:37:55 +0000
215@@ -55,7 +55,7 @@
216
217 Button {
218 text: i18n.tr("Yes")
219- color: UbuntuColors.green
220+ color: theme.palette.normal.positive
221 onClicked: {
222 root.accepted();
223 PopupUtils.close(root);
224@@ -64,7 +64,7 @@
225
226 Button {
227 text: i18n.tr("No")
228- color: UbuntuColors.red
229+ color: theme.palette.normal.negative
230 onClicked: {
231 root.rejected();
232 PopupUtils.close(root)
233
234=== modified file 'src/app/qml/components/RtfButton.qml'
235--- src/app/qml/components/RtfButton.qml 2015-09-15 14:50:55 +0000
236+++ src/app/qml/components/RtfButton.qml 2016-05-23 12:37:55 +0000
237@@ -48,7 +48,7 @@
238
239 Rectangle {
240 anchors.fill: parent
241- color: UbuntuColors.darkGrey
242+ color: theme.palette.normal.backgroundSecondaryText
243 opacity: root.active || mouseArea.pressed ? 0.2 : 0
244 }
245
246
247=== modified file 'src/app/qml/components/TagsDelegate.qml'
248--- src/app/qml/components/TagsDelegate.qml 2015-09-15 14:50:55 +0000
249+++ src/app/qml/components/TagsDelegate.qml 2016-05-23 12:37:55 +0000
250@@ -37,7 +37,6 @@
251 }
252 }
253
254- selectedRightActionColor: UbuntuColors.green
255 triggerActionOnMouseRelease: true
256 rightSideActions: [
257 Action {
258
259=== modified file 'src/app/qml/ui/AccountSelectorPage.qml'
260--- src/app/qml/ui/AccountSelectorPage.qml 2015-09-15 14:50:55 +0000
261+++ src/app/qml/ui/AccountSelectorPage.qml 2016-05-23 12:37:55 +0000
262@@ -89,7 +89,7 @@
263 anchors.horizontalCenter: parent.horizontalCenter
264 width: parent.width - units.gu(2)
265 text: i18n.tr("Add new account")
266- color: UbuntuColors.orange
267+ color: theme.palette.normal.positive
268 onClicked: root.oaSetup.exec()
269 }
270 }
271
272=== modified file 'src/app/qml/ui/EditNoteView.qml'
273--- src/app/qml/ui/EditNoteView.qml 2016-04-30 16:34:08 +0000
274+++ src/app/qml/ui/EditNoteView.qml 2016-05-23 12:37:55 +0000
275@@ -603,7 +603,7 @@
276 // TRANSLATORS: Button to close the edit mode
277 text: i18n.tr("Close")
278 height: parent.height
279- iconColor: UbuntuColors.green
280+ iconColor: theme.palette.normal.positive
281 onClicked: {
282 forceActiveFocus();
283 saveNote();
284
285=== modified file 'src/app/qml/ui/NoteView.qml'
286--- src/app/qml/ui/NoteView.qml 2016-04-30 16:34:08 +0000
287+++ src/app/qml/ui/NoteView.qml 2016-05-23 12:37:55 +0000
288@@ -149,7 +149,7 @@
289 // TRANSLATORS: Button to close the note viewer
290 text: i18n.tr("Close")
291 height: parent.height
292- iconColor: UbuntuColors.green
293+ iconColor: theme.palette.normal.positive
294 visible: root.canClose
295 onClicked: {
296 pageStack.pop()
297@@ -171,7 +171,7 @@
298 // TRANSLATORS: Button to go from note viewer to note editor
299 text: i18n.tr("Edit")
300 height: parent.height
301- iconColor: UbuntuColors.green
302+ iconColor: theme.palette.normal.positive
303 onClicked: {
304 root.editNote()
305 }
306
307=== modified file 'src/app/qml/ui/SetReminderView.qml'
308--- src/app/qml/ui/SetReminderView.qml 2015-09-15 14:50:55 +0000
309+++ src/app/qml/ui/SetReminderView.qml 2016-05-23 12:37:55 +0000
310@@ -75,7 +75,7 @@
311 // TRANSLATORS: Button that deletes a reminder
312 text: i18n.tr("Delete")
313 Layout.fillWidth: true
314- color: UbuntuColors.red
315+ color: theme.palette.normal.negative
316 onClicked: {
317 note.reminder = false;
318 NotesStore.saveNote(note.guid);
319@@ -86,7 +86,7 @@
320 Layout.fillWidth: true
321 // TRANSLATORS: Button that saves a reminder
322 text: i18n.tr("Save")
323- color: UbuntuColors.green
324+ color: theme.palette.normal.positive
325 onClicked: {
326 note.reminder = true;
327 var date = datePicker.date

Subscribers

People subscribed via source and target branches