Merge lp:~ahayzen/music-app/search-toolbar-item into lp:music-app/trusty

[Andrew Hayzen]

* Add search button to header items

* Add search button to header items

This is what the application looks like when running staging [0], should the search button be removed from the toolbar as it now exists twice?

TESTING
branch this to a known location eg for me ~/Workspace/sdk/music-app-search-toolbar-item
Then branch the SDK staging to another known location eg ~/Workspace/sdk/ubuntu-ui-toolkit-staging
Start a terminal in the staging directory and run the following
sudo apt-get build-dep ubuntu-ui-toolkit
qmake
make
source export_modules_dir.sh
qmlscene ~/Workspace/sdk/music-app-search-toolbar-item/music-app.qml

0 - https://docs.google.com/file/d/0B3XynHVKfrvMbHkydWlpWF9FQkE/edit

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

PASSED: Continuous integration, rev:454
http://91.189.93.70:8080/job/music-app-ci/776/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2482
    SUCCESS: http://91.189.93.70:8080/job/music-app-saucy-amd64-ci/778
    SUCCESS: http://91.189.93.70:8080/job/music-app-trusty-amd64-ci/497

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

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

We should try to detect the 14.10 SDK vs the 14.04 SDK via 'header.useDepcrecatedToolbar' or similar, as we had done previously. Perhaps we should use this to create a 'useUtopicSDK' so the code that depends on these switches makes more sense. That way we can hide the toolbar's search button that shows up on the desktop/tablet.

I think, overall, we should wait until this lands in the Utopic images before we land this so we can test it on the device without setting up a PPA or testing via a silo.

[Alan Pope 🍺🐧🐱 🦄 (popey)]

I agree we should continue to support 14.04 if possible, detecting the (lack of) new tool bar and reacting accordingly. However I wouldn't want us to end up with an unmaintainable mess that could result in supporting older versions. So think carefully about each of these cases.

[lp:~ahayzen/music-app/search-toolbar-item]

455. By Andrew Hayzen on 2014-05-08

* Remove search button from toolbar

[Andrew Hayzen (ahayzen)]

Ok as we are not supporting trusty mobile and only trusty+PPA we can assume that the new header components will exist.

Therefore I have removed the old search button as it is not needed any more.

However until the header parts land in the SDK i'll block myself

review: Needs Fixing

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

PASSED: Continuous integration, rev:455
http://91.189.93.70:8080/job/music-app-ci/777/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2512
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2512/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/46
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/46/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-trusty-amd64-ci/498
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/1

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

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

This functionality landed in the Utopic r25 image:

http://people.canonical.com/~ogra/touch-image-stats/25.changes

[Victor Thompson (vthompson)]

I think this should land as I believe it is more important to support search on Utopic mobile now that the HUD is gone than it is to support search in Trusty desktop with the non-PPA SDK.

However, I'd like to audit the Trusty release a bit more just in case we want to halt updating the Core Apps PPA prior to landing this.

[lp:~ahayzen/music-app/search-toolbar-item]

456. By Andrew Hayzen on 2014-05-22

* Merge of trunk

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

PASSED: Continuous integration, rev:456
http://91.189.93.70:8080/job/music-app-ci/808/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2781
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2781/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/318
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/318/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-trusty-amd64-ci/529
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/32

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

review: Approve (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

#blocked waiting for mediascanner2 branch to land.

Unmerged revisions

456. By Andrew Hayzen on 2014-05-22

* Merge of trunk

455. By Andrew Hayzen on 2014-05-08

* Remove search button from toolbar

454. By Andrew Hayzen on 2014-05-07

* Add search button to header items

=== modified file 'MusicToolbar.qml'
--- MusicToolbar.qml	2014-05-04 05:30:54 +0000
+++ MusicToolbar.qml	2014-05-22 10:37:50 +0000
@@ -483,44 +483,6 @@
                         opacity: player.shuffle && !emptyPage.noMusic ? 1 : .4
                     }
                 }
-
-                /* Search button in wideAspect */
-                Item {
-                    id: nowPlayingSearchButton
-                    objectName: "searchShape"
-                    anchors {
-                        right: parent.right
-                        rightMargin: units.gu(1)
-                        verticalCenter: parent.verticalCenter
-                    }
-                    height: units.gu(6)
-                    opacity: !emptyPage.noMusic ? 1 : .4
-                    width: height
-                    visible: wideAspect
-
-                    function trigger() {
-                        if (emptyPage.noMusic) {
-                            return;
-                        }
-
-                        if (!searchSheet.sheetVisible) {
-                            PopupUtils.open(searchSheet.sheet,
-                                            mainView, { title: i18n.tr("Search")} )
-                        }
-                    }
-
-                    Image {
-                        id: searchIcon
-                        anchors {
-                            horizontalCenter: parent.horizontalCenter
-                            verticalCenter: parent.verticalCenter
-                        }
-                        height: units.gu(3)
-                        opacity: !emptyPage.noMusic ? 1 : .4
-                        source: Qt.resolvedUrl("images/search.svg")
-                        width: height
-                    }
-                }
             }
 
             /* Progress bar component */

=== modified file 'music-app.qml'
--- music-app.qml	2014-05-08 22:58:35 +0000
+++ music-app.qml	2014-05-22 10:37:50 +0000
@@ -138,6 +138,7 @@
     // HUD Actions
     Action {
         id: searchAction
+        iconName: "search"
         text: i18n.tr("Search")
         keywords: i18n.tr("Search Track")
         onTriggered: {
@@ -198,6 +199,16 @@
 
     actions: [searchAction, nextAction, playsAction, prevAction, stopAction, backAction]
 
+    // TODO: when sdk supports move to global header item
+    ToolbarItems {
+        id: searchToolbarItem
+        ToolbarButton {
+            action: searchAction
+        }
+        opened: false
+        locked: true
+    }
+
     // signal to open new URIs
     // TODO currently this only allows playing file:// URIs of known files
     // (already in the database), not e.g. http:// URIs or files in directories
@@ -1070,6 +1081,7 @@
                 // Tab content begins here
                 page: MusicStart {
                     id: musicStartPage
+                    tools: searchToolbarItem
                 }
             }
 
@@ -1087,6 +1099,7 @@
                 // tab content
                 page: MusicArtists {
                     id: musicArtistsPage
+                    tools: searchToolbarItem
                 }
             }
 
@@ -1104,6 +1117,7 @@
                 // Tab content begins here
                 page: MusicAlbums {
                     id: musicAlbumsPage
+                    tools: searchToolbarItem
                 }
             }
 
@@ -1121,6 +1135,7 @@
                 // Tab content begins here
                 page: MusicTracks {
                     id: musicTracksPage
+                    tools: searchToolbarItem
                 }
             }
 
@@ -1139,6 +1154,7 @@
                 // Tab content begins here
                 page: MusicPlaylists {
                     id: musicPlaylistPage
+                    tools: searchToolbarItem
                 }
             }
 
@@ -1200,6 +1216,7 @@
 
     MusicNowPlaying {
         id: nowPlaying
+        tools: searchToolbarItem
     }
 
     MusicaddtoPlaylist {