Merge lp:~vthompson/music-app/music-uc1.3-sort-songs into lp:music-app

[Victor Thompson]

* Use Page Head Section to allow Songs tab to be sorted.

* Use Page Head Section to allow Songs tab to be sorted.

The related bug [1] has initial approval for using these Sections in the Now Playing view. This change allows the Songs tab to be sorted by date added.

1 - https://bugs.launchpad.net/music-app/+bug/1447428

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

PASSED: Continuous integration, rev:908
http://91.189.93.70:8080/job/music-app-ci/1398/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/250

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

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

Using this in the 'root' pages could be problematic when the convergence stuff lands [2] as it uses the head sections instead of tabs. As we would then have double sections it would look a bit weird, I think header actions would be preferable here.

1 - https://code.launchpad.net/~ahayzen/music-app/refactor-adaptive-page-layout

review: Needs Information

[Victor Thompson (vthompson)]

Agreed, since the converged view will use the sections for the different tabs/views we should find a different pattern for the sorting options.

review: Needs Fixing

[Andrew Hayzen (ahayzen)]

My suggestion is:
Create a header action called "Sort..." then use a popup (like the one in the webbrowser when you press and hold a link) that gives the options "Alphabetical", "Date added" etc.

review: Needs Information

Unmerged revisions

908. By Victor Thompson on 2015-10-24

* Use Page Head Section to allow Songs tab to be sorted.

=== modified file 'app/ui/Songs.qml'
--- app/ui/Songs.qml	2015-10-24 18:37:51 +0000
+++ app/ui/Songs.qml	2015-10-24 18:37:51 +0000
@@ -53,6 +53,23 @@
         }
     ]
 
+    PageHeadSections {
+        id: defaultStateSections
+        model: [i18n.tr("Title"), i18n.tr("Date added")]
+        selectedIndex: 0
+    }
+
+    head {
+        sections {
+            model: defaultStateSections.model
+            selectedIndex: defaultStateSections.selectedIndex
+            onSelectedIndexChanged: {
+                songsModelFilter.sort.property = head.sections.selectedIndex == 0 ? "title" : "eTag"
+                songsModelFilter.sort.order = head.sections.selectedIndex == 0 ? Qt.AscendingOrder : Qt.DescendingOrder
+            }
+        }
+    }
+
     // Hack for autopilot otherwise Albums appears as MusicPage
     // due to bug 1341671 it is required that there is a property so that
     // qml doesn't optimise using the parent type
 
