Merge lp:~ahayzen/music-app/remix-remove-jumping-fix-1379894 into lp:music-app/remix

[Andrew Hayzen]

* Switch to use positionAt when isListView becomes true
* Strip out jumpTo/ensureVisible code for the now playing queue
* Fix for console errors when pressing items in queue

* Switch to use positionAt when isListView becomes true
* Strip out jumpTo/ensureVisible code for the now playing queue
* Fix for console errors when pressing items in queue

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

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

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

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

One inline comment so far.

review: Needs Fixing

[lp:~ahayzen/music-app/remix-remove-jumping-fix-1379894]

665. By Andrew Hayzen on 2014-10-11

* Put positionAt back in and ensure Ctrl+J shows the queue

666. By Andrew Hayzen on 2014-10-11

* Switch to using ListView.Center

667. By Andrew Hayzen on 2014-10-11

* Switch to use positionAt when isListView becomes true

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

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

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

review: Approve (continuous-integration)

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

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

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

review: Approve (continuous-integration)

[lp:~ahayzen/music-app/remix-remove-jumping-fix-1379894]

668. By Andrew Hayzen on 2014-10-11

* Don't use highlight as causes the queue to jump

[Victor Thompson (vthompson)]

LGTM!

review: Approve

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

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

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

review: Approve (continuous-integration)

=== modified file 'MusicNowPlaying.qml'
--- MusicNowPlaying.qml	2014-10-10 20:05:14 +0000
+++ MusicNowPlaying.qml	2014-10-11 17:28:37 +0000
@@ -33,9 +33,14 @@
     title: isListView ? i18n.tr("Queue") : i18n.tr("Now playing")
     visible: false
 
-    property int ensureVisibleIndex: 0  // ensure first index is visible at startup
     property bool isListView: false
 
+    onIsListViewChanged: {
+        if (isListView) {
+            positionAt(player.currentIndex);
+        }
+    }
+
     head.backAction: Action {
         iconName: "back";
         objectName: "backButton"
@@ -60,36 +65,8 @@
         ]
     }
 
-    Connections {
-        target: player
-        onCurrentIndexChanged: {
-            if (player.source === "") {
-                return;
-            }
-
-            queuelist.currentIndex = player.currentIndex;
-
-            customdebug("MusicQueue update currentIndex: " + player.source);
-
-            // TODO: Never jump to track? Or only jump to track in queue view?
-            if (isListView) {
-                nowPlaying.jumpToCurrent(musicToolbar.opened, nowPlaying, musicToolbar.currentTab)
-            }
-        }
-    }
-
-    function jumpToCurrent(shown, currentPage, currentTab)
-    {
-        // If the toolbar is shown, the page is now playing and snaptrack is enabled
-        if (shown && currentPage === nowPlaying && Settings.getSetting("snaptrack") === "1")
-        {
-            // Then position the view at the current index
-            queuelist.positionViewAtIndex(queuelist.currentIndex, ListView.Beginning);
-        }
-    }
-
     function positionAt(index) {
-        queuelist.positionViewAtIndex(index, ListView.Beginning);
+        queuelist.positionViewAtIndex(index, ListView.Center);
     }
 
     Rectangle {
@@ -402,13 +379,6 @@
             height: mainView.height - (styleMusic.common.expandHeight + queuelist.currentHeight) + units.gu(8)
         }
         model: trackQueue.model
-        highlightFollowsCurrentItem: true
-        highlightMoveDuration: 0
-        highlight: Rectangle {
-            color: "#2c2c34"
-            focus: true
-        }
-
         objectName: "nowPlayingQueueList"
         state: "normal"
         states: [
@@ -440,7 +410,7 @@
             id: queueDelegate
             ListItemWithActions {
                 id: queueListItem
-                color: "transparent"
+                color: player.currentIndex === index ? "#2c2c34" : "transparent"
                 height: queuelist.normalHeight
                 objectName: "nowPlayingListItem" + index
                 showDivider: false
@@ -495,9 +465,6 @@
                     }
                 }
 
-                // TODO: If http://pad.lv/1354753 is fixed to expose whether the Shape should appear pressed, update this as well.
-                onPressedChanged: trackImage.pressed = pressed
-
                 Rectangle {
                     id: trackContainer;
                     anchors {
@@ -529,7 +496,7 @@
                         column: Column {
                             Label {
                                 id: trackTitle
-                                color: queuelist.currentIndex === index ? UbuntuColors.blue
+                                color: player.currentIndex === index ? UbuntuColors.blue
                                                                         : styleMusic.common.music
                                 fontSize: "small"
                                 objectName: "titleLabel"

=== modified file 'music-app.qml'
--- music-app.qml	2014-10-09 02:17:21 +0000
+++ music-app.qml	2014-10-11 17:28:37 +0000
@@ -90,7 +90,7 @@
                 break;
             case Qt.Key_J:  //      Ctrl+J      Jump to playing song
                 tabs.pushNowPlaying()
-                nowPlaying.positionAt(player.currentIndex);
+                nowPlaying.isListView = true;
                 break;
             case Qt.Key_N:  //      Ctrl+N      Show now playing
                 tabs.pushNowPlaying()
@@ -665,7 +665,6 @@
 
             // Show the Now Playing page and make sure the track is visible
             tabs.pushNowPlaying();
-            nowPlaying.ensureVisibleIndex = index;
         }
         else {
             player.source = file;
@@ -684,8 +683,6 @@
         if (!nowPlaying.isListView) {
             tabs.pushNowPlaying();
         }
-
-        nowPlaying.ensureVisibleIndex = index;
     }
 
     function playRandomSong(shuffle)