Merge lp:~vthompson/music-app/remove-white-error-labels-1353173 into lp:music-app/trusty

Proposed by Victor Thompson on 2014-08-05
Status: Merged
Approved by: Victor Thompson on 2014-08-07
Approved revision: 553
Merged at revision: 556
Proposed branch: lp:~vthompson/music-app/remove-white-error-labels-1353173
Merge into: lp:music-app/trusty
Diff against target: 86 lines (+10/-6)
3 files modified
MusicPlaylists.qml (+5/-3)
Style.qml (+2/-1)
music-app.qml (+3/-2)
To merge this branch: bzr merge lp:~vthompson/music-app/remove-white-error-labels-1353173
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve on 2014-08-07
Andrew Hayzen 2014-08-05 Approve on 2014-08-07
Review via email: mp+229713@code.launchpad.net

Commit message

* Make dialog error text red instead of white
* Make confirm dialog button orange

Description of the change

Make dialog error text red instead of white because a recent change to the ubuntu-ui-toolkit (see bug) has made the dialog boxes white, which is the same color the error text being used currently is. I suggest we use a red font color.

To post a comment you must log in.
552. By Victor Thompson on 2014-08-06

merge of trunk

553. By Victor Thompson on 2014-08-06

* Make dialog error text red instead of white
* Make confirm dialog button orange

Andrew Hayzen (ahayzen) wrote :

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 'MusicPlaylists.qml'
2--- MusicPlaylists.qml 2014-08-06 02:13:53 +0000
3+++ MusicPlaylists.qml 2014-08-06 02:26:47 +0000
4@@ -71,12 +71,13 @@
5 }
6 Label {
7 id: editplaylistoutput
8- color: "white"
9+ color: "red"
10 visible: false
11 }
12
13 Button {
14 text: i18n.tr("Change")
15+ color: styleMusic.dialog.confirmButtonColor
16 onClicked: {
17 editplaylistoutput.visible = true
18
19@@ -103,7 +104,7 @@
20 }
21 Button {
22 text: i18n.tr("Cancel")
23- color: styleMusic.dialog.buttonColor
24+ color: styleMusic.dialog.cancelButtonColor
25 onClicked: PopupUtils.close(dialogueEditPlaylist)
26 }
27 }
28@@ -120,6 +121,7 @@
29
30 Button {
31 text: i18n.tr("Remove")
32+ color: styleMusic.dialog.confirmButtonColor
33 onClicked: {
34 // removing playlist
35 Playlists.removePlaylist(oldPlaylistName)
36@@ -131,7 +133,7 @@
37 }
38 Button {
39 text: i18n.tr("Cancel")
40- color: styleMusic.dialog.buttonColor
41+ color: styleMusic.dialog.cancelButtonColor
42 onClicked: PopupUtils.close(dialogueRemovePlaylist)
43 }
44 }
45
46=== modified file 'Style.qml'
47--- Style.qml 2014-08-06 02:13:53 +0000
48+++ Style.qml 2014-08-06 02:26:47 +0000
49@@ -46,7 +46,8 @@
50 }
51
52 property QtObject dialog: QtObject {
53- property color buttonColor: UbuntuColors.coolGrey;
54+ property color confirmButtonColor: UbuntuColors.orange;
55+ property color cancelButtonColor: UbuntuColors.coolGrey;
56 property color normalTextFieldColor: common.white
57 }
58
59
60=== modified file 'music-app.qml'
61--- music-app.qml 2014-08-06 02:13:53 +0000
62+++ music-app.qml 2014-08-06 02:26:47 +0000
63@@ -707,12 +707,13 @@
64 }
65 Label {
66 id: newplaylistoutput
67- color: "white"
68+ color: "red"
69 visible: false // should only be visible when an error is made.
70 }
71
72 Button {
73 text: i18n.tr("Create")
74+ color: styleMusic.dialog.confirmButtonColor
75 objectName: "newPlaylistDialog_createButton"
76 onClicked: {
77 newplaylistoutput.visible = false // make sure its hidden now if there was an error last time
78@@ -739,7 +740,7 @@
79
80 Button {
81 text: i18n.tr("Cancel")
82- color: styleMusic.dialog.buttonColor
83+ color: styleMusic.dialog.cancelButtonColor
84 onClicked: PopupUtils.close(dialogueNewPlaylist)
85 }
86 }

Subscribers

People subscribed via source and target branches

to status/vote changes: