Ubuntu Music App

Merge lp:~vthompson/music-app/remix-stroke-button-highlight into lp:music-app/remix

  1. remix-stroke-button-highlight
  2. Merge into remix
Proposed by Victor Thompson
Status: Merged
Approved by: Andrew Hayzen
Approved revision: 700
Merged at revision: 699
Proposed branch: lp:~vthompson/music-app/remix-stroke-button-highlight
Merge into: lp:music-app/remix
Diff against target: 109 lines (+20/-38)
2 files modified
common/AlbumsPage.qml (+3/-12)
common/SongsPage.qml (+17/-26)
To merge this branch: bzr merge lp:~vthompson/music-app/remix-stroke-button-highlight
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Andrew Hayzen Approve
Review via email: mp+239353@code.launchpad.net

Commit message

* Highlight stroke buttons on press

Description of the change

Stroke buttons should highlight upon being pressed. This is the default, the app is just preventing this from occurring.

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:699
http://91.189.93.70:8080/job/music-app-remix-ci/152/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1203
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1203/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-utopic-amd64-ci/152

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-remix-ci/152/rebuild

review: Approve (continuous-integration)
lp:~vthompson/music-app/remix-stroke-button-highlight updated
700. By Victor Thompson

Update AlbumsPage as well

Revision history for this message
Andrew Hayzen (ahayzen) wrote :

Awesome feels much better :)

review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:700
http://91.189.93.70:8080/job/music-app-remix-ci/153/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1209
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1209/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-utopic-amd64-ci/153

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-remix-ci/153/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'common/AlbumsPage.qml'
2--- common/AlbumsPage.qml 2014-10-21 15:28:48 +0000
3+++ common/AlbumsPage.qml 2014-10-23 13:28:51 +0000
4@@ -54,10 +54,7 @@
5 color: "white"
6 text: i18n.tr("Shuffle")
7 }
8- MouseArea {
9- anchors.fill: parent
10- onClicked: shuffleModel(songArtistModel)
11- }
12+ onClicked: shuffleModel(songArtistModel)
13 }
14 Button {
15 id: queueAllRow
16@@ -71,10 +68,7 @@
17 color: "white"
18 text: i18n.tr("Queue all")
19 }
20- MouseArea {
21- anchors.fill: parent
22- onClicked: addQueueFromModel(songArtistModel)
23- }
24+ onClicked: addQueueFromModel(songArtistModel)
25 }
26 Button {
27 id: playRow
28@@ -82,10 +76,7 @@
29 height: units.gu(4)
30 text: i18n.tr("Play all")
31 width: units.gu(15)
32- MouseArea {
33- anchors.fill: parent
34- onClicked: trackClicked(songArtistModel, 0, true)
35- }
36+ onClicked: trackClicked(songArtistModel, 0, true)
37 }
38 }
39 coverSources: albumStackPage.covers
40
41=== modified file 'common/SongsPage.qml'
42--- common/SongsPage.qml 2014-10-22 19:47:39 +0000
43+++ common/SongsPage.qml 2014-10-23 13:28:51 +0000
44@@ -215,18 +215,15 @@
45 color: "white"
46 text: i18n.tr("Shuffle")
47 }
48- MouseArea {
49- anchors.fill: parent
50- onClicked: {
51- shuffleModel(albumtrackslist.model) // play track
52+ onClicked: {
53+ shuffleModel(albumtrackslist.model) // play track
54
55- if (isAlbum && songStackPage.line1 !== i18n.tr("Genre")) {
56- Library.addRecent(songStackPage.line2, songStackPage.line1, songStackPage.covers[0], songStackPage.line2, "album")
57- recentModel.filterRecent()
58- } else if (songStackPage.line1 === i18n.tr("Playlist")) {
59- Library.addRecent(songStackPage.line2, "Playlist", songStackPage.covers[0], songStackPage.line2, "playlist")
60- recentModel.filterRecent()
61- }
62+ if (isAlbum && songStackPage.line1 !== i18n.tr("Genre")) {
63+ Library.addRecent(songStackPage.line2, songStackPage.line1, songStackPage.covers[0], songStackPage.line2, "album")
64+ recentModel.filterRecent()
65+ } else if (songStackPage.line1 === i18n.tr("Playlist")) {
66+ Library.addRecent(songStackPage.line2, "Playlist", songStackPage.covers[0], songStackPage.line2, "playlist")
67+ recentModel.filterRecent()
68 }
69 }
70 }
71@@ -242,10 +239,7 @@
72 color: "white"
73 text: i18n.tr("Queue all")
74 }
75- MouseArea {
76- anchors.fill: parent
77- onClicked: addQueueFromModel(albumtrackslist.model)
78- }
79+ onClicked: addQueueFromModel(albumtrackslist.model)
80 }
81 Button {
82 id: playRow
83@@ -253,18 +247,15 @@
84 height: units.gu(4)
85 text: i18n.tr("Play all")
86 width: units.gu(15)
87- MouseArea {
88- anchors.fill: parent
89- onClicked: {
90- trackClicked(albumtrackslist.model, 0) // play track
91+ onClicked: {
92+ trackClicked(albumtrackslist.model, 0) // play track
93
94- if (isAlbum && songStackPage.line1 !== i18n.tr("Genre")) {
95- Library.addRecent(songStackPage.line2, songStackPage.line1, songStackPage.covers[0], songStackPage.line2, "album")
96- recentModel.filterRecent()
97- } else if (songStackPage.line1 === i18n.tr("Playlist")) {
98- Library.addRecent(songStackPage.line2, "Playlist", songStackPage.covers[0], songStackPage.line2, "playlist")
99- recentModel.filterRecent()
100- }
101+ if (isAlbum && songStackPage.line1 !== i18n.tr("Genre")) {
102+ Library.addRecent(songStackPage.line2, songStackPage.line1, songStackPage.covers[0], songStackPage.line2, "album")
103+ recentModel.filterRecent()
104+ } else if (songStackPage.line1 === i18n.tr("Playlist")) {
105+ Library.addRecent(songStackPage.line2, "Playlist", songStackPage.covers[0], songStackPage.line2, "playlist")
106+ recentModel.filterRecent()
107 }
108 }
109 }

Subscribers

People subscribed via source and target branches