Ubuntu Music App

Merge lp:~vthompson/music-app/fixes-1408508 into lp:music-app/remix

  1. fixes-1408508
  2. Merge into remix
Proposed by Victor Thompson
Status: Merged
Approved by: Andrew Hayzen
Approved revision: 773
Merged at revision: 772
Proposed branch: lp:~vthompson/music-app/fixes-1408508
Merge into: lp:music-app/remix
Diff against target: 47 lines (+12/-3)
3 files modified
MusicNowPlaying.qml (+4/-1)
MusicTracks.qml (+4/-1)
common/SongsPage.qml (+4/-1)
To merge this branch: bzr merge lp:~vthompson/music-app/fixes-1408508
Reviewer Review Type Date Requested Status
Andrew Hayzen Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+245808@code.launchpad.net

Commit message

* Clear selection when leaving multiselect mode

Description of the change

* Clear selection when leaving multiselect mode

Currently leaving multi-select mode does not clear the selection and items appear as though they are selected as the user navigates the list.

To post a comment you must log in.
lp:~vthompson/music-app/fixes-1408508 updated
772. By Victor Thompson

remove extra line break

773. By Victor Thompson

remove extra line break

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

PASSED: Continuous integration, rev:771
http://91.189.93.70:8080/job/music-app-ci/1185/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/584
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/584/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/37

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

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

PASSED: Continuous integration, rev:773
http://91.189.93.70:8080/job/music-app-ci/1186/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/585
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/585/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/38

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

review: Approve (continuous-integration)
Revision history for this message
Andrew Hayzen (ahayzen) wrote :

Nice catch :) LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'MusicNowPlaying.qml'
2--- MusicNowPlaying.qml 2014-12-14 01:12:42 +0000
3+++ MusicNowPlaying.qml 2015-01-08 00:48:55 +0000
4@@ -127,7 +127,10 @@
5 backAction: Action {
6 text: i18n.tr("Cancel selection")
7 iconName: "back"
8- onTriggered: queueListLoader.item.state = "normal"
9+ onTriggered: {
10+ queueListLoader.item.clearSelection()
11+ queueListLoader.item.state = "normal"
12+ }
13 }
14 actions: [
15 Action {
16
17=== modified file 'MusicTracks.qml'
18--- MusicTracks.qml 2014-11-21 19:49:36 +0000
19+++ MusicTracks.qml 2015-01-08 00:48:55 +0000
20@@ -41,7 +41,10 @@
21 backAction: Action {
22 text: i18n.tr("Cancel selection")
23 iconName: "back"
24- onTriggered: tracklist.state = "normal"
25+ onTriggered: {
26+ tracklist.clearSelection()
27+ tracklist.state = "normal"
28+ }
29 }
30 actions: [
31 Action {
32
33=== modified file 'common/SongsPage.qml'
34--- common/SongsPage.qml 2014-11-26 02:33:29 +0000
35+++ common/SongsPage.qml 2015-01-08 00:48:55 +0000
36@@ -130,7 +130,10 @@
37 backAction: Action {
38 text: i18n.tr("Cancel selection")
39 iconName: "back"
40- onTriggered: albumtrackslist.state = "normal"
41+ onTriggered: {
42+ albumtrackslist.clearSelection()
43+ albumtrackslist.state = "normal"
44+ }
45 }
46 actions: [
47 Action {

Subscribers

People subscribed via source and target branches