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

[Nekhelesh Ramananthan]

This MP brings trunk to up to date with the latest Podbird Devel release 0.7.6. It includes the following fixes,

- Added multi-select mode to the Episodes Page
- Brought back the "Add new podcasts" as a separate tab
- Added plural forms for %1 seconds in the settings page
- Added support for reordering items in the queue
- Added welcome wizard slide explaining about the listitem actions and multi-select mode

[Michael Sheldon (michael-sheldon)]

Seems to have the wrong icon for deleting podcasts

review: Needs Fixing

[Michael Sheldon (michael-sheldon)]

And another one (in diff comments)

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

193. By Nekhelesh Ramananthan on 2016-03-28

Changed icon to delete

[Nekhelesh Ramananthan (nik90)]

Reverted the icon change.

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

194. By Nekhelesh Ramananthan on 2016-03-28

merged prerequisite

195. By Nekhelesh Ramananthan on 2016-03-28

Removed hard coded colors

[Michael Sheldon (michael-sheldon)]

Looks good

review: Approve

=== added file 'app/components/TabsList.qml'
--- app/components/TabsList.qml	1970-01-01 00:00:00 +0000
+++ app/components/TabsList.qml	2016-03-28 22:41:59 +0000
@@ -0,0 +1,58 @@
+/*
+ * 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
+
+    children: [
+        Action {
+            text: i18n.tr("Episodes")
+            visible: tabs.selectedTab !== episodesTab
+            onTriggered: {
+                tabs.selectedTabIndex = 0
+            }
+        },
+
+        Action {
+            text: i18n.tr("Add New Podcasts")
+            visible: tabs.selectedTab !== searchTab
+            onTriggered: {
+                tabs.selectedTabIndex = 1
+            }
+        },
+
+        Action {
+            text: i18n.tr("Podcasts")
+            visible: tabs.selectedTab !== podcastTab
+            onTriggered: {
+                tabs.selectedTabIndex = 2
+            }
+        },
+
+        Action {
+            text: i18n.tr("Settings")
+            visible: tabs.selectedTab !== settingsTab
+            onTriggered: {
+                tabs.selectedTabIndex = 3
+            }
+        }
+    ]
+}

=== added file 'app/graphics/listitemactions.png'
Binary files app/graphics/listitemactions.png	1970-01-01 00:00:00 +0000 and app/graphics/listitemactions.png	2016-03-28 22:41:59 +0000 differ
=== modified file 'app/podbird.qml'
--- app/podbird.qml	2016-03-28 22:41:59 +0000
+++ app/podbird.qml	2016-03-28 22:41:59 +0000
@@ -54,9 +54,9 @@
     // RefreshModel function to call refreshModel() function of the tab currently
     // visible on application start.
     function refreshModels() {
-        if (tabs.selectedTabIndex === 0) {
+        if (tabs.selectedTab === episodesTab) {
             episodesTab.refreshModel()
-        } else if (tabs.selectedTabIndex === 1) {
+        } else if (tabs.selectedTab === podcastTab) {
             podcastPage.item.refreshModel()
         }
     }
@@ -323,6 +323,19 @@
             }
 
             Tab {
+                id: searchTab
+
+                // Dynamically load/unload the search tab as required
+                page: Loader {
+                    parent: searchTab
+                    anchors.left: parent.left
+                    anchors.right: parent.right
+                    anchors.bottom: parent.bottom
+                    source: (tabs.selectedTab === searchTab) ? Qt.resolvedUrl("ui/SearchPage.qml") : ""
+                }
+            }
+
+            Tab {
                 id: podcastTab
 
                 page: Loader {

=== modified file 'app/settings/CleanSetting.qml'
--- app/settings/CleanSetting.qml	2016-02-25 11:09:44 +0000
+++ app/settings/CleanSetting.qml	2016-03-28 22:41:59 +0000
@@ -24,7 +24,14 @@
     id: cleanSettingPage
 
     visible: false
-    title: i18n.tr("Delete older than")
+
+    header: PageHeader {
+        title: i18n.tr("Delete older than")
+        flickable: cleanup
+        StyleHints {
+            backgroundColor: podbird.appTheme.background
+        }
+    }
 
     ListModel {
         id: cleanupModel
@@ -39,7 +46,7 @@
         }
     }
 
-    UbuntuListView {
+    ListView {
         id: cleanup
 
         currentIndex: -1

=== modified file 'app/settings/DownloadSetting.qml'
--- app/settings/DownloadSetting.qml	2016-02-25 11:09:44 +0000
+++ app/settings/DownloadSetting.qml	2016-03-28 22:41:59 +0000
@@ -24,7 +24,14 @@
     id: downloadSetting
 
     visible: false
-    title: i18n.tr("Download at most")
+
+    header: PageHeader {
+        title: i18n.tr("Download at most")
+        flickable: download
+        StyleHints {
+            backgroundColor: podbird.appTheme.background
+        }
+    }
 
     ListModel {
         id: episodeDownloadNumber
@@ -38,7 +45,7 @@
         }
     }
 
-    UbuntuListView {
+    ListView {
         id: download
 
         currentIndex: -1

=== modified file 'app/settings/ThemeSetting.qml'
--- app/settings/ThemeSetting.qml	2016-02-25 11:09:44 +0000
+++ app/settings/ThemeSetting.qml	2016-03-28 22:41:59 +0000
@@ -24,7 +24,14 @@
     id: themeSettingPage
 
     visible: false
-    title: i18n.tr("Theme")
+
+    header: PageHeader {
+        title: i18n.tr("Theme")
+        flickable: themes
+        StyleHints {
+            backgroundColor: podbird.appTheme.background
+        }
+    }
 
     ListModel {
         id: themeModel
@@ -37,7 +44,7 @@
         }
     }
 
-    UbuntuListView {
+    ListView {
         id: themes
 
         currentIndex: -1

=== modified file 'app/themes/Dark.qml'
--- app/themes/Dark.qml	2016-03-28 22:41:59 +0000
+++ app/themes/Dark.qml	2016-02-19 20:10:06 +0000
@@ -33,9 +33,9 @@
     property color baseIcon: "White"
 
     // Button Colors
-    property color positiveActionButton: "#3EB34F" // UbuntuColors.green
-    property color negativeActionButton: "#ED3146" // UbuntuColors.red
-    property color neutralActionButton: "#5D5D5D" // UbuntuColors.coolGrey
+    property color positiveActionButton: UbuntuColors.green
+    property color negativeActionButton: UbuntuColors.red
+    property color neutralActionButton: UbuntuColors.coolGrey
 
     // Bottom Player Bar Colors
     property color bottomBarBackground: "#15141A"

=== modified file 'app/themes/Light.qml'
--- app/themes/Light.qml	2016-03-28 22:41:59 +0000
+++ app/themes/Light.qml	2016-02-19 20:10:06 +0000
@@ -33,9 +33,9 @@
     property color baseIcon: UbuntuColors.darkGrey
 
     // Button Colors
-    property color positiveActionButton: "#3EB34F" // UbuntuColors.green
-    property color negativeActionButton: "#ED3146" // UbuntuColors.red
-    property color neutralActionButton: "#5D5D5D" // UbuntuColors.coolGrey
+    property color positiveActionButton: UbuntuColors.green
+    property color negativeActionButton: UbuntuColors.red
+    property color neutralActionButton: UbuntuColors.coolGrey
 
     // Bottom Player Bar Colors
     property color bottomBarBackground: "#323435"

=== modified file 'app/ui/EpisodesPage.qml'
--- app/ui/EpisodesPage.qml	2016-03-28 22:41:59 +0000
+++ app/ui/EpisodesPage.qml	2016-03-28 22:41:59 +0000
@@ -29,8 +29,6 @@
     id: episodesPage
 
     visible: false
-    title: i18n.tr("Podcast")
-    flickable: null
 
     property string episodeName
     property string episodeId
@@ -47,81 +45,205 @@
             tempGuid = downloader.downloadingGuid
     }
 
-    head.contents: Label {
-        text: title
-        anchors.fill: parent
-        anchors.margins: units.gu(0.5)
-        verticalAlignment: Text.AlignVCenter
-
-        textSize: Label.XLarge
-        fontSizeMode: Text.Fit
-
-        maximumLineCount: 3
-        minimumPointSize: 8
-        elide: Text.Right
-        wrapMode: Text.WordWrap
-    }
-
-    state: "default"
-    states: [
-        PageHeadState {
-            name: "default"
-            head: episodesPage.head
+    header: standardHeader
+
+    PageHeader {
+        id: standardHeader
+        title: i18n.tr("Podcast")
+        flickable: null
+
+        StyleHints {
+            backgroundColor: podbird.appTheme.background
+        }
+
+        trailingActionBar.actions: [
+            Action {
+                iconName: "search"
+                text: i18n.tr("Search Episode")
+                onTriggered: {
+                    episodesPage.header = searchHeader
+                    searchField.item.forceActiveFocus()
+                }
+            },
+
+            Action {
+                text: i18n.tr("Unsubscribe")
+                iconName: "delete"
+                onTriggered: {
+                    PopupUtils.open(confirmDeleteDialog, episodesPage);
+                }
+            }
+        ]
+    }
+
+    PageHeader {
+        id: searchHeader
+        visible: episodesPage.header === searchHeader
+        flickable: null
+
+        leadingActionBar.actions: Action {
+            iconName: "back"
+            onTriggered: {
+                episodeList.forceActiveFocus()
+                episodesPage.header = standardHeader
+                episodeList.positionViewAtBeginning()
+            }
+        }
+
+        StyleHints {
+            backgroundColor: podbird.appTheme.background
+        }
+
+        contents: Loader {
+            id: searchField
+            sourceComponent: episodesPage.header === searchHeader ? searchFieldComponent : undefined
+            anchors.left: parent ? parent.left : undefined
+            anchors.right: parent ? parent.right : undefined
+            anchors.verticalCenter: parent ? parent.verticalCenter : undefined
+        }
+    }
+
+    PageHeader {
+        id: selectionHeader
+        visible: episodeList.ViewItems.selectMode
+        // TRANSLATORS: This is the page title. Keep it short. Otherwise it will just be elided.
+        title: i18n.tr("%1 item selected", "%1 items selected", episodeList.ViewItems.selectedIndices.length).arg(episodeList.ViewItems.selectedIndices.length)
+
+        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: "search"
-                    text: i18n.tr("Search Episode")
-                    onTriggered: {
-                        episodesPage.state = "search"
-                        searchField.item.forceActiveFocus()
-                    }
-                },
-
-                Action {
                     iconName: "select"
-                    text: i18n.tr("Mark all listened")
-                    onTriggered: {
-                        var db = Podcasts.init();
-                        db.transaction(function (tx) {
-                            tx.executeSql("UPDATE Episode SET listened=1 WHERE podcast=?", [episodeId]);
-                            refreshModel();
-                        });
-                    }
-                },
-
-                Action {
-                    text: i18n.tr("Unsubscribe")
+                    text: i18n.tr("Mark Listened")
+                    enabled: episodeList.ViewItems.selectedIndices.length !== 0
+                    visible: episodesPage.mode !== "listened"
+                    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=?", [episodeModel.get(index).guid]);
+                            }
+                        });
+
+                        refreshModel();
+                        episodeList.closeSelection()
+                    }
+                },
+
+                Action {
+                    iconName: "save"
+                    text: i18n.tr("Download episode(s)")
+                    enabled: episodeList.ViewItems.selectedIndices.length !== 0
+                    visible: episodesPage.mode !== "downloaded"
+
+                    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 (!episodeModel.get(index).downloadedfile) {
+                                    episodeModel.setProperty(index, "queued", 1)
+                                    tx.executeSql("UPDATE Episode SET queued=1 WHERE guid = ?", [episodeModel.get(index).guid]);
+                                    if (episodeModel.get(index).audiourl) {
+                                        podbird.downloadEpisode(episodeModel.get(index).image, episodeModel.get(index).name, episodeModel.get(index).guid, episodeModel.get(index).audiourl)
+                                    } else {
+                                        console.log("[ERROR]: Invalid download url: " + episodeModel.get(index).audiourl)
+                                    }
+                                }
+                            }
+                        });
+
+                        refreshModel();
+                        episodeList.closeSelection()
+                    }
+                },
+
+                Action {
                     iconName: "delete"
-                    onTriggered: {
-                        PopupUtils.open(confirmDeleteDialog, episodesPage);
+                    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 (episodeModel.get(index).downloadedfile) {
+                                    fileManager.deleteFile(episodeModel.get(index).downloadedfile);
+                                    tx.executeSql("UPDATE Episode SET downloadedfile = NULL WHERE guid = ?", [episodeModel.get(index).guid]);
+                                    episodeModel.setProperty(index, "downloadedfile", "")
+                                }
+                            }
+                        });
+
+                        refreshModel();
+                        episodeList.closeSelection()
+                    }
+                },
+
+                Action {
+                    iconName: "like"
+                    text: i18n.tr("Favourite 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 (!episodeModel.get(index).favourited) {
+                                    tx.executeSql("UPDATE Episode SET favourited=1 WHERE guid=?", [episodeModel.get(index).guid])
+                                    episodeModel.setProperty(index, "favourited", 1)
+                                }
+                            }
+                        });
+
+                        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 (episodeModel.get(index).audiourl) {
+                                var url = episodeModel.get(index).downloadedfile ? "file://" + episodeModel.get(index).downloadedfile : episodeModel.get(index).audiourl
+                                player.addEpisodeToQueue(episodeModel.get(index).guid, episodeModel.get(index).image, episodeModel.get(index).name, episodeModel.get(index).artist, url)
+                            }
+                        }
+
+                        episodeList.closeSelection()
                     }
                 }
-
             ]
-        },
-
-        PageHeadState {
-            name: "search"
-            head: episodesPage.head
-
-            backAction: Action {
-                iconName: "back"
-                onTriggered: {
-                    episodeList.forceActiveFocus()
-                    episodesPage.state = "default"
-                    episodeList.positionViewAtBeginning()
-                }
-            }
-
-            contents: Loader {
-                id: searchField
-                sourceComponent: episodesPage.state === "search" ? searchFieldComponent : undefined
-                anchors.left: parent ? parent.left : undefined
-                anchors.right: parent ? parent.right : undefined
-                anchors.rightMargin: units.gu(2)
-            }
         }
-    ]
+    }
 
     onVisibleChanged: {
         if (!visible) {
@@ -251,8 +373,8 @@
             verticalCenterOffset: Qt.inputMethod.visible ? units.gu(4) : 0
         }
 
-        sourceComponent: (episodesPage.state === "search" && sortedEpisodeModel.count === 0) ? emptyStateComponent
-                                                                                             : undefined
+        sourceComponent: (episodesPage.header === searchHeader && sortedEpisodeModel.count === 0) ? emptyStateComponent
+                                                                                                  : undefined
     }
 
     Component {
@@ -272,13 +394,16 @@
         id: sortedEpisodeModel
         model: episodeModel
         filter.property: "name"
-        filter.pattern: episodesPage.state === "search" && searchField.status == Loader.Ready ? RegExp(searchField.item.text, "gi")
-                                                                                              : RegExp("", "gi")
+        filter.pattern: episodesPage.header === searchHeader && searchField.status == Loader.Ready ? RegExp(searchField.item.text, "gi")
+                                                                                                   : RegExp("", "gi")
     }
 
     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
@@ -287,7 +412,7 @@
             flickDeceleration = flickDeceleration * scaleFactor;
         }
 
-        anchors.fill: parent
+        anchors { fill: parent; topMargin: episodesPage.header.height }
         model: sortedEpisodeModel
         clip: true
 
@@ -297,8 +422,8 @@
                 id: coverArtContainer
 
                 width: episodesPage.width
-                visible: episodesPage.state !== "search" && sortedEpisodeModel.count !== 0
-                height: episodesPage.state !== "search" && sortedEpisodeModel.count !== 0 ? cover.height + units.gu(6) : 0
+                visible: episodesPage.header !== searchHeader && sortedEpisodeModel.count !== 0
+                height: episodesPage.header !== searchHeader && sortedEpisodeModel.count !== 0 ? cover.height + units.gu(6) : 0
 
                 Image {
                     id:cover
@@ -548,11 +673,29 @@
 
             onClicked: {
                 Haptics.play()
-                if (currentGuid !== model.guid) {
-                    currentUrl = model.downloadedfile ? "file://" + model.downloadedfile : model.audiourl;
-                    player.playEpisode(model.guid, model.image, model.name, model.artist, currentUrl)
+                if (selectMode) {
+                    selected = !selected
+                } else {
+                    if (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
         }
 
         PullToRefresh {

=== modified file 'app/ui/EpisodesTab.qml'
--- app/ui/EpisodesTab.qml	2016-03-28 22:41:59 +0000
+++ app/ui/EpisodesTab.qml	2016-03-28 22:41:59 +0000
@@ -124,6 +124,8 @@
         PageHeader {
             id: selectionHeader
             visible: episodeList.ViewItems.selectMode
+            // TRANSLATORS: This is the page title. Keep it short. Otherwise it will just be elided.
+            title: i18n.tr("%1 item selected", "%1 items selected", episodeList.ViewItems.selectedIndices.length).arg(episodeList.ViewItems.selectedIndices.length)
 
             onVisibleChanged: {
                 if (visible) {

=== added file 'app/ui/FullPlayingView.qml'
--- app/ui/FullPlayingView.qml	1970-01-01 00:00:00 +0000
+++ app/ui/FullPlayingView.qml	2016-03-28 22:41:59 +0000
@@ -0,0 +1,304 @@
+/*
+ * 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 QtMultimedia 5.6
+import Ubuntu.Components 1.3
+import "../podcasts.js" as Podcasts
+import "../components"
+
+Item {
+    id: nowPlayingItem
+    
+    property bool isLandscapeMode: width > height
+    
+    // Landscape rule
+    states: [
+        State {
+            name: "landscape"
+            when: nowPlayingItem.isLandscapeMode
+            
+            PropertyChanges {
+                target: blurredBackground
+                width: nowPlayingItem.width/2.2
+                height: nowPlayingItem.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 ? nowPlayingItem.height/2.3 + units.gu(3)
+                                      : nowPlayingItem.height/2.3
+        art: currentImage
+        
+        Image {
+            width: Math.min(nowPlayingItem.width/2, nowPlayingItem.height/2)
+            height: width
+            sourceSize.height: width
+            sourceSize.width: width
+            source: currentImage
+            asynchronous: true
+            anchors.centerIn: parent
+        }
+    }
+    
+    Item {
+        id: dataContainer
+        
+        anchors {
+            top: blurredBackground.bottom
+            left: parent.left
+            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"
+                }
+            }
+        }
+    }
+}

=== modified file 'app/ui/NowPlayingPage.qml'
--- app/ui/NowPlayingPage.qml	2016-03-28 22:41:59 +0000
+++ app/ui/NowPlayingPage.qml	2016-03-28 22:41:59 +0000
@@ -37,6 +37,18 @@
             backgroundColor: podbird.appTheme.background
         }
 
+        leadingActionBar.actions: Action {
+            iconName: "back"
+            text: i18n.tr("Back")
+            onTriggered: {
+                if (nowPlayingPageSections.selectedIndex === 1 && currentViewLoader.item.ViewItems.dragMode) {
+                    currentViewLoader.item.ViewItems.dragMode = !currentViewLoader.item.ViewItems.dragMode
+                } else {
+                    mainStack.pop()
+                }
+            }
+        }
+
         trailingActionBar.actions: Action {
             iconName: "delete"
             visible: nowPlayingPageSections.selectedIndex === 1
@@ -62,314 +74,9 @@
         }
     }
 
-    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: blurredBackground.bottom
-                    left: parent.left
-                    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"
-                        }
-                    }
-                }
-            }
-        }
-
-        Queue {
-            width: tabView.width
-            height: tabView.height
-        }
-    }
-
-    ListView {
-        id: tabView
-        model: tabs
-        interactive: false
-
-        anchors {
-            top: nowPlayingPage.header.bottom
-            left: parent.left
-            right: parent.right
-            bottom: parent.bottom
-        }
-
-        orientation: Qt.Horizontal
-        snapMode: ListView.SnapOneItem
-        currentIndex: nowPlayingPageSections.selectedIndex
-        highlightMoveDuration: UbuntuAnimation.SlowDuration
+    Loader {
+        id: currentViewLoader
+        anchors { fill: parent; topMargin: nowPlayingPage.header.height }
+        source: nowPlayingPageSections.selectedIndex === 0 ? Qt.resolvedUrl("FullPlayingView.qml") : Qt.resolvedUrl("Queue.qml")
     }
 }

=== modified file 'app/ui/PodcastsTab.qml'
--- app/ui/PodcastsTab.qml	2016-03-28 22:41:59 +0000
+++ app/ui/PodcastsTab.qml	2016-03-28 22:41:59 +0000
@@ -59,13 +59,6 @@
                     podcastPage.header = searchHeader
                     searchField.item.forceActiveFocus()
                 }
-            },
-            Action {
-                iconName: "add"
-                text: i18n.tr("Add New Podcasts")
-                onTriggered: {
-                    mainStack.push(Qt.resolvedUrl("SearchPage.qml"))
-                }
             }
         ]
     }

=== modified file 'app/ui/Queue.qml'
--- app/ui/Queue.qml	2016-03-28 22:41:59 +0000
+++ app/ui/Queue.qml	2016-03-28 22:41:59 +0000
@@ -19,70 +19,85 @@
 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
+
+ListView {
+    id: queueList
+
+    Component.onCompleted: {
+        // FIXME: workaround for qtubuntu not returning values depending on the grid unit definition
+        // for Flickable.maximumFlickVelocity and Flickable.flickDeceleration
+        var scaleFactor = units.gridUnit / 8;
+        maximumFlickVelocity = maximumFlickVelocity * scaleFactor;
+        flickDeceleration = flickDeceleration * scaleFactor;
+    }
+
+    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
             }
 
-            leadingActions: ListItemActions {
-                actions: [
-                    Action {
-                        iconName: "delete"
-                        onTriggered: {
-                            player.playlist.removeItem(index)
-                            var source = model.source
-                            source = source.toString()
-                            Podcasts.removeItemFromQueue(source)
-                        }
+            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
                 }
+            ]
+        }
+
+        onClicked: {
+            if (player.playlist.currentIndex === index) {
+                player.toggle()
+            } else {
+                player.playlist.currentIndex = index
             }
         }
+
+        onPressAndHold: {
+            ListView.view.ViewItems.dragMode = !ListView.view.ViewItems.dragMode
+        }
+    }
+
+    ViewItems.onDragUpdated: {
+        // Only update the model when the listitem is dropped, not 'live'
+        if (event.status === ListItemDrag.Moving) {
+            event.accept = false
+        } else if (event.status === ListItemDrag.Dropped) {
+            player.playlist.moveItem(event.from, event.to)
+        }
     }
 }

=== modified file 'app/ui/SearchPage.qml'
--- app/ui/SearchPage.qml	2016-03-28 22:41:59 +0000
+++ app/ui/SearchPage.qml	2016-03-28 22:41:59 +0000
@@ -28,6 +28,10 @@
 
     property var xhr: new XMLHttpRequest;
 
+    TabsList {
+        id: tabsList
+    }
+
     header: standardHeader
 
     PageHeader {
@@ -40,6 +44,11 @@
             backgroundColor: podbird.appTheme.background
         }
 
+        leadingActionBar {
+            numberOfSlots: 0
+            actions: tabsList.actions
+        }
+
         trailingActionBar.actions: [
             Action {
                 iconName: "search"
@@ -284,7 +293,7 @@
                                 }
                             });
                         }
-                        mainStack.pop();
+                        tabs.selectedTabIndex = 2;
                     }
                 }
             }
@@ -433,7 +442,7 @@
                     Podcasts.subscribe(artist, name, feed, image);
                     imageDownloader.feed = feed;
                     imageDownloader.download(image);
-                    mainStack.pop();
+                    tabs.selectedTabIndex = 2;
                 } else {
                     PopupUtils.open(subscribeFailedDialog);
                     searchPage.header = addHeader

=== added file 'app/welcomewizard/Slide5.qml'
--- app/welcomewizard/Slide5.qml	1970-01-01 00:00:00 +0000
+++ app/welcomewizard/Slide5.qml	2016-03-28 22:41:59 +0000
@@ -0,0 +1,68 @@
+/*
+ * 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
+
+// Slide 5
+Component {
+    id: slide5
+    Item {
+        id: slide1Container
+
+        Image {
+            anchors {
+                top: parent.top
+                bottom: introductionText.top
+                bottomMargin: units.gu(6)
+                horizontalCenter: parent.horizontalCenter
+            }
+            fillMode: Image.PreserveAspectFit
+            source: Qt.resolvedUrl("../graphics/listitemactions.png")
+        }
+
+        Label {
+            id: introductionText
+            anchors.centerIn: parent
+            elide: Text.ElideRight
+            textSize: Label.XLarge
+            maximumLineCount: 2
+            text: i18n.tr("Touch Gestures")
+            horizontalAlignment: Text.AlignHCenter
+            width: parent.width
+            wrapMode: Text.WordWrap
+        }
+
+        Label {
+            id: finalMessage
+            anchors {
+                top: introductionText.bottom
+                bottom: parent.bottom
+                left: parent.left
+                right: parent.right
+                margins: units.gu(1)
+                topMargin: units.gu(4)
+            }
+            wrapMode: Text.WordWrap
+            horizontalAlignment: Text.AlignHCenter
+            linkColor: podbird.appTheme.linkText
+            text: i18n.tr("Episodes can be swiped left to reveal more actions. You can also multi-select them by long-pressing on an episode.")
+            onLinkActivated: Qt.openUrlExternally(link)
+        }
+    }
+}

=== renamed file 'app/welcomewizard/Slide5.qml' => 'app/welcomewizard/Slide6.qml'
=== renamed file 'app/welcomewizard/Slide6.qml' => 'app/welcomewizard/Slide7.qml'
=== modified file 'app/welcomewizard/WelcomeWizard.qml'
--- app/welcomewizard/WelcomeWizard.qml	2016-02-19 20:10:06 +0000
+++ app/welcomewizard/WelcomeWizard.qml	2016-03-28 22:41:59 +0000
@@ -36,6 +36,7 @@
         Slide3{},
         Slide4{},
         Slide5{},
-        Slide6{}
+        Slide6{},
+        Slide7{}
     ]
 }

=== modified file 'po/com.mikeasoft.podbird.pot'
--- po/com.mikeasoft.podbird.pot	2016-03-28 22:41:59 +0000
+++ po/com.mikeasoft.podbird.pot	2016-03-28 22:41:59 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-19 19:13+0530\n"
+"POT-Creation-Date: 2016-03-19 19:22+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"
@@ -18,15 +18,19 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../app/components/TabsList.qml:29 ../app/ui/EpisodesTab.qml:48
+#: ../app/components/TabsList.qml:27 ../app/ui/EpisodesTab.qml:48
 msgid "Episodes"
 msgstr ""
 
-#: ../app/components/TabsList.qml:37 ../app/ui/PodcastsTab.qml:42
+#: ../app/components/TabsList.qml:35 ../app/ui/SearchPage.qml:41
+msgid "Add New Podcasts"
+msgstr ""
+
+#: ../app/components/TabsList.qml:43 ../app/ui/PodcastsTab.qml:42
 msgid "Podcasts"
 msgstr ""
 
-#: ../app/components/TabsList.qml:45 ../app/ui/SettingsPage.qml:32
+#: ../app/components/TabsList.qml:51 ../app/ui/SettingsPage.qml:32
 msgid "Settings"
 msgstr ""
 
@@ -74,30 +78,30 @@
 msgid "Source code available on %1"
 msgstr ""
 
-#: ../app/settings/CleanSetting.qml:27
+#: ../app/settings/CleanSetting.qml:29
 msgid "Delete older than"
 msgstr ""
 
-#: ../app/settings/CleanSetting.qml:33 ../app/settings/DownloadSetting.qml:33
+#: ../app/settings/CleanSetting.qml:40 ../app/settings/DownloadSetting.qml:40
 msgid "Never"
 msgstr ""
 
-#: ../app/settings/CleanSetting.qml:34
+#: ../app/settings/CleanSetting.qml:41
 #, qt-format
 msgid "%1 day"
 msgid_plural "%1 days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../app/settings/CleanSetting.qml:35 ../app/settings/CleanSetting.qml:36
-#: ../app/settings/CleanSetting.qml:37
+#: ../app/settings/CleanSetting.qml:42 ../app/settings/CleanSetting.qml:43
+#: ../app/settings/CleanSetting.qml:44
 #, qt-format
 msgid "%1 month"
 msgid_plural "%1 months"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../app/settings/CleanSetting.qml:38
+#: ../app/settings/CleanSetting.qml:45
 #, qt-format
 msgid "%1 year"
 msgid_plural "%1 years"
@@ -122,95 +126,124 @@
 msgid "Translators"
 msgstr ""
 
-#: ../app/settings/DownloadSetting.qml:27
+#: ../app/settings/DownloadSetting.qml:29
 msgid "Download at most"
 msgstr ""
 
-#: ../app/settings/DownloadSetting.qml:34
-#: ../app/settings/DownloadSetting.qml:35
-#: ../app/settings/DownloadSetting.qml:36
-#: ../app/settings/DownloadSetting.qml:37
+#: ../app/settings/DownloadSetting.qml:41
+#: ../app/settings/DownloadSetting.qml:42
+#: ../app/settings/DownloadSetting.qml:43
+#: ../app/settings/DownloadSetting.qml:44
 #, qt-format
 msgid "%1 episode"
 msgid_plural "%1 episodes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../app/settings/ThemeSetting.qml:27 ../app/ui/SettingsPage.qml:144
+#: ../app/settings/ThemeSetting.qml:29 ../app/ui/SettingsPage.qml:144
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: Light Theme
-#: ../app/settings/ThemeSetting.qml:34 ../app/ui/SettingsPage.qml:145
+#: ../app/settings/ThemeSetting.qml:41 ../app/ui/SettingsPage.qml:145
 msgid "Light"
 msgstr ""
 
 #. TRANSLATORS: Dark Theme
-#: ../app/settings/ThemeSetting.qml:36 ../app/ui/SettingsPage.qml:145
+#: ../app/settings/ThemeSetting.qml:43 ../app/ui/SettingsPage.qml:145
 msgid "Dark"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:32
+#: ../app/ui/EpisodesPage.qml:52
 msgid "Podcast"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:73 ../app/ui/EpisodesTab.qml:62
+#: ../app/ui/EpisodesPage.qml:62 ../app/ui/EpisodesTab.qml:62
 msgid "Search Episode"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:82
-msgid "Mark all listened"
-msgstr ""
-
-#: ../app/ui/EpisodesPage.qml:93 ../app/ui/EpisodesPage.qml:184
-#: ../app/ui/SearchPage.qml:266
+#: ../app/ui/EpisodesPage.qml:70 ../app/ui/EpisodesPage.qml:306
+#: ../app/ui/SearchPage.qml:275
 msgid "Unsubscribe"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:136 ../app/ui/EpisodesTab.qml:120
+#. TRANSLATORS: This is the page title. Keep it short. Otherwise it will just be elided.
+#: ../app/ui/EpisodesPage.qml:110 ../app/ui/EpisodesTab.qml:128
+#, qt-format
+msgid "%1 item selected"
+msgid_plural "%1 items selected"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../app/ui/EpisodesPage.qml:125 ../app/ui/EpisodesTab.qml:143
+#: ../app/ui/NowPlayingPage.qml:42
+msgid "Back"
+msgstr ""
+
+#: ../app/ui/EpisodesPage.qml:137 ../app/ui/EpisodesTab.qml:155
+msgid "Mark Listened"
+msgstr ""
+
+#: ../app/ui/EpisodesPage.qml:156 ../app/ui/EpisodesTab.qml:173
+msgid "Download episode(s)"
+msgstr ""
+
+#: ../app/ui/EpisodesPage.qml:184 ../app/ui/EpisodesTab.qml:201
+msgid "Delete episode(s)"
+msgstr ""
+
+#: ../app/ui/EpisodesPage.qml:207 ../app/ui/EpisodesTab.qml:224
+msgid "Favourite episode(s)"
+msgstr ""
+
+#: ../app/ui/EpisodesPage.qml:229 ../app/ui/EpisodesTab.qml:270
+msgid "Add to queue"
+msgstr ""
+
+#: ../app/ui/EpisodesPage.qml:258 ../app/ui/EpisodesTab.qml:120
 msgid "Search episode"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:181
+#: ../app/ui/EpisodesPage.qml:303
 msgid "Unsubscribe Confirmation"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:182
+#: ../app/ui/EpisodesPage.qml:304
 #, qt-format
 msgid "Are you sure you want to unsubscribe from <b>%1</b>?"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:201 ../app/ui/SearchPage.qml:121
+#: ../app/ui/EpisodesPage.qml:323 ../app/ui/SearchPage.qml:130
 #: ../app/ui/SettingsPage.qml:83 ../app/ui/SettingsPage.qml:118
 msgid "Cancel"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:223 ../app/ui/EpisodesTab.qml:405
+#: ../app/ui/EpisodesPage.qml:345 ../app/ui/EpisodesTab.qml:407
 msgid "Episode Description"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:234 ../app/ui/EpisodesTab.qml:416
-#: ../app/ui/SearchPage.qml:170
+#: ../app/ui/EpisodesPage.qml:356 ../app/ui/EpisodesTab.qml:418
+#: ../app/ui/SearchPage.qml:179
 msgid "Close"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:262
+#: ../app/ui/EpisodesPage.qml:384
 msgid "No episodes found"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:263
+#: ../app/ui/EpisodesPage.qml:385
 msgid "No episodes found matching the search term."
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:377
+#: ../app/ui/EpisodesPage.qml:502
 msgid "Unheard"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:394
+#: ../app/ui/EpisodesPage.qml:519
 msgid "Listened"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:413
+#: ../app/ui/EpisodesPage.qml:538
 msgid "Downloaded"
 msgstr ""
 
@@ -226,195 +259,167 @@
 msgid "Favourites"
 msgstr ""
 
-#: ../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
+#: ../app/ui/EpisodesTab.qml:247
 msgid "Unfavourite episode(s)"
 msgstr ""
 
-#: ../app/ui/EpisodesTab.qml:268
-msgid "Add to queue"
-msgstr ""
-
-#: ../app/ui/EpisodesTab.qml:308
+#: ../app/ui/EpisodesTab.qml:310
 msgid "No New Episodes"
 msgstr ""
 
-#: ../app/ui/EpisodesTab.qml:310
+#: ../app/ui/EpisodesTab.qml:312
 msgid "No Downloaded Episodes"
 msgstr ""
 
-#: ../app/ui/EpisodesTab.qml:312
+#: ../app/ui/EpisodesTab.qml:314
 msgid "No Favourited Episodes"
 msgstr ""
 
-#: ../app/ui/EpisodesTab.qml:314
+#: ../app/ui/EpisodesTab.qml:316
 msgid "No Episodes Found"
 msgstr ""
 
-#: ../app/ui/EpisodesTab.qml:320
+#: ../app/ui/EpisodesTab.qml:322
 msgid "No more episodes to listen to!"
 msgstr ""
 
-#: ../app/ui/EpisodesTab.qml:322
+#: ../app/ui/EpisodesTab.qml:324
 msgid "No episodes have been downloaded for offline listening"
 msgstr ""
 
-#: ../app/ui/EpisodesTab.qml:324
+#: ../app/ui/EpisodesTab.qml:326
 msgid "No episodes have been favourited."
 msgstr ""
 
-#: ../app/ui/EpisodesTab.qml:326
+#: ../app/ui/EpisodesTab.qml:328
 msgid "No Episodes found matching the search term."
 msgstr ""
 
-#: ../app/ui/EpisodesTab.qml:455
+#: ../app/ui/EpisodesTab.qml:457
 msgid "Downloads in progress"
 msgstr ""
 
-#: ../app/ui/EpisodesTab.qml:495
+#: ../app/ui/EpisodesTab.qml:497
 msgid "Downloaded episodes"
 msgstr ""
 
-#: ../app/ui/EpisodesTab.qml:505
+#: ../app/ui/EpisodesTab.qml:507
 msgid "Today"
 msgstr ""
 
-#: ../app/ui/EpisodesTab.qml:509
+#: ../app/ui/EpisodesTab.qml:511
 msgid "Yesterday"
 msgstr ""
 
-#: ../app/ui/EpisodesTab.qml:513
+#: ../app/ui/EpisodesTab.qml:515
 msgid "Older"
 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/FullPlayingView.qml:215
+#, 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/FullPlayingView.qml:276
+#, no-c-format, qt-format
+msgid "+%1s"
+msgstr ""
+
 #: ../app/ui/NowPlayingPage.qml:34
 msgid "Now Playing"
 msgstr ""
 
-#: ../app/ui/NowPlayingPage.qml:61
+#: ../app/ui/NowPlayingPage.qml:73
 msgid "Full view"
 msgstr ""
 
-#: ../app/ui/NowPlayingPage.qml:61
+#: ../app/ui/NowPlayingPage.qml:73
 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: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:322
-#, no-c-format, qt-format
-msgid "+%1s"
-msgstr ""
-
-#: ../app/ui/PodcastsTab.qml:57 ../app/ui/SearchPage.qml:46
-#: ../app/ui/SearchPage.qml:152
+#: ../app/ui/PodcastsTab.qml:57 ../app/ui/SearchPage.qml:55
+#: ../app/ui/SearchPage.qml:161
 msgid "Search Podcast"
 msgstr ""
 
-#: ../app/ui/PodcastsTab.qml:65 ../app/ui/SearchPage.qml:37
-msgid "Add New Podcasts"
-msgstr ""
-
-#: ../app/ui/PodcastsTab.qml:104
+#: ../app/ui/PodcastsTab.qml:97
 msgid "Search podcast"
 msgstr ""
 
-#: ../app/ui/PodcastsTab.qml:134
+#: ../app/ui/PodcastsTab.qml:127
 msgid "No Podcast Subscriptions"
 msgstr ""
 
-#: ../app/ui/PodcastsTab.qml:134
+#: ../app/ui/PodcastsTab.qml:127
 msgid "No Podcasts Found"
 msgstr ""
 
-#: ../app/ui/PodcastsTab.qml:135
+#: ../app/ui/PodcastsTab.qml:128
 msgid ""
 "You haven't subscribed to any podcasts yet, visit the 'Find New Podcasts' "
 "page to add some."
 msgstr ""
 
-#: ../app/ui/PodcastsTab.qml:136 ../app/ui/SearchPage.qml:200
+#: ../app/ui/PodcastsTab.qml:129 ../app/ui/SearchPage.qml:209
 msgid "No podcasts found matching the search term."
 msgstr ""
 
-#: ../app/ui/PodcastsTab.qml:222
+#: ../app/ui/PodcastsTab.qml:215
 #, qt-format
 msgid "%1 unheard episode"
 msgid_plural "%1 unheard episodes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../app/ui/SearchPage.qml:54
+#: ../app/ui/SearchPage.qml:63
 msgid "Add Podcast"
 msgstr ""
 
-#: ../app/ui/SearchPage.qml:113
+#: ../app/ui/SearchPage.qml:122
 msgid "Save Podcast"
 msgstr ""
 
-#: ../app/ui/SearchPage.qml:140
+#: ../app/ui/SearchPage.qml:149
 msgid "Feed URL"
 msgstr ""
 
-#: ../app/ui/SearchPage.qml:167
+#: ../app/ui/SearchPage.qml:176
 msgid "Unable to subscribe"
 msgstr ""
 
-#: ../app/ui/SearchPage.qml:168
+#: ../app/ui/SearchPage.qml:177
 msgid "Please check the URL and try again"
 msgstr ""
 
-#: ../app/ui/SearchPage.qml:198
+#: ../app/ui/SearchPage.qml:207
 msgid "Looking to add a new Podcast?"
 msgstr ""
 
-#: ../app/ui/SearchPage.qml:198
+#: ../app/ui/SearchPage.qml:207
 msgid "No Podcasts found"
 msgstr ""
 
-#: ../app/ui/SearchPage.qml:199
+#: ../app/ui/SearchPage.qml:208
 msgid ""
 "Click the 'magnifier' at the top to search or the 'plus' button to add by URL"
 msgstr ""
 
-#: ../app/ui/SearchPage.qml:266
+#: ../app/ui/SearchPage.qml:275
 msgid "Subscribe"
 msgstr ""
 
 #. TRANSLATORS: The first argument here is the date of when the podcast was last updated followed by
 #. the podcast description.
-#: ../app/ui/SearchPage.qml:305
+#: ../app/ui/SearchPage.qml:314
 #, qt-format
 msgid ""
 "Last Updated: %1\n"
 "%2"
 msgstr ""
 
-#: ../app/ui/SearchPage.qml:362
+#: ../app/ui/SearchPage.qml:371
 msgid "Not Available"
 msgstr ""
 
@@ -536,33 +541,43 @@
 msgstr ""
 
 #: ../app/welcomewizard/Slide5.qml:45
+msgid "Touch Gestures"
+msgstr ""
+
+#: ../app/welcomewizard/Slide5.qml:64
+msgid ""
+"Episodes can be swiped left to reveal more actions. You can also multi-"
+"select them by long-pressing on an episode."
+msgstr ""
+
+#: ../app/welcomewizard/Slide6.qml:45
 msgid "Support"
 msgstr ""
 
 #. TRANSLATORS: The %1 points to a url defined in html format <a href=\link\>Link</a>.
-#: ../app/welcomewizard/Slide5.qml:65
+#: ../app/welcomewizard/Slide6.qml:65
 #, qt-format
 msgid ""
 "If you find any bugs or have any feature requests, let us know on our "
 "project page at %1"
 msgstr ""
 
-#: ../app/welcomewizard/Slide6.qml:45
+#: ../app/welcomewizard/Slide7.qml:45
 msgid "Enjoy"
 msgstr ""
 
-#: ../app/welcomewizard/Slide6.qml:62
+#: ../app/welcomewizard/Slide7.qml:62
 msgid "We hope you enjoy using Podbird!"
 msgstr ""
 
-#: ../app/welcomewizard/Slide6.qml:76
+#: ../app/welcomewizard/Slide7.qml:76
 msgid "Finish"
 msgstr ""
 
-#: /home/krnekhelesh/Development/devel-branch-sync-2-build/po/Podbird.desktop.in.h:1
+#: /home/krnekhelesh/Development/devel-branch-sync-3-build/po/Podbird.desktop.in.h:1
 msgid "The chirpiest podcast manager for Ubuntu"
 msgstr ""
 
-#: /home/krnekhelesh/Development/devel-branch-sync-2-build/po/Podbird.desktop.in.h:2
+#: /home/krnekhelesh/Development/devel-branch-sync-3-build/po/Podbird.desktop.in.h:2
 msgid "podcast;audio;itunes;broadcast;digital;stream;podcatcher;video;vodcast;"
 msgstr ""