Merge lp:~nik90/podbird/devel-branch-sync-2 into lp:podbird

[Nekhelesh Ramananthan]

This is a pretty heavy MP. It adds the following,
- Queue Support
- Migration to DownloadManager
- New GridView
- Multi-select view for the EpisodesTab alone (others will follow in the next MP)

[lp:~nik90/podbird/devel-branch-sync-2]

192. By Nekhelesh Ramananthan on 2016-03-28

merged prerequisite

[Michael Sheldon (michael-sheldon)]

Looks good

review: Approve

=== modified file 'app/components/Card.qml'
--- app/components/Card.qml	2016-02-25 11:09:44 +0000
+++ app/components/Card.qml	2016-03-28 22:39:33 +0000
@@ -1,12 +1,13 @@
 /*
- * Copyright (C) 2014-2016
- *      Andrew Hayzen <[e-mail]>
- *
- * This program is free software; you can redistribute it and/or modify
+ * Copyright 2016 Podbird Team
+ *
+ * This file is part of Podbird.
+ *
+ * Podbird is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; version 3.
  *
- * This program is distributed in the hope that it will be useful,
+ * Podbird is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
@@ -18,122 +19,66 @@
 import QtQuick 2.4
 import Ubuntu.Components 1.3
 
-Item {
+AbstractButton {
     id: card
 
-    /* Required by ColumnFlow */
-    property int index
-    property var model
+    height: parent.parent.cellHeight
+    width: parent.parent.cellWidth
 
     property alias coverArt: imgFrame.source
     property alias primaryText: primaryLabel.text
-    property alias secondaryText: secondaryLabel.text
-    property alias secondaryTextVisible: secondaryLabel.visible
-
-    signal clicked(var mouse)
-    signal pressAndHold(var mouse)
-
-    height: cardColumn.childrenRect.height + 2 * bg.anchors.margins
-
-    /* Background for card */
-    Rectangle {
-        id: bg
-        anchors.fill: parent
-        anchors.margins: units.gu(1)
-        color: podbird.appTheme.hightlightListView
-    }
-
-    /* Column containing image and labels */
-    Column {
-        id: cardColumn
-
-        anchors.fill: bg
-        spacing: units.gu(0.5)
-
-        Image {
-            id: imgFrame
-            width: parent.width
-            height: width
-            sourceSize.height: width
-            sourceSize.width: width
-        }
-
-        Item {
-            height: units.gu(1)
-            width: units.gu(1)
-        }
-
-        Label {
-            id: primaryLabel
-            anchors {
-                left: parent.left
-                right: parent.right
-                margins: units.gu(1)
-            }
-            color: podbird.appTheme.baseText
-            elide: Text.ElideRight
-            textSize: Label.Small
-            opacity: 1.0
-            wrapMode: Text.WordWrap
-            horizontalAlignment: Text.AlignHCenter
-        }
-
-        Label {
-            id: secondaryLabel
-            anchors {
-                left: parent.left
-                leftMargin: units.gu(1)
-                right: parent.right
-                rightMargin: units.gu(1)
-            }
-            color: podbird.appTheme.baseSubText
-            elide: Text.ElideRight
-            textSize: Label.Small
-            opacity: 1.0
-            wrapMode: Text.WordWrap
-            horizontalAlignment: Text.AlignHCenter
-        }
-
-        Item {
-            height: units.gu(1.5)
-            width: units.gu(1)
-        }
-    }
-
-    /* Overlay for when card is pressed */
-    Rectangle {
-        id: overlay
-        anchors.fill: bg
-        color: "#000"
-        opacity: 0
-
-        Behavior on opacity {
-            UbuntuNumberAnimation {}
-        }
-    }
-
-    /* Capture mouse events */
-    MouseArea {
-        anchors.fill: parent
-        onClicked: card.clicked(mouse)
-        onPressAndHold: card.pressAndHold(mouse)
-        onPressedChanged: overlay.opacity = pressed ? 0.3 : 0
-    }
-
-    /* Animations */
-    Behavior on height {
-        UbuntuNumberAnimation {}
-    }
-
-    Behavior on width {
-        UbuntuNumberAnimation {}
-    }
-
-    Behavior on x {
-        UbuntuNumberAnimation {}
-    }
-
-    Behavior on y {
-        UbuntuNumberAnimation {}
+    property string secondaryText: ""
+
+    Image {
+        id: imgFrame
+        width: parent.width/1.2
+        height: width
+        anchors.top: parent.top
+        anchors.horizontalCenter: parent.horizontalCenter
+        sourceSize.height: width
+        sourceSize.width: width
+
+        Loader {
+            id: hintLoader
+            anchors.verticalCenter: parent.top
+            anchors.right: parent.right
+            anchors.rightMargin: units.gu(-0.5)
+            sourceComponent: secondaryText !== "" ? hintComponent : undefined
+        }
+
+        Component {
+            id: hintComponent
+            Rectangle {
+                color: podbird.appTheme.focusText
+                width: secondaryLabel.implicitWidth + units.gu(1)
+                height: secondaryLabel.implicitHeight + units.gu(1)
+                radius: units.gu(0.5)
+                visible: secondaryLabel.text !== ""
+                Label {
+                    id: secondaryLabel
+                    anchors.centerIn: parent
+                    text: secondaryText
+                    visible: text !== ""
+                    textSize: Label.Small
+                    color: "White"
+                }
+            }
+        }
+    }
+
+    Label {
+        id: primaryLabel
+        anchors {
+            top: imgFrame.bottom
+            left: imgFrame.left
+            right: imgFrame.right
+            margins: units.gu(1)
+        }
+        color: podbird.appTheme.baseText
+        elide: Text.ElideRight
+        textSize: Label.Small
+        wrapMode: Text.WordWrap
+        maximumLineCount: 2
+        horizontalAlignment: Text.AlignHCenter
     }
 }

=== modified file 'app/components/CardView.qml'
--- app/components/CardView.qml	2016-02-25 11:09:44 +0000
+++ app/components/CardView.qml	2016-03-28 22:39:33 +0000
@@ -18,33 +18,28 @@
 import QtQuick 2.4
 import Ubuntu.Components 1.3
 
-Flickable {
-    id: cardViewFlickable
+GridView {
+    id: gridView
+
     anchors {
         fill: parent
         margins: units.gu(1)
     }
 
-    // dont use flow.contentHeight as it is inaccurate due to height of labels
-    // changing as they load
-    contentHeight: flow.contentHeight + flow.anchors.margins * 2 + units.gu(8)
-    contentWidth: width
-
-    property alias count: flow.count
-    property alias delegate: flow.delegate
-    property var getter
-    property alias model: flow.model
-    property real itemWidth: units.gu(15)
-
-    onGetterChanged: flow.getter = getter  // cannot use alias to set a function (must be var)
-
-    ColumnFlow {
-        id: flow
-        anchors.fill: parent
-        columns: parseInt(cardViewFlickable.width / itemWidth) || 1  // never drop to 0
-        flickable: cardViewFlickable
+    cellHeight: cellSize + heightOffset
+    cellWidth: cellSize + widthOffset
+
+    header: Item {
+        width: parent.width
+        height: units.gu(2)
     }
 
+    readonly property int columns: parseInt(width / itemWidth) || 1  // never drop to 0
+    readonly property int cellSize: width / columns
+    property int itemWidth: units.gu(15)
+    property int heightOffset: 0
+    property int widthOffset: 0
+
     Component.onCompleted: {
         // FIXME: workaround for qtubuntu not returning values depending on the grid unit definition
         // for Flickable.maximumFlickVelocity and Flickable.flickDeceleration

=== removed file 'app/components/ColumnFlow.qml'
--- app/components/ColumnFlow.qml	2016-02-25 11:09:44 +0000
+++ app/components/ColumnFlow.qml	1970-01-01 00:00:00 +0000
@@ -1,494 +0,0 @@
-/*
- * Copyright (C) 2014-2016
- *      Andrew Hayzen <[e-mail]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.4
-
-Item {
-    id: columnFlow
-    property int columns: 1
-    property Flickable flickable
-    property var model
-    property Component delegate
-
-    property var getter: function (i) { return model.get(i); }  // optional getter override (useful for music-app ms2 models)
-
-    property int buffer: units.gu(20)
-    property var columnHeights: []
-    property var columnHeightsMax: []
-    property int columnWidth: parent.width / columns
-    property int contentHeight: 0
-    property int count: model === undefined ? 0 : model.count
-    property int delayRebuildIndex: -1
-    property var incubating: ({})  // incubating objects
-    property var items: ({})
-    property var itemToColumn: ({})  // cache of the columns of indexes
-    property int lastIndex: 0  // the furtherest index loaded
-    property bool removing: false
-    property bool restoring: false  // is the view restoring?
-    property var restoreItems: ({})  // when rebuilding items are stored here temporarily
-
-    onColumnWidthChanged: {
-        if (restoring) {
-            return;
-        } else if (columns != columnHeights.length && visible) {
-            // number of columns has changed so rebuild the columns
-            rebuildColumns()
-        } else {  // column width has changed update visible items properties linked to columnWidth
-            for (var column=0; column < columnHeights.length; column++) {
-                for (var i in columnHeights[column]) {
-                    if (columnHeights[column].hasOwnProperty(i) && items.hasOwnProperty(i)) {
-                        items[i].width = columnWidth;
-                        items[i].x = column * columnWidth;
-                    }
-                }
-            }
-
-            ensureItemsVisible()
-        }
-    }
-
-    onVisibleChanged: {
-        if (visible && delayRebuildIndex !== -1) {  // restore from count change
-            if (delayRebuildIndex === 0) {
-                reset()
-            } else {
-                removeIndex(delayRebuildIndex)
-            }
-
-            delayRebuildIndex = -1
-            append(true)
-        }
-
-        // number of columns has changed while invisible so reset if not already restoring
-        if (visible && !restoring && columns != columnHeights.length) {
-            rebuildColumns()
-        }
-    }
-
-    ListModel {  // fakemodel for connections to link to when there is no model
-        id: fakeModel
-    }
-
-    Connections {
-        target: model === undefined ? fakeModel : model
-        onModelReset: {
-            if (!visible && lastIndex > 0) {
-                delayRebuildIndex = 0
-            } else {
-                reset()
-                append()
-            }
-        }
-        onRowsInserted: {
-            if (!visible && lastIndex > 0) {
-                setDelayRebuildIndex(first)
-            } else {
-                if (first <= lastIndex) {
-                    if (first === 0) {
-                        reset()
-                    } else {
-                        removeIndex(first)  // remove earliest index and all items after
-                    }
-                }
-
-                // Supply last index if larger as count is not updated until after insertion
-                append(true, last > count ? last : count)
-            }
-        }
-        onRowsRemoved: {
-            if (!visible) {
-                setDelayRebuildIndex(first)
-            } else {
-                if (first <= lastIndex) {
-                    if (first === 0) {
-                        reset()
-                    } else {
-                        removeIndex(first)  // remove earliest index and all items after
-                    }
-
-                    // count is not updated until after removal, so send insertMax
-                    // insertMax is count - removal region inclusive - 1 (lastIndex is 1 infront)
-
-                    append(true, count - (1 + last - first) - 1)  // rebuild any items on screen or before
-                }
-            }
-        }
-    }
-
-
-    Connections {
-        target: flickable
-        onContentYChanged: {
-            append()  // Append any new items (scrolling down)
-
-            ensureItemsVisible()
-        }
-    }
-
-    // Append a new row of items if possible
-    function append(loadBefore, insertMax)
-    {
-        // Do not allow append to run if incubating
-        if (isIncubating() || restoring || removing) {
-            return;
-        }
-
-        // get the columns in order
-        var columnsByHeight = getColumnsByHeight();
-        var workDone = false;
-
-        // check if a new item in each column is possible
-        for (var i=0; i < columnsByHeight.length; i++) {
-            var y = columnHeightsMax[columnsByHeight[i]];
-
-            // build new object in column if possible
-            // if insertMax is undefined then allow if there is work todo (from the count in the model)
-            // otherwise use the insertMax as the count to compare with the lastIndex added to the columnFlow
-            // and
-            // allow if the y position is within the viewport
-            // or if loadBefore is true then allow if the y position is before the viewport
-            if (((count > 0 && lastIndex < count && insertMax === undefined) || (insertMax !== undefined && lastIndex <= insertMax)) && (inViewport(y, 0) || (loadBefore === true && beforeViewport(y)))) {
-                incubateObject(lastIndex++, columnsByHeight[i], getMaxInColumn(columnsByHeight[i]), append);
-                workDone = true
-            } else {
-                break;
-            }
-        }
-
-        if (!workDone) {  // last iteration over append so visible ensure items are correct
-            ensureItemsVisible();
-        }
-    }
-
-    // Detect if a loaded object is before the viewport with a buffer
-    function beforeViewport(y)
-    {
-        return y <= flickable.contentY - buffer;
-    }
-
-    // Cache the size of the columns for use later
-    function cacheColumnHeights()
-    {
-        columnHeightsMax = [];
-
-        for (var i=0; i < columnHeights.length; i++) {
-            var sum = 0;
-
-            for (var j in columnHeights[i]) {
-                sum += columnHeights[i][j];
-            }
-
-            columnHeightsMax.push(sum);
-        }
-
-        if (!restoring) {  // when not restoring otherwise user will be pushed to the top of the view
-            // set the height of columnFlow to max column (for flickable contentHeight)
-            contentHeight = Math.max.apply(null, columnHeightsMax);
-        }
-    }
-
-    // Recache the visible items heights (due to a change in their height)
-    function cacheVisibleItemsHeights()
-    {
-        for (var i in items) {
-            if (items.hasOwnProperty(i)) {
-                columnHeights[itemToColumn[i]][i] = items[i].height;
-            }
-        }
-
-        cacheColumnHeights();
-    }
-
-    // Ensures that the correct items are visible
-    function ensureItemsVisible()
-    {
-        for (var i in items) {
-            if (items.hasOwnProperty(i)) {
-                items[i].visible = inViewport(items[i].y, items[i].height)
-            }
-        }
-    }
-
-    // Return if there are incubating objects
-    function isIncubating()
-    {
-        for (var i in incubating) {
-            if (incubating.hasOwnProperty(i)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    // Run after incubation to store new column height and call any further append/restores
-    function finishIncubation(index, callback)
-    {
-        var obj = incubating[index].object;
-        delete incubating[index];
-
-        obj.heightChanged.connect(cacheVisibleItemsHeights)  // if the height changes recache
-
-        // Ensure properties linked to columnWidth are correct (as width may still be changing)
-        obj.x = itemToColumn[index] * columnWidth;
-        obj.width = columnWidth;
-
-        items[index] = obj;
-
-        columnHeights[itemToColumn[index]][index] = obj.height;  // ensure height is the latest
-
-        if (!isIncubating()) {
-            cacheColumnHeights();
-
-            // Check if there is any more work to be done (append or restore)
-            callback();
-        }
-    }
-
-    // Force any incubation to finish
-    function forceIncubationCompletion()
-    {
-        for (var i in incubating) {
-            if (incubating.hasOwnProperty(i)) {
-                incubating[i].forceCompletion()
-            }
-        }
-    }
-
-    // Get the column index in order of height
-    function getColumnsByHeight()
-    {
-        var columnsByHeight = [];
-
-        for (var i=0; i < columnHeightsMax.length; i++) {
-            var min = undefined;
-            var index = -1;
-
-            // Find the smallest column that has not been found yet
-            for (var j=0; j < columnHeightsMax.length; j++) {
-                if (columnsByHeight.indexOf(j) === -1 && (min === undefined || columnHeightsMax[j] < min)) {
-                    min = columnHeightsMax[j];
-                    index = j;
-                }
-            }
-
-            columnsByHeight.push(index);
-        }
-
-        return columnsByHeight;
-    }
-
-    // Get the highest index for a column
-    function getMaxInColumn(column)
-    {
-        var max;
-
-        for (var i in columnHeights[column]) {
-            if (columnHeights[column].hasOwnProperty(i)) {
-                i = parseInt(i);
-
-                if (items.hasOwnProperty(i)) {
-                    if (i > max || max === undefined) {
-                        max = i;
-                    }
-                }
-            }
-        }
-
-        return max;
-    }
-
-    // Incubate an object for creation
-    function incubateObject(index, column, anchorIndex, callback)
-    {
-        // Load parameters to send to the object on creation
-        var params = {
-            "anchors.top": anchorIndex === undefined ? parent.top : items[anchorIndex].bottom,
-            index: index,
-            model: getter(index),
-            width: columnWidth,
-            x: column * columnWidth
-        };
-
-        // Start incubating and cache the column
-        incubating[index] = delegate.incubateObject(parent, params);
-        itemToColumn[index] = column;
-
-        if (incubating[index].status != Component.Ready) {
-            incubating[index].onStatusChanged = function(status) {
-                if (status == Component.Ready) {
-                    finishIncubation(index, callback)
-                }
-            }
-        } else {
-            finishIncubation(index, callback)
-        }
-    }
-
-    // Detect if a loaded object is in the viewport with a buffer
-    function inViewport(y, height)
-    {
-        return flickable.contentY - buffer < y + height && y < flickable.contentY + flickable.height + buffer;
-    }
-
-    // Number of columns has changed rebuild with live items
-    function rebuildColumns()
-    {
-        restoring = true;
-        var i;
-
-        forceIncubationCompletion()
-
-        columnHeights = []
-        columnHeightsMax = []
-
-        for (i=0; i < columns; i++) {
-            columnHeights.push({});
-            columnHeightsMax.push(0);
-        }
-
-        lastIndex = 0;
-
-        restoreItems = items;
-        items = {};
-
-        restoreExisting()
-
-        restoring = false;
-
-        cacheColumnHeights();  // rebuilds contentHeight
-
-        // If the columns have changed while the view was locked rerun
-        if (columns != columnHeights.length && visible) {
-            rebuildColumns()
-        } else {
-            append()  // check if any new items can be added
-        }
-    }
-
-    // Remove an index from the model (invalidating anything after)
-    function removeIndex(index)
-    {
-        removing = true
-
-        forceIncubationCompletion()
-
-        for (var i in items) {
-            if (i >= index && items.hasOwnProperty(i)) {
-                delete columnHeights[itemToColumn[i]][i]
-                delete itemToColumn[i]
-
-                items[i].destroy()
-                delete items[i]
-            }
-        }
-
-        lastIndex = index
-        removing = false
-
-        cacheColumnHeights()
-    }
-
-    // Restores existing items into potentially new positions
-    function restoreExisting()
-    {
-        var i;
-
-        // get the columns in order
-        var columnsByHeight = getColumnsByHeight();
-        var workDone = false;
-
-        // check if a new item in each column is possible
-        for (i=0; i < columnsByHeight.length; i++) {
-            var column = columnsByHeight[i];
-
-            // build new object in column if possible
-            if (count > 0 && lastIndex < count) {
-                if (restoreItems.hasOwnProperty(lastIndex)) {
-                    var item = restoreItems[lastIndex];
-                    var maxInColumn = getMaxInColumn(column);  // get lowest item in column
-
-                    itemToColumn[lastIndex] = column;
-                    columnHeights[column][lastIndex] = item.height;  // ensure height is the latest
-
-                    // Rebuild item properties
-                    item.anchors.bottom = undefined
-                    item.anchors.top = maxInColumn === undefined ? parent.top : items[maxInColumn].bottom;
-                    item.x = column * columnWidth;
-                    item.visible = inViewport(item.y, item.height);
-
-                    // Migrate item from restoreItems to items
-                    items[lastIndex] = item;
-                    delete restoreItems[lastIndex];
-
-                    // set after restore as height will likely change causing cacheVisibleItemsHeights to be run
-                    item.width = columnWidth;
-
-                    cacheColumnHeights();  // ensure column heights are up to date
-
-                    lastIndex++;
-                    workDone = true;
-                }
-            } else {
-                break;
-            }
-        }
-
-        if (workDone) {
-            restoreExisting()  // if work done then check if any more is needed
-        } else {
-            restoreItems = {};  // ensure restoreItems is empty
-        }
-    }
-
-    // Reset the column flow
-    function reset()
-    {
-        forceIncubationCompletion()
-
-        // Destroy any old items
-        for (var j in items) {
-            if (items.hasOwnProperty(j)) {
-                items[j].destroy()
-            }
-        }
-
-        // Reset and rebuild the variables
-        items = ({})
-        itemToColumn = ({})
-        lastIndex = 0
-
-        columnHeights = []
-
-        for (var k=0; k < columns; k++) {
-            columnHeights.push({})
-        }
-
-        cacheColumnHeights()
-
-        contentHeight = 0
-    }
-
-    function setDelayRebuildIndex(index)
-    {
-        if (delayRebuildIndex === -1 || index < lastIndex) {
-            delayRebuildIndex = index
-        }
-    }
-
-    Component.onCompleted: append(true)
-}

=== added file 'app/components/CustomSectionHeader.qml'
--- app/components/CustomSectionHeader.qml	1970-01-01 00:00:00 +0000
+++ app/components/CustomSectionHeader.qml	2016-03-28 22:39:33 +0000
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2016 Podbird Team
+ *
+ * This file is part of Podbird.
+ *
+ * Podbird is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * Podbird is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+Item {
+    id: customSectionHeader
+
+    property alias title: headerText.text
+
+    height: headerText.text !== "" ? headerText.implicitHeight + divider.height + headerText.anchors.topMargin + headerText.anchors.bottomMargin
+                                   : units.gu(0)
+
+    anchors { left: parent.left; right: parent.right; margins: units.gu(2) }
+
+    Label {
+        id: headerText
+        color: podbird.appTheme.baseText
+        font.weight: Font.DemiBold
+        anchors { top: parent.top; topMargin: units.gu(2); bottom: parent.bottom; bottomMargin: units.gu(2) }
+        width: parent.width
+    }
+    
+    Rectangle {
+        id: divider
+        color: settings.themeName === "Dark.qml" ? "#888888" : "#cdcdcd"
+        width: parent.width
+        height: units.dp(1)
+        anchors.bottom: parent.bottom
+    }
+}

=== removed file 'app/components/TabsList.qml'
--- app/components/TabsList.qml	2016-03-28 22:39:32 +0000
+++ app/components/TabsList.qml	1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
-/*
- * Copyright 2015-2016 Podbird Team
- *
- * This file is part of Podbird.
- *
- * Podbird is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * Podbird is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.4
-import Ubuntu.Components 1.3
-
-ActionList {
-    id: tabsList
-
-    property int currentTab: tabs.selectedTabIndex
-
-    children: [
-        Action {
-            text: i18n.tr("Episodes")
-            visible: currentTab !== 0
-            onTriggered: {
-                tabs.selectedTabIndex = 0
-            }
-        },
-
-        Action {
-            text: i18n.tr("Podcasts")
-            visible: currentTab !== 1
-            onTriggered: {
-                tabs.selectedTabIndex = 1
-            }
-        },
-
-        Action {
-            text: i18n.tr("Settings")
-            visible: currentTab !== 2
-            onTriggered: {
-                tabs.selectedTabIndex = 2
-            }
-        }
-    ]
-}

=== modified file 'app/podbird.qml'
--- app/podbird.qml	2016-03-28 22:39:32 +0000
+++ app/podbird.qml	2016-03-28 22:39:33 +0000
@@ -18,13 +18,12 @@
 
 import QtQuick 2.4
 import Podbird 1.0
-import UserMetrics 0.1
-import QtMultimedia 5.4
+import QtMultimedia 5.6
 import Ubuntu.Connectivity 1.0
 import Qt.labs.settings 1.0
 import Ubuntu.Components 1.3
 import QtQuick.LocalStorage 2.0
-import Ubuntu.DownloadManager 0.1
+import Ubuntu.DownloadManager 1.2
 import "ui"
 import "themes" as Themes
 import "podcasts.js" as Podcasts
@@ -45,11 +44,11 @@
 
     Component.onDestruction: {
         console.log("[LOG]: Download cancelled");
-        downloader.cancel();
         var db = Podcasts.init()
         db.transaction(function (tx) {
             tx.executeSql('UPDATE Episode SET queued=0 WHERE queued=1');
         })
+        Podcasts.clearQueue()
     }
 
     // RefreshModel function to call refreshModel() function of the tab currently
@@ -138,84 +137,156 @@
         }
     }
 
-    SingleDownload {
+    Component {
+        id: singleDownloadComponent
+        SingleDownload {
+            id: singleDownloadObject
+            property string image
+            property string title
+            property string guid
+            metadata: Metadata {
+                showInIndicator: true
+                title: singleDownloadObject.title
+            }
+        }
+    }
+
+    function downloadEpisode(image, title, guid, url) {
+        var singleDownload = singleDownloadComponent.createObject(podbird, {"image": image, "title": title, "guid": guid})
+        singleDownload.download(url)
+    }
+
+    DownloadManager {
         id: downloader
-        property var queue: []
-        property string downloadingGuid
-
-        onFinished: {
+
+        property string downloadingGuid: downloads.length > 0 ? downloads[0].guid : "NULL"
+        property int progress: downloads.length > 0 ? downloads[0].progress : 0
+
+        cleanDownloads: true
+        onDownloadFinished: {
             var db = Podcasts.init();
             var finalLocation = fileManager.saveDownload(path);
             db.transaction(function (tx) {
-                tx.executeSql("UPDATE Episode SET downloadedfile=?, queued=0 WHERE guid=?", [finalLocation, downloadingGuid]);
-                queue.shift();
-                if (queue.length > 0) {
-                    downloadingGuid = queue[0][0];
-                    download(queue[0][1]);
-                } else {
-                    downloadingGuid = "";
-                }
+                tx.executeSql("UPDATE Episode SET downloadedfile=?, queued=0 WHERE guid=?", [finalLocation, download.guid]);
             });
         }
 
-        function addDownload(guid, url) {
-            queue.push([guid, url]);
-            if (queue.length == 1) {
-                downloadingGuid = guid;
-                download(url);
-            }
-        }
-    }
-
-    // UserMetrics to show Podbird stats on welcome screen
-    Metric {
-        id: podcastsMetric
-        name: "podcast-metrics"
-        // 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)
-        format: i18n.tr("Podcasts listened to today: <b>%1</b>")
-        emptyFormat: i18n.tr("No podcasts listened to today")
-        domain: "com.mikeasoft.podbird"
-    }
-
-    // Load the media player only when the user starts to play some media. This
-    // should improve app-startup slightly.
-    Loader {
-        id: playerLoader
-        sourceComponent: currentUrl != "" ? playerComponent : undefined
-    }
-
-    Component {
-        id: playerComponent
-        MediaPlayer {
-            id: player
-
-            property bool podcastCounted: false
-
-            source: currentUrl
-
-            onSourceChanged: {
-                podcastCounted = false
-            }
-
-            onPositionChanged: {
-                if (currentGuid == "" || duration <= 0) {
-                    return;
-                }
-
-                if (position > 10000 && !podcastCounted) {
-                    podcastCounted = true
-                    podcastsMetric.increment()
-                    console.log("[LOG]: Podcast User metric incremented")
-                }
-
-                var db = Podcasts.init();
-                db.transaction(function (tx) {
-                    tx.executeSql("UPDATE Episode SET position=? WHERE guid=?", [position >= duration ? 120 : position, currentGuid]);
-                    if (position >= duration - 120) {
-                        tx.executeSql("UPDATE Episode SET listened = 1 WHERE guid=?", [currentGuid]);
-                    }
-                });
-            }
+        onErrorFound: {
+            console.log("[ERROR]: " + download.errorMessage)
+        }
+    }
+
+    MediaPlayer {
+        id: player
+
+        // Wrapper function around decodeURIComponent() to prevent exceptions
+        // from bubbling up to the app.
+        function decodeFileURI(filename)
+        {
+            var newFilename = "";
+            try {
+                newFilename = decodeURIComponent(filename);
+            } catch (e) {
+                newFilename = filename;
+                console.log("Unicode decoding error:", filename, e.message)
+            }
+
+            return newFilename;
+        }
+
+        function metaForSource(source) {
+            var blankMeta = {
+                name: "",
+                artist: "",
+                image: "",
+                guid: "",
+            }
+
+            source = source.toString()
+
+            return Podcasts.lookup(decodeFileURI(source)) || blankMeta;
+        }
+
+        function toggle() {
+            if (playbackState === MediaPlayer.PlayingState) {
+                pause()
+            } else {
+                play()
+            }
+        }
+
+        function playEpisode(guid, image, name, artist, url) {
+            // Clear current queue
+            player.playlist.clear()
+            Podcasts.clearQueue()
+
+            // Add episode to queue
+            Podcasts.addItemToQueue(guid, image, name, artist, url)
+            player.playlist.addItem(url)
+
+            // Play episode
+            player.play()
+        }
+
+        function addEpisodeToQueue(guid, image, name, artist, url) {
+            Podcasts.addItemToQueue(guid, image, name, artist, url)
+            player.playlist.addItem(url)
+
+            // If added episode is the first one in the queue, then set the current metadata
+            // so that the bottom player controls will be shown, allowing the user to play
+            // the episode if he chooses to.
+            if (player.playlist.itemCount === 0) {
+                currentGuid = guid
+                currentName = name
+                currentArtist = artist
+                currentImage = image
+                currentUrl = url
+            }
+        }
+
+        property bool endOfMedia: false
+        property double progress: 0
+
+        playlist: Playlist {
+            playbackMode: Playlist.Sequential
+
+            readonly property bool canGoPrevious: currentIndex !== 0
+            readonly property bool canGoNext: currentIndex !== itemCount - 1
+
+            onCurrentItemSourceChanged: {
+                var meta = player.metaForSource(currentItemSource)
+                currentGuid = "";
+                currentName = meta.name
+                currentArtist = meta.artist
+                currentImage = meta.image
+                currentGuid = meta.guid
+            }
+        }
+
+        onStatusChanged: {
+            if (status === MediaPlayer.EndOfMedia) {
+                console.log("[LOG]: End of Media. Stopping.")
+                endOfMedia = true
+                stop()
+            }
+        }
+
+        onStopped: {
+            if (playlist.itemCount > 0) {
+                if (endOfMedia) {
+                    // We just ended media, so jump to start of playlist
+                    playlist.currentIndex  = 0;
+
+                    // Play then pause otherwise when we come from EndOfMedia
+                    // it calls next() until EndOfMedia again.
+                    play()
+                }
+
+                pause()
+            }
+
+            // Always reset endOfMedia
+            endOfMedia = false
         }
     }
 
@@ -290,13 +361,13 @@
         states: [
             State {
                 name: "shown"
-                when: currentUrl != "" && !mainStack.currentPage.isNowPlayingPage
+                when: player.playlist.itemCount !== 0 && !mainStack.currentPage.isNowPlayingPage
                 PropertyChanges { target: playerControlLoader; anchors.bottomMargin: 0 }
             },
 
             State {
                 name: "hidden"
-                when: currentUrl == "" || mainStack.currentPage.isNowPlayingPage || !playerControl.visible
+                when: player.playlist.itemCount === 0 || mainStack.currentPage.isNowPlayingPage || !playerControl.visible
                 PropertyChanges { target: playerControlLoader; anchors.bottomMargin: -units.gu(7) }
             }
         ]

=== modified file 'app/podcasts.js'
--- app/podcasts.js	2016-03-28 22:39:32 +0000
+++ app/podcasts.js	2016-03-28 22:39:33 +0000
@@ -22,6 +22,7 @@
     db.transaction(function(tx) {
         tx.executeSql('CREATE TABLE IF NOT EXISTS Podcast(artist TEXT, name TEXT, description TEXT, feed TEXT, image TEXT, lastupdate TIMESTAMP)');
         tx.executeSql('CREATE TABLE IF NOT EXISTS Episode(guid TEXT, podcast INTEGER, name TEXT, subtitle TEXT, description TEXT, duration INTEGER, audiourl TEXT, downloadedfile TEXT, published TIMESTAMP, queued BOOLEAN, listened BOOLEAN, favourited BOOLEAN, position INTEGER, FOREIGN KEY(podcast) REFERENCES Podcast(rowid))');
+        tx.executeSql('CREATE TABLE IF NOT EXISTS Queue(ind INTEGER NOT NULL, guid TEXT, image TEXT, name TEXT, artist TEXT, url TEXT)');
     });
 
     try {
@@ -55,6 +56,105 @@
     return db;
 }
 
+// Function to add item to queue
+function addItemToQueue(guid, image, name, artist, url) {
+    var db = init()
+
+    db.transaction(function(tx) {
+        var ind = getNextIndex(tx);
+        var rs = tx.executeSql("INSERT OR REPLACE INTO Queue (ind, guid, image, name, artist, url) VALUES (?, ?, ?, ?, ?, ?)", [ind, guid, image, name, artist, url]);
+        if (rs.rowsAffected > 0) {
+            console.log("[LOG]: QUEUE add OK")
+            console.log("[LOG]: URL Added to queue: " + url)
+        } else {
+            console.log("[LOG]: QUEUE add FAIL")
+        }
+    });
+}
+
+function removeItemFromQueue(source) {
+    var db = init()
+
+    db.transaction(function(tx) {
+        // Remove selected source from the queue
+        tx.executeSql("DELETE FROM Queue WHERE url = ?", source)
+
+        // Rebuild queue in order
+        var rs = tx.executeSql("SELECT ind FROM Queue ORDER BY ind ASC")
+
+        for (var i=0; i<rs.rows.length; i++) {
+            tx.executeSql("UPDATE Queue SET ind = ? WHERE ind = ?", [i, rs.rows.item(i).ind])
+        }
+    })
+}
+
+// Function to clear the queue
+function clearQueue() {
+    var db = init();
+    db.transaction(function(tx) {
+        tx.executeSql("DELETE FROM Queue");
+    });
+}
+
+function lookup(source) {
+    var db = init();
+    var meta = {
+        name: "",
+        artist: "",
+        image: "",
+        guid: "",
+    }
+
+    db.transaction(function(tx) {
+        var rs = tx.executeSql("SELECT * FROM Queue ORDER BY ind ASC");
+        for(var i = 0; i < rs.rows.length; i++) {
+            var episode = rs.rows.item(i);
+            if (source  === episode.url) {
+                meta.name = episode.name
+                meta.artist = episode.artist
+                meta.image = episode.image
+                meta.guid = episode.guid
+                break
+            }
+        }
+    });
+
+    return meta
+}
+
+// Function to get the next index for the queue
+function getNextIndex(tx) {
+    var ind;
+
+    if (tx === undefined) {
+        var db = init();
+        db.transaction(function(tx) {
+            ind = getNextIndex(tx);
+        });
+    } else {
+        var rs = tx.executeSql('SELECT MAX(ind) FROM Queue')
+        ind = isQueueEmpty(tx) ? 0 : rs.rows.item(0)["MAX(ind)"] + 1
+    }
+
+    return ind;
+}
+
+function isQueueEmpty(tx) {
+    var empty = false;
+
+    if (tx === undefined) {
+        var db = init();
+        db.transaction( function(tx) {
+            empty = isQueueEmpty(tx)
+        });
+    } else {
+        var rs = tx.executeSql("SELECT count(*) as value FROM Queue")
+        empty = rs.rows.item(0).value === 0
+    }
+
+    return empty
+}
+
 function subscribe(artist, name, feed, img) {
     var db = init();
     db.transaction(function(tx) {
@@ -259,8 +359,8 @@
             var rs2 = tx.executeSql("SELECT rowid, * FROM Episode WHERE podcast=? ORDER BY published DESC", [rs.rows.item(i).rowid]);
             var loopCount = maxEpisodeDownload > rs2.rows.length ? rs2.rows.length : maxEpisodeDownload
             for (var j=0; j < loopCount; j++) {
-                if (!rs2.rows.item(j).downloadedfile && !rs2.rows.item(j).listened) {
-                    downloader.addDownload(rs2.rows.item(j).guid, rs2.rows.item(j).audiourl)
+                if (!rs2.rows.item(j).downloadedfile && !rs2.rows.item(j).listened && rs2.rows.item(j).audiourl) {
+                    podbird.downloadEpisode(rs.rows.item(i).image, rs2.rows.item(j).name, rs2.rows.item(j).guid, rs2.rows.item(j).audiourl)
                     tx.executeSql("UPDATE Episode SET queued=1 WHERE guid = ?", [rs2.rows.item(j).guid]);
                 }
             }

=== modified file 'app/settings/About.qml'
--- app/settings/About.qml	2016-02-25 11:09:44 +0000
+++ app/settings/About.qml	2016-03-28 22:39:33 +0000
@@ -36,7 +36,6 @@
 
             anchors {
                 left: parent.left
-                leftMargin: units.gu(2)
                 bottom: parent.bottom
             }
 

=== modified file 'app/ui/EpisodesPage.qml'
--- app/ui/EpisodesPage.qml	2016-03-28 22:39:32 +0000
+++ app/ui/EpisodesPage.qml	2016-03-28 22:39:33 +0000
@@ -17,10 +17,10 @@
  */
 
 import QtQuick 2.4
-import QtMultimedia 5.4
+import QtMultimedia 5.6
 import Ubuntu.Components 1.3
 import QtQuick.LocalStorage 2.0
-import Ubuntu.DownloadManager 0.1
+import Ubuntu.DownloadManager 1.2
 import Ubuntu.Components.Popups 1.3
 import "../podcasts.js" as Podcasts
 import "../components"
@@ -442,8 +442,8 @@
                 id: listItemLayout
 
                 title.text: model.name !== undefined ? model.name.trim() : "Undefined"
-                title.color: currentGuid === model.guid || downloader.downloadingGuid === model.guid ? podbird.appTheme.focusText
-                                                                                                     : podbird.appTheme.baseText
+                title.color: downloader.downloadingGuid === model.guid ? podbird.appTheme.focusText
+                                                                       : podbird.appTheme.baseText
                 // #FIXME: Change this 2 to prevent title eliding when UITK is updated to rev > 1800
                 title.maximumLineCount: 1
 
@@ -505,12 +505,24 @@
                                     tx.executeSql("UPDATE Episode SET queued=1 WHERE guid = ?", [model.guid]);
                                 });
                                 episodeModel.setProperty(model.index, "queued", 1)
-                                downloader.addDownload(model.guid, model.audiourl);
+                                if (model.audiourl) {
+                                    podbird.downloadEpisode(model.image, model.name, model.guid, model.audiourl)
+                                } else {
+                                    console.log("[ERROR]: Invalid download url: " + model.audiourl)
+                                }
                             }
                         }
                     },
 
                     Action {
+                        iconName: "add-to-playlist"
+                        onTriggered: {
+                            var url = model.downloadedfile ? "file://" + model.downloadedfile : model.audiourl
+                            player.addEpisodeToQueue(model.guid, model.image, model.name, model.artist, url)
+                        }
+                    },
+
+                    Action {
                         iconName: model.favourited ? "unlike" : "like"
                         onTriggered: {
                             var db = Podcasts.init();
@@ -536,20 +548,10 @@
 
             onClicked: {
                 Haptics.play()
-                var db = Podcasts.init();
-                db.transaction(function (tx) {
-                    if (currentGuid !== model.guid) {
-                        currentGuid = "";
-                        currentUrl = model.downloadedfile ? model.downloadedfile : model.audiourl;
-                        var rs = tx.executeSql("SELECT position FROM Episode WHERE guid=?", [model.guid]);
-                        playerLoader.item.play();
-                        playerLoader.item.seek(rs.rows.item(0).position);
-                        currentName = model.name;
-                        currentArtist = model.artist;
-                        currentImage = model.image;
-                        currentGuid = model.guid;
-                    }
-                });
+                if (currentGuid !== model.guid) {
+                    currentUrl = model.downloadedfile ? "file://" + model.downloadedfile : model.audiourl;
+                    player.playEpisode(model.guid, model.image, model.name, model.artist, currentUrl)
+                }
             }
         }
 

=== modified file 'app/ui/EpisodesTab.qml'
--- app/ui/EpisodesTab.qml	2016-03-28 22:39:32 +0000
+++ app/ui/EpisodesTab.qml	2016-03-28 22:39:33 +0000
@@ -17,10 +17,10 @@
  */
 
 import QtQuick 2.4
-import QtMultimedia 5.4
+import QtMultimedia 5.6
 import Ubuntu.Components 1.3
 import QtQuick.LocalStorage 2.0
-import Ubuntu.DownloadManager 0.1
+import Ubuntu.DownloadManager 1.2
 import Ubuntu.Components.Popups 1.3
 import "../podcasts.js" as Podcasts
 import "../components"
@@ -64,58 +64,6 @@
                         episodesPage.header = searchHeader
                         searchField.item.forceActiveFocus()
                     }
