Merge lp:~vthompson/music-app/remix-now-playing-main-view-blue-slider into lp:music-app/trusty

[Victor Thompson]

* Make the Ubuntu Slider leftColor UbuntuColors.blue

This change makes the Ubuntu Slider leftColor UbuntuColors.blue for use in the Now Playing full view.

Unmerged revisions

666. By Victor Thompson on 2014-10-04

* Make the Ubuntu Slider leftColor UbuntuColors.blue

665. By Victor Thompson on 2014-10-04

fix update

664. By Victor Thompson on 2014-10-04

update

663. By Victor Thompson on 2014-10-04

Small tweaks and a toolbar hack

662. By Victor Thompson on 2014-10-04

Merge of remix

661. By Victor Thompson on 2014-10-04

Update per comments

660. By Victor Thompson on 2014-10-03

Default to the listview view for now

659. By Victor Thompson on 2014-10-03

Initial Now Playing toggle

658. By Victor Thompson on 2014-10-03

Clean slate

657. By Victor Thompson on 2014-10-03

Fit items into view

=== modified file 'MusicArtists.qml'
--- MusicArtists.qml	2014-09-20 15:41:33 +0000
+++ MusicArtists.qml	2014-10-04 17:07:09 +0000
@@ -38,8 +38,9 @@
 
     ListView {
         id: artistlist
-        anchors.fill: parent
-        anchors.bottomMargin: musicToolbar.mouseAreaOffset + musicToolbar.minimizedHeight
+        anchors {
+            fill: parent
+        }
         model: ArtistsModel {
             id: artistsModel
             albumArtists: true

=== modified file 'MusicNowPlaying.qml'
--- MusicNowPlaying.qml	2014-09-20 15:41:33 +0000
+++ MusicNowPlaying.qml	2014-10-04 17:07:09 +0000
@@ -17,7 +17,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 import QtMultimedia 5.0
 import QtQuick 2.3
 import QtQuick.LocalStorage 2.0
@@ -32,20 +31,27 @@
     objectName: "nowPlayingPage"
     title: i18n.tr("Now Playing")
     visible: false
+    onVisibleChanged: {
+        if (!visible) {
+            // Reset the isListView property
+            // TODO: In the future this will default to false
+            isListView = true
+        }
+    }
 
     property int ensureVisibleIndex: 0  // ensure first index is visible at startup
-
-    Rectangle {
-        anchors.fill: parent
-        color: styleMusic.nowPlaying.backgroundColor
-        opacity: 0.75 // change later
-        MouseArea {  // Block events to lower layers
-            anchors.fill: parent
-        }
-    }
-
-    Component.onCompleted: {
-        onToolbarShownChanged.connect(jumpToCurrent)
+    property bool isListView: true
+
+    head {
+        actions: [
+            Action {
+                objectName: "toggleView"
+                iconName: "media-playlist"
+                onTriggered: {
+                    isListView = !isListView
+                }
+            }
+        ]
     }
 
     Connections {
@@ -77,14 +83,302 @@
 
     function positionAt(index) {
         queuelist.positionViewAtIndex(index, ListView.Beginning);
-        queuelist.contentY -= header.height;
+    }
+
+    Rectangle {
+        id: fullview
+        visible: !isListView
+        anchors.fill: parent
+        color: "transparent"
+        clip: true
+
+        BlurredBackground {
+            id: blurredBackground
+            anchors.top: parent.top
+            anchors.topMargin: mainView.header.height
+            height: units.gu(27)
+            art: albumImage.source
+
+            Image {
+                id: albumImage
+                anchors.centerIn: parent
+                width: units.gu(18)
+                height: width
+                smooth: true
+                source: player.currentMetaArt === "" ?
+                            decodeURIComponent("image://albumart/artist=" +
+                                               player.currentMetaArtist +
+                                               "&album=" + player.currentMetaAlbum)
+                          : player.currentMetaArt
+            }
+        }
+
+        /* Full toolbar */
+        Item {
+            id: musicToolbarFullContainer
+            anchors.top: blurredBackground.bottom
+            anchors.topMargin: units.gu(4)
+            width: blurredBackground.width
+
+            /* Column for labels in wideAspect */
+            Column {
+                id: nowPlayingWideAspectLabels
+                spacing: units.gu(1)
+                anchors {
+                    left: parent.left
+                    leftMargin: units.gu(2)
+                    right: parent.right
+                    rightMargin: units.gu(2)
+                }
+
+                /* Title of track */
+                Label {
+                    id: nowPlayingWideAspectTitle
+                    anchors {
+                        left: parent.left
+                        leftMargin: units.gu(1)
+                        right: parent.right
+                        rightMargin: units.gu(1)
+                    }
+                    color: styleMusic.playerControls.labelColor
+                    elide: Text.ElideRight
+                    fontSize: "x-large"
+                    objectName: "playercontroltitle"
+                    text: trackQueue.model.count === 0 ? "" : player.currentMetaTitle === "" ? player.currentMetaFile : player.currentMetaTitle
+                }
+
+                /* Artist of track */
+                Label {
+                    id: nowPlayingWideAspectArtist
+                    anchors {
+                        left: parent.left
+                        leftMargin: units.gu(1)
+                        right: parent.right
+                        rightMargin: units.gu(1)
+                    }
+                    color: styleMusic.nowPlaying.labelSecondaryColor
+                    elide: Text.ElideRight
+                    fontSize: "small"
+                    text: trackQueue.model.count === 0 ? "" : player.currentMetaArtist
+                }
+            }
+
+            /* Progress bar component */
+            MouseArea {
+                id: musicToolbarFullProgressContainer
+                anchors.left: parent.left
+                anchors.leftMargin: units.gu(3)
+                anchors.right: parent.right
+                anchors.rightMargin: units.gu(3)
+                anchors.top: nowPlayingWideAspectLabels.bottom
+                anchors.topMargin: units.gu(3)
+                height: units.gu(3)
+                width: parent.width
+
+                /* Position label */
+                Label {
+                    id: musicToolbarFullPositionLabel
+                    anchors.top: progressSliderMusic.bottom
+                    anchors.topMargin: units.gu(-2)
+                    anchors.left: parent.left
+                    color: styleMusic.nowPlaying.labelSecondaryColor
+                    fontSize: "small"
+                    height: parent.height
+                    horizontalAlignment: Text.AlignHCenter
+                    text: durationToString(player.position)
+                    verticalAlignment: Text.AlignVCenter
+                    width: units.gu(3)
+                }
+
+                Slider {
+                    id: progressSliderMusic
+                    anchors.left: parent.left
+                    anchors.right: parent.right
+                    function formatValue(v) { return durationToString(v) }
+
+                    property bool seeking: false
+
+                    onSeekingChanged: {
+                        if (seeking === false) {
+                            musicToolbarFullPositionLabel.text = durationToString(player.position)
+                        }
+                    }
+
+                    Component.onCompleted: {
+                        Theme.palette.selected.foreground = UbuntuColors.blue
+                    }
+
+                    onPressedChanged: {
+                        seeking = pressed
+                        if (!pressed) {
+                           player.seek(value)
+                       }
+                    }
+
+                    Connections {
+                        target: player
+                        onDurationChanged: {
+                            musicToolbarFullDurationLabel.text = durationToString(player.duration)
+                            progressSliderMusic.maximumValue = player.duration
+                        }
+                        onPositionChanged: {
+                            if (progressSliderMusic.seeking === false) {
+                                progressSliderMusic.value = player.position
+                                musicToolbarFullPositionLabel.text = durationToString(player.position)
+                                musicToolbarFullDurationLabel.text = durationToString(player.duration)
+                            }
+                        }
+                        onStopped: {
+                            musicToolbarFullPositionLabel.text = durationToString(0);
+                            musicToolbarFullDurationLabel.text = durationToString(0);
+                        }
+                    }
+                }
+
+                /* Duration label */
+                Label {
+                    id: musicToolbarFullDurationLabel
+                    anchors.top: progressSliderMusic.bottom
+                    anchors.topMargin: units.gu(-2)
+                    anchors.right: parent.right
+                    color: styleMusic.nowPlaying.labelSecondaryColor
+                    fontSize: "small"
+                    height: parent.height
+                    horizontalAlignment: Text.AlignHCenter
+                    text: durationToString(player.duration)
+                    verticalAlignment: Text.AlignVCenter
+                    width: units.gu(3)
+                }
+            }
+
+            /* Repeat button */
+            MouseArea {
+                id: nowPlayingRepeatButton
+                objectName: "repeatShape"
+                anchors.right: nowPlayingPreviousButton.left
+                anchors.rightMargin: units.gu(1)
+                anchors.verticalCenter: nowPlayingPlayButton.verticalCenter
+                height: units.gu(6)
+                opacity: player.repeat && !emptyPage.noMusic ? 1 : .4
+                width: height
+                onClicked: player.repeat = !player.repeat
+
+                Icon {
+                    id: repeatIcon
+                    height: units.gu(3)
+                    width: height
+                    anchors.verticalCenter: parent.verticalCenter
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    color: "white"
+                    name: "media-playlist-repeat"
+                    opacity: player.repeat && !emptyPage.noMusic ? 1 : .4
+                }
+            }
+
+            /* Previous button */
+            MouseArea {
+                id: nowPlayingPreviousButton
+                anchors.right: nowPlayingPlayButton.left
+                anchors.rightMargin: units.gu(1)
+                anchors.verticalCenter: nowPlayingPlayButton.verticalCenter
+                height: units.gu(6)
+                objectName: "previousShape"
+                opacity: trackQueue.model.count === 0  ? .4 : 1
+                width: height
+                onClicked: player.previousSong()
+
+                Icon {
+                    id: nowPlayingPreviousIndicator
+                    height: units.gu(3)
+                    width: height
+                    anchors.verticalCenter: parent.verticalCenter
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    color: "white"
+                    name: "media-skip-backward"
+                    opacity: 1
+                }
+            }
+
+            /* Play/Pause button */
+            MouseArea {
+                id: nowPlayingPlayButton
+                anchors.horizontalCenter: parent.horizontalCenter
+                anchors.top: musicToolbarFullProgressContainer.bottom
+                anchors.topMargin: units.gu(2)
+                height: units.gu(12)
+                objectName: "playShape"
+                width: height
+                onClicked: player.toggle()
+
+                Icon {
+                    id: nowPlayingPlayIndicator
+                    height: units.gu(6)
+                    width: height
+                    anchors.verticalCenter: parent.verticalCenter
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    opacity: emptyPage.noMusic ? .4 : 1
+                    color: "white"
+                    name: player.playbackState === MediaPlayer.PlayingState ? "media-playback-pause" : "media-playback-start"
+                }
+            }
+
+            /* Next button */
+            MouseArea {
+                id: nowPlayingNextButton
+                anchors.left: nowPlayingPlayButton.right
+                anchors.leftMargin: units.gu(1)
+                anchors.verticalCenter: nowPlayingPlayButton.verticalCenter
+                height: units.gu(6)
+                objectName: "forwardShape"
+                opacity: trackQueue.model.count === 0 ? .4 : 1
+                width: height
+                onClicked: player.nextSong()
+
+                Icon {
+                    id: nowPlayingNextIndicator
+                    height: units.gu(3)
+                    width: height
+                    anchors.verticalCenter: parent.verticalCenter
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    color: "white"
+                    name: "media-skip-forward"
+                    opacity: 1
+                }
+            }
+
+            /* Shuffle button */
+            MouseArea {
+                id: nowPlayingShuffleButton
+                objectName: "shuffleShape"
+                anchors.left: nowPlayingNextButton.right
+                anchors.leftMargin: units.gu(1)
+                anchors.verticalCenter: nowPlayingPlayButton.verticalCenter
+                height: units.gu(6)
+                opacity: player.shuffle && !emptyPage.noMusic ? 1 : .4
+                width: height
+                onClicked: player.shuffle = !player.shuffle
+
+                Icon {
+                    id: shuffleIcon
+                    height: units.gu(3)
+                    width: height
+                    anchors.verticalCenter: parent.verticalCenter
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    color: "white"
+                    name: "media-playlist-shuffle"
+                    opacity: player.shuffle && !emptyPage.noMusic ? 1 : .4
+                }
+            }
+        }
     }
 
     ListView {
         id: queuelist
+        visible: isListView
         objectName: "nowPlayingQueueList"
-        anchors.fill: parent
-        anchors.bottomMargin: musicToolbar.mouseAreaOffset + musicToolbar.minimizedHeight
+        anchors {
+            fill: parent
+        }
         delegate: queueDelegate
         model: trackQueue.model
         highlightFollowsCurrentItem: false
@@ -117,10 +411,6 @@
             customdebug("Queue: Now has: " + queuelist.count + " tracks")
         }
 
-        onMovementStarted: {
-            musicToolbar.hideToolbar();
-        }
-
         Component {
             id: queueDelegate
             ListItemWithActions {
@@ -218,7 +508,7 @@
                                   ? queuelist.currentHeight
                                   : mainView.width - (trackImage.anchors.leftMargin * 2))
                                : queuelist.normalHeight) - units.gu(2)
-                        covers: [{art: model.art}]
+                        covers: [{art: model.art, album: model.album, author: model.author}]
 
                         spacing: units.gu(2)
 

=== modified file 'MusicPlaylists.qml'
--- MusicPlaylists.qml	2014-09-20 10:50:45 +0000
+++ MusicPlaylists.qml	2014-10-04 17:07:09 +0000
@@ -116,8 +116,9 @@
     ListView {
         id: playlistslist
         objectName: "playlistsListView"
-        anchors.fill: parent
-        anchors.bottomMargin: musicToolbar.mouseAreaOffset + musicToolbar.minimizedHeight
+        anchors {
+            fill: parent
+        }
         model: playlistModel.model
         delegate: playlistDelegate
         onCountChanged: {

=== modified file 'MusicSettings.qml'
--- MusicSettings.qml	2014-09-20 10:50:45 +0000
+++ MusicSettings.qml	2014-10-04 17:07:09 +0000
@@ -30,17 +30,6 @@
     title: i18n.tr("Settings")
     contentsHeight: parent.height;
 
-    onVisibleChanged: {
-        if (visible === true)
-        {
-            musicToolbar.disableToolbar()
-        }
-        else
-        {
-            musicToolbar.enableToolbar()
-        }
-    }
-
     onCancelClicked: PopupUtils.close(musicSettings)
     onConfirmClicked: {
         PopupUtils.close(musicSettings)

=== modified file 'MusicToolbar.qml'
--- MusicToolbar.qml	2014-09-23 20:45:41 +0000
+++ MusicToolbar.qml	2014-10-04 17:07:09 +0000
@@ -43,7 +43,6 @@
     property int transitionDuration: 100
 
     property alias currentHeight: musicToolbarPanel.height
-    property alias minimizedHeight: musicToolbarPanel.minimizedHeight
     property alias expandedHeight: musicToolbarPanel.expandedHeight
     property alias fullHeight: musicToolbarPanel.fullHeight
     property alias mouseAreaOffset: musicToolbarPanel.hintSize
@@ -72,22 +71,6 @@
 
     /* Helper functions */
 
-    // Disable the toolbar for this page/view (eg a dialog)
-    function disableToolbar()
-    {
-        cachedStates.push(state);
-        musicToolbarPanel.state = "hidden";
-    }
-
-    // Enable the toolbar (run when closing a page that disabled it)
-    function enableToolbar()
-    {
-        if (cachedStates.length > 0)
-        {
-            musicToolbarPanel.state = cachedStates.pop();
-        }
-    }
-
     // Back button has been pressed, jump up pageStack or back to parent page
     function goBack()
     {
@@ -98,18 +81,6 @@
         else if (mainPageStack !== null && mainPageStack.depth > 1) {
             mainPageStack.pop(currentPage)
         }
-
-        startAutohideTimer()
-    }
-
-    // Hide the toolbar
-    function hideToolbar()
-    {
-        if (!wideAspect) {
-            musicToolbarPanel.close();
-        }
-
-        toolbarAutoHideTimer.stop();  // cancel any autohide
     }
 
     // Remove sheet as it has been closed
@@ -135,32 +106,6 @@
         currentSheet.push(sheet)
     }
 
-    // Show the toolbar
-    function showToolbar()
-    {
-        startAutohideTimer();  // always attempt to autohide toolbar
-
-        if (!musicToolbarPanel.opened) {
-            musicToolbarPanel.open();
-        }
-    }
-
-    // Start the autohidetimer
-    function startAutohideTimer()
-    {
-        toolbarAutoHideTimer.restart();
-    }
-
-    Connections {
-        target: mainView
-        onWideAspectChanged: {
-            // Force toolbar to show if in wideAspect
-            if (wideAspect && !opened) {
-                showToolbar();
-            }
-        }
-    }
-
     Panel {
         id: musicToolbarPanel
         anchors {
@@ -168,32 +113,25 @@
             right: parent.right
             bottom: parent.bottom
         }
-        height: currentMode === "full" ? fullHeight : expandedHeight
-        locked: wideAspect
-
-        __closeOnContentsClicks: false  // TODO: fix bug 1295720
-
+        // TODO: this will be removed when the toolbar is redone
+        height: currentMode === "hidden" ? 0 : (currentMode === "full" ? fullHeight : expandedHeight)
+        locked: true
+        opened: true
+
+        // TODO: this will be removed when the toolbar is redone
         // The current mode of the controls
-        property string currentMode: wideAspect || (currentPage === nowPlaying)
-                                     ? "full" : "expanded"
+        property string currentMode: !nowPlaying.isListView && currentPage === nowPlaying
+            ? "hidden" : (wideAspect || currentPage === nowPlaying
+                ?  "full" : "expanded")
 
         // Properties for the different heights
-        property int minimizedHeight: units.gu(0.5)
-        property int expandedHeight: units.gu(8)
+        property int expandedHeight: units.gu(7.25)
         property int fullHeight: units.gu(11)
 
         onCurrentModeChanged: {
             musicToolbarFullProgressMouseArea.enabled = currentMode === "full"
         }
 
-        onOpenedChanged: {
-            onToolbarShownChanged(opened, currentPage, currentTab);
-
-            if (opened) {
-                startAutohideTimer();
-            }
-        }
-
         /* Full toolbar */
         Rectangle {
             id: musicToolbarFullContainer
@@ -717,8 +655,10 @@
 
             Rectangle {
                 id: musicToolbarPlayerControls
-                anchors.fill: parent
-                color: styleMusic.playerControls.backgroundColor
+                anchors {
+                    fill: parent
+                }
+                color: "#000"
                 state: trackQueue.model.count === 0 ? "disabled" : "enabled"
                 states: [
                     State {
@@ -745,39 +685,55 @@
                     }
                 ]
 
+                /* Disabled (empty state) controls */
                 Rectangle {
                     id: disabledPlayerControlsGroup
-                    anchors.fill: parent
+                    anchors {
+                        bottom: playerControlsProgressBar.top
+                        left: parent.left
+                        right: parent.right
+                        top: parent.top
+                    }
                     color: "transparent"
-                    visible: trackQueue.model.count === 0
 
                     Label {
                         id: noSongsInQueueLabel
                         anchors {
                             left: parent.left
+                            leftMargin: units.gu(2)
                             right: disabledPlayerControlsPlayButton.left
-                            margins: units.gu(1)
-                            top: parent.top
+                            rightMargin: units.gu(2)
+                            verticalCenter: parent.verticalCenter
                         }
                         color: styleMusic.playerControls.labelColor
-                        text: i18n.tr("Tap play to shuffle music")
+                        text: i18n.tr("Tap to shuffle music")
                         fontSize: "large"
                         wrapMode: Text.WordWrap
                         maximumLineCount: 2
                     }
 
-                    Rectangle {
+                    /* Play/Pause button */
+                    Icon {
                         id: disabledPlayerControlsPlayButton
-                        anchors.right: parent.right
-                        anchors.rightMargin: units.gu(1)
-                        anchors.verticalCenter: parent.verticalCenter
-                        antialiasing: true
-                        color: "#444"
-                        height: units.gu(7)
-                        radius: height / 2
+                        anchors {
+                            right: parent.right
+                            rightMargin: units.gu(3)
+                            verticalCenter: parent.verticalCenter
+                        }
+                        color: "#FFF"
+                        height: units.gu(2.5)
+                        name: player.playbackState === MediaPlayer.PlayingState ?
+                                  "media-playback-pause" : "media-playback-start"
+                        objectName: "disabledSmallPlayShape"
                         width: height
+                    }
 
-                        function trigger() {
+                    /* Click to shuffle music */
+                    MouseArea {
+                        anchors {
+                            fill: parent
+                        }
+                        onClicked: {
                             if (emptyPage.noMusic) {
                                 return;
                             }
@@ -789,230 +745,65 @@
                                 player.toggle();
                             }
                         }
-
-                        // draws the outer shadow/highlight
-                        Rectangle {
-                            id: disabledSourceOutter
-                            anchors { fill: parent; margins: -units.gu(0.1) }
-                            radius: (width / 2)
-                            antialiasing: true
-                            gradient: Gradient {
-                                GradientStop { position: 0.0; color: "black" }
-                                GradientStop { position: 0.5; color: "transparent" }
-                                GradientStop { position: 1.0; color: UbuntuColors.warmGrey }
-                            }
-
-                            Rectangle {
-                                anchors.verticalCenter: parent.verticalCenter
-                                anchors.horizontalCenter: parent.horizontalCenter
-                                antialiasing: true
-                                color: "#444"
-                                height: playerControlsPlayButton.height - units.gu(.1)
-                                radius: height / 2
-                                width: height
-
-                                Rectangle {
-                                    id: disabledPlayerControlsPlayInnerCircle
-                                    anchors.horizontalCenter: parent.horizontalCenter
-                                    anchors.verticalCenter: parent.verticalCenter
-                                    antialiasing: true
-                                    height: units.gu(4.5)
-                                    radius: height / 2
-                                    width: height
-                                    color: styleMusic.toolbar.fullInnerPlayCircleColor
-
-                                    // draws the inner shadow/highlight
-                                    Rectangle {
-                                        id: disabledSourceInner
-                                        anchors { fill: parent; margins: -units.gu(0.1) }
-                                        radius: (width / 2)
-                                        antialiasing: true
-                                        gradient: Gradient {
-                                            GradientStop { position: 0.0; color: UbuntuColors.warmGrey }
-                                            GradientStop { position: 0.5; color: "transparent" }
-                                            GradientStop { position: 1.0; color: "black" }
-                                        }
-
-                                        Rectangle {
-                                            anchors.verticalCenter: parent.verticalCenter
-                                            anchors.horizontalCenter: parent.horizontalCenter
-                                            antialiasing: true
-                                            height: playerControlsPlayInnerCircle.height - units.gu(.1)
-                                            radius: height / 2
-                                            width: height
-                                            color: styleMusic.toolbar.fullInnerPlayCircleColor
-
-                                            Image {
-                                                id: disabledPlayIndicator
-                                                height: units.gu(4)
-                                                width: height
-                                                anchors.horizontalCenter: parent.horizontalCenter
-                                                anchors.verticalCenter: parent.verticalCenter
-                                                opacity: emptyPage.noMusic ? .4 : 1
-                                                source: player.playbackState === MediaPlayer.PlayingState ?
-                                                            Qt.resolvedUrl("images/media-playback-pause.svg") : Qt.resolvedUrl("images/media-playback-start.svg")
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
                     }
                 }
 
+                /* Enabled (queue > 0) controls */
                 Rectangle {
                     id: enabledPlayerControlsGroup
-                    anchors.fill: parent
+                    anchors {
+                        bottom: playerControlsProgressBar.top
+                        left: parent.left
+                        right: parent.right
+                        top: parent.top
+                    }
                     color: "transparent"
-                    visible: trackQueue.model.count !== 0
-
-                    /* Settings button */
-                    // TODO: Enable settings when it is practical
-                    /* Rectangle {
-                        id: playerControlsSettings
-                        anchors.right: parent.right
-                        anchors.verticalCenter: parent.verticalCenter
-                        width: units.gu(6)
-                        height: width
-                        color: "transparent"
-
-                        Image {
-                            anchors.horizontalCenter: parent.horizontalCenter
-                            anchors.verticalCenter: parent.verticalCenter
-                            height: units.gu(3)
-                            source: Qt.resolvedUrl("images/settings.png")
-                            width: height
-                        }
-
-                        MouseArea {
-                            anchors.fill: parent
-                            onClicked: {
-                                console.debug('Debug: Show settings')
-                                PopupUtils.open(Qt.resolvedUrl("MusicSettings.qml"), mainView,
-                                                {
-                                                    title: i18n.tr("Settings")
-                                                } )
-                            }
-                        }
-                    } */
-
-                    /* Play/Pause button TODO: image and colours needs updating */
-                    Rectangle {
-                        id: playerControlsPlayButton
-                        anchors.right: parent.right
-                        anchors.rightMargin: units.gu(1)
-                        anchors.verticalCenter: parent.verticalCenter
-                        antialiasing: true
-                        color: "#444"
-                        height: units.gu(7)
-                        objectName: "smallPlayShape"
-                        radius: height / 2
-                        width: height
-
-                        function trigger() {
-                            if (emptyPage.noMusic) {
-                                return;
-                            }
-
-                            if (trackQueue.model.count === 0) {
-                                playRandomSong();
-                            }
-                            else {
-                                player.toggle();
-                            }
-                        }
-
-                        // draws the outer shadow/highlight
-                        Rectangle {
-                            id: sourceOutter
-                            anchors { fill: parent; margins: -units.gu(0.1) }
-                            radius: (width / 2)
-                            antialiasing: true
-                            gradient: Gradient {
-                                GradientStop { position: 0.0; color: "black" }
-                                GradientStop { position: 0.5; color: "transparent" }
-                                GradientStop { position: 1.0; color: UbuntuColors.warmGrey }
-                            }
-
-                            Rectangle {
-                                anchors.verticalCenter: parent.verticalCenter
-                                anchors.horizontalCenter: parent.horizontalCenter
-                                antialiasing: true
-                                color: "#444"
-                                height: playerControlsPlayButton.height - units.gu(.1)
-                                radius: height / 2
-                                width: height
-
-                                Rectangle {
-                                    id: playerControlsPlayInnerCircle
-                                    anchors.horizontalCenter: parent.horizontalCenter
-                                    anchors.verticalCenter: parent.verticalCenter
-                                    antialiasing: true
-                                    height: units.gu(4.5)
-                                    radius: height / 2
-                                    width: height
-                                    color: styleMusic.toolbar.fullInnerPlayCircleColor
-
-                                    // draws the inner shadow/highlight
-                                    Rectangle {
-                                        id: sourceInner
-                                        anchors { fill: parent; margins: -units.gu(0.1) }
-                                        radius: (width / 2)
-                                        antialiasing: true
-                                        gradient: Gradient {
-                                            GradientStop { position: 0.0; color: UbuntuColors.warmGrey }
-                                            GradientStop { position: 0.5; color: "transparent" }
-                                            GradientStop { position: 1.0; color: "black" }
-                                        }
-
-                                        Rectangle {
-                                            anchors.verticalCenter: parent.verticalCenter
-                                            anchors.horizontalCenter: parent.horizontalCenter
-                                            antialiasing: true
-                                            height: playerControlsPlayInnerCircle.height - units.gu(.1)
-                                            radius: height / 2
-                                            width: height
-                                            color: styleMusic.toolbar.fullInnerPlayCircleColor
-
-                                            Image {
-                                                id: playindicator
-                                                height: units.gu(4)
-                                                width: height
-                                                anchors.horizontalCenter: parent.horizontalCenter
-                                                anchors.verticalCenter: parent.verticalCenter
-                                                opacity: emptyPage.noMusic ? .4 : 1
-                                                source: player.playbackState === MediaPlayer.PlayingState ?
-                                                            Qt.resolvedUrl("images/media-playback-pause.svg") : Qt.resolvedUrl("images/media-playback-start.svg")
-                                            }
-                                        }
-                                    }
-                                }
+
+                    /* Album art in player controls */
+                    Image {
+                        id: playerControlsImage
+                        anchors {
+                            bottom: parent.bottom
+                            left: parent.left
+                            top: parent.top
+                        }
+                        smooth: true
+                        source: player.currentMetaArt === "" ?
+                                    decodeURIComponent("image://albumart/artist=" +
+                                                       player.currentMetaArtist +
+                                                       "&album=" + player.currentMetaAlbum)
+                                  : player.currentMetaArt
+                        width: parent.height
+
+                        onStatusChanged: {
+                            if (status === Image.Error) {
+                                source = Qt.resolvedUrl("../images/[e-mail]")
                             }
                         }
                     }
 
-                    /* Container holding the labels for the toolbar */
-                    Rectangle {
-                        id: playerControlLabelContainer
-                        anchors.bottom: parent.bottom
-                        anchors.left: parent.left
-                        anchors.right: playerControlsPlayButton.left
-                        anchors.top: parent.top
-                        color: "transparent"
+                    /* Column of meta labels */
+                    Column {
+                        id: playerControlsLabels
+                        anchors {
+                            left: playerControlsImage.right
+                            leftMargin: units.gu(1.5)
+                            right: playerControlsPlayButton.left
+                            rightMargin: units.gu(1)
+                            verticalCenter: parent.verticalCenter
+                        }
 
                         /* Title of track */
                         Label {
                             id: playerControlsTitle
-                            anchors.left: parent.left
-                            anchors.leftMargin: units.gu(1)
-                            anchors.right: parent.right
-                            anchors.rightMargin: units.gu(1)
-                            anchors.top: parent.top
-                            anchors.topMargin: units.gu(1)
-                            color: styleMusic.playerControls.labelColor
+                            anchors {
+                                left: parent.left
+                                right: parent.right
+                            }
+                            color: "#FFF"
                             elide: Text.ElideRight
-                            fontSize: "medium"
-                            objectName: "playercontroltitle"
+                            fontSize: "small"
+                            font.weight: Font.DemiBold
                             text: player.currentMetaTitle === ""
                                   ? player.source : player.currentMetaTitle
                         }
@@ -1020,72 +811,103 @@
                         /* Artist of track */
                         Label {
                             id: playerControlsArtist
-                            anchors.left: parent.left
-                            anchors.leftMargin: units.gu(1)
-                            anchors.right: parent.right
-                            anchors.rightMargin: units.gu(1)
-                            anchors.top: playerControlsTitle.bottom
-                            color: styleMusic.playerControls.labelColor
+                            anchors {
+                                left: parent.left
+                                right: parent.right
+                            }
+                            color: "#FFF"
                             elide: Text.ElideRight
                             fontSize: "small"
+                            opacity: 0.4
                             text: player.currentMetaArtist
                         }
-
-                        /* Album of track */
-                        Label {
-                            id: playerControlsAlbum
-                            anchors.left: parent.left
-                            anchors.leftMargin: units.gu(1)
-                            anchors.right: parent.right
-                            anchors.rightMargin: units.gu(1)
-                            anchors.top: playerControlsArtist.bottom
-                            color: styleMusic.playerControls.labelColor
-                            elide: Text.ElideRight
-                            fontSize: "small"
-                            text: player.currentMetaAlbum
-                        }
-                    }
-
+                    }
+
+                    /* Play/Pause button */
+                    Icon {
+                        id: playerControlsPlayButton
+                        anchors {
+                            right: parent.right
+                            rightMargin: units.gu(3)
+                            verticalCenter: parent.verticalCenter
+                        }
+                        color: "#FFF"
+                        height: units.gu(2.5)
+                        name: player.playbackState === MediaPlayer.PlayingState ?
+                                  "media-playback-pause" : "media-playback-start"
+                        objectName: "smallPlayShape"
+                        width: height
+                    }
+
+                    MouseArea {
+                        anchors {
+                            bottom: parent.bottom
+                            horizontalCenter: playerControlsPlayButton.horizontalCenter
+                            top: parent.top
+                        }
+                        onClicked: player.toggle()
+                        width: units.gu(8)
+
+                        Rectangle {
+                            anchors {
+                                fill: parent
+                            }
+                            color: "#FFF"
+                            opacity: parent.pressed ? 0.1 : 0
+
+                            Behavior on opacity {
+                                UbuntuNumberAnimation {
+                                    duration: UbuntuAnimation.FastDuration
+                                }
+                            }
+                        }
+                    }
+
+                    /* Mouse area to jump to now playing */
                     Rectangle {
-                        anchors.fill: playerControlLabelContainer
+                        anchors {
+                            bottom: parent.bottom
+                            left: parent.left
+                            right: playerControlsLabels.right
+                            top: parent.top
+                        }
                         color: "transparent"
                         function trigger() {
                             tabs.pushNowPlaying();
                         }
                     }
                 }
-            }
-        }
-
-        /* Object which provides the progress bar when toolbar is minimized */
-        Rectangle {
-            id: musicToolbarSmallProgressBackground
-            anchors {
-                bottom: parent.top
-                left: parent.left
-                right: parent.right
-            }
-            color: styleMusic.common.black
-            height: musicToolbarPanel.minimizedHeight
-            visible: (!musicToolbarPanel.animating &&
-                        !musicToolbarPanel.opened)
-                     || musicToolbarPanel.currentMode == "expanded"
-
-            Rectangle {
-                id: musicToolbarSmallProgressHint
-                anchors.left: parent.left
-                anchors.top: parent.top
-                color: styleMusic.nowPlaying.progressForegroundColor
-                height: parent.height
-                width: 0
-
-                Connections {
-                    target: player
-                    onPositionChanged: {
-                        musicToolbarSmallProgressHint.width = (player.position / player.duration) * musicToolbarSmallProgressBackground.width
+
+                /* Object which provides the progress bar when toolbar is minimized */
+                Rectangle {
+                    id: playerControlsProgressBar
+                    anchors {
+                        bottom: parent.bottom
+                        left: parent.left
+                        right: parent.right
                     }
-                    onStopped: {
-                        musicToolbarSmallProgressHint.width = 0;
+                    color: styleMusic.common.black
+                    height: units.gu(0.25)
+
+                    Rectangle {
+                        id: playerControlsProgressBarHint
+                        anchors {
+                            left: parent.left
+                            top: parent.top
+                        }
+                        color: UbuntuColors.blue
+                        height: parent.height
+                        width: 0
+
+                        Connections {
+                            target: player
+                            onPositionChanged: {
+                                playerControlsProgressBarHint.width = (player.position / player.duration) * playerControlsProgressBar.width
+                            }
+                            onStopped: {
+                                playerControlsProgressBarHint.width = 0;
+                            }
+                        }
                     }
                 }
             }
@@ -1123,19 +945,6 @@
                 musicToolbarFullProgressBarContainer.seeking = false;
             }
         }
-
-        // Timer for autohide
-        Timer {
-            id: toolbarAutoHideTimer
-            interval: 5000
-            repeat: false
-            running: false
-            onTriggered: {
-                if (currentPage !== nowPlaying) {  // don't autohide on now playing
-                    hideToolbar();
-                }
-            }
-        }
     }
 }
 

=== modified file 'MusicTracks.qml'
--- MusicTracks.qml	2014-09-20 15:41:33 +0000
+++ MusicTracks.qml	2014-10-04 17:07:09 +0000
@@ -36,8 +36,9 @@
 
     ListView {
         id: tracklist
-        anchors.fill: parent
-        anchors.bottomMargin: musicToolbar.mouseAreaOffset + musicToolbar.minimizedHeight
+        anchors {
+            fill: parent
+        }
         highlightFollowsCurrentItem: false
         objectName: "trackstab-listview"
         model: SortFilterModel {

=== modified file 'MusicaddtoPlaylist.qml'
--- MusicaddtoPlaylist.qml	2014-09-20 10:50:45 +0000
+++ MusicaddtoPlaylist.qml	2014-10-04 17:07:09 +0000
@@ -65,7 +65,6 @@
     ListView {
         id: addtoPlaylistView
         anchors {
-            bottomMargin: musicToolbar.mouseAreaOffset + musicToolbar.minimizedHeight
             fill: parent
         }
         clip: true

=== modified file 'Player.qml'
--- Player.qml	2014-09-20 15:41:33 +0000
+++ Player.qml	2014-10-04 17:07:09 +0000
@@ -187,7 +187,11 @@
             else {
                 var obj = trackQueue.model.get(player.currentIndex);
                 currentMetaAlbum = obj.album;
-                currentMetaArt = obj.art;
+
+                if (obj.art !== undefined) {  // FIXME: protect against not art property in playlists
+                    currentMetaArt = obj.art;
+                }
+
                 currentMetaArtist = obj.author;
                 currentMetaFile = obj.filename;
                 currentMetaTitle = obj.title;

=== modified file 'Style.qml'
--- Style.qml	2014-09-20 10:50:45 +0000
+++ Style.qml	2014-10-04 17:07:09 +0000
@@ -34,8 +34,8 @@
     property QtObject common: QtObject {
         property color black: "#000000";
         property color white: "#FFFFFF";
-        property color music: "#333333";
-        property color subtitle: "#666666";
+        property color music: "#FFFFFF";
+        property color subtitle: "#999999";
         property color expandedColor: "#000000";
         property int albumSize: units.gu(10);
         property int itemHeight: units.gu(12);

=== modified file 'common/AlbumsPage.qml'
--- common/AlbumsPage.qml	2014-09-20 15:41:33 +0000
+++ common/AlbumsPage.qml	2014-10-04 17:07:09 +0000
@@ -28,7 +28,6 @@
 
 MusicPage {
     id: albumStackPage
-    anchors.bottomMargin: units.gu(.5)
     objectName: "albumsArtistPage"
     visible: false
 
@@ -38,7 +37,6 @@
     ListView {
         id: albumtrackslist
         anchors {
-            bottomMargin: wideAspect ? musicToolbar.fullHeight : musicToolbar.mouseAreaOffset + musicToolbar.minimizedHeight
             fill: parent
         }
         delegate: albumTracksDelegate

=== modified file 'common/BlurredBackground.qml'
--- common/BlurredBackground.qml	2014-09-20 15:41:33 +0000
+++ common/BlurredBackground.qml	2014-10-04 17:07:09 +0000
@@ -23,8 +23,14 @@
 
 // Blurred background
 Rectangle {
-    anchors.fill: parent
-    property string art: player.currentMetaFile === "" ? Qt.resolvedUrl("../images/[e-mail]") : player.currentMetaArt
+    width: parent.width
+    property string art  // : player.currentMetaFile === "" ? Qt.resolvedUrl("../images/[e-mail]") : player.currentMetaArt
+
+    // dark layer
+    Rectangle {
+        anchors.fill: parent
+        color: "black" 
+    }
 
     // the album art
     Image {
@@ -32,7 +38,8 @@
         anchors.horizontalCenter: parent.horizontalCenter
         anchors.verticalCenter: parent.verticalCenter
         source: art // this has to be fixed for the default cover art to work - cant find in this dir
-        height: Math.max(parent.height, parent.width)
+        fillMode: Image.PreserveAspectCrop
+        height: parent.height
         width: Math.max(parent.height, parent.width)
         visible: false
         onStatusChanged: {
@@ -47,12 +54,7 @@
         anchors.fill: backgroundImage
         source: backgroundImage
         radius: units.dp(42)
-    }
-    // transparent white layer
-    Rectangle {
-        anchors.fill: parent
-        color: "white"
-        opacity: 0.7
+        opacity: 0.2
     }
     onArtChanged: {
         // TODO: This is a work around for LP:1261078 and LP:1306845. Ideally,

=== modified file 'common/MusicPage.qml'
--- common/MusicPage.qml	2014-08-20 17:35:52 +0000
+++ common/MusicPage.qml	2014-10-04 17:07:09 +0000
@@ -23,6 +23,10 @@
 // generic page for music, could be useful for bottomedge implementation
 Page {
     id: thisPage
+    anchors {
+        bottomMargin: musicToolbar.currentHeight
+        fill: parent
+    }
 
     onVisibleChanged: {
         if (visible) {

=== modified file 'common/MusicRow.qml'
--- common/MusicRow.qml	2014-09-20 10:50:45 +0000
+++ common/MusicRow.qml	2014-10-04 17:07:09 +0000
@@ -24,12 +24,13 @@
 Row {
     anchors {
         left: parent.left
-        leftMargin: units.gu(1)
+        leftMargin: units.gu(2)
         right: parent.right
-        rightMargin: units.gu(1)
+        rightMargin: units.gu(2)
     }
 
     property alias covers: coverRow.covers
+    property bool showCovers: true
     property alias pressed: coverRow.pressed
     property alias column: columnComponent.sourceComponent
 
@@ -37,6 +38,7 @@
 
     CoverRow {
         id: coverRow
+        visible: showCovers
         anchors {
             top: parent.top
             topMargin: units.gu(1)
@@ -50,7 +52,7 @@
         id: columnComponent
         anchors {
             top: parent.top
-            topMargin: units.gu(2)
+            topMargin: units.gu(1)
         }
         width: parent.width - coverRow.width - parent.spacing
 

=== modified file 'common/SongsPage.qml'
--- common/SongsPage.qml	2014-09-20 15:41:33 +0000
+++ common/SongsPage.qml	2014-10-04 17:07:09 +0000
@@ -29,7 +29,6 @@
 
 MusicPage {
     id: songStackPage
-    anchors.bottomMargin: units.gu(.5)
     objectName: "songsPage"
     visible: false
 
@@ -52,7 +51,6 @@
     ListView {
         id: albumtrackslist
         anchors {
-            bottomMargin: wideAspect ? musicToolbar.fullHeight : musicToolbar.mouseAreaOffset + musicToolbar.minimizedHeight
             fill: parent
         }
         delegate: albumTracksDelegate
@@ -61,99 +59,161 @@
         width: parent.width
         header: ListItem.Standard {
             id: albumInfo
-            height: units.gu(22)
-
-            CoverRow {
+            height: albumArtist.visible ? units.gu(33) : units.gu(30)
+
+            BlurredBackground {
+                id: blurredBackground
+                height: parent.height
+                art: albumImage.source
+            }
+
+            Image {
                 id: albumImage
                 anchors {
                     top: parent.top
                     left: parent.left
-                    margins: units.gu(1)
+                    topMargin: units.gu(3)
+                    bottomMargin: units.gu(2)
+                    leftMargin: units.gu(2)
+                    rightMargin: units.gu(2)
                 }
-                count: songStackPage.covers.length
-                size: units.gu(20)
-                covers: songStackPage.covers
-                spacing: units.gu(2)
+                width: units.gu(18)
+                height: width
+                smooth: true
+                source: covers.length > 0
+                        ? (covers[0].art !== undefined
+                           ? covers[0].art
+                           : decodeURIComponent("image://albumart/artist=" + covers[0].author + "&album=" + covers[0].album))
+                        : Qt.resolvedUrl("../images/[e-mail]")
             }
 
             Label {
-                id: albumArtist
-                objectName: "songsPageHeaderAlbumArtist"
-                wrapMode: Text.NoWrap
-                maximumLineCount: 1
-                fontSize: "small"
-                color: styleMusic.common.subtitle
-                anchors.left: albumImage.right
-                anchors.leftMargin: units.gu(1)
-                anchors.top: parent.top
-                anchors.topMargin: units.gu(1.5)
-                anchors.right: parent.right
-                anchors.rightMargin: units.gu(1.5)
-                elide: Text.ElideRight
-                text: line1
-            }
-            Label {
                 id: albumLabel
                 wrapMode: Text.NoWrap
                 maximumLineCount: 2
-                fontSize: "medium"
+                fontSize: "x-large"
                 color: styleMusic.common.music
-                anchors.left: albumImage.right
-                anchors.leftMargin: units.gu(1)
-                anchors.top: albumArtist.bottom
-                anchors.topMargin: units.gu(0.8)
-                anchors.right: parent.right
-                anchors.rightMargin: units.gu(1.5)
+                anchors {
+                    top: albumImage.bottom
+                    topMargin: units.gu(1)
+                    left: albumImage.left
+                }
                 elide: Text.ElideRight
                 text: line2
             }
+
+            Label {
+                id: albumArtist
+                objectName: "songsPageHeaderAlbumArtist"
+                wrapMode: Text.NoWrap
+                maximumLineCount: 1
+                fontSize: "small"
+                color: styleMusic.common.subtitle
+                visible: text !== i18n.tr("Playlist") &&
+                         text !== i18n.tr("Genre")
+                anchors {
+                    top: albumLabel.bottom
+                    topMargin: units.gu(0.75)
+                    left: albumImage.left
+                }
+                elide: Text.ElideRight
+                text: line1
+            }
+
             Label {
                 id: albumYear
                 wrapMode: Text.NoWrap
                 maximumLineCount: 1
-                fontSize: "x-small"
+                fontSize: "small"
                 color: styleMusic.common.subtitle
-                anchors.left: albumImage.right
-                anchors.leftMargin: units.gu(1)
-                anchors.top: albumLabel.bottom
-                anchors.topMargin: units.gu(2)
-                anchors.right: parent.right
-                anchors.rightMargin: units.gu(1.5)
+                anchors {
+                    top: albumArtist.visible ? albumArtist.bottom
+                                             : albumLabel.bottom
+                    topMargin: units.gu(1)
+                    left: albumImage.left
+                }
                 elide: Text.ElideRight
                 text: isAlbum && line1 !== i18n.tr("Genre") ? year + " | " + i18n.tr("%1 song", "%1 songs", albumtrackslist.count).arg(albumtrackslist.count)
                                                    : i18n.tr("%1 song", "%1 songs", albumtrackslist.count).arg(albumtrackslist.count)
 
             }
 
+            // Shuffle
+            Button {
+                id: shuffleRow
+                anchors {
+                    bottom: queueAllRow.top
+                    bottomMargin: units.gu(2)
+                    left: albumImage.right
+                    leftMargin: units.gu(2)
+                }
+                strokeColor: UbuntuColors.green
+                height: units.gu(4)
+                width: units.gu(15)
+                Text {
+                    anchors {
+                        centerIn: parent
+                    }
+                    color: "white"
+                    text: i18n.tr("Shuffle")
+                }
+                MouseArea {
+                    anchors.fill: parent
+                    onClicked: {
+                        shuffleModel(albumtrackslist.model)  // play track
+
+                        if (isAlbum && songStackPage.line1 !== i18n.tr("Genre")) {
+                            Library.addRecent(songStackPage.line2, songStackPage.line1, songStackPage.covers[0], songStackPage.line2, "album")
+                            mainView.hasRecent = true
+                            recentModel.filterRecent()
+                        } else if (songStackPage.line1 === i18n.tr("Playlist")) {
+                            Library.addRecent(songStackPage.line2, "Playlist", songStackPage.covers[0], songStackPage.line2, "playlist")
+                            mainView.hasRecent = true
+                            recentModel.filterRecent()
+                        }
+                    }
+                }
+            }
+
+            // Queue
+            Button {
+                id: queueAllRow
+                anchors {
+                    bottom: playRow.top
+                    bottomMargin: units.gu(2)
+                    left: albumImage.right
+                    leftMargin: units.gu(2)
+                }
+                strokeColor: UbuntuColors.green
+                height: units.gu(4)
+                width: units.gu(15)
+                Text {
+                    anchors {
+                        centerIn: parent
+                    }
+                    color: "white"
+                    text: i18n.tr("Queue all")
+                }
+                MouseArea {
+                    anchors.fill: parent
+                    onClicked: {
+                        addQueueFromModel(albumtrackslist.model)
+                    }
+                }
+            }
+
             // Play
-            Rectangle {
+            Button {
                 id: playRow
-                anchors.top: albumYear.bottom
-                anchors.topMargin: units.gu(1)
-                anchors.left: albumImage.right
-                anchors.leftMargin: units.gu(1)
-                color: "transparent"
+                anchors {
+                    bottom: albumImage.bottom
+                    left: albumImage.right
+                    leftMargin: units.gu(2)
+                }
+                color: UbuntuColors.green
                 height: units.gu(4)
                 width: units.gu(15)
-                Icon {
-                    id: playTrack
-                    objectName: "songspage-playtrack"
-                    anchors.verticalCenter: parent.verticalCenter
-                    name: "media-playback-start"
-                    height: styleMusic.common.expandedItem
-                    width: styleMusic.common.expandedItem
-                }
-                Label {
-                    anchors.left: playTrack.right
-                    anchors.leftMargin: units.gu(0.5)
-                    anchors.verticalCenter: parent.verticalCenter
-                    fontSize: "small"
-                    color: styleMusic.common.subtitle
-                    width: parent.width - playTrack.width - units.gu(1)
-                    text: i18n.tr("Play all")
-                    wrapMode: Text.WordWrap
-                    maximumLineCount: 3
-                }
+                text: i18n.tr("Play all")
                 MouseArea {
                     anchors.fill: parent
                     onClicked: {
@@ -171,43 +231,6 @@
                     }
                 }
             }
-
-            // Queue
-            Rectangle {
-                id: queueAllRow
-                anchors.top: playRow.bottom
-                anchors.topMargin: units.gu(1)
-                anchors.left: albumImage.right
-                anchors.leftMargin: units.gu(1)
-                color: "transparent"
-                height: units.gu(4)
-                width: units.gu(15)
-                Icon {
-                    id: queueAll
-                    objectName: "songspage-queue-all"
-                    anchors.verticalCenter: parent.verticalCenter
-                    name: "add"
-                    height: styleMusic.common.expandedItem
-                    width: styleMusic.common.expandedItem
-                }
-                Label {
-                    anchors.left: queueAll.right
-                    anchors.leftMargin: units.gu(0.5)
-                    anchors.verticalCenter: parent.verticalCenter
-                    fontSize: "small"
-                    color: styleMusic.common.subtitle
-                    width: parent.width - queueAll.width - units.gu(1)
-                    text: i18n.tr("Add to queue")
-                    wrapMode: Text.WordWrap
-                    maximumLineCount: 3
-                }
-                MouseArea {
-                    anchors.fill: parent
-                    onClicked: {
-                        addQueueFromModel(albumtrackslist.model)
-                    }
-                }
-            }
         }
 
         Component {
@@ -219,7 +242,8 @@
                 objectName: "songsPageListItem" + index
                 iconFrame: false
                 progression: false
-                height: styleMusic.common.itemHeight
+                showDivider: false
+                height: units.gu(6)
 
                 leftSideAction: songStackPage.line1 === i18n.tr("Playlist")
                                 ? playlistRemoveAction.item : null
@@ -272,30 +296,23 @@
 
                 MusicRow {
                     id: musicRow
-                    covers: model.art !== undefined ? [{art: model.art}] : [{author: model.author, album: model.album}]
+                    covers: []
+                    showCovers: false
                     column: Column {
-                        spacing: units.gu(1)
+                        Label {
+                            id: trackTitle
+                            color: styleMusic.common.music
+                            fontSize: "small"
+                            objectName: "songspage-tracktitle"
+                            text: model.title
+                        }
+
                         Label {
                             id: trackArtist
                             color: styleMusic.common.subtitle
                             fontSize: "x-small"
                             text: model.author
                         }
-
-                        Label {
-                            id: trackTitle
-                            color: styleMusic.common.subtitle
-                            fontSize: "medium"
-                            objectName: "songspage-tracktitle"
-                            text: model.title
-                        }
-
-                        Label {
-                            id: trackAlbum
-                            color: styleMusic.common.subtitle
-                            fontSize: "xx-small"
-                            text: model.album
-                        }
                     }
                 }
 

=== modified file 'music-app.qml'
--- music-app.qml	2014-09-23 15:59:28 +0000
+++ music-app.qml	2014-10-04 17:07:09 +0000
@@ -40,18 +40,13 @@
     id: mainView
     useDeprecatedToolbar: false
 
-    // Use toolbar color for header
-    headerColor: styleMusic.toolbar.fullBackgroundColor
-    backgroundColor: styleMusic.toolbar.fullBackgroundColor
+    backgroundColor: "#1e1e23"
+    headerColor: "#1e1e23"
 
     // Global keyboard shortcuts
     focus: true
     Keys.onPressed: {
-        if (event.key === Qt.Key_Alt) {
-            // On alt key press show toolbar and start autohide timer
-            musicToolbar.showToolbar();
-        }
-        else if(event.key === Qt.Key_Escape) {
+        if(event.key === Qt.Key_Escape) {
             musicToolbar.goBack();  // Esc      Go back
         }
         else if(event.modifiers === Qt.AltModifier) {
@@ -96,11 +91,9 @@
             case Qt.Key_J:  //      Ctrl+J      Jump to playing song
                 nowPlaying.visible = true;
                 nowPlaying.positionAt(player.currentIndex);
-                musicToolbar.showToolbar();
                 break;
             case Qt.Key_N:  //      Ctrl+N      Show now playing
                 nowPlaying.visible = true;
-                musicToolbar.showToolbar();
                 break;
             case Qt.Key_P:  //      Ctrl+P      Toggle playing state
                 player.toggle();
@@ -577,12 +570,6 @@
         if (args.values.url) {
             uriHandler.process(args.values.url, true);
         }
-
-        // Show toolbar and start timer if there is music
-        if (!emptyPage.noMusic) {
-            musicToolbar.showToolbar();
-            musicToolbar.startAutohideTimer();
-        }
     }
 
     // VARIABLES
@@ -598,7 +585,6 @@
     property bool selectedAlbum: false
 
     signal listItemSwiping(int i)
-    signal onToolbarShownChanged(bool shown, var currentPage, var currentTab)
 
     property bool wideAspect: width >= units.gu(70) && loadedUI
     property bool loadedUI: false  // property to detect if the UI has finished
@@ -680,8 +666,6 @@
             // Show the Now Playing page and make sure the track is visible
             tabs.pushNowPlaying();
             nowPlaying.ensureVisibleIndex = index;
-
-            musicToolbar.showToolbar();
         }
         else {
             player.source = file;
@@ -699,8 +683,6 @@
         // Show the Now Playing page and make sure the track is visible
         tabs.pushNowPlaying();
         nowPlaying.ensureVisibleIndex = index;
-
-        musicToolbar.showToolbar();
     }
 
     function playRandomSong(shuffle)
@@ -716,6 +698,17 @@
         trackClicked(allSongsModel, index, true)
     }
 
+    function shuffleModel(model)
+    {
+        var now = new Date();
+        var seed = now.getSeconds();
+        var index = Math.floor(model.count * Math.random(seed));
+
+        player.shuffle = true;
+
+        trackClicked(model, index, true)
+    }
+
     // Load mediascanner store
     MediaStore {
         id: musicStore
@@ -867,10 +860,6 @@
         id: searchSheet
     }
 
-    // Blurred background
-    BlurredBackground {
-    }
-
     // Popover for tracks, queue and add to playlist, for example
     Component {
         id: trackPopoverComponent
@@ -973,6 +962,7 @@
 
     MusicToolbar {
         id: musicToolbar
+        visible: nowPlaying.isListView || !nowPlaying.visible
         objectName: "musicToolbarObject"
         z: 200  // put on top of everything else
     }

=== modified file 'po/com.ubuntu.music.pot'
--- po/com.ubuntu.music.pot	2014-09-23 12:44:36 +0000
+++ po/com.ubuntu.music.pot	2014-10-04 17:07:09 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: music-app\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-23 13:43+0100\n"
+"POT-Creation-Date: 2014-10-02 20:40-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"
@@ -76,7 +76,7 @@
 
 #: ../MusicArtists.qml:113 ../MusicPlaylists.qml:180 ../MusicStart.qml:371
 #: ../MusicaddtoPlaylist.qml:106 ../common/AlbumsPage.qml:331
-#: ../common/SongsPage.qml:123 ../common/SongsPage.qml:124
+#: ../common/SongsPage.qml:138 ../common/SongsPage.qml:139
 #, qt-format
 msgid "%1 song"
 msgid_plural "%1 songs"
@@ -114,31 +114,32 @@
 msgid "Change"
 msgstr ""
 
-#: ../MusicPlaylists.qml:96 ../music-app.qml:956
+#: ../MusicPlaylists.qml:96 ../music-app.qml:962
 msgid "Playlist already exists"
 msgstr ""
 
-#: ../MusicPlaylists.qml:100 ../music-app.qml:961
+#: ../MusicPlaylists.qml:100 ../music-app.qml:967
 msgid "Please type in a name."
 msgstr ""
 
-#: ../MusicPlaylists.qml:105 ../music-app.qml:493 ../music-app.qml:967
+#: ../MusicPlaylists.qml:105 ../music-app.qml:492 ../music-app.qml:973
 msgid "Cancel"
 msgstr ""
 
 #: ../MusicPlaylists.qml:159 ../MusicPlaylists.qml:163 ../MusicStart.qml:118
-#: ../MusicStart.qml:200 ../common/SongsPage.qml:166
-#: ../common/SongsPage.qml:224 ../common/SongsPage.qml:226
-#: ../common/SongsPage.qml:244
+#: ../MusicStart.qml:200 ../common/SongsPage.qml:114
+#: ../common/SongsPage.qml:171 ../common/SongsPage.qml:228
+#: ../common/SongsPage.qml:250 ../common/SongsPage.qml:252
+#: ../common/SongsPage.qml:270
 msgid "Playlist"
 msgstr ""
 
-#: ../MusicSearch.qml:44 ../MusicSearch.qml:75 ../MusicToolbar.qml:519
-#: ../music-app.qml:93 ../music-app.qml:141 ../music-app.qml:147
+#: ../MusicSearch.qml:44 ../MusicSearch.qml:75 ../MusicToolbar.qml:522
+#: ../music-app.qml:92 ../music-app.qml:140 ../music-app.qml:146
 msgid "Search"
 msgstr ""
 
-#: ../MusicSettings.qml:30 ../music-app.qml:191
+#: ../MusicSettings.qml:30 ../music-app.qml:190
 msgid "Settings"
 msgstr ""
 
@@ -224,7 +225,7 @@
 msgid "Clean everything!"
 msgstr ""
 
-#: ../MusicStart.qml:35 ../music-app.qml:589 ../music-app.qml:1150
+#: ../MusicStart.qml:35 ../music-app.qml:588 ../music-app.qml:1156
 #: com.ubuntu.music_music.desktop.in.in.h:1
 msgid "Music"
 msgstr ""
@@ -241,13 +242,14 @@
 msgid "Genres"
 msgstr ""
 
-#: ../MusicStart.qml:316 ../MusicStart.qml:318 ../common/SongsPage.qml:123
-#: ../common/SongsPage.qml:162 ../common/SongsPage.qml:240
+#: ../MusicStart.qml:316 ../MusicStart.qml:318 ../common/SongsPage.qml:115
+#: ../common/SongsPage.qml:138 ../common/SongsPage.qml:167
+#: ../common/SongsPage.qml:224 ../common/SongsPage.qml:266
 msgid "Genre"
 msgstr ""
 
-#: ../MusicToolbar.qml:760
-msgid "Tap play to shuffle music"
+#: ../MusicToolbar.qml:767
+msgid "Tap to shuffle music"
 msgstr ""
 
 #: ../MusicTracks.qml:35
@@ -259,16 +261,16 @@
 msgstr ""
 
 #: ../common/AlbumsPage.qml:167 ../common/AlbumsPage.qml:360
-#: ../common/SongsPage.qml:153
+#: ../common/SongsPage.qml:218
 msgid "Play all"
 msgstr ""
 
 #: ../common/AlbumsPage.qml:211 ../common/AlbumsPage.qml:400
-#: ../common/SongsPage.qml:200 ../music-app.qml:888
+#: ../music-app.qml:894
 msgid "Add to queue"
 msgstr ""
 
-#: ../common/ListItemActions/AddToPlaylist.qml:25 ../music-app.qml:902
+#: ../common/ListItemActions/AddToPlaylist.qml:25 ../music-app.qml:908
 msgid "Add to playlist"
 msgstr ""
 
@@ -294,6 +296,14 @@
 msgid "Loading..."
 msgstr ""
 
+#: ../common/SongsPage.qml:160
+msgid "Shuffle"
+msgstr ""
+
+#: ../common/SongsPage.qml:197
+msgid "Queue all"
+msgstr ""
+
 #: ../common/SwipeDelete.qml:52 ../common/SwipeDelete.qml:88
 msgid "Clear"
 msgstr ""
@@ -306,127 +316,127 @@
 msgid "Unknown Artist"
 msgstr ""
 
-#: ../music-app.qml:142
+#: ../music-app.qml:141
 msgid "Search Track"
 msgstr ""
 
+#: ../music-app.qml:153
+msgid "Next"
+msgstr ""
+
 #: ../music-app.qml:154
-msgid "Next"
-msgstr ""
-
-#: ../music-app.qml:155
 msgid "Next Track"
 msgstr ""
 
-#: ../music-app.qml:161
+#: ../music-app.qml:160
 msgid "Pause"
 msgstr ""
 
-#: ../music-app.qml:161
+#: ../music-app.qml:160
 msgid "Play"
 msgstr ""
 
-#: ../music-app.qml:163
+#: ../music-app.qml:162
 msgid "Pause Playback"
 msgstr ""
 
-#: ../music-app.qml:163
+#: ../music-app.qml:162
 msgid "Continue or start playback"
 msgstr ""
 
+#: ../music-app.qml:167
+msgid "Back"
+msgstr ""
+
 #: ../music-app.qml:168
-msgid "Back"
-msgstr ""
-
-#: ../music-app.qml:169
 msgid "Go back to last page"
 msgstr ""
 
+#: ../music-app.qml:176
+msgid "Previous"
+msgstr ""
+
 #: ../music-app.qml:177
-msgid "Previous"
-msgstr ""
-
-#: ../music-app.qml:178
 msgid "Previous Track"
 msgstr ""
 
+#: ../music-app.qml:182
+msgid "Stop"
+msgstr ""
+
 #: ../music-app.qml:183
-msgid "Stop"
-msgstr ""
-
-#: ../music-app.qml:184
 msgid "Stop Playback"
 msgstr ""
 
-#: ../music-app.qml:192
+#: ../music-app.qml:191
 msgid "Music Settings"
 msgstr ""
 
 #. TRANSLATORS: This string represents that the target destination filepath does not start with ~/Music/Imported/
-#: ../music-app.qml:338
+#: ../music-app.qml:337
 msgid "Filepath must start with"
 msgstr ""
 
 #. TRANSLATORS: This string represents that a blank filepath destination has been used
-#: ../music-app.qml:364
+#: ../music-app.qml:363
 msgid "Filepath must be a file"
 msgstr ""
 
 #. TRANSLATORS: This string represents that there was failure moving the file to the target destination
-#: ../music-app.qml:370
+#: ../music-app.qml:369
 msgid "Failed to move file"
 msgstr ""
 
-#: ../music-app.qml:447
+#: ../music-app.qml:446
 msgid "Waiting for file(s)..."
 msgstr ""
 
-#: ../music-app.qml:466
+#: ../music-app.qml:465
 msgid "OK"
 msgstr ""
 
-#: ../music-app.qml:479
+#: ../music-app.qml:478
 msgid "Imported file not found"
 msgstr ""
 
-#: ../music-app.qml:483
+#: ../music-app.qml:482
 msgid "Wait"
 msgstr ""
 
 #. TRANSLATORS: this refers to a number of songs greater than one. The actual number will be prepended to the string automatically (plural forms are not yet fully supported in usermetrics, the library that displays that string)
+#: ../music-app.qml:503
+msgid "songs played today"
+msgstr ""
+
 #: ../music-app.qml:504
-msgid "songs played today"
-msgstr ""
-
-#: ../music-app.qml:505
 msgid "No songs played today"
 msgstr ""
 
-#: ../music-app.qml:613
+#: ../music-app.qml:612
 msgid "Debug: "
 msgstr ""
 
-#: ../music-app.qml:925
+#: ../music-app.qml:931
 msgid "New Playlist"
 msgstr ""
 
-#: ../music-app.qml:926
+#: ../music-app.qml:932
 msgid "Name your playlist."
 msgstr ""
 
-#: ../music-app.qml:930
+#: ../music-app.qml:936
 msgid "Name"
 msgstr ""
 
-#: ../music-app.qml:940
+#: ../music-app.qml:946
 msgid "Create"
 msgstr ""
 
-#: ../music-app.qml:1176
+#: ../music-app.qml:1182
 msgid "No music found"
 msgstr ""
 
-#: ../music-app.qml:1183
+#: ../music-app.qml:1189
 msgid "Please import music"
 msgstr ""
 

=== modified file 'po/pt_BR.po'
--- po/pt_BR.po	2014-10-01 06:25:24 +0000
+++ po/pt_BR.po	2014-10-04 17:07:09 +0000
@@ -1,78 +1,88 @@
 # Brazilian Portuguese translation for music-app
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
 # This file is distributed under the same license as the music-app package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: music-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2014-09-23 13:43+0100\n"
 "PO-Revision-Date: 2014-09-30 17:34+0000\n"
 "Last-Translator: Rafael Neri <Unknown>\n"
+=======
+"POT-Creation-Date: 2014-09-30 15:08+0100\n"
+"PO-Revision-Date: 2014-09-30 18:07+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+>>>>>>> MERGE-SOURCE
 "Language-Team: Brazilian Portuguese <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-10-01 06:25+0000\n"
+=======
+"X-Launchpad-Export-Date: 2014-10-03 06:28+0000\n"
+>>>>>>> MERGE-SOURCE
 "X-Generator: Launchpad (build 17196)\n"
 
 #: ../LoginLastFM.qml:48 ../MusicSettings.qml:145 ../MusicSettings.qml:153
 msgid "Last.fm"
-msgstr "Last.fm"
+msgstr ""
 
 #: ../LoginLastFM.qml:54
 msgid "Login to be able to scrobble."
-msgstr "Faça login para habilitar o scrobble."
+msgstr ""
 
 #: ../LoginLastFM.qml:62
 msgid "Username"
-msgstr "Usuário"
+msgstr ""
 
 #: ../LoginLastFM.qml:72
 msgid "Password"
-msgstr "Senha"
+msgstr ""
 
 #: ../LoginLastFM.qml:94
 msgid "Login"
-msgstr "Login"
+msgstr ""
 
 #: ../LoginLastFM.qml:101
 msgid "Trying to login..."
-msgstr "Tentando entrar..."
+msgstr ""
 
 #: ../LoginLastFM.qml:115
 msgid "Login Successful"
-msgstr "Login realizado com sucesso"
+msgstr ""
 
 #: ../LoginLastFM.qml:121
 msgid "Login Failed"
-msgstr "Falha no login"
+msgstr ""
 
 #: ../LoginLastFM.qml:127
 msgid "You forgot to set your username and/or password"
-msgstr "Você esqueceu de definir seu usuário e/ou senha"
+msgstr ""
 
 #: ../MusicAlbums.qml:35 ../MusicStart.qml:392
 msgid "Albums"
-msgstr "Álbuns"
+msgstr ""
 
 #: ../MusicAlbums.qml:152 ../MusicStart.qml:200 ../MusicStart.qml:454
 #: ../common/AlbumsPage.qml:264
 msgid "Album"
-msgstr "Álbum"
+msgstr ""
 
 #: ../MusicArtists.qml:37
 msgid "Artists"
-msgstr "Artistas"
+msgstr ""
 
 #: ../MusicArtists.qml:107 ../common/AlbumsPage.qml:112
 #, qt-format
 msgid "%1 album"
 msgid_plural "%1 albums"
-msgstr[0] "%1 álbum"
-msgstr[1] "%1 álbuns"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../MusicArtists.qml:113 ../MusicPlaylists.qml:180 ../MusicStart.qml:371
 #: ../MusicaddtoPlaylist.qml:106 ../common/AlbumsPage.qml:331
@@ -80,362 +90,360 @@
 #, qt-format
 msgid "%1 song"
 msgid_plural "%1 songs"
-msgstr[0] "%1 música"
-msgstr[1] "%1 músicas"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../MusicArtists.qml:123
 msgid "Artist"
-msgstr "Artista"
+msgstr ""
 
 #: ../MusicNowPlaying.qml:33
 msgid "Now Playing"
-msgstr "Reproduzindo agora"
+msgstr ""
 
 #. 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
 #: ../MusicPlaylists.qml:38
 msgid "Playlists"
-msgstr "Listas de reprodução"
+msgstr ""
 
 #: ../MusicPlaylists.qml:48 ../MusicaddtoPlaylist.qml:48
 msgid "New playlist"
-msgstr "Nova lista de reprodução"
+msgstr ""
 
 #. TRANSLATORS: this is a title of a dialog with a prompt to rename a playlist
 #: ../MusicPlaylists.qml:64
 msgid "Change name"
-msgstr "Alterar nome"
+msgstr ""
 
 #: ../MusicPlaylists.qml:65
 msgid "Enter the new name of the playlist."
-msgstr "Inserir o novo nome da lista de reprodução."
+msgstr ""
 
 #: ../MusicPlaylists.qml:78
 msgid "Change"
-msgstr "Alterar"
+msgstr ""
 
-#: ../MusicPlaylists.qml:96 ../music-app.qml:956
+#: ../MusicPlaylists.qml:96 ../music-app.qml:951
 msgid "Playlist already exists"
-msgstr "Lista de reprodução já existe"
+msgstr ""
 
-#: ../MusicPlaylists.qml:100 ../music-app.qml:961
+#: ../MusicPlaylists.qml:100 ../music-app.qml:956
 msgid "Please type in a name."
-msgstr "Por favor, informe um nome."
+msgstr ""
 
-#: ../MusicPlaylists.qml:105 ../music-app.qml:493 ../music-app.qml:967
+#: ../MusicPlaylists.qml:105 ../music-app.qml:492 ../music-app.qml:962
 msgid "Cancel"
-msgstr "Cancelar"
+msgstr ""
 
 #: ../MusicPlaylists.qml:159 ../MusicPlaylists.qml:163 ../MusicStart.qml:118
 #: ../MusicStart.qml:200 ../common/SongsPage.qml:166
 #: ../common/SongsPage.qml:224 ../common/SongsPage.qml:226
 #: ../common/SongsPage.qml:244
 msgid "Playlist"
-msgstr "Lista de reprodução"
+msgstr ""
 
-#: ../MusicSearch.qml:44 ../MusicSearch.qml:75 ../MusicToolbar.qml:519
-#: ../music-app.qml:93 ../music-app.qml:141 ../music-app.qml:147
+#: ../MusicSearch.qml:44 ../MusicSearch.qml:75 ../MusicToolbar.qml:522
+#: ../music-app.qml:92 ../music-app.qml:140 ../music-app.qml:146
 msgid "Search"
-msgstr "Pesquisar"
+msgstr ""
 
-#: ../MusicSettings.qml:30 ../music-app.qml:191
+#: ../MusicSettings.qml:30 ../music-app.qml:190
 msgid "Settings"
-msgstr "Configurações"
+msgstr ""
 
 #: ../MusicSettings.qml:81
 msgid "Equaliser"
-msgstr "Equalizador"
+msgstr ""
 
 #: ../MusicSettings.qml:82
 msgid "Default"
-msgstr "Padrão"
+msgstr ""
 
 #: ../MusicSettings.qml:83
 msgid "Acoustic"
-msgstr "Acústico"
+msgstr ""
 
 #: ../MusicSettings.qml:84
 msgid "Classical"
-msgstr "Clássica"
+msgstr ""
 
 #: ../MusicSettings.qml:85
 msgid "Electronic"
-msgstr "Eletrônica"
+msgstr ""
 
 #: ../MusicSettings.qml:86
 msgid "Flat"
-msgstr "Flat"
+msgstr ""
 
 #: ../MusicSettings.qml:87
 msgid "Hip Hop"
-msgstr "Hip Hop"
+msgstr ""
 
 #: ../MusicSettings.qml:88
 msgid "Jazz"
-msgstr "Jazz"
+msgstr ""
 
 #: ../MusicSettings.qml:89
 msgid "Metal"
-msgstr "Metal"
+msgstr ""
 
 #: ../MusicSettings.qml:90
 msgid "Pop"
-msgstr "Pop"
+msgstr ""
 
 #: ../MusicSettings.qml:91
 msgid "Rock"
-msgstr "Rock"
+msgstr ""
 
 #: ../MusicSettings.qml:92
 msgid "Custom"
-msgstr "Personalizado"
+msgstr ""
 
 #: ../MusicSettings.qml:112
 msgid ""
 "Snap to current song \n"
 "when opening toolbar"
 msgstr ""
-"Ajustar a música atual \n"
-"quando abrir a barra de ferramentas"
 
 #: ../MusicSettings.qml:132
 msgid "Accounts"
-msgstr "Contas"
+msgstr ""
 
 #: ../MusicSettings.qml:146
 msgid "Login to scrobble and import playlists"
-msgstr "Fazer login no scrobble e importar as listas de reprodução"
+msgstr ""
 
 #: ../MusicSettings.qml:169
 msgid "Music Streaming"
-msgstr "Streaming de música"
+msgstr ""
 
 #: ../MusicSettings.qml:179
 msgid "Ubuntu One"
-msgstr "Ubuntu One"
+msgstr ""
 
 #: ../MusicSettings.qml:180
 msgid "Sign in to stream your cloud music"
-msgstr "Fazer login para transmitir suas músicas armazenadas em nuvem"
+msgstr ""
 
 #: ../MusicSettings.qml:196
 msgid "Stream only on Wi-Fi"
-msgstr "Transmitir apenas através de Wi-Fi"
+msgstr ""
 
 #: ../MusicSettings.qml:230
 msgid "Clean everything!"
-msgstr "Limpar tudo!"
+msgstr ""
 
-#: ../MusicStart.qml:35 ../music-app.qml:589 ../music-app.qml:1150
+#: ../MusicStart.qml:35 ../music-app.qml:588 ../music-app.qml:1145
 #: com.ubuntu.music_music.desktop.in.in.h:1
 msgid "Music"
-msgstr "Música"
+msgstr ""
 
 #: ../MusicStart.qml:75
 msgid "Recent"
-msgstr "Recente"
+msgstr ""
 
 #: ../MusicStart.qml:103
 msgid "Clear History"
-msgstr "Limpar histórico"
+msgstr ""
 
 #: ../MusicStart.qml:227
 msgid "Genres"
-msgstr "Gêneros"
+msgstr ""
 
 #: ../MusicStart.qml:316 ../MusicStart.qml:318 ../common/SongsPage.qml:123
 #: ../common/SongsPage.qml:162 ../common/SongsPage.qml:240
 msgid "Genre"
-msgstr "Gênero"
+msgstr ""
 
-#: ../MusicToolbar.qml:760
-msgid "Tap play to shuffle music"
-msgstr "Toque em reproduzir para embaralhar músicas"
+#: ../MusicToolbar.qml:767
+msgid "Tap to shuffle music"
+msgstr ""
 
 #: ../MusicTracks.qml:35
 msgid "Songs"
-msgstr "Músicas"
+msgstr ""
 
 #: ../MusicaddtoPlaylist.qml:41
 msgid "Select playlist"
-msgstr "Selecione uma lista de reprodução"
+msgstr ""
 
 #: ../common/AlbumsPage.qml:167 ../common/AlbumsPage.qml:360
 #: ../common/SongsPage.qml:153
 msgid "Play all"
-msgstr "Tocar tudo"
+msgstr ""
 
 #: ../common/AlbumsPage.qml:211 ../common/AlbumsPage.qml:400
-#: ../common/SongsPage.qml:200 ../music-app.qml:888
+#: ../common/SongsPage.qml:200 ../music-app.qml:883
 msgid "Add to queue"
-msgstr "Adicionar à fila"
+msgstr ""
 
-#: ../common/ListItemActions/AddToPlaylist.qml:25 ../music-app.qml:902
+#: ../common/ListItemActions/AddToPlaylist.qml:25 ../music-app.qml:897
 msgid "Add to playlist"
-msgstr "Adicionar à lista de reprodução"
+msgstr ""
 
 #: ../common/ListItemActions/AddToQueue.qml:25
 msgid "Add to Queue"
-msgstr "Adicionar à fila de reprodução"
+msgstr ""
 
 #. TRANSLATORS: this refers to deleting a playlist
 #: ../common/ListItemActions/DeletePlaylist.qml:26
 msgid "Delete"
-msgstr "Apagar"
+msgstr ""
 
 #. TRANSLATORS: this refers to editing a playlist
 #: ../common/ListItemActions/EditPlaylist.qml:26
 msgid "Edit"
-msgstr "Editar"
+msgstr ""
 
 #: ../common/ListItemActions/Remove.qml:27
 msgid "Remove"
-msgstr "Remover"
+msgstr ""
 
 #: ../common/LoadingSpinnerComponent.qml:47
 msgid "Loading..."
-msgstr "Carregando..."
+msgstr ""
 
 #: ../common/SwipeDelete.qml:52 ../common/SwipeDelete.qml:88
 msgid "Clear"
-msgstr "Limpar"
+msgstr ""
 
 #: ../meta-database.js:90 ../meta-database.js:92
 msgid "Unknown Album"
-msgstr "Álbum desconhecido"
+msgstr ""
 
 #: ../meta-database.js:91
 msgid "Unknown Artist"
-msgstr "Artista desconhecido"
+msgstr ""
 
-#: ../music-app.qml:142
+#: ../music-app.qml:141
 msgid "Search Track"
-msgstr "Pesquisar faixa"
+msgstr ""
+
+#: ../music-app.qml:153
+msgid "Next"
+msgstr ""
 
 #: ../music-app.qml:154
-msgid "Next"
-msgstr "Próximo"
-
-#: ../music-app.qml:155
 msgid "Next Track"
-msgstr "Próxima faixa"
+msgstr ""
 
-#: ../music-app.qml:161
+#: ../music-app.qml:160
 msgid "Pause"
-msgstr "Pausar"
+msgstr ""
 
-#: ../music-app.qml:161
+#: ../music-app.qml:160
 msgid "Play"
-msgstr "Tocar"
+msgstr ""
 
-#: ../music-app.qml:163
+#: ../music-app.qml:162
 msgid "Pause Playback"
-msgstr "Pausar Reprodução"
+msgstr ""
 
-#: ../music-app.qml:163
+#: ../music-app.qml:162
 msgid "Continue or start playback"
-msgstr "Continuar ou iniciar reprodução"
+msgstr ""
+
+#: ../music-app.qml:167
+msgid "Back"
+msgstr ""
 
 #: ../music-app.qml:168
-msgid "Back"
-msgstr "Voltar"
-
-#: ../music-app.qml:169
 msgid "Go back to last page"
-msgstr "Voltar para a última página"
+msgstr ""
+
+#: ../music-app.qml:176
+msgid "Previous"
+msgstr ""
 
 #: ../music-app.qml:177
-msgid "Previous"
-msgstr "Anterior"
-
-#: ../music-app.qml:178
 msgid "Previous Track"
-msgstr "Faixa anterior"
+msgstr ""
+
+#: ../music-app.qml:182
+msgid "Stop"
+msgstr ""
 
 #: ../music-app.qml:183
-msgid "Stop"
-msgstr "Parar"
-
-#: ../music-app.qml:184
 msgid "Stop Playback"
-msgstr "Parar reprodução"
+msgstr ""
 
-#: ../music-app.qml:192
+#: ../music-app.qml:191
 msgid "Music Settings"
-msgstr "Configurações de Música"
+msgstr ""
 
 #. TRANSLATORS: This string represents that the target destination filepath does not start with ~/Music/Imported/
-#: ../music-app.qml:338
+#: ../music-app.qml:337
 msgid "Filepath must start with"
 msgstr "O caminho do arquivo deve começar com"
 
 #. TRANSLATORS: This string represents that a blank filepath destination has been used
-#: ../music-app.qml:364
+#: ../music-app.qml:363
 msgid "Filepath must be a file"
-msgstr "O caminho deve ser de um arquivo"
+msgstr ""
 
 #. TRANSLATORS: This string represents that there was failure moving the file to the target destination
-#: ../music-app.qml:370
+#: ../music-app.qml:369
 msgid "Failed to move file"
-msgstr "Falhou ao mover arquivo"
+msgstr ""
 
-#: ../music-app.qml:447
+#: ../music-app.qml:446
 msgid "Waiting for file(s)..."
 msgstr "Aguardando pelo(s) arquivo(s)"
 
-#: ../music-app.qml:466
+#: ../music-app.qml:465
 msgid "OK"
-msgstr "OK"
+msgstr ""
 
-#: ../music-app.qml:479
+#: ../music-app.qml:478
 msgid "Imported file not found"
-msgstr "O arquivo importado não foi encontrado"
+msgstr ""
 
-#: ../music-app.qml:483
+#: ../music-app.qml:482
 msgid "Wait"
-msgstr "Aguardando"
+msgstr ""
 
 #. TRANSLATORS: this refers to a number of songs greater than one. The actual number will be prepended to the string automatically (plural forms are not yet fully supported in usermetrics, the library that displays that string)
+#: ../music-app.qml:503
+msgid "songs played today"
+msgstr ""
+
 #: ../music-app.qml:504
-msgid "songs played today"
-msgstr "músicas tocadas hoje"
-
-#: ../music-app.qml:505
 msgid "No songs played today"
-msgstr "Nenhuma música tocada hoje"
+msgstr ""
 
-#: ../music-app.qml:613
+#: ../music-app.qml:612
 msgid "Debug: "
-msgstr "Debug: "
+msgstr ""
 
-#: ../music-app.qml:925
+#: ../music-app.qml:920
 msgid "New Playlist"
-msgstr "Nova lista de reprodução"
+msgstr ""
 
-#: ../music-app.qml:926
+#: ../music-app.qml:921
 msgid "Name your playlist."
-msgstr "Nomear sua lista de reprodução."
+msgstr ""
 
-#: ../music-app.qml:930
+#: ../music-app.qml:925
 msgid "Name"
-msgstr "Nome"
+msgstr ""
 
-#: ../music-app.qml:940
+#: ../music-app.qml:935
 msgid "Create"
-msgstr "Criar"
+msgstr ""
 
-#: ../music-app.qml:1176
+#: ../music-app.qml:1171
 msgid "No music found"
-msgstr "Nenhuma música encontrada"
+msgstr ""
 
-#: ../music-app.qml:1183
+#: ../music-app.qml:1178
 msgid "Please import music"
-msgstr "Por favor, importar músicas"
+msgstr ""
 
 #: com.ubuntu.music_music.desktop.in.in.h:2
 msgid "A music application for Ubuntu"
-msgstr "Aplicativo de musica para o Ubuntu"
+msgstr ""
 
 #: com.ubuntu.music_music.desktop.in.in.h:3
 msgid "music;songs;play;tracks;player;tunes;"
-msgstr "música;músicas;tocar;faixas;player;tons;"
+msgstr ""