=== modified file 'debian/changelog'
--- debian/changelog	2015-10-24 18:37:51 +0000
+++ debian/changelog	2015-10-24 18:37:51 +0000
@@ -6,6 +6,7 @@
   [ Victor Thompson ]
   * Remove some deprecated code for the UbuntuShape image property.
   * Update app to use the Ubuntu Components version 1.3 (LP: #1508363)
+  * Use Page Head Section to allow Songs tab to be sorted.
 
  -- Bartosz Kosiorek <[e-mail]>  Tue, 08 Sep 2015 10:08:49 +0200
 
 
=== modified file 'po/com.ubuntu.music.pot'
--- po/com.ubuntu.music.pot	2015-08-21 19:41:03 +0000
+++ po/com.ubuntu.music.pot	2015-10-24 18:37:51 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: music-app\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-21 20:40+0100\n"
+"POT-Creation-Date: 2015-10-24 13:31-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -37,7 +37,7 @@
 msgid "Cancel"
 msgstr ""
 
-#: ../app/components/Dialog/ContentHubWaitDialog.qml:34
+#: ../app/components/Dialog/ContentHubWaitDialog.qml:33
 msgid "Waiting for file(s)..."
 msgstr ""
 
@@ -83,7 +83,7 @@
 msgstr ""
 
 #: ../app/components/Dialog/RemovePlaylistDialog.qml:37
-#: ../app/components/ListItemActions/Remove.qml:28
+#: ../app/components/ListItemActions/Remove.qml:27
 msgid "Remove"
 msgstr ""
 
@@ -180,11 +180,11 @@
 msgid "Shuffle"
 msgstr ""
 
-#: ../app/components/Walkthrough/Slide1.qml:58
+#: ../app/components/Walkthrough/Slide1.qml:59
 msgid "Welcome to Music"
 msgstr ""
 
-#: ../app/components/Walkthrough/Slide1.qml:72
+#: ../app/components/Walkthrough/Slide1.qml:73
 msgid ""
 "Enjoy your favorite music with Ubuntu's Music App. Take a short tour on how "
 "to get started or press skip to start listening now."
@@ -195,7 +195,7 @@
 msgstr ""
 
 #: ../app/components/Walkthrough/Slide2.qml:67
-#: ../app/ui/LibraryEmptyState.qml:117
+#: ../app/ui/LibraryEmptyState.qml:123
 msgid ""
 "Connect your device to any computer and simply drag files to the Music "
 "folder or insert removable media with music."
@@ -213,84 +213,84 @@
 msgid "Start"
 msgstr ""
 
-#: ../app/components/Walkthrough/Walkthrough.qml:84
+#: ../app/components/Walkthrough/Walkthrough.qml:120
 msgid "Skip"
 msgstr ""
 
-#: ../app/music-app.qml:155
+#: ../app/music-app.qml:156
 msgid "Next"
 msgstr ""
 
-#: ../app/music-app.qml:156
+#: ../app/music-app.qml:157
 msgid "Next Track"
 msgstr ""
 
-#: ../app/music-app.qml:162
+#: ../app/music-app.qml:163
 msgid "Pause"
 msgstr ""
 
-#: ../app/music-app.qml:162
+#: ../app/music-app.qml:163
 msgid "Play"
 msgstr ""
 
-#: ../app/music-app.qml:164
+#: ../app/music-app.qml:165
 msgid "Pause Playback"
 msgstr ""
 
-#: ../app/music-app.qml:164
+#: ../app/music-app.qml:165
 msgid "Continue or start playback"
 msgstr ""
 
-#: ../app/music-app.qml:169
+#: ../app/music-app.qml:170
 msgid "Back"
 msgstr ""
 
-#: ../app/music-app.qml:170
+#: ../app/music-app.qml:171
 msgid "Go back to last page"
 msgstr ""
 
-#: ../app/music-app.qml:178
+#: ../app/music-app.qml:179
 msgid "Previous"
 msgstr ""
 
-#: ../app/music-app.qml:179
+#: ../app/music-app.qml:180
 msgid "Previous Track"
 msgstr ""
 
-#: ../app/music-app.qml:184
+#: ../app/music-app.qml:185
 msgid "Stop"
 msgstr ""
 
-#: ../app/music-app.qml:185
+#: ../app/music-app.qml:186
 msgid "Stop Playback"
 msgstr ""
 
-#: ../app/music-app.qml:276 com.ubuntu.music_music.desktop.in.in.h:1
+#: ../app/music-app.qml:277 com.ubuntu.music_music.desktop.in.in.h:1
 msgid "Music"
 msgstr ""
 
-#: ../app/music-app.qml:306
+#: ../app/music-app.qml:307
 msgid "Debug: "
 msgstr ""
 
 #. TRANSLATORS: this appears in the header with limited space (around 20 characters)
-#: ../app/music-app.qml:371 ../app/music-app.qml:986
+#: ../app/music-app.qml:372 ../app/music-app.qml:987
 #: ../app/ui/NowPlaying.qml:38
 msgid "Now playing"
 msgstr ""
 
 #. TRANSLATORS: this appears in the header with limited space (around 20 characters)
-#: ../app/music-app.qml:371 ../app/music-app.qml:403 ../app/music-app.qml:987
-#: ../app/music-app.qml:991 ../app/ui/NowPlaying.qml:40
+#: ../app/music-app.qml:372 ../app/music-app.qml:404 ../app/music-app.qml:988
+#: ../app/music-app.qml:992 ../app/ui/NowPlaying.qml:40
 msgid "Queue"
 msgstr ""
 
 #. TRANSLATORS: this appears in the header with limited space (around 20 characters)
-#: ../app/ui/AddToPlaylist.qml:46
+#: ../app/ui/AddToPlaylist.qml:45
 msgid "Select playlist"
 msgstr ""
 
-#: ../app/ui/AddToPlaylist.qml:94 ../app/ui/Playlists.qml:87
+#: ../app/ui/AddToPlaylist.qml:93 ../app/ui/Playlists.qml:86
 #: ../app/ui/SongsView.qml:292 ../app/ui/SongsView.qml:293
 #, qt-format
 msgid "%1 song"
@@ -300,12 +300,12 @@
 
 #. TRANSLATORS: this is the name of the playlists page shown in the tab header.
 #. Remember to keep the translation short to fit the screen width
-#: ../app/ui/AddToPlaylist.qml:99 ../app/ui/Playlists.qml:38
+#: ../app/ui/AddToPlaylist.qml:98 ../app/ui/Playlists.qml:37
 #: ../app/ui/SongsView.qml:103
 msgid "Playlists"
 msgstr ""
 
-#: ../app/ui/AddToPlaylist.qml:109 ../app/ui/Recent.qml:37
+#: ../app/ui/AddToPlaylist.qml:108 ../app/ui/Recent.qml:36
 #: ../app/ui/SongsView.qml:91
 msgid "Recent"
 msgstr ""
@@ -314,35 +314,35 @@
 msgid "Albums"
 msgstr ""
 
-#: ../app/ui/Albums.qml:72 ../app/ui/ArtistView.qml:129
-#: ../app/ui/ArtistView.qml:142 ../app/ui/Recent.qml:82
+#: ../app/ui/Albums.qml:72 ../app/ui/ArtistView.qml:128
+#: ../app/ui/ArtistView.qml:141 ../app/ui/Recent.qml:81
 #: ../app/ui/SongsView.qml:249
 msgid "Unknown Album"
 msgstr ""
 
-#: ../app/ui/Albums.qml:73 ../app/ui/ArtistView.qml:85
-#: ../app/ui/ArtistView.qml:141 ../app/ui/Artists.qml:80
-#: ../app/ui/Recent.qml:83 ../app/ui/SongsView.qml:270
+#: ../app/ui/Albums.qml:73 ../app/ui/ArtistView.qml:84
+#: ../app/ui/ArtistView.qml:140 ../app/ui/Artists.qml:79
+#: ../app/ui/Recent.qml:82 ../app/ui/SongsView.qml:270
 msgid "Unknown Artist"
 msgstr ""
 
-#: ../app/ui/Albums.qml:83 ../app/ui/ArtistView.qml:140
-#: ../app/ui/Recent.qml:98
+#: ../app/ui/Albums.qml:83 ../app/ui/ArtistView.qml:139
+#: ../app/ui/Recent.qml:97
 msgid "Album"
 msgstr ""
 
-#: ../app/ui/ArtistView.qml:104
+#: ../app/ui/ArtistView.qml:103
 #, qt-format
 msgid "%1 album"
 msgid_plural "%1 albums"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../app/ui/Artists.qml:38
+#: ../app/ui/Artists.qml:37
 msgid "Artists"
 msgstr ""
 
-#: ../app/ui/Artists.qml:108
+#: ../app/ui/Artists.qml:107
 msgid "Artist"
 msgstr ""
 
@@ -361,7 +361,7 @@
 msgid "Genre"
 msgstr ""
 
-#: ../app/ui/LibraryEmptyState.qml:106
+#: ../app/ui/LibraryEmptyState.qml:112
 msgid "No music found"
 msgstr ""
 
@@ -370,8 +370,8 @@
 msgid "Clear queue"
 msgstr ""
 
-#: ../app/ui/Playlists.qml:99 ../app/ui/Playlists.qml:100
-#: ../app/ui/Recent.qml:83 ../app/ui/Recent.qml:98 ../app/ui/SongsView.qml:67
+#: ../app/ui/Playlists.qml:98 ../app/ui/Playlists.qml:99
+#: ../app/ui/Recent.qml:82 ../app/ui/Recent.qml:97 ../app/ui/SongsView.qml:67
 #: ../app/ui/SongsView.qml:82 ../app/ui/SongsView.qml:114
 #: ../app/ui/SongsView.qml:154 ../app/ui/SongsView.qml:188
 #: ../app/ui/SongsView.qml:203 ../app/ui/SongsView.qml:222
@@ -385,6 +385,14 @@
 msgid "Songs"
 msgstr ""
 
+#: ../app/ui/Songs.qml:58
+msgid "Title"
+msgstr ""
+
+#: ../app/ui/Songs.qml:58
+msgid "Date added"
+msgstr ""
+
 #: com.ubuntu.music_music.desktop.in.in.h:2
 msgid "A music application for Ubuntu"
 msgstr ""