-                },
-
-                Action {
-                    iconName: "select"
-                    visible: episodesPageHeaderSections.selectedIndex === 0
-                    text: i18n.tr("Mark all listened")
-                    onTriggered: {
-                        var db = Podcasts.init();
-                        db.transaction(function (tx) {
-                            for (var i=0; i<episodesModel.count; i++) {
-                                tx.executeSql("UPDATE Episode SET listened=1 WHERE guid=?", [episodesModel.get(i).guid]);
-                            }
-                            episodesModel.clear()
-                        });
-                    }
-                },
-
-                Action {
-                    iconName: "save"
-                    visible: episodesPageHeaderSections.selectedIndex === 0
-                    text: i18n.tr("Download all")
-                    onTriggered: {
-                        var db = Podcasts.init();
-                        db.transaction(function (tx) {
-                            for (var i=0; i<episodesModel.count; i++) {
-                                if (!episodesModel.get(i).downloadedfile) {
-                                    episodesModel.setProperty(i, "queued", 1)
-                                    tx.executeSql("UPDATE Episode SET queued=1 WHERE guid = ?", [episodesModel.get(i).guid]);
-                                    downloader.addDownload(episodesModel.get(i).guid, episodesModel.get(i).audiourl);
-                                }
-                            }
-                        });
-                    }
-                },
-
-                Action {
-                    iconName: "delete"
-                    text: i18n.tr("Delete all")
-                    visible: episodesPageHeaderSections.selectedIndex === 1
-                    onTriggered: {
-                        var db = Podcasts.init();
-                        db.transaction(function (tx) {
-                            for (var i=0; i<episodesModel.count; i++) {
-                                if (episodesModel.get(i).downloadedfile) {
-                                    fileManager.deleteFile(episodesModel.get(i).downloadedfile);
-                                    tx.executeSql("UPDATE Episode SET downloadedfile = NULL WHERE guid = ?", [episodesModel.get(i).guid]);
-                                    episodesModel.setProperty(i, "downloadedfile", "")
-                                }
-                            }
-                        });
-                        refreshModel();
-                    }
                 }
             ]
 
