ubuntu-touch-coreapps-reviewers team mailing list archive
-
ubuntu-touch-coreapps-reviewers team
-
Mailing list archive
-
Message #03968
[Merge] lp:~vthompson/music-app/prototype-page-head-sections-3 into lp:music-app
Victor Thompson has proposed merging lp:~vthompson/music-app/prototype-page-head-sections-3 into lp:music-app.
Commit message:
* Update for sorting Songs tab
Requested reviews:
Music App Developers (music-app-dev)
For more details, see:
https://code.launchpad.net/~vthompson/music-app/prototype-page-head-sections-3/+merge/266825
* Update for sorting Songs tab
--
Your team Music App Developers is requested to review the proposed merge of lp:~vthompson/music-app/prototype-page-head-sections-3 into lp:music-app.
=== modified file 'app/components/BlurredBackground.qml'
--- app/components/BlurredBackground.qml 2015-05-03 16:22:31 +0000
+++ app/components/BlurredBackground.qml 2015-08-04 03:27:08 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
import QtGraphicalEffects 1.0
// Blurred background
=== modified file 'app/components/BlurredHeader.qml'
--- app/components/BlurredHeader.qml 2015-05-03 16:22:31 +0000
+++ app/components/BlurredHeader.qml 2015-08-04 03:27:08 +0000
@@ -17,7 +17,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
import Ubuntu.Components.ListItems 1.0 as ListItem
ListItem.Standard {
=== modified file 'app/components/CoverGrid.qml'
--- app/components/CoverGrid.qml 2015-05-03 16:22:31 +0000
+++ app/components/CoverGrid.qml 2015-08-04 03:27:08 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
Item {
id: coverGrid
=== modified file 'app/components/Delegates/Card.qml'
--- app/components/Delegates/Card.qml 2015-05-03 16:22:31 +0000
+++ app/components/Delegates/Card.qml 2015-08-04 03:27:08 +0000
@@ -16,7 +16,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
import "../"
=== modified file 'app/components/Delegates/ListItemWithActions.qml'
--- app/components/Delegates/ListItemWithActions.qml 2015-05-03 16:22:31 +0000
+++ app/components/Delegates/ListItemWithActions.qml 2015-08-04 03:27:08 +0000
@@ -15,7 +15,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
import Ubuntu.Components.ListItems 1.0 as ListItem
=== modified file 'app/components/Delegates/MusicListItem.qml'
--- app/components/Delegates/MusicListItem.qml 2015-05-03 16:22:31 +0000
+++ app/components/Delegates/MusicListItem.qml 2015-08-04 03:27:08 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
import "../"
=== modified file 'app/components/Dialog/ContentHubErrorDialog.qml'
--- app/components/Dialog/ContentHubErrorDialog.qml 2015-05-03 16:22:31 +0000
+++ app/components/Dialog/ContentHubErrorDialog.qml 2015-08-04 03:27:08 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
import Ubuntu.Components.Popups 1.0
Dialog {
=== modified file 'app/components/Dialog/ContentHubNotFoundDialog.qml'
--- app/components/Dialog/ContentHubNotFoundDialog.qml 2015-05-03 16:22:31 +0000
+++ app/components/Dialog/ContentHubNotFoundDialog.qml 2015-08-04 03:27:08 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
import Ubuntu.Components.Popups 1.0
Dialog {
=== modified file 'app/components/Dialog/ContentHubWaitDialog.qml'
--- app/components/Dialog/ContentHubWaitDialog.qml 2015-05-03 16:22:31 +0000
+++ app/components/Dialog/ContentHubWaitDialog.qml 2015-08-04 03:27:08 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
import Ubuntu.Components.Popups 1.0
import "../"
=== modified file 'app/components/Dialog/EditPlaylistDialog.qml'
--- app/components/Dialog/EditPlaylistDialog.qml 2015-05-03 16:22:31 +0000
+++ app/components/Dialog/EditPlaylistDialog.qml 2015-08-04 03:27:08 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
import Ubuntu.Components.Popups 1.0
import QtQuick.LocalStorage 2.0
import "../../logic/meta-database.js" as Library
=== modified file 'app/components/Dialog/NewPlaylistDialog.qml'
--- app/components/Dialog/NewPlaylistDialog.qml 2015-05-03 16:22:31 +0000
+++ app/components/Dialog/NewPlaylistDialog.qml 2015-08-04 03:27:08 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
import Ubuntu.Components.Popups 1.0
import QtQuick.LocalStorage 2.0
import "../../logic/playlists.js" as Playlists
=== modified file 'app/components/Dialog/RemovePlaylistDialog.qml'
--- app/components/Dialog/RemovePlaylistDialog.qml 2015-05-03 16:22:31 +0000
+++ app/components/Dialog/RemovePlaylistDialog.qml 2015-08-04 03:27:08 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
import Ubuntu.Components.Popups 1.0
import QtQuick.LocalStorage 2.0
import "../../logic/meta-database.js" as Library
=== modified file 'app/components/Flickables/CardView.qml'
--- app/components/Flickables/CardView.qml 2015-07-02 18:16:05 +0000
+++ app/components/Flickables/CardView.qml 2015-08-04 03:27:08 +0000
@@ -16,7 +16,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
import "../"
=== modified file 'app/components/Flickables/MultiSelectListView.qml'
--- app/components/Flickables/MultiSelectListView.qml 2015-05-03 16:22:31 +0000
+++ app/components/Flickables/MultiSelectListView.qml 2015-08-04 03:27:08 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
MusicListView {
property var selectedItems: []
=== modified file 'app/components/Flickables/MusicListView.qml'
--- app/components/Flickables/MusicListView.qml 2015-05-03 16:22:31 +0000
+++ app/components/Flickables/MusicListView.qml 2015-08-04 03:27:08 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
ListView {
=== modified file 'app/components/HeadState/MultiSelectHeadState.qml'
--- app/components/HeadState/MultiSelectHeadState.qml 2015-06-27 21:06:26 +0000
+++ app/components/HeadState/MultiSelectHeadState.qml 2015-08-04 03:27:08 +0000
@@ -17,7 +17,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
PageHeadState {
id: selectionState
=== modified file 'app/components/HeadState/PlaylistsHeadState.qml'
--- app/components/HeadState/PlaylistsHeadState.qml 2015-05-03 16:22:31 +0000
+++ app/components/HeadState/PlaylistsHeadState.qml 2015-08-04 03:27:08 +0000
@@ -17,7 +17,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
import Ubuntu.Components.Popups 1.0
=== modified file 'app/components/HeadState/SearchHeadState.qml'
--- app/components/HeadState/SearchHeadState.qml 2015-05-03 16:22:31 +0000
+++ app/components/HeadState/SearchHeadState.qml 2015-08-04 03:27:08 +0000
@@ -17,7 +17,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
PageHeadState {
id: headerState
=== modified file 'app/components/HeadState/SearchableHeadState.qml'
--- app/components/HeadState/SearchableHeadState.qml 2015-05-03 16:22:31 +0000
+++ app/components/HeadState/SearchableHeadState.qml 2015-08-04 03:27:08 +0000
@@ -17,7 +17,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
PageHeadState {
=== modified file 'app/components/Helpers/ContentHubHelper.qml'
--- app/components/Helpers/ContentHubHelper.qml 2015-07-25 01:22:17 +0000
+++ app/components/Helpers/ContentHubHelper.qml 2015-08-04 03:27:08 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
import Ubuntu.Components.Popups 1.0
import Ubuntu.Content 1.1
import "../../logic/stored-request.js" as StoredRequest
=== modified file 'app/components/Helpers/UriHandlerHelper.qml'
--- app/components/Helpers/UriHandlerHelper.qml 2015-06-28 03:06:49 +0000
+++ app/components/Helpers/UriHandlerHelper.qml 2015-08-04 03:27:08 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
import "../"
import "../../logic/stored-request.js" as StoredRequest
=== modified file 'app/components/Helpers/UserMetricsHelper.qml'
--- app/components/Helpers/UserMetricsHelper.qml 2015-05-03 16:22:31 +0000
+++ app/components/Helpers/UserMetricsHelper.qml 2015-08-04 03:27:08 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
import UserMetrics 0.1
=== modified file 'app/components/ListItemActions/AddToPlaylist.qml'
--- app/components/ListItemActions/AddToPlaylist.qml 2015-06-27 21:06:26 +0000
+++ app/components/ListItemActions/AddToPlaylist.qml 2015-08-04 03:27:08 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
Action {
iconName: "add-to-playlist"
=== modified file 'app/components/ListItemActions/AddToQueue.qml'
--- app/components/ListItemActions/AddToQueue.qml 2015-05-03 16:22:31 +0000
+++ app/components/ListItemActions/AddToQueue.qml 2015-08-04 03:27:08 +0000
@@ -19,7 +19,7 @@
import QtQuick 2.4
import QtQuick.LocalStorage 2.0
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
import "../../logic/meta-database.js" as Library
Action {
=== modified file 'app/components/ListItemActions/CheckBox.qml'
--- app/components/ListItemActions/CheckBox.qml 2015-06-27 20:18:02 +0000
+++ app/components/ListItemActions/CheckBox.qml 2015-08-04 03:27:08 +0000
@@ -15,7 +15,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
CheckBox {
checked: root.selected
=== modified file 'app/components/ListItemActions/Remove.qml'
--- app/components/ListItemActions/Remove.qml 2015-05-03 16:22:31 +0000
+++ app/components/ListItemActions/Remove.qml 2015-08-04 03:27:08 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
import Ubuntu.Components.Popups 1.0
Action {
=== modified file 'app/components/ListItemReorderComponent.qml'
--- app/components/ListItemReorderComponent.qml 2015-05-03 16:22:31 +0000
+++ app/components/ListItemReorderComponent.qml 2015-08-04 03:27:08 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
Item {
=== modified file 'app/components/LoadingSpinnerComponent.qml'
--- app/components/LoadingSpinnerComponent.qml 2015-05-03 16:22:31 +0000
+++ app/components/LoadingSpinnerComponent.qml 2015-08-04 03:27:08 +0000
@@ -18,7 +18,7 @@
* Andrew Starr-Bochicchio <a.starr.b@xxxxxxxxx>
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
Item {
id: refresh
=== modified file 'app/components/MusicPage.qml'
--- app/components/MusicPage.qml 2015-05-03 16:22:31 +0000
+++ app/components/MusicPage.qml 2015-08-04 03:27:08 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
import Ubuntu.Components.Popups 1.0
=== modified file 'app/components/MusicRow.qml'
--- app/components/MusicRow.qml 2015-05-03 16:22:31 +0000
+++ app/components/MusicRow.qml 2015-08-04 03:27:08 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
Row {
=== modified file 'app/components/MusicToolbar.qml'
--- app/components/MusicToolbar.qml 2015-07-29 01:23:11 +0000
+++ app/components/MusicToolbar.qml 2015-08-04 03:27:08 +0000
@@ -19,7 +19,7 @@
import QtQuick 2.4
import QtMultimedia 5.0
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
Rectangle {
anchors {
=== modified file 'app/components/NowPlayingFullView.qml'
--- app/components/NowPlayingFullView.qml 2015-05-03 16:22:31 +0000
+++ app/components/NowPlayingFullView.qml 2015-08-04 03:27:08 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
import Ubuntu.Thumbnailer 0.1
import "../components/Themes/Ambiance"
=== modified file 'app/components/NowPlayingToolbar.qml'
--- app/components/NowPlayingToolbar.qml 2015-07-29 01:23:11 +0000
+++ app/components/NowPlayingToolbar.qml 2015-08-04 03:27:08 +0000
@@ -19,7 +19,7 @@
import QtMultimedia 5.0
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
/* Full toolbar */
=== modified file 'app/components/PlaylistsEmptyState.qml'
--- app/components/PlaylistsEmptyState.qml 2015-05-03 16:22:31 +0000
+++ app/components/PlaylistsEmptyState.qml 2015-08-04 03:27:08 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
Rectangle {
=== modified file 'app/components/Queue.qml'
--- app/components/Queue.qml 2015-06-27 21:06:26 +0000
+++ app/components/Queue.qml 2015-08-04 03:27:08 +0000
@@ -19,7 +19,7 @@
import QtQuick 2.4
import QtQuick.LocalStorage 2.0
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
import "Delegates"
import "Flickables"
import "ListItemActions"
=== modified file 'app/components/Style.qml'
--- app/components/Style.qml 2015-05-03 16:22:31 +0000
+++ app/components/Style.qml 2015-08-04 03:27:08 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
QtObject {
=== modified file 'app/components/Themes/Ambiance/BubbleShape.qml'
--- app/components/Themes/Ambiance/BubbleShape.qml 2015-06-20 17:49:57 +0000
+++ app/components/Themes/Ambiance/BubbleShape.qml 2015-08-04 03:27:08 +0000
@@ -15,7 +15,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
Item {
id: bubbleShape
=== modified file 'app/components/Themes/Ambiance/UbuntuBlueSliderStyle.qml'
--- app/components/Themes/Ambiance/UbuntuBlueSliderStyle.qml 2015-06-20 17:49:57 +0000
+++ app/components/Themes/Ambiance/UbuntuBlueSliderStyle.qml 2015-08-04 03:27:08 +0000
@@ -15,7 +15,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
/*
The default slider style consists of a bar and a thumb shape.
=== modified file 'app/components/ViewButton/PlayAllButton.qml'
--- app/components/ViewButton/PlayAllButton.qml 2015-05-03 16:22:31 +0000
+++ app/components/ViewButton/PlayAllButton.qml 2015-08-04 03:27:08 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
Button {
=== modified file 'app/components/ViewButton/QueueAllButton.qml'
--- app/components/ViewButton/QueueAllButton.qml 2015-05-03 16:22:31 +0000
+++ app/components/ViewButton/QueueAllButton.qml 2015-08-04 03:27:08 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
Button {
=== modified file 'app/components/ViewButton/ShuffleButton.qml'
--- app/components/ViewButton/ShuffleButton.qml 2015-05-03 16:22:31 +0000
+++ app/components/ViewButton/ShuffleButton.qml 2015-08-04 03:27:08 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
Button {
=== modified file 'app/components/Walkthrough/FirstRunWalkthrough.qml'
--- app/components/Walkthrough/FirstRunWalkthrough.qml 2015-05-03 16:22:31 +0000
+++ app/components/Walkthrough/FirstRunWalkthrough.qml 2015-08-04 03:27:08 +0000
@@ -20,7 +20,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
// Initial Walkthrough tutorial
Walkthrough {
=== modified file 'app/components/Walkthrough/Slide1.qml'
--- app/components/Walkthrough/Slide1.qml 2015-05-03 16:22:31 +0000
+++ app/components/Walkthrough/Slide1.qml 2015-08-04 03:27:08 +0000
@@ -21,7 +21,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
// Slide 1
Component {
=== modified file 'app/components/Walkthrough/Slide2.qml'
--- app/components/Walkthrough/Slide2.qml 2015-05-03 16:22:31 +0000
+++ app/components/Walkthrough/Slide2.qml 2015-08-04 03:27:08 +0000
@@ -21,7 +21,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
// Walkthrough - Slide 2
Component {
=== modified file 'app/components/Walkthrough/Slide3.qml'
--- app/components/Walkthrough/Slide3.qml 2015-05-03 16:22:31 +0000
+++ app/components/Walkthrough/Slide3.qml 2015-08-04 03:27:08 +0000
@@ -21,7 +21,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
// Walkthrough - Slide 7
Component {
=== modified file 'app/components/Walkthrough/Walkthrough.qml'
--- app/components/Walkthrough/Walkthrough.qml 2015-05-03 16:22:31 +0000
+++ app/components/Walkthrough/Walkthrough.qml 2015-08-04 03:27:08 +0000
@@ -21,7 +21,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
import Ubuntu.Components.ListItems 1.0 as ListItem
Page {
=== modified file 'app/components/WorkerWaiter.qml'
--- app/components/WorkerWaiter.qml 2015-05-03 16:22:31 +0000
+++ app/components/WorkerWaiter.qml 2015-08-04 03:27:08 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
Timer { // A timer to wait for a worker to stop
=== modified file 'app/music-app.qml'
--- app/music-app.qml 2015-07-29 01:23:11 +0000
+++ app/music-app.qml 2015-08-04 03:27:08 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
import Ubuntu.Components.Popups 1.0
import Ubuntu.MediaScanner 0.1
import Qt.labs.settings 1.0
@@ -368,7 +368,7 @@
if (!clear) {
// If same track and on Now playing page then toggle
- if ((mainPageStack.currentPage.title === i18n.tr("Now playing") || mainPageStack.currentPage.title === i18n.tr("Queue"))
+ if (mainPageStack.currentPage.title === i18n.tr("Now playing")
&& trackQueue.model.get(player.currentIndex) !== undefined
&& Qt.resolvedUrl(trackQueue.model.get(player.currentIndex).filename) === file) {
player.toggle()
@@ -398,11 +398,6 @@
else {
player.playSong(trackQueue.model.get(index).filename, index);
}
-
- // Show the Now playing page and make sure the track is visible
- if (mainPageStack.currentPage.title !== i18n.tr("Queue")) {
- tabs.pushNowPlaying();
- }
}
function playRandomSong(shuffle)
@@ -715,7 +710,6 @@
asynchronous: true
source: "components/MusicToolbar.qml"
visible: mainPageStack.currentPage.title !== i18n.tr("Now playing") &&
- mainPageStack.currentPage.title !== i18n.tr("Queue") &&
mainPageStack.currentPage.title !== i18n.tr("Select playlist") &&
!firstRun &&
!noMusic
@@ -985,14 +979,9 @@
function pushNowPlaying()
{
// only push if on a different page
- if (mainPageStack.currentPage.title !== i18n.tr("Now playing")
- && mainPageStack.currentPage.title !== i18n.tr("Queue")) {
+ if (mainPageStack.currentPage.title !== i18n.tr("Now playing")) {
mainPageStack.push(Qt.resolvedUrl("ui/NowPlaying.qml"), {})
}
-
- if (mainPageStack.currentPage.title === i18n.tr("Queue")) {
- mainPageStack.currentPage.isListView = false; // ensure full view
- }
}
} // end of tabs
}
=== modified file 'app/ui/AddToPlaylist.qml'
--- app/ui/AddToPlaylist.qml 2015-06-27 21:06:26 +0000
+++ app/ui/AddToPlaylist.qml 2015-08-04 03:27:08 +0000
@@ -19,7 +19,7 @@
import QtMultimedia 5.0
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
import Ubuntu.Components.ListItems 1.0 as ListItem
import Ubuntu.Components.Popups 1.0
import QtQuick.LocalStorage 2.0
=== modified file 'app/ui/Albums.qml'
--- app/ui/Albums.qml 2015-05-03 16:22:31 +0000
+++ app/ui/Albums.qml 2015-08-04 03:27:08 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
import Ubuntu.MediaScanner 0.1
import "../components"
import "../components/Delegates"
=== modified file 'app/ui/ArtistView.qml'
--- app/ui/ArtistView.qml 2015-05-03 16:22:31 +0000
+++ app/ui/ArtistView.qml 2015-08-04 03:27:08 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
import Ubuntu.Components.Popups 1.0
import Ubuntu.Components.ListItems 1.0 as ListItem
import Ubuntu.MediaScanner 0.1
=== modified file 'app/ui/Artists.qml'
--- app/ui/Artists.qml 2015-05-03 16:22:31 +0000
+++ app/ui/Artists.qml 2015-08-04 03:27:08 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
import Ubuntu.Components.Popups 1.0
import Ubuntu.Components.ListItems 1.0 as ListItem
import Ubuntu.MediaScanner 0.1
=== modified file 'app/ui/Genres.qml'
--- app/ui/Genres.qml 2015-05-03 16:22:31 +0000
+++ app/ui/Genres.qml 2015-08-04 03:27:08 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
import Ubuntu.MediaScanner 0.1
import "../components"
import "../components/Delegates"
=== modified file 'app/ui/LibraryEmptyState.qml'
--- app/ui/LibraryEmptyState.qml 2015-05-03 16:22:31 +0000
+++ app/ui/LibraryEmptyState.qml 2015-08-04 03:27:08 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
Page {
id: libraryEmptyPage
=== modified file 'app/ui/NowPlaying.qml'
--- app/ui/NowPlaying.qml 2015-06-27 21:06:26 +0000
+++ app/ui/NowPlaying.qml 2015-08-04 03:27:08 +0000
@@ -19,7 +19,7 @@
import QtQuick 2.4
import QtQuick.LocalStorage 2.0
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
import "../components"
import "../components/HeadState"
import "../logic/meta-database.js" as Library
@@ -29,13 +29,15 @@
id: nowPlaying
flickable: isListView ? queueListLoader.item : null // Ensures that the header is shown in fullview
objectName: "nowPlayingPage"
- title: isListView ? queueTitle : nowPlayingTitle
+ title: nowPlayingTitle
visible: false
property bool isListView: false
// TRANSLATORS: this appears in the header with limited space (around 20 characters)
property string nowPlayingTitle: i18n.tr("Now playing")
// TRANSLATORS: this appears in the header with limited space (around 20 characters)
+ property string fullViewTitle: i18n.tr("Full view")
+ // TRANSLATORS: this appears in the header with limited space (around 20 characters)
property string queueTitle: i18n.tr("Queue")
onIsListViewChanged: {
@@ -79,13 +81,6 @@
name: "default"
actions: [
Action {
- objectName: "toggleView"
- iconName: isListView ? "stock_image" : "view-list-symbolic"
- onTriggered: {
- isListView = !isListView
- }
- },
- Action {
enabled: trackQueue.model.count > 0
iconName: "add-to-playlist"
// TRANSLATORS: this action appears in the overflow drawer with limited space (around 18 characters)
@@ -144,6 +139,24 @@
visible: !isListView
}
+ PageHeadSections {
+ id: defaultStateSections
+ model: [fullViewTitle, queueTitle]
+ selectedIndex: 0
+ }
+
+ head {
+ sections {
+ model: defaultStateSections.model
+ selectedIndex: defaultStateSections.selectedIndex
+ onSelectedIndexChanged: {
+ if (head.sections.model[head.sections.selectedIndex] != isListView) {
+ isListView = !isListView
+ }
+ }
+ }
+ }
+
Loader {
id: queueListLoader
anchors {
=== modified file 'app/ui/Playlists.qml'
--- app/ui/Playlists.qml 2015-06-27 21:06:26 +0000
+++ app/ui/Playlists.qml 2015-08-04 03:27:08 +0000
@@ -19,7 +19,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
import Ubuntu.Components.Popups 1.0
import QtMultimedia 5.0
import QtQuick.LocalStorage 2.0
=== modified file 'app/ui/Recent.qml'
--- app/ui/Recent.qml 2015-06-27 21:06:26 +0000
+++ app/ui/Recent.qml 2015-08-04 03:27:08 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
import Ubuntu.Components.Popups 1.0
import Ubuntu.Components.ListItems 1.0 as ListItem
import Ubuntu.MediaScanner 0.1
=== modified file 'app/ui/Songs.qml'
--- app/ui/Songs.qml 2015-06-27 21:06:26 +0000
+++ app/ui/Songs.qml 2015-08-04 03:27:08 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
import Ubuntu.MediaScanner 0.1
import Ubuntu.Thumbnailer 0.1
import QtMultimedia 5.0
@@ -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 'app/ui/SongsView.qml'
--- app/ui/SongsView.qml 2015-07-26 22:43:31 +0000
+++ app/ui/SongsView.qml 2015-08-04 03:27:08 +0000
@@ -18,7 +18,7 @@
*/
import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
import Ubuntu.Components.ListItems 1.0 as ListItem
import Ubuntu.Components.Popups 1.0
import Ubuntu.MediaScanner 0.1
=== modified file 'music-app.qmltheme'
--- music-app.qmltheme 2015-06-27 20:18:02 +0000
+++ music-app.qmltheme 2015-08-04 03:27:08 +0000
@@ -1,5 +1,5 @@
@qml-mapping(.frame, , FrameDelegate);
-@qml-import(Ubuntu.Components 1.2);
+@qml-import(Ubuntu.Components 1.3);
.button {
color: "#c94212";
=== modified file 'po/com.ubuntu.music.pot'
--- po/com.ubuntu.music.pot 2015-05-15 00:16:56 +0000
+++ po/com.ubuntu.music.pot 2015-08-04 03:27:08 +0000
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: music-app\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-14 19:15-0500\n"
+"POT-Creation-Date: 2015-08-03 22:25-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -83,7 +83,7 @@
msgstr ""
#: ../app/components/Dialog/RemovePlaylistDialog.qml:37
-#: ../app/components/ListItemActions/Remove.qml:27
+#: ../app/components/ListItemActions/Remove.qml:28
msgid "Remove"
msgstr ""
@@ -94,7 +94,7 @@
#. TRANSLATORS: this action appears in the overflow drawer with limited space (around 18 characters)
#: ../app/components/HeadState/MultiSelectHeadState.qml:39
#: ../app/components/ListItemActions/AddToPlaylist.qml:26
-#: ../app/ui/NowPlaying.qml:92
+#: ../app/ui/NowPlaying.qml:87
msgid "Add to playlist"
msgstr ""
@@ -138,7 +138,7 @@
msgid "No songs played today"
msgstr ""
-#: ../app/components/ListItemActions/AddToQueue.qml:27
+#: ../app/components/ListItemActions/AddToQueue.qml:28
msgid "Add to Queue"
msgstr ""
@@ -217,82 +217,75 @@
msgid "Skip"
msgstr ""
-#: ../app/music-app.qml:154
+#: ../app/music-app.qml:155
msgid "Next"
msgstr ""
-#: ../app/music-app.qml:155
+#: ../app/music-app.qml:156
msgid "Next Track"
msgstr ""
-#: ../app/music-app.qml:161
+#: ../app/music-app.qml:162
msgid "Pause"
msgstr ""
-#: ../app/music-app.qml:161
+#: ../app/music-app.qml:162
msgid "Play"
msgstr ""
-#: ../app/music-app.qml:163
+#: ../app/music-app.qml:164
msgid "Pause Playback"
msgstr ""
-#: ../app/music-app.qml:163
+#: ../app/music-app.qml:164
msgid "Continue or start playback"
msgstr ""
-#: ../app/music-app.qml:168
+#: ../app/music-app.qml:169
msgid "Back"
msgstr ""
-#: ../app/music-app.qml:169
+#: ../app/music-app.qml:170
msgid "Go back to last page"
msgstr ""
-#: ../app/music-app.qml:177
+#: ../app/music-app.qml:178
msgid "Previous"
msgstr ""
-#: ../app/music-app.qml:178
+#: ../app/music-app.qml:179
msgid "Previous Track"
msgstr ""
-#: ../app/music-app.qml:183
+#: ../app/music-app.qml:184
msgid "Stop"
msgstr ""
-#: ../app/music-app.qml:184
+#: ../app/music-app.qml:185
msgid "Stop Playback"
msgstr ""
-#: ../app/music-app.qml:275 com.ubuntu.music_music.desktop.in.in.h:1
+#: ../app/music-app.qml:276 com.ubuntu.music_music.desktop.in.in.h:1
msgid "Music"
msgstr ""
-#: ../app/music-app.qml:294
+#: ../app/music-app.qml:306
msgid "Debug: "
msgstr ""
#. TRANSLATORS: this appears in the header with limited space (around 20 characters)
-#: ../app/music-app.qml:359 ../app/music-app.qml:690 ../app/music-app.qml:961
+#: ../app/music-app.qml:371 ../app/music-app.qml:712 ../app/music-app.qml:982
#: ../app/ui/NowPlaying.qml:37
msgid "Now playing"
msgstr ""
#. TRANSLATORS: this appears in the header with limited space (around 20 characters)
-#: ../app/music-app.qml:359 ../app/music-app.qml:391 ../app/music-app.qml:691
-#: ../app/music-app.qml:962 ../app/music-app.qml:966
-#: ../app/ui/NowPlaying.qml:39
-msgid "Queue"
-msgstr ""
-
-#. TRANSLATORS: this appears in the header with limited space (around 20 characters)
-#: ../app/music-app.qml:692 ../app/ui/AddToPlaylist.qml:46
+#: ../app/music-app.qml:713 ../app/ui/AddToPlaylist.qml:46
msgid "Select playlist"
msgstr ""
-#: ../app/ui/AddToPlaylist.qml:94 ../app/ui/Playlists.qml:86
-#: ../app/ui/SongsView.qml:283 ../app/ui/SongsView.qml:284
+#: ../app/ui/AddToPlaylist.qml:93 ../app/ui/Playlists.qml:87
+#: ../app/ui/SongsView.qml:292 ../app/ui/SongsView.qml:293
#, qt-format
msgid "%1 song"
msgid_plural "%1 songs"
@@ -301,13 +294,13 @@
#. 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:100 ../app/ui/Playlists.qml:38
-#: ../app/ui/SongsView.qml:90
+#: ../app/ui/AddToPlaylist.qml:98 ../app/ui/Playlists.qml:38
+#: ../app/ui/SongsView.qml:103
msgid "Playlists"
msgstr ""
#: ../app/ui/AddToPlaylist.qml:108 ../app/ui/Recent.qml:37
-#: ../app/ui/SongsView.qml:100
+#: ../app/ui/SongsView.qml:91
msgid "Recent"
msgstr ""
@@ -316,19 +309,19 @@
msgstr ""
#: ../app/ui/Albums.qml:72 ../app/ui/ArtistView.qml:129
-#: ../app/ui/ArtistView.qml:142 ../app/ui/Recent.qml:81
-#: ../app/ui/SongsView.qml:240
+#: ../app/ui/ArtistView.qml:142 ../app/ui/Recent.qml:82
+#: ../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:82 ../app/ui/SongsView.qml:261
+#: ../app/ui/Recent.qml:83 ../app/ui/SongsView.qml:270
msgid "Unknown Artist"
msgstr ""
#: ../app/ui/Albums.qml:83 ../app/ui/ArtistView.qml:140
-#: ../app/ui/Recent.qml:97
+#: ../app/ui/Recent.qml:98
msgid "Album"
msgstr ""
@@ -352,9 +345,9 @@
msgstr ""
#: ../app/ui/Genres.qml:110 ../app/ui/Genres.qml:112
-#: ../app/ui/SongsView.qml:192 ../app/ui/SongsView.qml:211
-#: ../app/ui/SongsView.qml:226 ../app/ui/SongsView.qml:263
-#: ../app/ui/SongsView.qml:282 ../app/ui/SongsView.qml:326
+#: ../app/ui/SongsView.qml:201 ../app/ui/SongsView.qml:220
+#: ../app/ui/SongsView.qml:235 ../app/ui/SongsView.qml:272
+#: ../app/ui/SongsView.qml:291 ../app/ui/SongsView.qml:334
msgid "Genre"
msgstr ""
@@ -362,18 +355,29 @@
msgid "No music found"
msgstr ""
+#. TRANSLATORS: this appears in the header with limited space (around 20 characters)
+#: ../app/ui/NowPlaying.qml:39
+msgid "Full view"
+msgstr ""
+
+#. TRANSLATORS: this appears in the header with limited space (around 20 characters)
+#: ../app/ui/NowPlaying.qml:41
+msgid "Queue"
+msgstr ""
+
#. TRANSLATORS: this action appears in the overflow drawer with limited space (around 18 characters)
-#: ../app/ui/NowPlaying.qml:107
+#: ../app/ui/NowPlaying.qml:102
msgid "Clear queue"
msgstr ""
-#: ../app/ui/Playlists.qml:98 ../app/ui/Playlists.qml:99
-#: ../app/ui/Recent.qml:82 ../app/ui/Recent.qml:97 ../app/ui/SongsView.qml:69
-#: ../app/ui/SongsView.qml:110 ../app/ui/SongsView.qml:150
-#: ../app/ui/SongsView.qml:194 ../app/ui/SongsView.qml:213
-#: ../app/ui/SongsView.qml:225 ../app/ui/SongsView.qml:262
-#: ../app/ui/SongsView.qml:310 ../app/ui/SongsView.qml:313
-#: ../app/ui/SongsView.qml:328
+#: ../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/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
+#: ../app/ui/SongsView.qml:234 ../app/ui/SongsView.qml:271
+#: ../app/ui/SongsView.qml:319 ../app/ui/SongsView.qml:322
+#: ../app/ui/SongsView.qml:336
msgid "Playlist"
msgstr ""
@@ -381,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 ""
References
