Ubuntu Notes app

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

  1. no-ubuntucolors
  2. Merge into trunk
Proposed by Michael Terry
Status: Merged
Approved by: Michael Zanetti
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
Alan Pope 🍺🐧🐱 🦄 (community) Approve
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.
Revision history for this message
Alan Pope 🍺🐧🐱 🦄 (popey) wrote :

LGTM!

review: Approve
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 'src/app/qml/Reminders.qml'
--- src/app/qml/Reminders.qml 2016-04-30 20:03:57 +0000
+++ src/app/qml/Reminders.qml 2016-05-23 12:37:55 +0000
@@ -515,7 +515,7 @@
515 shown: text515 shown: text
516 text: EvernoteConnection.error || NotesStore.error516 text: EvernoteConnection.error || NotesStore.error
517 iconName: "sync-error"517 iconName: "sync-error"
518 iconColor: UbuntuColors.red518 iconColor: theme.palette.normal.negative
519 showCancelButton: true519 showCancelButton: true
520520
521 onCancel: {521 onCancel: {
@@ -737,7 +737,7 @@
737 Button {737 Button {
738 objectName: "openAccountButton"738 objectName: "openAccountButton"
739 text: i18n.tr("Set Up…")739 text: i18n.tr("Set Up…")
740 color: UbuntuColors.green740 color: theme.palette.normal.positive
741 onClicked: setup.exec()741 onClicked: setup.exec()
742 Layout.fillWidth: true742 Layout.fillWidth: true
743 }743 }
@@ -763,17 +763,15 @@
763 Button {763 Button {
764 text: i18n.tr("Create new note")764 text: i18n.tr("Create new note")
765 onClicked: importDialog.accepted(true)765 onClicked: importDialog.accepted(true)
766 color: UbuntuColors.green766 color: theme.palette.normal.positive
767 }767 }
768 Button {768 Button {
769 text: i18n.tr("Attach to existing note")769 text: i18n.tr("Attach to existing note")
770 onClicked: importDialog.accepted(false);770 onClicked: importDialog.accepted(false);
771 color: UbuntuColors.blue
772 }771 }
773 Button {772 Button {
774 text: i18n.tr("Cancel import")773 text: i18n.tr("Cancel import")
775 onClicked: importDialog.rejected();774 onClicked: importDialog.rejected();
776 color: UbuntuColors.red
777 }775 }
778 }776 }
779 }777 }
780778
=== modified file 'src/app/qml/components/BouncingProgressBar.qml'
--- src/app/qml/components/BouncingProgressBar.qml 2015-09-15 14:50:55 +0000
+++ src/app/qml/components/BouncingProgressBar.qml 2016-05-23 12:37:55 +0000
@@ -28,7 +28,7 @@
28 Rectangle {28 Rectangle {
29 id: rectangle29 id: rectangle
30 anchors.fill: parent30 anchors.fill: parent
31 color: UbuntuColors.orange31 color: theme.palette.normal.activity
32 visible: animation.running // Avoid to show the orange bar before animation starts32 visible: animation.running // Avoid to show the orange bar before animation starts
33 }33 }
3434
3535
=== modified file 'src/app/qml/components/EditTagsDialog.qml'
--- src/app/qml/components/EditTagsDialog.qml 2016-04-30 16:34:08 +0000
+++ src/app/qml/components/EditTagsDialog.qml 2016-05-23 12:37:55 +0000
@@ -98,9 +98,9 @@
98 top: textField.bottom98 top: textField.bottom
99 right: textField.right99 right: textField.right
100 }100 }
101 color: "white"101 color: theme.palette.normal.background
102 border.width: units.dp(1)102 border.width: units.dp(1)
103 border.color: "black"103 border.color: theme.palette.normal.backgroundText
104 height: Math.min(5, tagsListView.count) * units.gu(4)104 height: Math.min(5, tagsListView.count) * units.gu(4)
105 visible: (textField.text.length > 0 || textField.inputMethodComposing) && (textField.focus || tagsListView.focus)105 visible: (textField.text.length > 0 || textField.inputMethodComposing) && (textField.focus || tagsListView.focus)
106106
@@ -121,7 +121,7 @@
121 property bool used: root.note ? root.note.tagGuids.indexOf(model.guid) !== -1 : false121 property bool used: root.note ? root.note.tagGuids.indexOf(model.guid) !== -1 : false
122 Label {122 Label {
123 text: model.name123 text: model.name
124 color: textField.text === model.name ? UbuntuColors.orange : "black"124 color: textField.text === model.name ? theme.palette.normal.positionText : theme.palette.normal.backgroundText
125 Layout.fillHeight: true125 Layout.fillHeight: true
126 Layout.fillWidth: true126 Layout.fillWidth: true
127 }127 }
@@ -144,7 +144,7 @@
144 Button {144 Button {
145 id: okButton145 id: okButton
146 text: i18n.tr("OK")146 text: i18n.tr("OK")
147 color: UbuntuColors.orange147 color: theme.palette.normal.positive
148 enabled: textField.text.replace(/\s+/g, '') !== '' || textField.inputMethodComposing === true; // Not only whitespaces!148 enabled: textField.text.replace(/\s+/g, '') !== '' || textField.inputMethodComposing === true; // Not only whitespaces!
149 onClicked: textField.accept()149 onClicked: textField.accept()
150 }150 }
@@ -197,8 +197,6 @@
197 Layout.preferredWidth: parent.width - units.gu(2)197 Layout.preferredWidth: parent.width - units.gu(2)
198 Layout.alignment: Qt.AlignHCenter198 Layout.alignment: Qt.AlignHCenter
199199
200 color: UbuntuColors.orange
201
202 text: i18n.tr("Close")200 text: i18n.tr("Close")
203201
204 onClicked: {202 onClicked: {
205203
=== modified file 'src/app/qml/components/ListItemWithActions.qml'
--- src/app/qml/components/ListItemWithActions.qml 2015-09-15 14:50:55 +0000
+++ src/app/qml/components/ListItemWithActions.qml 2016-05-23 12:37:55 +0000
@@ -29,9 +29,8 @@
29 property Action activeAction: null29 property Action activeAction: null
30 property var activeItem: null30 property var activeItem: null
31 property bool triggerActionOnMouseRelease: false31 property bool triggerActionOnMouseRelease: false
32 property color color: Theme.palette.normal.background32 property color color: theme.palette.normal.background
33 property color selectedColor: "#E6E6E6"33 property color selectedRightActionColor: theme.palette.normal.positive
34 property color selectedRightActionColor: UbuntuColors.lightAubergine
35 property bool selected: false34 property bool selected: false
36 property bool selectionMode: false35 property bool selectionMode: false
37 property alias showDivider: divider.visible36 property alias showDivider: divider.visible
@@ -185,7 +184,7 @@
185 }184 }
186 width: root.leftActionWidth + actionThreshold185 width: root.leftActionWidth + actionThreshold
187 visible: leftSideAction186 visible: leftSideAction
188 color: UbuntuColors.red187 color: theme.palette.normal.negative
189188
190 Icon {189 Icon {
191 anchors {190 anchors {
@@ -193,7 +192,7 @@
193 horizontalCenterOffset: actionThreshold / 2192 horizontalCenterOffset: actionThreshold / 2
194 }193 }
195 name: leftSideAction && _showActions ? leftSideAction.iconName : ""194 name: leftSideAction && _showActions ? leftSideAction.iconName : ""
196 color: Theme.palette.selected.field195 color: theme.palette.normal.negativeText
197 height: units.gu(3)196 height: units.gu(3)
198 width: units.gu(3)197 width: units.gu(3)
199 }198 }
@@ -244,7 +243,7 @@
244 height: units.gu(3)243 height: units.gu(3)
245 source: modelData.iconSource ? modelData.iconSource : ''244 source: modelData.iconSource ? modelData.iconSource : ''
246 name: modelData.iconName ? modelData.iconName : ''245 name: modelData.iconName ? modelData.iconName : ''
247 color: root.activeAction === modelData || !root.triggerActionOnMouseRelease ? root.selectedRightActionColor : UbuntuColors.lightGrey246 color: root.activeAction === modelData || !root.triggerActionOnMouseRelease ? root.selectedRightActionColor : theme.palette.normal.backgroundSecondaryText
248 }247 }
249 Rectangle {248 Rectangle {
250 id: underscore249 id: underscore
251250
=== modified file 'src/app/qml/components/NoteHeader.qml'
--- src/app/qml/components/NoteHeader.qml 2015-11-02 20:26:37 +0000
+++ src/app/qml/components/NoteHeader.qml 2016-05-23 12:37:55 +0000
@@ -117,7 +117,7 @@
117 iconName: root.note && root.note.reminder ? "reminder" : "reminder-new"117 iconName: root.note && root.note.reminder ? "reminder" : "reminder-new"
118 height: parent.height118 height: parent.height
119 width: height119 width: height
120 iconColor: root.note && note.reminder ? UbuntuColors.blue : Qt.rgba(0.0, 0.0, 0.0, 0.0)120 iconColor: root.note && note.reminder ? theme.palette.normal.positive : Qt.rgba(0.0, 0.0, 0.0, 0.0)
121 visible: index == notebookSelector.selectedIndex121 visible: index == notebookSelector.selectedIndex
122 onClicked: {122 onClicked: {
123 Qt.inputMethod.hide();123 Qt.inputMethod.hide();
124124
=== modified file 'src/app/qml/components/NotebooksDelegate.qml'
--- src/app/qml/components/NotebooksDelegate.qml 2015-09-15 14:50:55 +0000
+++ src/app/qml/components/NotebooksDelegate.qml 2016-05-23 12:37:55 +0000
@@ -39,7 +39,6 @@
39 }39 }
40 }40 }
4141
42 selectedRightActionColor: UbuntuColors.green
43 triggerActionOnMouseRelease: true42 triggerActionOnMouseRelease: true
44 rightSideActions: [43 rightSideActions: [
45 Action {44 Action {
4645
=== modified file 'src/app/qml/components/NotesDelegate.qml'
--- src/app/qml/components/NotesDelegate.qml 2016-04-28 15:53:23 +0000
+++ src/app/qml/components/NotesDelegate.qml 2016-05-23 12:37:55 +0000
@@ -56,7 +56,6 @@
56 }56 }
57 }57 }
5858
59 selectedRightActionColor: UbuntuColors.green
60 triggerActionOnMouseRelease: true59 triggerActionOnMouseRelease: true
61 rightSideActions: root.conflicting ? conflictActions : enabledRightSideActions60 rightSideActions: root.conflicting ? conflictActions : enabledRightSideActions
62 property list<Action> conflictActions: [61 property list<Action> conflictActions: [
6362
=== modified file 'src/app/qml/components/PageWithBottomEdge.qml'
--- src/app/qml/components/PageWithBottomEdge.qml 2015-09-15 14:50:55 +0000
+++ src/app/qml/components/PageWithBottomEdge.qml 2016-05-23 12:37:55 +0000
@@ -165,7 +165,7 @@
165 visible: bottomEdgeLabelVisible165 visible: bottomEdgeLabelVisible
166166
167 z: 1167 z: 1
168 color: Theme.palette.normal.background168 color: theme.palette.normal.background
169 parent: page169 parent: page
170 anchors {170 anchors {
171 left: parent.left171 left: parent.left
@@ -205,7 +205,7 @@
205205
206 width: tipLabel.paintedWidth + units.gu(6)206 width: tipLabel.paintedWidth + units.gu(6)
207 height: bottomEdge.tipHeight + units.gu(1)207 height: bottomEdge.tipHeight + units.gu(1)
208 color: Theme.palette.normal.overlay208 color: theme.palette.normal.overlay
209 Label {209 Label {
210 id: tipLabel210 id: tipLabel
211211
212212
=== modified file 'src/app/qml/components/RemindersDelegate.qml'
--- src/app/qml/components/RemindersDelegate.qml 2015-09-15 14:50:55 +0000
+++ src/app/qml/components/RemindersDelegate.qml 2016-05-23 12:37:55 +0000
@@ -41,7 +41,6 @@
41 }41 }
42 }42 }
4343
44 selectedRightActionColor: UbuntuColors.green
45 triggerActionOnMouseRelease: true44 triggerActionOnMouseRelease: true
46 rightSideActions: [45 rightSideActions: [
47 Action {46 Action {
4847
=== modified file 'src/app/qml/components/ResolveConflictConfirmationDialog.qml'
--- src/app/qml/components/ResolveConflictConfirmationDialog.qml 2015-09-15 14:50:55 +0000
+++ src/app/qml/components/ResolveConflictConfirmationDialog.qml 2016-05-23 12:37:55 +0000
@@ -55,7 +55,7 @@
5555
56 Button {56 Button {
57 text: i18n.tr("Yes")57 text: i18n.tr("Yes")
58 color: UbuntuColors.green58 color: theme.palette.normal.positive
59 onClicked: {59 onClicked: {
60 root.accepted();60 root.accepted();
61 PopupUtils.close(root);61 PopupUtils.close(root);
@@ -64,7 +64,7 @@
6464
65 Button {65 Button {
66 text: i18n.tr("No")66 text: i18n.tr("No")
67 color: UbuntuColors.red67 color: theme.palette.normal.negative
68 onClicked: {68 onClicked: {
69 root.rejected();69 root.rejected();
70 PopupUtils.close(root)70 PopupUtils.close(root)
7171
=== modified file 'src/app/qml/components/RtfButton.qml'
--- src/app/qml/components/RtfButton.qml 2015-09-15 14:50:55 +0000
+++ src/app/qml/components/RtfButton.qml 2016-05-23 12:37:55 +0000
@@ -48,7 +48,7 @@
4848
49 Rectangle {49 Rectangle {
50 anchors.fill: parent50 anchors.fill: parent
51 color: UbuntuColors.darkGrey51 color: theme.palette.normal.backgroundSecondaryText
52 opacity: root.active || mouseArea.pressed ? 0.2 : 052 opacity: root.active || mouseArea.pressed ? 0.2 : 0
53 }53 }
5454
5555
=== modified file 'src/app/qml/components/TagsDelegate.qml'
--- src/app/qml/components/TagsDelegate.qml 2015-09-15 14:50:55 +0000
+++ src/app/qml/components/TagsDelegate.qml 2016-05-23 12:37:55 +0000
@@ -37,7 +37,6 @@
37 }37 }
38 }38 }
3939
40 selectedRightActionColor: UbuntuColors.green
41 triggerActionOnMouseRelease: true40 triggerActionOnMouseRelease: true
42 rightSideActions: [41 rightSideActions: [
43 Action {42 Action {
4443
=== modified file 'src/app/qml/ui/AccountSelectorPage.qml'
--- src/app/qml/ui/AccountSelectorPage.qml 2015-09-15 14:50:55 +0000
+++ src/app/qml/ui/AccountSelectorPage.qml 2016-05-23 12:37:55 +0000
@@ -89,7 +89,7 @@
89 anchors.horizontalCenter: parent.horizontalCenter89 anchors.horizontalCenter: parent.horizontalCenter
90 width: parent.width - units.gu(2)90 width: parent.width - units.gu(2)
91 text: i18n.tr("Add new account")91 text: i18n.tr("Add new account")
92 color: UbuntuColors.orange92 color: theme.palette.normal.positive
93 onClicked: root.oaSetup.exec()93 onClicked: root.oaSetup.exec()
94 }94 }
95 }95 }
9696
=== modified file 'src/app/qml/ui/EditNoteView.qml'
--- src/app/qml/ui/EditNoteView.qml 2016-04-30 16:34:08 +0000
+++ src/app/qml/ui/EditNoteView.qml 2016-05-23 12:37:55 +0000
@@ -603,7 +603,7 @@
603 // TRANSLATORS: Button to close the edit mode603 // TRANSLATORS: Button to close the edit mode
604 text: i18n.tr("Close")604 text: i18n.tr("Close")
605 height: parent.height605 height: parent.height
606 iconColor: UbuntuColors.green606 iconColor: theme.palette.normal.positive
607 onClicked: {607 onClicked: {
608 forceActiveFocus();608 forceActiveFocus();
609 saveNote();609 saveNote();
610610
=== modified file 'src/app/qml/ui/NoteView.qml'
--- src/app/qml/ui/NoteView.qml 2016-04-30 16:34:08 +0000
+++ src/app/qml/ui/NoteView.qml 2016-05-23 12:37:55 +0000
@@ -149,7 +149,7 @@
149 // TRANSLATORS: Button to close the note viewer149 // TRANSLATORS: Button to close the note viewer
150 text: i18n.tr("Close")150 text: i18n.tr("Close")
151 height: parent.height151 height: parent.height
152 iconColor: UbuntuColors.green152 iconColor: theme.palette.normal.positive
153 visible: root.canClose153 visible: root.canClose
154 onClicked: {154 onClicked: {
155 pageStack.pop()155 pageStack.pop()
@@ -171,7 +171,7 @@
171 // TRANSLATORS: Button to go from note viewer to note editor171 // TRANSLATORS: Button to go from note viewer to note editor
172 text: i18n.tr("Edit")172 text: i18n.tr("Edit")
173 height: parent.height173 height: parent.height
174 iconColor: UbuntuColors.green174 iconColor: theme.palette.normal.positive
175 onClicked: {175 onClicked: {
176 root.editNote()176 root.editNote()
177 }177 }
178178
=== modified file 'src/app/qml/ui/SetReminderView.qml'
--- src/app/qml/ui/SetReminderView.qml 2015-09-15 14:50:55 +0000
+++ src/app/qml/ui/SetReminderView.qml 2016-05-23 12:37:55 +0000
@@ -75,7 +75,7 @@
75 // TRANSLATORS: Button that deletes a reminder75 // TRANSLATORS: Button that deletes a reminder
76 text: i18n.tr("Delete")76 text: i18n.tr("Delete")
77 Layout.fillWidth: true77 Layout.fillWidth: true
78 color: UbuntuColors.red78 color: theme.palette.normal.negative
79 onClicked: {79 onClicked: {
80 note.reminder = false;80 note.reminder = false;
81 NotesStore.saveNote(note.guid);81 NotesStore.saveNote(note.guid);
@@ -86,7 +86,7 @@
86 Layout.fillWidth: true86 Layout.fillWidth: true
87 // TRANSLATORS: Button that saves a reminder87 // TRANSLATORS: Button that saves a reminder
88 text: i18n.tr("Save")88 text: i18n.tr("Save")
89 color: UbuntuColors.green89 color: theme.palette.normal.positive
90 onClicked: {90 onClicked: {
91 note.reminder = true;91 note.reminder = true;
92 var date = datePicker.date92 var date = datePicker.date

Subscribers

People subscribed via source and target branches