Merge lp:~ahayzen/music-app/show-toolbar-on-play into lp:music-app/trusty

[Andrew Hayzen]

* Show toolbar when a track is clicked

* Show toolbar when a track is clicked

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:176
http://91.189.93.70:8080/job/music-app-ci/175/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/932
    SUCCESS: http://91.189.93.70:8080/job/music-app-precise-amd64-ci/175
    SUCCESS: http://91.189.93.70:8080/job/music-app-quantal-amd64-ci/175
    SUCCESS: http://91.189.93.70:8080/job/music-app-raring-amd64-ci/175
    SUCCESS: http://91.189.93.70:8080/job/music-app-saucy-amd64-ci/177

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

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

Good idea. There are more places we make the now playing view visible. I think we should also popup the toolbar in those cases as well.

review: Needs Fixing

[Andrew Hayzen (ahayzen)]

Such as?

And this branch is just fixing the bug Lisette reported.

Any other places that aren't in the design spec should probably be done in a separate branch as they will need to be discussed with design.

[Victor Thompson (vthompson)]

The Recently Played and Genres lists need to be fixed so this is consistent.

[Andrew Hayzen (ahayzen)]

Ah ok, forgot they don't use trackClicked()

[lp:~ahayzen/music-app/show-toolbar-on-play]

177. By Andrew Hayzen on 2013-10-12

* Fix for selecting Recently Played or Genre

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:177
http://91.189.93.70:8080/job/music-app-ci/180/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/937
    SUCCESS: http://91.189.93.70:8080/job/music-app-precise-amd64-ci/180
    SUCCESS: http://91.189.93.70:8080/job/music-app-quantal-amd64-ci/180
    SUCCESS: http://91.189.93.70:8080/job/music-app-raring-amd64-ci/180
    SUCCESS: http://91.189.93.70:8080/job/music-app-saucy-amd64-ci/182

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

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

Looks good.

review: Approve

=== modified file 'MusicStart.qml'
--- MusicStart.qml	2013-10-11 02:28:39 +0000
+++ MusicStart.qml	2013-10-12 19:15:27 +0000
@@ -131,6 +131,7 @@
                         player.source = Qt.resolvedUrl(file)
                         player.play()
                         nowPlaying.visible = true
+                        musicToolbar.showToolbar()
                     }
                 }
             }
@@ -202,6 +203,7 @@
                         player.source = Qt.resolvedUrl(file)
                         player.play()
                         nowPlaying.visible = true
+                        musicToolbar.showToolbar();
                     }
                 }
                 UbuntuShape {  // Background so can see text in current state

=== modified file 'music-app.qml'
--- music-app.qml	2013-10-12 16:46:31 +0000
+++ music-app.qml	2013-10-12 19:15:27 +0000
@@ -408,6 +408,8 @@
                 // Show the Now Playing page and make sure the track is visible
                 nowPlaying.visible = true;
                 nowPlaying.ensureVisibleIndex = index;
+
+                musicToolbar.showToolbar();
             }
 
             return
@@ -442,6 +444,8 @@
             // Show the Now Playing page and make sure the track is visible
             nowPlaying.visible = true;
             nowPlaying.ensureVisibleIndex = index;
+
+            musicToolbar.showToolbar();
         }
 
         return file