@@ -124,7 +72,6 @@
 
                 anchors {
                     left: parent.left
-                    leftMargin: units.gu(2)
                     bottom: parent.bottom
                 }
 
@@ -132,7 +79,7 @@
                     selectedSectionColor: podbird.appTheme.focusText
                 }
 
-                model: [i18n.tr("Recent"), i18n.tr("Downloaded"), i18n.tr("Favourites")]
+                model: [i18n.tr("Recent"), i18n.tr("Downloads"), i18n.tr("Favourites")]
                 onSelectedIndexChanged: {
                     refreshModel();
                 }
@@ -174,6 +121,169 @@
             }
         }
 
+        PageHeader {
+            id: selectionHeader
+            visible: episodeList.ViewItems.selectMode
+
+            onVisibleChanged: {
+                if (visible) {
+                    episodesPage.header = selectionHeader
+                }
+            }
+
+            StyleHints {
+                backgroundColor: podbird.appTheme.background
+            }
+
+            leadingActionBar.actions: [
+                Action {
+                    iconName: "back"
+                    text: i18n.tr("Back")
+                    onTriggered: {
+                        episodeList.closeSelection()
+                    }
+                }
+            ]
+
+            trailingActionBar {
+                numberOfSlots: 6
+                actions: [
+                    Action {
+                        iconName: "select"
+                        text: i18n.tr("Mark Listened")
+                        enabled: episodeList.ViewItems.selectedIndices.length !== 0
+                        onTriggered: {
+                            var db = Podcasts.init();
+                            db.transaction(function (tx) {
+                                for (var i=0; i<episodeList.ViewItems.selectedIndices.length; i++) {
+                                    var index = episodeList.ViewItems.selectedIndices[i]
+                                    tx.executeSql("UPDATE Episode SET listened=1 WHERE guid=?", [episodesModel.get(index).guid]);
+                                }
+                            });
+
+                            refreshModel();
+                            episodeList.closeSelection()
+                        }
+                    },
+
+                    Action {
+                        iconName: "save"
+                        text: i18n.tr("Download episode(s)")
+                        enabled: episodeList.ViewItems.selectedIndices.length !== 0
+                        visible: episodesPageHeaderSections.selectedIndex !== 1
+
+                        onTriggered: {
+                            var db = Podcasts.init();
+                            db.transaction(function (tx) {
+                                for (var i=0; i<episodeList.ViewItems.selectedIndices.length; i++) {
+                                    var index = episodeList.ViewItems.selectedIndices[i]
+                                    if (!episodesModel.get(index).downloadedfile) {
+                                        episodesModel.setProperty(index, "queued", 1)
+                                        tx.executeSql("UPDATE Episode SET queued=1 WHERE guid = ?", [episodesModel.get(index).guid]);
+                                        if (episodesModel.get(index).audiourl) {
+                                            podbird.downloadEpisode(episodesModel.get(index).image, episodesModel.get(index).name, episodesModel.get(index).guid, episodesModel.get(index).audiourl)
+                                        } else {
+                                            console.log("[ERROR]: Invalid download url: " + episodesModel.get(index).audiourl)
+                                        }
+                                    }
+                                }
+                            });
+
+                            refreshModel();
+                            episodeList.closeSelection()
+                        }
+                    },
+
+                    Action {
+                        iconName: "delete"
+                        text: i18n.tr("Delete episode(s)")
+                        enabled: episodeList.ViewItems.selectedIndices.length !== 0
+
+                        onTriggered: {
+                            var db = Podcasts.init();
+                            db.transaction(function (tx) {
+                                for (var i=0; i<episodeList.ViewItems.selectedIndices.length; i++) {
+                                    var index = episodeList.ViewItems.selectedIndices[i]
+                                    if (episodesModel.get(index).downloadedfile) {
+                                        fileManager.deleteFile(episodesModel.get(index).downloadedfile);
+                                        tx.executeSql("UPDATE Episode SET downloadedfile = NULL WHERE guid = ?", [episodesModel.get(index).guid]);
+                                        episodesModel.setProperty(index, "downloadedfile", "")
+                                    }
+                                }
+                            });
+
+                            refreshModel();
+                            episodeList.closeSelection()
+                        }
+                    },
+
+                    Action {
+                        iconName: "like"
+                        text: i18n.tr("Favourite episode(s)")
+                        visible: episodesPageHeaderSections.selectedIndex !== 2
+                        enabled: episodeList.ViewItems.selectedIndices.length !== 0
+
+                        onTriggered: {
+                            var db = Podcasts.init();
+                            db.transaction(function (tx) {
+                                for (var i=0; i<episodeList.ViewItems.selectedIndices.length; i++) {
+                                    var index = episodeList.ViewItems.selectedIndices[i]
+                                    if (!episodesModel.get(index).favourited) {
+                                        tx.executeSql("UPDATE Episode SET favourited=1 WHERE guid=?", [episodesModel.get(index).guid])
+                                        episodesModel.setProperty(index, "favourited", 1)
+                                    }
+                                }
+                            });
+
+                            refreshModel();
+                            episodeList.closeSelection()
+                        }
+                    },
+
+                    Action {
+                        iconName: "unlike"
+                        text: i18n.tr("Unfavourite episode(s)")
+                        visible: episodesPageHeaderSections.selectedIndex === 2
+                        enabled: episodeList.ViewItems.selectedIndices.length !== 0
+
+                        onTriggered: {
+                            var db = Podcasts.init();
+                            db.transaction(function (tx) {
+                                for (var i=0; i<episodeList.ViewItems.selectedIndices.length; i++) {
+                                    var index = episodeList.ViewItems.selectedIndices[i]
+                                    if (episodesModel.get(index).favourited) {
+                                        tx.executeSql("UPDATE Episode SET favourited=0 WHERE guid=?", [episodesModel.get(index).guid])
+                                        episodesModel.setProperty(index, "favourited", 0)
+                                    }
+                                }
+                            });
+
+                            refreshModel();
+                            episodeList.closeSelection()
+                        }
+                    },
+
+                    Action {
+                        iconName: "add-to-playlist"
+                        text: i18n.tr("Add to queue")
+                        enabled: episodeList.ViewItems.selectedIndices.length !== 0
+
+                        onTriggered: {
+                            for (var i=0; i<episodeList.ViewItems.selectedIndices.length; i++) {
+                                var index = episodeList.ViewItems.selectedIndices[i]
+                                if (episodesModel.get(index).audiourl) {
+                                    var url = episodesModel.get(index).downloadedfile ? "file://" + episodesModel.get(index).downloadedfile : episodesModel.get(index).audiourl
+                                    player.addEpisodeToQueue(episodesModel.get(index).guid, episodesModel.get(index).image, episodesModel.get(index).name, episodesModel.get(index).artist, url)
+                                }
+                            }
+
+                            episodeList.closeSelection()
+                        }
+                    }
+                ]
+            }
+        }
+
         Loader {
             id: emptyState
 
@@ -185,7 +295,7 @@
                 verticalCenterOffset: Qt.inputMethod.visible ? units.gu(4) : 0
             }
 
