Merge lp:~vthompson/music-app/new-playlist-header into lp:music-app/trusty

[Victor Thompson]

* New playlist from header

This change places an action in the header to create a new playlist and removes the old button. It also introduces this action the the Playlists tab.

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

FAILED: Continuous integration, rev:511
http://91.189.93.70:8080/job/music-app-ci/904/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/755
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/755/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/128

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

review: Needs Fixing (continuous-integration)

[lp:~vthompson/music-app/new-playlist-header]

512. By Victor Thompson on 2014-07-02

Fix test

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

PASSED: Continuous integration, rev:512
http://91.189.93.70:8080/job/music-app-ci/910/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/804
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/804/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/134

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

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

Sweet! Looks good to me :)

review: Approve

=== modified file 'MusicPlaylists.qml'
--- MusicPlaylists.qml	2014-06-24 19:35:57 +0000
+++ MusicPlaylists.qml	2014-07-02 23:10:52 +0000
@@ -44,6 +44,20 @@
     property string oldPlaylistID: ""
     property string inPlaylist: ""
 
+    tools: ToolbarItems {
+        ToolbarButton {
+            action: Action {
+                objectName: "newplaylistButton"
+                text: i18n.tr("New playlist")
+                iconSource: "images/add.svg"
+                onTriggered: {
+                    customdebug("New playlist.")
+                    PopupUtils.open(newPlaylistDialog, mainView)
+                }
+            }
+        }
+    }
+
     // Edit name of playlist dialog
     Component {
         id: editPlaylistDialog

=== modified file 'MusicaddtoPlaylist.qml'
--- MusicaddtoPlaylist.qml	2014-06-24 19:35:57 +0000
+++ MusicaddtoPlaylist.qml	2014-07-02 23:10:52 +0000
@@ -40,6 +40,20 @@
     title: i18n.tr("Select playlist")
     visible: false
 
+    tools: ToolbarItems {
+        ToolbarButton {
+            action: Action {
+                objectName: "newplaylistButton"
+                text: i18n.tr("New playlist")
+                iconSource: "images/add.svg"
+                onTriggered: {
+                    customdebug("New playlist.")
+                    PopupUtils.open(newPlaylistDialog, mainView)
+                }
+            }
+        }
+    }
+
     Component.onCompleted: {
         // check the four latest track in each playlist
         // get the cover art of them
@@ -118,21 +132,4 @@
             }
         }
     }
-
-    Button {
-        id: newPlaylistItem
-        anchors {
-            bottom: parent.bottom
-            bottomMargin: wideAspect ? musicToolbar.fullHeight : musicToolbar.mouseAreaOffset + musicToolbar.minimizedHeight
-        }
-        objectName: "newplaylistButton"
-        text: i18n.tr("New playlist")
-        iconSource: "images/add.svg"
-        iconPosition: "left"
-        width: parent.width
-        onClicked: {
-            customdebug("New playlist.")
-            PopupUtils.open(newPlaylistDialog, mainView)
-        }
-    }
 }

=== modified file 'common/MusicPage.qml'
--- common/MusicPage.qml	2014-06-25 19:43:32 +0000
+++ common/MusicPage.qml	2014-07-02 23:10:52 +0000
@@ -23,7 +23,6 @@
 // generic page for music, could be useful for bottomedge implementation
 Page {
     id: thisPage
-    tools: null
 
     onVisibleChanged: {
         if (visible) {

=== modified file 'tests/autopilot/music_app/emulators.py'
--- tests/autopilot/music_app/emulators.py	2014-06-26 17:48:54 +0000
+++ tests/autopilot/music_app/emulators.py	2014-07-02 23:10:52 +0000
@@ -78,6 +78,10 @@
         queueTrackLabel = self.get_songs_page_queuetrack_label()
         self.pointing_device.click_object(queueTrackLabel)
 
+    def tap_new_playlist_action(self):
+        header = self.get_header()
+        header.click_action_button('newplaylistButton')
+
     def get_player(self):
         return self.select_single("*", objectName="player")
 
@@ -248,9 +252,6 @@
             if item.visible:
                 return item
 
-    def get_newplaylistButton(self):
-        return self.select_many_retry("Button", objectName="newplaylistButton")
-
     def get_newPlaylistDialog_createButton(self):
         return self.wait_select_single(
             "Button", objectName="newPlaylistDialog_createButton")

=== modified file 'tests/autopilot/music_app/tests/test_music.py'
--- tests/autopilot/music_app/tests/test_music.py	2014-06-26 17:48:54 +0000
+++ tests/autopilot/music_app/tests/test_music.py	2014-07-02 23:10:52 +0000
@@ -457,9 +457,8 @@
         # get initial list view playlist count
         playlist_count = self.main_view.get_addtoplaylistview()[0].count
 
-        # click on New playlist button
-        newplaylistButton = self.main_view.get_newplaylistButton()[0]
-        self.pointing_device.click_object(newplaylistButton)
+        # click on New playlist button in header
+        self.main_view.tap_new_playlist_action()
 
         # input playlist name
         playlistNameFld = self.main_view.get_newPlaylistDialog_name_textfield()