-            sourceComponent: episodesModel.count === 0 || sortedEpisodeModel.count === 0 ? emptyStateComponent : undefined
+            sourceComponent: (episodesModel.count === 0 || sortedEpisodeModel.count === 0) && downloader.downloads.length === 0 ? emptyStateComponent : undefined
         }
 
         Component {
@@ -315,6 +425,9 @@
         ListView {
             id: episodeList
 
+            signal clearSelection()
+            signal closeSelection()
+
             Component.onCompleted: {
                 // FIXME: workaround for qtubuntu not returning values depending on the grid unit definition
                 // for Flickable.maximumFlickVelocity and Flickable.flickDeceleration
@@ -332,35 +445,77 @@
 
             clip: true
             model: sortedEpisodeModel
+
+            header: Column {
+                width: episodeList.width
+                visible: height !== 0
+                height: downloader.downloads.length > 0 && episodesPageHeaderSections.selectedIndex === 1 ? childrenRect.height : 0
+
+                CustomSectionHeader {
+                    title: i18n.tr("Downloads in progress")
+                }
+
+                Repeater {
+                    model: downloader.downloads
+                    delegate: ListItem {
+                        divider.visible: false
+                        height: inProgressLayout.height
+                        SlotsLayout {
+                            id: inProgressLayout
+
+                            Image {
+                                height: width
+                                width: units.gu(6)
+                                source: modelData.image !== undefined ? modelData.image : Qt.resolvedUrl("../graphics/podbird.png")
+                                SlotsLayout.position: SlotsLayout.Leading
+                                sourceSize { width: width; height: height }
+                            }
+
+                            mainSlot: Column {
+                                spacing: units.gu(0.5)
+
+                                Label {
+                                    text: modelData.title
+                                    width: parent.width
+                                    elide: Text.ElideRight
+                                }
+
+                                CustomProgressBar {
+                                    width: parent.width
+                                    height: modelData.progress > 0 ? units.dp(5) : 0
+                                    progress: modelData.progress
+                                    indeterminateProgress: modelData.progress < 0 || modelData.progress > 100
+                                }
+                            }
+                        }
+                    }
+                }
+
+                CustomSectionHeader {
+                    title: i18n.tr("Downloaded episodes")
+                    visible: sortedEpisodeModel.count !== 0 || episodesModel.count !== 0
+                }
+            }
+
             section.property: "diff"
             section.labelPositioning: ViewSection.InlineLabels
-
-            section.delegate: ListItem {
-                height: headerText.title.text !== "" ? headerText.height + divider.height : units.gu(0)
-                divider.anchors.leftMargin: units.gu(2)
-                divider.anchors.rightMargin: units.gu(2)
-
-                ListItemLayout {
-                    id: headerText
-                    title.text: {
-                        if (section === "Today") {
-                            return i18n.tr("Today")
-                        }
-
-                        else if (section === "Yesterday") {
-                            return i18n.tr("Yesterday")
-                        }
-
-                        else if (section === "Older") {
-                            return i18n.tr("Older")
-                        }
-
-                        else {
-                            return ""
-                        }
-                    }
-                    title.color: podbird.appTheme.baseText
-                    title.font.weight: Font.DemiBold
+            section.delegate: CustomSectionHeader {
+                title: {
+                    if (section === "Today") {
+                        return i18n.tr("Today")
+                    }
+
+                    else if (section === "Yesterday") {
+                        return i18n.tr("Yesterday")
+                    }
+
+                    else if (section === "Older") {
+                        return i18n.tr("Older")
+                    }
+
+                    else {
+                        return ""
+                    }
                 }
             }
 
@@ -380,8 +535,8 @@
                     id: listItemLayout
 
                     title.text: model.name !== undefined ? model.name.trim() : "Undefined"
-                    title.color: currentGuid === model.guid || downloader.downloadingGuid === model.guid ? podbird.appTheme.focusText
-                                                                                                         : podbird.appTheme.baseText
+                    title.color: downloader.downloadingGuid === model.guid ? podbird.appTheme.focusText
+                                                                           : podbird.appTheme.baseText
                     // #FIXME: Change this 2 to prevent title eliding when UITK is updated to rev > 1800
                     title.maximumLineCount: 1
 
@@ -439,7 +594,11 @@
                                         tx.executeSql("UPDATE Episode SET queued=1 WHERE guid = ?", [model.guid]);
                                     });
                                     episodesModel.setProperty(model.index, "queued", 1)
-                                    downloader.addDownload(model.guid, model.audiourl);
+                                    if (model.audiourl) {
+                                        podbird.downloadEpisode(model.image, model.name, model.guid, model.audiourl)
+                                    } else {
+                                        console.log("[ERROR]: Invalid download url: " + model.audiourl)
+                                    }
                                 }
                             }
                         },
@@ -465,6 +624,14 @@
                         },
 
                         Action {
+                            iconName: "add-to-playlist"
+                            onTriggered: {
+                                var url = model.downloadedfile ? "file://" + model.downloadedfile : model.audiourl
+                                player.addEpisodeToQueue(model.guid, model.image, model.name, model.artist, url)
+                            }
+                        },
+
+                        Action {
                             iconName: model.favourited ? "unlike" : "like"
                             onTriggered: {
                                 var db = Podcasts.init();
@@ -496,21 +663,29 @@
 
                 onClicked: {
                     Haptics.play()
-                    var db = Podcasts.init();
-                    db.transaction(function (tx) {
+                    if (selectMode) {
+                        selected = !selected
+                    } else {
                         if (currentGuid !== model.guid) {
-                            currentGuid = "";
-                            currentUrl = model.downloadedfile ? model.downloadedfile : model.audiourl;
-                            var rs = tx.executeSql("SELECT position FROM Episode WHERE guid=?", [model.guid]);
-                            playerLoader.item.play();
-                            playerLoader.item.seek(rs.rows.item(0).position);
-                            currentName = model.name;
-                            currentArtist = model.artist;
-                            currentImage = model.image;
-                            currentGuid = model.guid;
+                            currentUrl = model.downloadedfile ? "file://" + model.downloadedfile : model.audiourl;
+                            player.playEpisode(model.guid, model.image, model.name, model.artist, currentUrl)
                         }
-                    });
-                }
+                    }
+                }
+
+                onPressAndHold: {
+                    ListView.view.ViewItems.selectMode = !ListView.view.ViewItems.selectMode
+                }
+            }
+
+            onClearSelection: {
+                ViewItems.selectedIndices = []
+            }
+
+            onCloseSelection: {
+                clearSelection()
+                ViewItems.selectMode = false
+                episodesPage.header = standardHeader
             }
 
             Scrollbar {

=== modified file 'app/ui/NowPlayingPage.qml'
--- app/ui/NowPlayingPage.qml	2016-02-25 11:09:44 +0000
+++ app/ui/NowPlayingPage.qml	2016-03-28 22:39:33 +0000
@@ -17,8 +17,9 @@
  */
 
 import QtQuick 2.4
-import QtMultimedia 5.4
+import QtMultimedia 5.6
 import Ubuntu.Components 1.3
+import QtQuick.LocalStorage 2.0
 import "../podcasts.js" as Podcasts
 import "../components"
 
@@ -26,245 +27,349 @@
     id: nowPlayingPage
 
     visible: false
-    title: i18n.tr("Now Playing")
 
     property bool isNowPlayingPage: true
-    property bool isLandscapeMode: width > height
-
-    // Landscape rule
-    states: [
-        State {
-            name: "landscape"
-            when: isLandscapeMode
-
-            PropertyChanges {
-                target: blurredBackground
-                width: parent.width/2.2
-                height: parent.height
-            }
-
-            AnchorChanges {
-                target: blurredBackground
+
+    header: PageHeader {
+        title: i18n.tr("Now Playing")
+
+        StyleHints {
+            backgroundColor: podbird.appTheme.background
+        }
+
+        trailingActionBar.actions: Action {
+            iconName: "delete"
+            visible: nowPlayingPageSections.selectedIndex === 1
+            onTriggered: {
+                Podcasts.clearQueue()
+                player.playlist.clear()
+                mainStack.pop()
+            }
+        }
+
+        extension: Sections {
+            id: nowPlayingPageSections
+
+            anchors {
+                left: parent.left
+                bottom: parent.bottom
+            }
+
+            StyleHints {
+                selectedSectionColor: podbird.appTheme.focusText
+            }
+            model: [i18n.tr("Full view"), i18n.tr("Queue")]
+        }
+    }
+
+    VisualItemModel {
+        id: tabs
+
+        Item {
+            id: nowPlayingItem
+
+            width: tabView.width
+            height: tabView.height
+
+            property bool isLandscapeMode: nowPlayingPage.width > nowPlayingPage.height
+
+            // Landscape rule
+            states: [
+                State {
+                    name: "landscape"
+                    when: nowPlayingItem.isLandscapeMode
+
+                    PropertyChanges {
+                        target: blurredBackground
+                        width: nowPlayingPage.width/2.2
+                        height: nowPlayingPage.height
+                    }
+
+                    AnchorChanges {
+                        target: blurredBackground
+                        anchors {
+                            top: nowPlayingItem.top
+                            left: parent.left
+                            right: undefined
+                        }
+                    }
+
+                    AnchorChanges {
+                        target: dataContainer
+                        anchors {
+                            top: nowPlayingItem.top
+                            left: blurredBackground.right
+                            right: parent.right
+                            bottom: parent.bottom
+                        }
+                    }
+                }
+            ]
+
+            BlurredBackground {
+                id: blurredBackground
+
+                anchors.left: parent.left
+                anchors.top: nowPlayingItem.top
+                anchors.right: parent.right
+                height: title.lineCount === 1 ? nowPlayingPage.height/2.3 + units.gu(3)
+                                              : nowPlayingPage.height/2.3
+                art: currentImage
+
+                Image {
+                    width: Math.min(nowPlayingPage.width/2, nowPlayingPage.height/2)
+                    height: width
+                    sourceSize.height: width
+                    sourceSize.width: width
+                    source: currentImage
+                    asynchronous: true
+                    anchors.centerIn: parent
+                }
+            }
+
+            Item {
+                id: dataContainer
+
                 anchors {
-                    top: parent.top
+                    top: blurredBackground.bottom
                     left: parent.left
-                    right: undefined
-                }
-            }
-
-            AnchorChanges {
-                target: dataContainer
-                anchors {
-                    top: parent.top
-                    left: blurredBackground.right
                     right: parent.right
                     bottom: parent.bottom
+                    margins: units.gu(2)
+                    bottomMargin: nowPlayingItem.isLandscapeMode ? units.gu(4) : units.gu(2)
+                }
+
+                Label {
+                    id: title
+                    anchors.left: parent.left
+                    anchors.right: parent.right
+                    anchors.top: parent.top
+                    text: currentName
+                    elide: Text.ElideRight
+                    textSize: Label.Large
+                    maximumLineCount: 2
+                    wrapMode: Text.WordWrap
+                    color: podbird.appTheme.baseText
+                }
+
+                Label {
+                    id: artist
+                    anchors.left: title.left
+                    anchors.right: title.right
+                    anchors.top: title.bottom
+                    anchors.topMargin: units.gu(1)
+                    text: currentArtist
+                    elide: Text.ElideRight
+                    textSize: Label.Small
+                    color: podbird.appTheme.baseSubText
+                }
+
+                Slider {
+                    id: scrubber
+
+                    anchors {
+                        left: parent.left
+                        right: parent.right
+                        bottom: controls.top
+                        bottomMargin: nowPlayingItem.isLandscapeMode && title.lineCount < 2 ? units.gu(4) : units.gu(2)
+                    }
+
+                    live: true
+                    minimumValue: 0
+                    maximumValue: player.duration
+                    value: player.position
+                    height: units.gu(2)
+
+                    onValueChanged: {
+                        if (pressed) {
+                            player.seek(value);
+                        }
+                    }
+
+                    function formatValue(v) { return Podcasts.formatTime(v/1000); }
+                    StyleHints { foregroundColor: podbird.appTheme.focusText }
+                }
+
+                Connections {
+                    target: player
+                    onPositionChanged: scrubber.value = player.position
+                }
+
+                Label {
+                    id: startTime
+                    textSize: Label.Small
+                    anchors.left: scrubber.left
+                    anchors.top: scrubber.bottom
+                    color: podbird.appTheme.baseText
+                    text: Podcasts.formatTime(player.position / 1000)
+                }
+
+                Label {
+                    id: endTime
+                    textSize: Label.Small
+                    anchors.right: scrubber.right
+                    anchors.top: scrubber.bottom
+                    color: podbird.appTheme.baseText
+                    text: Podcasts.formatTime(player.duration / 1000)
+                }
+
+                Row {
+                    id: controls
+
+                    anchors.bottom: parent.bottom
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    spacing: units.gu(1)
+
+                    AbstractButton {
+                        id: mediaBackwardButton
+                        width: units.gu(6)
+                        height: width
+                        anchors.verticalCenter: parent.verticalCenter
+                        enabled: player.playlist.canGoPrevious
+                        opacity: enabled ? 1.0 : 0.4
+                        onClicked: player.playlist.previous()
+
+                        Icon {
+                            id: mediaBackwardIcon
+                            width: units.gu(3)
+                            height: width
+                            anchors.centerIn: parent
+                            color: podbird.appTheme.baseIcon
+                            name: "media-skip-backward"
+                        }
+                    }
+
+                    AbstractButton {
+                        id: skipBackwardButton
+                        width: units.gu(6)
+                        height: width
+                        anchors.verticalCenter: parent.verticalCenter
+                        opacity: player.position === 0 ? 0.4 : 1.0
+                        onClicked: {
+                            if (player.position > 0) {
+                                player.seek(player.position - podbird.settings.skipBack * 1000);
+                            }
+                        }
+
+                        Row {
+                            spacing: units.gu(1)
+                            anchors.centerIn: parent
+
+                            Label {
+                                // TRANSLATORS: The string shown in the UI is -15s to denote the number of seconds that the podcast playback will skip backward.
+                                // xgettext: no-c-format
+                                text: i18n.tr("-%1s").arg(podbird.settings.skipBack)
+                                textSize: Label.XxSmall
+                                color: podbird.appTheme.baseText
+                                anchors.verticalCenter: skipBackwardIcon.verticalCenter
+                            }
+
+                            Icon {
+                                id: skipBackwardIcon
+                                width: units.gu(3)
+                                height: width
+                                name: "media-seek-backward"
+                                color: podbird.appTheme.baseIcon
+                            }
+                        }
+                    }
+
+                    AbstractButton {
+                        id: playButton
+                        width: units.gu(10)
+                        height: width
+                        opacity: playButton.pressed ? 0.4 : 1.0
+                        onClicked: player.playbackState === MediaPlayer.PlayingState ? player.pause() : player.play()
+
+                        Icon {
+                            id: playIcon
+                            width: units.gu(6)
+                            height: width
+                            anchors.centerIn: parent
+                            color: podbird.appTheme.baseIcon
+                            name: player.playbackState === MediaPlayer.PlayingState ? "media-playback-pause"
+                                                                                    : "media-playback-start"
+                        }
+                    }
+
+                    AbstractButton {
+                        id: skipForwardButton
+                        width: units.gu(6)
+                        height: width
+                        anchors.verticalCenter: parent.verticalCenter
+                        opacity: player.position === 0 ? 0.4 : 1.0
+                        onClicked: {
+                            if (player.position > 0) {
+                                player.seek(player.position + podbird.settings.skipForward * 1000);
+                            }
+                        }
+
+                        Row {
+                            spacing: units.gu(1)
+                            anchors.centerIn: parent
+
+                            Icon {
+                                id: skipForwardIcon
+                                width: units.gu(3)
+                                height: width
+                                name: "media-seek-forward"
+                                color: podbird.appTheme.baseIcon
+                            }
+
+                            Label {
+                                // TRANSLATORS: The string shown in the UI is +15s to denote the number of seconds that the podcast playback will skip forward.
+                                // xgettext: no-c-format
+                                text: i18n.tr("+%1s").arg(podbird.settings.skipForward)
+                                textSize: Label.XxSmall
+                                color: podbird.appTheme.baseText
+                                anchors.verticalCenter: skipForwardIcon.verticalCenter
+                            }
+                        }
+                    }
+
+                    AbstractButton {
+                        id: mediaForwardButton
+                        width: units.gu(6)
+                        height: width
+                        anchors.verticalCenter: parent.verticalCenter
+                        enabled: player.playlist.canGoNext
+                        opacity: enabled ? 1.0 : 0.4
+                        onClicked: player.playlist.next()
+
+                        Icon {
+                            id: mediaForwardIcon
+                            width: units.gu(3)
+                            height: width
+                            anchors.centerIn: parent
+                            color: podbird.appTheme.baseIcon
+                            name: "media-skip-forward"
+                        }
+                    }
                 }
             }
         }
-    ]
-
-    BlurredBackground {
-        id: blurredBackground
-
-        anchors.left: parent.left
-        anchors.top: parent.top
-        anchors.right: parent.right
-        height: title.lineCount === 1 ? parent.height/2 + units.gu(3)
-                                      : parent.height/2
-        art: currentImage
-
-        Image {
-            width: Math.min(parent.width/2, parent.height)
-            height: width
-            sourceSize.height: width
-            sourceSize.width: width
-            source: currentImage
-            asynchronous: true
-            anchors.centerIn: parent
+
+        Queue {
+            width: tabView.width
+            height: tabView.height
         }
     }
 
-    Item {
-        id: dataContainer
+    ListView {
+        id: tabView
+        model: tabs
+        interactive: false
 
         anchors {
-            top: blurredBackground.bottom
+            top: nowPlayingPage.header.bottom
             left: parent.left
             right: parent.right
             bottom: parent.bottom
-            margins: units.gu(2)
-            bottomMargin: isLandscapeMode ? units.gu(4) : units.gu(2)
-        }
-
-        Label {
-            id: title
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.top: parent.top
-            text: currentName
-            elide: Text.ElideRight
-            textSize: Label.Large
-            maximumLineCount: 2
-            wrapMode: Text.WordWrap
-            color: podbird.appTheme.baseText
-        }
-
-        Label {
-            id: artist
-            anchors.left: title.left
-            anchors.right: title.right
-            anchors.top: title.bottom
-            anchors.topMargin: units.gu(1)
-            text: currentArtist
-            elide: Text.ElideRight
-            textSize: Label.Small
-            color: podbird.appTheme.baseSubText
-        }
-
-        Slider {
-            id: scrubber
-
-            anchors {
-                left: parent.left
-                right: parent.right
-                bottom: controls.top
-                bottomMargin: isLandscapeMode && title.lineCount < 2 ? units.gu(4) : units.gu(2)
-            }
-
-            live: true
-            minimumValue: 0
-            maximumValue: playerLoader.item.duration
-            value: playerLoader.item.position
-            height: units.gu(2)
-
-            onValueChanged: {
-                if (pressed) {
-                    playerLoader.item.seek(value);
-                }
-            }
-
-            function formatValue(v) { return Podcasts.formatTime(v/1000); }
-            StyleHints { foregroundColor: podbird.appTheme.focusText }
-        }
-
-        Connections {
-            target: playerLoader.item
-            onPositionChanged: scrubber.value = playerLoader.item.position
-        }
-
-        Label {
-            id: startTime
-            textSize: Label.Small
-            anchors.left: scrubber.left
-            anchors.top: scrubber.bottom
-            color: podbird.appTheme.baseText
-            text: Podcasts.formatTime(playerLoader.item.position / 1000)
-        }
-
-        Label {
-            id: endTime
-            textSize: Label.Small
-            anchors.right: scrubber.right
-            anchors.top: scrubber.bottom
-            color: podbird.appTheme.baseText
-            text: Podcasts.formatTime(playerLoader.item.duration / 1000)
-        }
-
-        Row {
-            id: controls
-
-            anchors.bottom: parent.bottom
-            anchors.horizontalCenter: parent.horizontalCenter
-            spacing: units.gu(2)
-
-            AbstractButton {
-                id: skipBackwardButton
-                width: units.gu(6)
-                height: width
-                anchors.verticalCenter: parent.verticalCenter
-                opacity: playerLoader.item.position === 0 ? 0.4 : 1.0
-                onClicked: {
-                    if (playerLoader.item.position > 0) {
-                        playerLoader.item.seek(playerLoader.item.position - podbird.settings.skipBack * 1000);
-                    }
-                }
-
-                Row {
-                    spacing: units.gu(1)
-                    anchors.centerIn: parent
-
-                    Label {
-                        // TRANSLATORS: The string shown in the UI is -15s to denote the number of seconds that the podcast playback will skip backward.
-                        // xgettext: no-c-format
-                        text: i18n.tr("-%1s").arg(podbird.settings.skipBack)
-                        textSize: Label.XxSmall
-                        color: podbird.appTheme.baseText
-                        anchors.verticalCenter: skipBackwardIcon.verticalCenter
-                    }
-
-                    Icon {
-                        id: skipBackwardIcon
-                        width: units.gu(3)
-                        height: width
-                        name: "media-seek-backward"
-                        color: podbird.appTheme.baseIcon
-                    }
-                }
-            }
-
-            AbstractButton {
-                id: playButton
-                width: units.gu(10)
-                height: width
-                opacity: playButton.pressed ? 0.4 : 1.0
-                onClicked: playerLoader.item.playbackState === MediaPlayer.PlayingState ? playerLoader.item.pause() : playerLoader.item.play()
-
-                Icon {
-                    id: playIcon
-                    width: units.gu(6)
-                    height: width
-                    anchors.centerIn: parent
-                    color: podbird.appTheme.baseIcon
-                    name: playerLoader.item.playbackState === MediaPlayer.PlayingState ? "media-playback-pause"
-                                                                                       : "media-playback-start"
-                }
-            }
-
-            AbstractButton {
-                id: skipForwardButton
-                width: units.gu(6)
-                height: width
-                anchors.verticalCenter: parent.verticalCenter
-                opacity: playerLoader.item.position === 0 ? 0.4 : 1.0
-                onClicked: {
-                    if (playerLoader.item.position > 0) {
-                        playerLoader.item.seek(playerLoader.item.position + podbird.settings.skipForward * 1000);
-                    }
-                }
-
-                Row {
-                    spacing: units.gu(1)
-                    anchors.centerIn: parent
-
-                    Icon {
-                        id: skipForwardIcon
-                        width: units.gu(3)
-                        height: width
-                        name: "media-seek-forward"
-                        color: podbird.appTheme.baseIcon
-                    }
-
-                    Label {
-                        // TRANSLATORS: The string shown in the UI is +15s to denote the number of seconds that the podcast playback will skip forward.
-                        // xgettext: no-c-format
-                        text: i18n.tr("+%1s").arg(podbird.settings.skipForward)
-                        textSize: Label.XxSmall
-                        color: podbird.appTheme.baseText
-                        anchors.verticalCenter: skipForwardIcon.verticalCenter
-                    }
-                }
-            }
-        }
+        }
+
+        orientation: Qt.Horizontal
+        snapMode: ListView.SnapOneItem
+        currentIndex: nowPlayingPageSections.selectedIndex
+        highlightMoveDuration: UbuntuAnimation.SlowDuration
     }
 }

=== modified file 'app/ui/PlayerControls.qml'
--- app/ui/PlayerControls.qml	2016-02-25 11:09:44 +0000
+++ app/ui/PlayerControls.qml	2016-03-28 22:39:33 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import QtMultimedia 5.4
+import QtMultimedia 5.6
 import Ubuntu.Components 1.3
 
 Rectangle {
@@ -49,7 +49,7 @@
         anchors.top: cover.bottom
         color: podbird.appTheme.focusText
         height: units.gu(0.25)
-        width: playerLoader.item.duration > 0 ? (playerLoader.item.position / playerLoader.item.duration) * parent.width : 0
+        width: player.duration > 0 ? (player.position / player.duration) * parent.width : 0
     }
 
     Column {
@@ -97,16 +97,16 @@
             visible: playButton.pressed
         }
 
-        onClicked: playerLoader.item.playbackState === MediaPlayer.PlayingState ? playerLoader.item.pause()
-                                                                                : playerLoader.item.play()
+        onClicked: player.playbackState === MediaPlayer.PlayingState ? player.pause()
+                                                                     : player.play()
 
         Icon {
             color: "white"
             width: units.gu(3)
             height: width
             anchors.centerIn: playButtonBackground
-            name: playerLoader.item.playbackState === MediaPlayer.PlayingState ? "media-playback-pause"
-                                                                               : "media-playback-start"
+            name: player.playbackState === MediaPlayer.PlayingState ? "media-playback-pause"
+                                                                    : "media-playback-start"
             opacity: playButton.pressed ? 0.4 : 1.0
         }
     }

=== modified file 'app/ui/PodcastsTab.qml'
--- app/ui/PodcastsTab.qml	2016-03-28 22:39:32 +0000
+++ app/ui/PodcastsTab.qml	2016-03-28 22:39:33 +0000
@@ -17,10 +17,10 @@
  */
 
 import QtQuick 2.4
-import QtMultimedia 5.4
+import QtMultimedia 5.6
 import QtQuick.LocalStorage 2.0
 import Ubuntu.Components 1.3
-import Ubuntu.DownloadManager 0.1
+import Ubuntu.DownloadManager 1.2
 import Ubuntu.Components.Popups 1.0
 import "../podcasts.js" as Podcasts
 import "../components"
@@ -166,12 +166,13 @@
         CardView {
             id: cardView
             clip: true
+            heightOffset: units.gu(4)
             model: sortedPodcastModel
             delegate: Card {
                 id: albumCard
                 coverArt: model.image !== undefined ? model.image : Qt.resolvedUrl("../graphics/podbird.png")
                 primaryText: model.name !== undefined ? model.name.trim() : "Undefined"
-                secondaryText: model.episodeCount > 0 ? i18n.tr("%1 unheard episode", "%1 unheard episodes", model.episodeCount).arg(model.episodeCount)
+                secondaryText: model.episodeCount > 0 ? model.episodeCount
                                                       : ""
                 onClicked: {
                     if(podcastPage.header === searchHeader) {

=== added file 'app/ui/Queue.qml'
--- app/ui/Queue.qml	1970-01-01 00:00:00 +0000
+++ app/ui/Queue.qml	2016-03-28 22:39:33 +0000
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2016 Podbird Team
+ *
+ * This file is part of Podbird.
+ *
+ * Podbird is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * Podbird is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import "../podcasts.js" as Podcasts
+import "../components"
+
+Item {
+    id: queuePage
+
+    ListView {
+        id: queueList
+
+        anchors.fill: parent
+        model: player.playlist
+
+        delegate: ListItem {
+            id: listItem
+
+            height: layout.height
+            divider.visible: false
+
+            ListItemLayout {
+                id: layout
+
+                // Grab the metaData for the current index using its unique source url
+                property var metaModel: player.metaForSource(model.source)
+
+                Image {
+                    id: imgFrame
+                    width: units.gu(6)
+                    height: width
+                    source: Qt.resolvedUrl(layout.metaModel.image)
+                    sourceSize.height: width
+                    sourceSize.width: width
+                    SlotsLayout.position: SlotsLayout.First
+                }
+
+                title.text: layout.metaModel.name
+                // #FIXME: Change this 2 to prevent title eliding when UITK is updated to rev > 1800
+                title.maximumLineCount: 1
+                title.color: player.playlist.currentIndex === index ? podbird.appTheme.focusText
+                                                                    : podbird.appTheme.baseText
+
+                subtitle.text: layout.metaModel.artist
+                subtitle.color: podbird.appTheme.baseSubText
+            }
+
+            leadingActions: ListItemActions {
+                actions: [
+                    Action {
+                        iconName: "delete"
+                        onTriggered: {
+                            player.playlist.removeItem(index)
+                            var source = model.source
+                            source = source.toString()
+                            Podcasts.removeItemFromQueue(source)
+                        }
+                    }
+                ]
+            }
+
+            onClicked: {
+                if (player.playlist.currentIndex === index) {
+                    player.toggle()
+                } else {
+                    player.playlist.currentIndex = index
+                }
+            }
+        }
+    }
+}

=== modified file 'po/com.mikeasoft.podbird.pot'
--- po/com.mikeasoft.podbird.pot	2016-03-28 22:39:32 +0000
+++ po/com.mikeasoft.podbird.pot	2016-03-28 22:39:33 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-19 07:47+0530\n"
+"POT-Creation-Date: 2016-03-19 19:13+0530\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -34,52 +34,42 @@
 msgid "Skip"
 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)
-#: ../app/podbird.qml:175
-#, qt-format
-msgid "Podcasts listened to today: <b>%1</b>"
-msgstr ""
-
-#: ../app/podbird.qml:176
-msgid "No podcasts listened to today"
-msgstr ""
-
-#: ../app/podcasts.js:182
+#: ../app/podcasts.js:282
 #, no-c-format, qt-format
 msgid "%1 hr %2 min"
 msgstr ""
 
-#: ../app/podcasts.js:191
+#: ../app/podcasts.js:291
 #, no-c-format, qt-format
 msgid "%1 hr"
 msgstr ""
 
-#: ../app/podcasts.js:199
+#: ../app/podcasts.js:299
 #, no-c-format, qt-format
 msgid "%1 min"
 msgstr ""
 
 #. TRANSLATORS: About as in information about the app
-#: ../app/settings/About.qml:28 ../app/settings/About.qml:47
+#: ../app/settings/About.qml:28 ../app/settings/About.qml:46
 #: ../app/ui/SettingsPage.qml:222
 msgid "About"
 msgstr ""
 
-#: ../app/settings/About.qml:47
+#: ../app/settings/About.qml:46
 msgid "Credits"
 msgstr ""
 
 #. TRANSLATORS: Podbird version number e.g Version 0.7
-#: ../app/settings/About.qml:93
+#: ../app/settings/About.qml:92
 #, qt-format
 msgid "Version %1"
 msgstr ""
 
-#: ../app/settings/About.qml:114
+#: ../app/settings/About.qml:113
 msgid "Released under the terms of the GNU GPL v3"
 msgstr ""
 
-#: ../app/settings/About.qml:124
+#: ../app/settings/About.qml:123
 #, qt-format
 msgid "Source code available on %1"
 msgstr ""
@@ -168,7 +158,7 @@
 msgid "Search Episode"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:82 ../app/ui/EpisodesTab.qml:72
+#: ../app/ui/EpisodesPage.qml:82
 msgid "Mark all listened"
 msgstr ""
 
@@ -177,7 +167,7 @@
 msgid "Unsubscribe"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:136 ../app/ui/EpisodesTab.qml:173
+#: ../app/ui/EpisodesPage.qml:136 ../app/ui/EpisodesTab.qml:120
 msgid "Search episode"
 msgstr ""
 
@@ -195,11 +185,11 @@
 msgid "Cancel"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:223 ../app/ui/EpisodesTab.qml:295
+#: ../app/ui/EpisodesPage.qml:223 ../app/ui/EpisodesTab.qml:405
 msgid "Episode Description"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:234 ../app/ui/EpisodesTab.qml:306
+#: ../app/ui/EpisodesPage.qml:234 ../app/ui/EpisodesTab.qml:416
 #: ../app/ui/SearchPage.qml:170
 msgid "Close"
 msgstr ""
@@ -220,82 +210,122 @@
 msgid "Listened"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:413 ../app/ui/EpisodesTab.qml:135
+#: ../app/ui/EpisodesPage.qml:413
 msgid "Downloaded"
 msgstr ""
 
-#: ../app/ui/EpisodesTab.qml:87
-msgid "Download all"
-msgstr ""
-
-#: ../app/ui/EpisodesTab.qml:104
-msgid "Delete all"
-msgstr ""
-
-#: ../app/ui/EpisodesTab.qml:135
+#: ../app/ui/EpisodesTab.qml:82
 msgid "Recent"
 msgstr ""
 
-#: ../app/ui/EpisodesTab.qml:135
+#: ../app/ui/EpisodesTab.qml:82
+msgid "Downloads"
+msgstr ""
+
+#: ../app/ui/EpisodesTab.qml:82
 msgid "Favourites"
 msgstr ""
 
-#: ../app/ui/EpisodesTab.qml:198
+#: ../app/ui/EpisodesTab.qml:141
+msgid "Back"
+msgstr ""
+
+#: ../app/ui/EpisodesTab.qml:153
+msgid "Mark Listened"
+msgstr ""
+
+#: ../app/ui/EpisodesTab.qml:171
+msgid "Download episode(s)"
+msgstr ""
+
+#: ../app/ui/EpisodesTab.qml:199
+msgid "Delete episode(s)"
+msgstr ""
+
+#: ../app/ui/EpisodesTab.qml:222
+msgid "Favourite episode(s)"
+msgstr ""
+
+#: ../app/ui/EpisodesTab.qml:245
+msgid "Unfavourite episode(s)"
+msgstr ""
+
+#: ../app/ui/EpisodesTab.qml:268
+msgid "Add to queue"
+msgstr ""
+
+#: ../app/ui/EpisodesTab.qml:308
 msgid "No New Episodes"
 msgstr ""
 
-#: ../app/ui/EpisodesTab.qml:200
+#: ../app/ui/EpisodesTab.qml:310
 msgid "No Downloaded Episodes"
 msgstr ""
 
-#: ../app/ui/EpisodesTab.qml:202
+#: ../app/ui/EpisodesTab.qml:312
 msgid "No Favourited Episodes"
 msgstr ""
 
-#: ../app/ui/EpisodesTab.qml:204
+#: ../app/ui/EpisodesTab.qml:314
 msgid "No Episodes Found"
 msgstr ""
 
-#: ../app/ui/EpisodesTab.qml:210
+#: ../app/ui/EpisodesTab.qml:320
 msgid "No more episodes to listen to!"
 msgstr ""
 
-#: ../app/ui/EpisodesTab.qml:212
+#: ../app/ui/EpisodesTab.qml:322
 msgid "No episodes have been downloaded for offline listening"
 msgstr ""
 
-#: ../app/ui/EpisodesTab.qml:214
+#: ../app/ui/EpisodesTab.qml:324
 msgid "No episodes have been favourited."
 msgstr ""
 
-#: ../app/ui/EpisodesTab.qml:216
+#: ../app/ui/EpisodesTab.qml:326
 msgid "No Episodes found matching the search term."
 msgstr ""
 
-#: ../app/ui/EpisodesTab.qml:347
+#: ../app/ui/EpisodesTab.qml:455
+msgid "Downloads in progress"
+msgstr ""
+
+#: ../app/ui/EpisodesTab.qml:495
+msgid "Downloaded episodes"
+msgstr ""
+
+#: ../app/ui/EpisodesTab.qml:505
 msgid "Today"
 msgstr ""
 
-#: ../app/ui/EpisodesTab.qml:351
+#: ../app/ui/EpisodesTab.qml:509
 msgid "Yesterday"
 msgstr ""
 
-#: ../app/ui/EpisodesTab.qml:355
+#: ../app/ui/EpisodesTab.qml:513
 msgid "Older"
 msgstr ""
 
-#: ../app/ui/NowPlayingPage.qml:29
+#: ../app/ui/NowPlayingPage.qml:34
 msgid "Now Playing"
 msgstr ""
 
+#: ../app/ui/NowPlayingPage.qml:61
+msgid "Full view"
+msgstr ""
+
+#: ../app/ui/NowPlayingPage.qml:61
+msgid "Queue"
+msgstr ""
+
 #. TRANSLATORS: The string shown in the UI is -15s to denote the number of seconds that the podcast playback will skip backward.
-#: ../app/ui/NowPlayingPage.qml:200
+#: ../app/ui/NowPlayingPage.qml:261
 #, no-c-format, qt-format
 msgid "-%1s"
 msgstr ""
 
 #. TRANSLATORS: The string shown in the UI is +15s to denote the number of seconds that the podcast playback will skip forward.
-#: ../app/ui/NowPlayingPage.qml:261
+#: ../app/ui/NowPlayingPage.qml:322
 #, no-c-format, qt-format
 msgid "+%1s"
 msgstr ""
@@ -331,7 +361,7 @@
 msgid "No podcasts found matching the search term."
 msgstr ""
 
-#: ../app/ui/PodcastsTab.qml:174 ../app/ui/PodcastsTab.qml:221
+#: ../app/ui/PodcastsTab.qml:222
 #, qt-format
 msgid "%1 unheard episode"
 msgid_plural "%1 unheard episodes"
@@ -529,10 +559,10 @@
 msgid "Finish"
 msgstr ""
 
-#: /home/krnekhelesh/Development/devel-branch-sync-1-build/po/Podbird.desktop.in.h:1
+#: /home/krnekhelesh/Development/devel-branch-sync-2-build/po/Podbird.desktop.in.h:1
 msgid "The chirpiest podcast manager for Ubuntu"
 msgstr ""
 
-#: /home/krnekhelesh/Development/devel-branch-sync-1-build/po/Podbird.desktop.in.h:2
+#: /home/krnekhelesh/Development/devel-branch-sync-2-build/po/Podbird.desktop.in.h:2
 msgid "podcast;audio;itunes;broadcast;digital;stream;podcatcher;video;vodcast;"
 msgstr ""