Merge lp:~nik90/podbird/new-navigation-structure into lp:podbird/devel

[Nekhelesh Ramananthan]

- Added new navigation structure which involves combining the SearchTab and PodcastsTab
- Moved WhatsNewTab into a bigger tab called EpisodesTab which also shows Downloaded episodes (globally)
- Added back button in search mode
- Moved podcast grid/list view option into the settings page

- Added new navigation structure which involves combining the SearchTab and PodcastsTab
- Moved WhatsNewTab into a bigger tab called EpisodesTab which also shows Downloaded episodes (globally)
- Added back button in search mode
- Moved podcast grid/list view option into the settings page

=== modified file 'app/components/TabsList.qml'
--- app/components/TabsList.qml	2016-03-04 10:40:54 +0000
+++ app/components/TabsList.qml	2016-03-05 16:56:57 +0000
@@ -26,7 +26,7 @@
 
     children: [
         Action {
-            text: i18n.tr("What's New")
+            text: i18n.tr("Episodes")
             visible: currentTab !== 0
             onTriggered: {
                 tabs.selectedTabIndex = 0
@@ -42,19 +42,11 @@
         },
 
         Action {
-            text: i18n.tr("Add New Podcasts")
+            text: i18n.tr("Settings")
             visible: currentTab !== 2
             onTriggered: {
                 tabs.selectedTabIndex = 2
             }
-        },
-
-        Action {
-            text: i18n.tr("Settings")
-            visible: currentTab !== 3
-            onTriggered: {
-                tabs.selectedTabIndex = 3
-            }
         }
     ]
 }

=== modified file 'app/podbird.qml'
--- app/podbird.qml	2016-03-04 10:40:54 +0000
+++ app/podbird.qml	2016-03-05 16:56:57 +0000
@@ -56,7 +56,7 @@
     // visible on application start.
     function refreshModels() {
         if (tabs.selectedTabIndex === 0) {
-            whatsNewTab.refreshModel()
+            episodesTab.refreshModel()
         } else if (tabs.selectedTabIndex === 1) {
             podcastPage.item.refreshModel()
         }
@@ -246,9 +246,9 @@
                 }
             }
 
-            WhatsNewTab {
-                id: whatsNewTab
-                objectName: "whatsNewTab"
+            EpisodesTab {
+                id: episodesTab
+                objectName: "episodesTab"
             }
 
             Tab {
@@ -264,19 +264,6 @@
             }
 
             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: settingsTab
 
                 // Dynamically load/unload the settings tab as required

=== modified file 'app/ui/EpisodesPage.qml'
--- app/ui/EpisodesPage.qml	2016-03-04 10:40:54 +0000
+++ app/ui/EpisodesPage.qml	2016-03-05 16:56:57 +0000
@@ -105,17 +105,14 @@
             name: "search"
             head: episodesPage.head
 
-            actions: [
-                Action {
-                    iconName: "edit-clear"
-                    text: i18n.tr("Cancel")
-                    onTriggered: {
-                        episodeList.forceActiveFocus()
-                        episodesPage.state = "default"
-                        episodeList.positionViewAtBeginning()
-                    }
+            backAction: Action {
+                iconName: "back"
+                onTriggered: {
+                    episodeList.forceActiveFocus()
+                    episodesPage.state = "default"
+                    episodeList.positionViewAtBeginning()
                 }
-            ]
+            }
 
             contents: Loader {
                 id: searchField

=== renamed file 'app/ui/WhatsNewTab.qml' => 'app/ui/EpisodesTab.qml'
--- app/ui/WhatsNewTab.qml	2016-03-04 10:40:54 +0000
+++ app/ui/EpisodesTab.qml	2016-03-05 16:56:57 +0000
@@ -26,7 +26,7 @@
 import "../components"
 
 Tab {
-    id: whatsNewTab
+    id: episodesTab
 
     property var today: new Date()
     property int dayToMs: 86400000
@@ -38,14 +38,14 @@
     }
 
     page: Page {
-        id: whatsNewPage
+        id: episodesPage
 
         header: standardHeader
 
         PageHeader {
             id: standardHeader
-            visible: whatsNewPage.header === standardHeader
-            title: i18n.tr("What's New")
+            visible: episodesPage.header === standardHeader
+            title: i18n.tr("Episodes")
 
             StyleHints {
                 backgroundColor: podbird.appTheme.background
@@ -61,47 +61,87 @@
                     iconName: "search"
                     text: i18n.tr("Search Episode")
                     onTriggered: {
-                        whatsNewPage.header = searchHeader
+                        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<whatsNewModel.count; i++) {
-                                tx.executeSql("UPDATE Episode SET listened=1 WHERE guid=?", [whatsNewModel.get(i).guid]);
+                            for (var i=0; i<episodesModel.count; i++) {
+                                tx.executeSql("UPDATE Episode SET listened=1 WHERE guid=?", [episodesModel.get(i).guid]);
                             }
-                            whatsNewModel.clear()
+                            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<whatsNewModel.count; i++) {
-                                if (!whatsNewModel.get(i).downloadedfile) {
-                                    whatsNewModel.setProperty(i, "queued", 1)
-                                    tx.executeSql("UPDATE Episode SET queued=1 WHERE guid = ?", [whatsNewModel.get(i).guid]);
-                                    downloader.addDownload(whatsNewModel.get(i).guid, whatsNewModel.get(i).audiourl);
-                                }
-                            }
-                        });
+                            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();
                     }
                 }
             ]
+
+            extension: Sections {
+                id: episodesPageHeaderSections
+
+                anchors {
+                    left: parent.left
+                    leftMargin: units.gu(2)
+                    bottom: parent.bottom
+                }
+
+                StyleHints {
+                    selectedSectionColor: podbird.appTheme.focusText
+                }
+
+                model: [i18n.tr("What's New"), i18n.tr("Downloaded")]
+                onSelectedIndexChanged: {
+                    refreshModel();
+                }
+            }
         }
 
         PageHeader {
             id: searchHeader
-            visible: whatsNewPage.header === searchHeader
+            visible: episodesPage.header === searchHeader
 
             StyleHints {
                 backgroundColor: podbird.appTheme.background
@@ -109,19 +149,18 @@
 
             contents: Loader {
                 id: searchField
-                sourceComponent: whatsNewPage.header === searchHeader ? searchFieldComponent : undefined
+                sourceComponent: episodesPage.header === searchHeader ? searchFieldComponent : undefined
                 anchors.left: parent ? parent.left : undefined
                 anchors.right: parent ? parent.right : undefined
                 anchors.verticalCenter: parent ? parent.verticalCenter : undefined
             }
 
-            trailingActionBar.actions: [
+            leadingActionBar.actions: [
                 Action {
-                    iconName: "edit-clear"
-                    text: i18n.tr("Cancel")
+                    iconName: "back"
                     onTriggered: {
                         episodeList.forceActiveFocus()
-                        whatsNewPage.header = standardHeader
+                        episodesPage.header = standardHeader
                     }
                 }
             ]
@@ -146,28 +185,28 @@
                 verticalCenterOffset: Qt.inputMethod.visible ? units.gu(4) : 0
             }
 
-            sourceComponent: whatsNewModel.count === 0 || sortedEpisodeModel.count === 0 ? emptyStateComponent : undefined
+            sourceComponent: episodesModel.count === 0 || sortedEpisodeModel.count === 0 ? emptyStateComponent : undefined
         }
 
         Component {
             id: emptyStateComponent
             EmptyState {
-                icon.source: whatsNewModel.count === 0 ? Qt.resolvedUrl("../graphics/owlSearch.svg") : Qt.resolvedUrl("../graphics/notFound.svg")
-                title: whatsNewModel.count === 0 ? i18n.tr("No New Episodes") : i18n.tr("No Episodes Found")
-                subTitle: whatsNewModel.count === 0 ? i18n.tr("No more episodes to listen to!") : i18n.tr("No Episodes found matching the search term.")
+                icon.source: episodesModel.count === 0 ? Qt.resolvedUrl("../graphics/owlSearch.svg") : Qt.resolvedUrl("../graphics/notFound.svg")
+                title: episodesModel.count === 0 ? i18n.tr("No New Episodes") : i18n.tr("No Episodes Found")
+                subTitle: episodesModel.count === 0 ? i18n.tr("No more episodes to listen to!") : i18n.tr("No Episodes found matching the search term.")
             }
         }
 
         ListModel {
-            id: whatsNewModel
+            id: episodesModel
         }
 
         SortFilterModel {
             id: sortedEpisodeModel
-            model: whatsNewModel
+            model: episodesModel
             filter.property: "name"
-            filter.pattern: whatsNewPage.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")
         }
 
         onVisibleChanged: {
@@ -176,7 +215,7 @@
                 if (downloader.downloadingGuid != "")
                     tempGuid = downloader.downloadingGuid
             } else {
-                whatsNewPage.header = standardHeader
+                episodesPage.header = standardHeader
             }
         }
 
@@ -187,16 +226,16 @@
                 db.transaction(function (tx) {
                     /*
                      If tempGuid is NULL, then the episode currently being downloaded is not found within
-                     this podcast. On the other hand, if it is within this podcast, then update the whatsNewModel
+                     this podcast. On the other hand, if it is within this podcast, then update the episodesModel
                      with the downloadedfile location we just received from the downloader.
                     */
                     if (tempGuid != "NULL") {
                         var rs2 = tx.executeSql("SELECT downloadedfile FROM Episode WHERE guid=?", [tempGuid]);
-                        for (var i=0; i<whatsNewModel.count; i++) {
-                            if (whatsNewModel.get(i).guid == tempGuid) {
+                        for (var i=0; i<episodesModel.count; i++) {
+                            if (episodesModel.get(i).guid == tempGuid) {
                                 console.log("[LOG]: Setting episode download URL to " + rs2.rows.item(0).downloadedfile)
-                                whatsNewModel.setProperty(i, "downloadedfile", rs2.rows.item(0).downloadedfile)
-                                whatsNewModel.setProperty(i, "queued", 0)
+                                episodesModel.setProperty(i, "downloadedfile", rs2.rows.item(0).downloadedfile)
+                                episodesModel.setProperty(i, "queued", 0)
                                 break
                             }
                         }
@@ -252,7 +291,7 @@
             }
         }
 
-        UbuntuListView {
+        ListView {
             id: episodeList
 
             Component.onCompleted: {
@@ -264,23 +303,21 @@
             }
 
             anchors {
-                top: whatsNewPage.header.bottom
+                top: episodesPage.header.bottom
                 left: parent.left
                 right: parent.right
                 bottom: parent.bottom
             }
 
             clip: true
-
             model: sortedEpisodeModel
-            currentIndex: -1
             section.property: "diff"
             section.labelPositioning: ViewSection.InlineLabels
 
             section.delegate: Rectangle {
                 width: parent.width
                 color: "Transparent"
-                height: header.implicitHeight + units.gu(2)
+                height: header.text !== "" ? header.implicitHeight + units.gu(2) : units.gu(0)
                 Label {
                     id: header
                     anchors {
@@ -299,8 +336,13 @@
                             return i18n.tr("Yesterday")
                         }
 
-                        else if (section === "Older")
+                        else if (section === "Older") {
                             return i18n.tr("Older")
+                        }
+
+                        else {
+                            return ""
+                        }
                     }
                 }
             }
@@ -372,24 +414,36 @@
                                     db.transaction(function (tx) {
                                         tx.executeSql("UPDATE Episode SET downloadedfile = NULL WHERE guid = ?", [model.guid]);
                                     });
-                                    whatsNewModel.setProperty(model.index, "downloadedfile", "")
+                                    episodesModel.setProperty(model.index, "downloadedfile", "")
+                                    if (episodesPageHeaderSections.selectedIndex === 1) {
+                                        episodesModel.remove(model.index, 1)
+                                    }
                                 } else {
                                     db.transaction(function (tx) {
                                         tx.executeSql("UPDATE Episode SET queued=1 WHERE guid = ?", [model.guid]);
                                     });
-                                    whatsNewModel.setProperty(model.index, "queued", 1)
+                                    episodesModel.setProperty(model.index, "queued", 1)
                                     downloader.addDownload(model.guid, model.audiourl);
                                 }
                             }
                         },
 
                         Action {
-                            iconName: "select"
+                            iconName: model.listened ? "view-collapse" : "select"
                             onTriggered: {
                                 var db = Podcasts.init();
                                 db.transaction(function (tx) {
-                                    tx.executeSql("UPDATE Episode SET listened=1 WHERE guid=?", [model.guid])
-                                    whatsNewModel.remove(model.index, 1)
+                                    if (model.listened) {
+                                        tx.executeSql("UPDATE Episode SET listened=0 WHERE guid=?", [model.guid])
+                                        episodesModel.setProperty(model.index, "listened", 0)
+                                    }
+                                    else {
+                                        tx.executeSql("UPDATE Episode SET listened=1 WHERE guid=?", [model.guid])
+                                        episodesModel.setProperty(model.index, "listened", 1)
+                                        if (episodesPage.head.sections.selectedIndex === 0) {
+                                            episodesModel.remove(model.index, 1)
+                                        }
+                                    }
                                 });
                             }
                         },
@@ -397,7 +451,7 @@
                         Action {
                             iconName: "info"
                             onTriggered: {
-                                var popup = PopupUtils.open(episodeDescriptionDialog, whatsNewTab);
+                                var popup = PopupUtils.open(episodeDescriptionDialog, episodesTab);
                                 popup.description = model.description
                             }
                         }
@@ -437,44 +491,70 @@
     }
 
     function refreshModel() {
-        var today = new Date()
-        var dayToMs = 86400000; //1 * 24 * 60 * 60 * 1000
-        var i, j, episode, diff
-        var todayCount, yesterdayCount
-
-        whatsNewModel.clear()
-        todayCount = 0
-        yesterdayCount = 0
-
+        var i, j, episode
         var db = Podcasts.init()
-        db.transaction(function (tx) {
-            var rs = tx.executeSql("SELECT rowid, * FROM Podcast ORDER BY name ASC");
-            for (i=0; i < rs.rows.length; i++) {
-                var podcast = rs.rows.item(i);
-                var rs2 = tx.executeSql("SELECT rowid, * FROM Episode WHERE podcast=? ORDER BY published DESC", [rs.rows.item(i).rowid]);
-                for (j=0; j < rs2.rows.length; j++) {
-                    episode = rs2.rows.item(j)
-                    diff = Math.floor((today - episode.published)/dayToMs)
-                    if (diff < 7 && !episode.listened) {
-                        if (diff < 1) {
-                            whatsNewModel.insert(todayCount, {"guid" : episode.guid, "listened" : episode.listened, "published": episode.published, "name" : episode.name, "description" : episode.description, "duration" : episode.duration, "position" : episode.position, "downloadedfile" : episode.downloadedfile, "image" : podcast.image, "artist" : podcast.artist, "audiourl" : episode.audiourl, "queued": episode.queued, "diff": "Today"})
-                            todayCount++;
-                        } else if (diff < 2) {
-                            whatsNewModel.insert(todayCount + yesterdayCount, {"guid" : episode.guid, "listened" : episode.listened, "published": episode.published, "name" : episode.name, "description" : episode.description, "duration" : episode.duration, "position" : episode.position, "downloadedfile" : episode.downloadedfile, "image" : podcast.image, "artist" : podcast.artist, "audiourl" : episode.audiourl, "queued": episode.queued, "diff": "Yesterday"})
-                            yesterdayCount++;
-                        } else {
-                            whatsNewModel.append({"guid" : episode.guid, "listened" : episode.listened, "published": episode.published, "name" : episode.name, "description" : episode.description, "duration" : episode.duration, "position" : episode.position, "downloadedfile" : episode.downloadedfile, "image" : podcast.image, "artist" : podcast.artist, "audiourl" : episode.audiourl, "queued": episode.queued, "diff": "Older"})
-                        }
-                    } else if (diff >= 7){
-                        break
-                    }
-                }
-
-                if (podcast.lastupdate === null && !episodesUpdating) {
-                    updateEpisodesDatabase();
-                }
-            }
-        });
+
+        episodesModel.clear()
+
+        // Episode Model for the what's new view
+        if (episodesPageHeaderSections.selectedIndex === 0) {
+            var today = new Date()
+            var dayToMs = 86400000; //1 * 24 * 60 * 60 * 1000
+            var todayCount, yesterdayCount, diff
+
+            todayCount = 0
+            yesterdayCount = 0
+
+            db.transaction(function (tx) {
+                var rs = tx.executeSql("SELECT rowid, * FROM Podcast ORDER BY name ASC");
+                for (i=0; i < rs.rows.length; i++) {
+                    var podcast = rs.rows.item(i);
+                    var rs2 = tx.executeSql("SELECT rowid, * FROM Episode WHERE podcast=? ORDER BY published DESC", [rs.rows.item(i).rowid]);
+                    for (j=0; j < rs2.rows.length; j++) {
+                        episode = rs2.rows.item(j)
+                        diff = Math.floor((today - episode.published)/dayToMs)
+                        if (diff < 7 && !episode.listened) {
+                            if (diff < 1) {
+                                episodesModel.insert(todayCount, {"guid" : episode.guid, "listened" : episode.listened, "published": episode.published, "name" : episode.name, "description" : episode.description, "duration" : episode.duration, "position" : episode.position, "downloadedfile" : episode.downloadedfile, "image" : podcast.image, "artist" : podcast.artist, "audiourl" : episode.audiourl, "queued": episode.queued, "diff": "Today"})
+                                todayCount++;
+                            } else if (diff < 2) {
+                                episodesModel.insert(todayCount + yesterdayCount, {"guid" : episode.guid, "listened" : episode.listened, "published": episode.published, "name" : episode.name, "description" : episode.description, "duration" : episode.duration, "position" : episode.position, "downloadedfile" : episode.downloadedfile, "image" : podcast.image, "artist" : podcast.artist, "audiourl" : episode.audiourl, "queued": episode.queued, "diff": "Yesterday"})
+                                yesterdayCount++;
+                            } else {
+                                episodesModel.append({"guid" : episode.guid, "listened" : episode.listened, "published": episode.published, "name" : episode.name, "description" : episode.description, "duration" : episode.duration, "position" : episode.position, "downloadedfile" : episode.downloadedfile, "image" : podcast.image, "artist" : podcast.artist, "audiourl" : episode.audiourl, "queued": episode.queued, "diff": "Older"})
+                            }
+                        } else if (diff >= 7){
+                            break
+                        }
+                    }
+
+                    if (podcast.lastupdate === null && !episodesUpdating) {
+                        updateEpisodesDatabase();
+                    }
+                }
+            });
+        }
+
+        // Episode Model for the downloaded view
+        else if (episodesPageHeaderSections.selectedIndex === 1) {
+            db.transaction(function (tx) {
+                var rs = tx.executeSql("SELECT rowid, * FROM Podcast ORDER BY name ASC");
+                for (i=0; i < rs.rows.length; i++) {
+                    var podcast = rs.rows.item(i);
+                    var rs2 = tx.executeSql("SELECT rowid, * FROM Episode WHERE podcast=? ORDER BY published DESC", [rs.rows.item(i).rowid]);
+                    for (j=0; j < rs2.rows.length; j++) {
+                        episode = rs2.rows.item(j)
+                        if (episode.downloadedfile) {
+                            episodesModel.append({"guid" : episode.guid, "listened" : episode.listened, "published": episode.published, "name" : episode.name, "description" : episode.description, "duration" : episode.duration, "position" : episode.position, "downloadedfile" : episode.downloadedfile, "image" : podcast.image, "artist" : podcast.artist, "audiourl" : episode.audiourl, "queued": episode.queued, "diff": "Null"})
+                        }
+                    }
+
+                    if (podcast.lastupdate === null && !episodesUpdating) {
+                        updateEpisodesDatabase();
+                    }
+                }
+            });
+        }
 
         episodesUpdating = false;
     }

=== modified file 'app/ui/PodcastsTab.qml'
--- app/ui/PodcastsTab.qml	2016-03-04 10:40:54 +0000
+++ app/ui/PodcastsTab.qml	2016-03-05 16:56:57 +0000
@@ -61,10 +61,10 @@
                 }
             },
             Action {
-                iconName: podbird.settings.showListView ? "view-grid-symbolic" : "view-list-symbolic"
-                text: podbird.settings.showListView ? i18n.tr("Grid View") : i18n.tr("List View")
+                iconName: "add"
+                text: i18n.tr("Add New Podcasts")
                 onTriggered: {
-                    podbird.settings.showListView = !podbird.settings.showListView
+                    mainStack.push(Qt.resolvedUrl("SearchPage.qml"))
                 }
             }
         ]
@@ -86,21 +86,13 @@
             anchors.verticalCenter: parent.verticalCenter
         }
 
-        trailingActionBar.actions: [
+        leadingActionBar.actions: [
             Action {
-                iconName: "edit-clear"
-                text: i18n.tr("Cancel")
+                iconName: "back"
                 onTriggered: {
                     viewLoader.item.forceActiveFocus()
                     podcastPage.header = standardHeader
                 }
-            },
-            Action {
-                iconName: podbird.settings.showListView ? "view-grid-symbolic" : "view-list-symbolic"
-                text: podbird.settings.showListView ? i18n.tr("Grid View") : i18n.tr("List View")
-                onTriggered: {
-                    podbird.settings.showListView = !podbird.settings.showListView
-                }
             }
         ]
     }

=== modified file 'app/ui/SearchPage.qml'
--- app/ui/SearchPage.qml	2016-03-04 10:40:54 +0000
+++ app/ui/SearchPage.qml	2016-03-05 16:56:57 +0000
@@ -28,10 +28,6 @@
 
     property var xhr: new XMLHttpRequest;
 
-    TabsList {
-        id: tabsList
-    }
-
     header: standardHeader
 
     PageHeader {
@@ -44,11 +40,6 @@
             backgroundColor: podbird.appTheme.background
         }
 
-        leadingActionBar {
-            numberOfSlots: 0
-            actions: tabsList.actions
-        }
-
         trailingActionBar.actions: [
             Action {
                 iconName: "search"
@@ -87,10 +78,9 @@
             anchors.verticalCenter: parent.verticalCenter
         }
 
-        trailingActionBar.actions: [
+        leadingActionBar.actions: [
             Action {
-                iconName: "edit-clear"
-                text: i18n.tr("Cancel")
+                iconName: "back"
                 onTriggered: {
                     resultsView.forceActiveFocus()
                     searchResults.clear()
@@ -294,7 +284,7 @@
                                 }
                             });
                         }
-                        tabs.selectedTabIndex = 1;
+                        mainStack.pop();
                     }
                 }
             }
@@ -443,7 +433,7 @@
                     Podcasts.subscribe(artist, name, feed, image);
                     imageDownloader.feed = feed;
                     imageDownloader.download(image);
-                    tabs.selectedTabIndex = 1;
+                    mainStack.pop();
                 } else {
                     PopupUtils.open(subscribeFailedDialog);
                     searchPage.header = addHeader

=== modified file 'app/ui/SettingsPage.qml'
--- app/ui/SettingsPage.qml	2016-03-04 10:40:54 +0000
+++ app/ui/SettingsPage.qml	2016-03-05 16:56:57 +0000
@@ -146,6 +146,20 @@
                 onClicked: mainStack.push(Qt.resolvedUrl("../settings/ThemeSetting.qml"))
             }
 
+            ListItem {
+                ListItemLayout {
+                    id: gridViewLayout
+                    title.text: i18n.tr("Displays podcasts in a list view")
+                    Switch {
+                        SlotsLayout.position: SlotsLayout.Last
+                        checked: podbird.settings.showListView
+                        onClicked: podbird.settings.showListView = checked
+                    }
+                }
+                divider.visible: false
+                height: gridViewLayout.height
+            }
+
             HeaderListItem {
                 title.text: i18n.tr("Playback Settings")
             }

=== modified file 'po/podbird.nik90.pot'
--- po/podbird.nik90.pot	2016-03-04 10:40:54 +0000
+++ po/podbird.nik90.pot	2016-03-05 16:56:57 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-04 16:09+0530\n"
+"POT-Creation-Date: 2016-03-05 22: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,7 +18,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../app/components/TabsList.qml:29 ../app/ui/WhatsNewTab.qml:48
+#: ../app/components/TabsList.qml:29 ../app/ui/EpisodesTab.qml:135
 msgid "What's New"
 msgstr ""
 
@@ -26,11 +26,7 @@
 msgid "Podcasts"
 msgstr ""
 
-#: ../app/components/TabsList.qml:45 ../app/ui/SearchPage.qml:41
-msgid "Add New Podcasts"
-msgstr ""
-
-#: ../app/components/TabsList.qml:53 ../app/ui/SettingsPage.qml:32
+#: ../app/components/TabsList.qml:45 ../app/ui/SettingsPage.qml:32
 msgid "Settings"
 msgstr ""
 
@@ -65,7 +61,7 @@
 
 #. TRANSLATORS: About as in information about the app
 #: ../app/settings/About.qml:28 ../app/settings/About.qml:47
-#: ../app/ui/SettingsPage.qml:208
+#: ../app/ui/SettingsPage.qml:222
 msgid "About"
 msgstr ""
 
@@ -143,7 +139,7 @@
 #: ../app/settings/DownloadSetting.qml:34
 #: ../app/settings/DownloadSetting.qml:35
 #: ../app/settings/DownloadSetting.qml:36
-#: ../app/settings/DownloadSetting.qml:37 ../app/ui/EpisodesPage.qml:347
+#: ../app/settings/DownloadSetting.qml:37 ../app/ui/EpisodesPage.qml:344
 #, qt-format
 msgid "%1 episode"
 msgid_plural "%1 episodes"
@@ -168,68 +164,106 @@
 msgid "Podcast"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:74 ../app/ui/WhatsNewTab.qml:62
+#: ../app/ui/EpisodesPage.qml:74 ../app/ui/EpisodesTab.qml:62
 msgid "Search Episode"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:83 ../app/ui/WhatsNewTab.qml:71
+#: ../app/ui/EpisodesPage.qml:83 ../app/ui/EpisodesTab.qml:72
 msgid "Mark all listened"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:94 ../app/ui/EpisodesPage.qml:188
-#: ../app/ui/SearchPage.qml:276
+#: ../app/ui/EpisodesPage.qml:94 ../app/ui/EpisodesPage.qml:185
+#: ../app/ui/SearchPage.qml:266
 msgid "Unsubscribe"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:111 ../app/ui/EpisodesPage.qml:205
-#: ../app/ui/PodcastsTab.qml:92 ../app/ui/SearchPage.qml:93
-#: ../app/ui/SearchPage.qml:131 ../app/ui/SettingsPage.qml:83
-#: ../app/ui/SettingsPage.qml:118 ../app/ui/WhatsNewTab.qml:121
-msgid "Cancel"
-msgstr ""
-
-#: ../app/ui/EpisodesPage.qml:140 ../app/ui/WhatsNewTab.qml:134
+#: ../app/ui/EpisodesPage.qml:137 ../app/ui/EpisodesTab.qml:173
 msgid "Search episode"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:185
+#: ../app/ui/EpisodesPage.qml:182
 msgid "Unsubscribe Confirmation"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:186
+#: ../app/ui/EpisodesPage.qml:183
 #, qt-format
 msgid "Are you sure you want to unsubscribe from <b>%1</b>?"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:227 ../app/ui/WhatsNewTab.qml:234
+#: ../app/ui/EpisodesPage.qml:202 ../app/ui/SearchPage.qml:121
+#: ../app/ui/SettingsPage.qml:83 ../app/ui/SettingsPage.qml:118
+msgid "Cancel"
+msgstr ""
+
+#: ../app/ui/EpisodesPage.qml:224 ../app/ui/EpisodesTab.qml:273
 msgid "Episode Description"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:239 ../app/ui/SearchPage.qml:180
-#: ../app/ui/WhatsNewTab.qml:246
+#: ../app/ui/EpisodesPage.qml:236 ../app/ui/EpisodesTab.qml:285
+#: ../app/ui/SearchPage.qml:170
 msgid "Close"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:267
+#: ../app/ui/EpisodesPage.qml:264
 msgid "No episodes found"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:268
+#: ../app/ui/EpisodesPage.qml:265
 msgid "No episodes found matching the search term."
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:364
+#: ../app/ui/EpisodesPage.qml:361
 msgid "Unheard"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:391
+#: ../app/ui/EpisodesPage.qml:388
 msgid "Listened"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:416
+#: ../app/ui/EpisodesPage.qml:413 ../app/ui/EpisodesTab.qml:135
 msgid "Downloaded"
 msgstr ""
 
+#: ../app/ui/EpisodesTab.qml:48
+msgid "Episodes"
+msgstr ""
+
+#: ../app/ui/EpisodesTab.qml:87
+msgid "Download all"
+msgstr ""
+
+#: ../app/ui/EpisodesTab.qml:104
+msgid "Delete all"
+msgstr ""
+
+#: ../app/ui/EpisodesTab.qml:195
+msgid "No New Episodes"
+msgstr ""
+
+#: ../app/ui/EpisodesTab.qml:195
+msgid "No Episodes Found"
+msgstr ""
+
+#: ../app/ui/EpisodesTab.qml:196
+msgid "No more episodes to listen to!"
+msgstr ""
+
+#: ../app/ui/EpisodesTab.qml:196
+msgid "No Episodes found matching the search term."
+msgstr ""
+
+#: ../app/ui/EpisodesTab.qml:332
+msgid "Today"
+msgstr ""
+
+#: ../app/ui/EpisodesTab.qml:336
+msgid "Yesterday"
+msgstr ""
+
+#: ../app/ui/EpisodesTab.qml:340
+msgid "Older"
+msgstr ""
+
 #: ../app/ui/NowPlayingPage.qml:29
 msgid "Now Playing"
 msgstr ""
@@ -246,106 +280,102 @@
 msgid "+%1s"
 msgstr ""
 
-#: ../app/ui/PodcastsTab.qml:57 ../app/ui/SearchPage.qml:55
-#: ../app/ui/SearchPage.qml:162
+#: ../app/ui/PodcastsTab.qml:57 ../app/ui/SearchPage.qml:46
+#: ../app/ui/SearchPage.qml:152
 msgid "Search Podcast"
 msgstr ""
 
-#: ../app/ui/PodcastsTab.qml:65 ../app/ui/PodcastsTab.qml:100
-msgid "Grid View"
-msgstr ""
-
-#: ../app/ui/PodcastsTab.qml:65 ../app/ui/PodcastsTab.qml:100
-msgid "List View"
-msgstr ""
-
-#: ../app/ui/PodcastsTab.qml:112
+#: ../app/ui/PodcastsTab.qml:65 ../app/ui/SearchPage.qml:37
+msgid "Add New Podcasts"
+msgstr ""
+
+#: ../app/ui/PodcastsTab.qml:104
 msgid "Search podcast"
 msgstr ""
 
-#: ../app/ui/PodcastsTab.qml:142
+#: ../app/ui/PodcastsTab.qml:134
 msgid "No Podcast Subscriptions"
 msgstr ""
 
-#: ../app/ui/PodcastsTab.qml:142
+#: ../app/ui/PodcastsTab.qml:134
 msgid "No Podcasts Found"
 msgstr ""
 
-#: ../app/ui/PodcastsTab.qml:143
+#: ../app/ui/PodcastsTab.qml:135
 msgid ""
 "You haven't subscribed to any podcasts yet, visit the 'Find New Podcasts' "
 "page to add some."
 msgstr ""
 
-#: ../app/ui/PodcastsTab.qml:144 ../app/ui/SearchPage.qml:210
+#: ../app/ui/PodcastsTab.qml:136 ../app/ui/SearchPage.qml:200
 msgid "No podcasts found matching the search term."
 msgstr ""
 
-#: ../app/ui/PodcastsTab.qml:182 ../app/ui/PodcastsTab.qml:230
+#: ../app/ui/PodcastsTab.qml:174 ../app/ui/PodcastsTab.qml:222
 #, qt-format
 msgid "%1 unheard episode"
 msgid_plural "%1 unheard episodes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../app/ui/SearchPage.qml:63
+#: ../app/ui/SearchPage.qml:54
 msgid "Add Podcast"
 msgstr ""
 
-#: ../app/ui/SearchPage.qml:123
+#: ../app/ui/SearchPage.qml:113
 msgid "Save Podcast"
 msgstr ""
 
-#: ../app/ui/SearchPage.qml:150
+#: ../app/ui/SearchPage.qml:140
 msgid "Feed URL"
 msgstr ""
 
-#: ../app/ui/SearchPage.qml:177
+#: ../app/ui/SearchPage.qml:167
 msgid "Unable to subscribe"
 msgstr ""
 
-#: ../app/ui/SearchPage.qml:178
+#: ../app/ui/SearchPage.qml:168
 msgid "Please check the URL and try again"
 msgstr ""
 
-#: ../app/ui/SearchPage.qml:208
+#: ../app/ui/SearchPage.qml:198
 msgid "Looking to add a new Podcast?"
 msgstr ""
 
-#: ../app/ui/SearchPage.qml:208
+#: ../app/ui/SearchPage.qml:198
 msgid "No Podcasts found"
 msgstr ""
 
-#: ../app/ui/SearchPage.qml:209
+#: ../app/ui/SearchPage.qml:199
 msgid ""
 "Click the 'magnifier' at the top to search or the 'plus' button to add by URL"
 msgstr ""
 
-#: ../app/ui/SearchPage.qml:276
+#: ../app/ui/SearchPage.qml:266
 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:315
+#: ../app/ui/SearchPage.qml:305
 #, qt-format
 msgid ""
 "Last Updated: %1\n"
 "%2"
 msgstr ""
 
-#: ../app/ui/SearchPage.qml:372
+#: ../app/ui/SearchPage.qml:362
 msgid "Not Available"
 msgstr ""
 
 #. TRANSLATORS: This strings refers to the seeking of the episode playback. Users can set how far they
 #. want to seek forward when pressing on this button.
-#: ../app/ui/SettingsPage.qml:63 ../app/ui/SettingsPage.qml:155
+#: ../app/ui/SettingsPage.qml:63 ../app/ui/SettingsPage.qml:169
 msgid "Skip forward"
 msgstr ""
 
 #: ../app/ui/SettingsPage.qml:70 ../app/ui/SettingsPage.qml:105
-#: ../app/ui/SettingsPage.qml:156 ../app/ui/SettingsPage.qml:163
+#: ../app/ui/SettingsPage.qml:170 ../app/ui/SettingsPage.qml:177
 #, qt-format
 msgid "%1 seconds"
 msgstr ""
@@ -356,7 +386,7 @@
 
 #. TRANSLATORS: This strings refers to the seeking of the episode playback. Users can set how far they
 #. want to seek backward when pressing on this button.
-#: ../app/ui/SettingsPage.qml:98 ../app/ui/SettingsPage.qml:162
+#: ../app/ui/SettingsPage.qml:98 ../app/ui/SettingsPage.qml:176
 msgid "Skip back"
 msgstr ""
 
@@ -366,73 +396,45 @@
 msgid "General Settings"
 msgstr ""
 
-#: ../app/ui/SettingsPage.qml:150
+#: ../app/ui/SettingsPage.qml:152
+msgid "Displays podcasts in a list view"
+msgstr ""
+
+#: ../app/ui/SettingsPage.qml:164
 msgid "Playback Settings"
 msgstr ""
 
-#: ../app/ui/SettingsPage.qml:168
+#: ../app/ui/SettingsPage.qml:182
 msgid "Podcast Episode Settings"
 msgstr ""
 
-#: ../app/ui/SettingsPage.qml:174
+#: ../app/ui/SettingsPage.qml:188
 msgid "Automatically delete old episodes"
 msgstr ""
 
-#: ../app/ui/SettingsPage.qml:176
+#: ../app/ui/SettingsPage.qml:190
 msgid ""
 "Delete episodes that are older than a given number of days for each podcast"
 msgstr ""
 
-#: ../app/ui/SettingsPage.qml:188
+#: ../app/ui/SettingsPage.qml:202
 msgid "Automatically download new episodes"
 msgstr ""
 
-#: ../app/ui/SettingsPage.qml:190
+#: ../app/ui/SettingsPage.qml:204
 msgid "Default number of new episodes to download for each podcast"
 msgstr ""
 
 #. TRANSLATORS: Shortened form of "Miscellaneous" which is shown to denote other setting options
 #. that doesn't fit into any other category.
-#: ../app/ui/SettingsPage.qml:202
+#: ../app/ui/SettingsPage.qml:216
 msgid "Misc."
 msgstr ""
 
-#: ../app/ui/SettingsPage.qml:218
+#: ../app/ui/SettingsPage.qml:232
 msgid "Report Bug"
 msgstr ""
 
-#: ../app/ui/WhatsNewTab.qml:85
-msgid "Download all"
-msgstr ""
-
-#: ../app/ui/WhatsNewTab.qml:156
-msgid "No New Episodes"
-msgstr ""
-
-#: ../app/ui/WhatsNewTab.qml:156
-msgid "No Episodes Found"
-msgstr ""
-
-#: ../app/ui/WhatsNewTab.qml:157
-msgid "No more episodes to listen to!"
-msgstr ""
-
-#: ../app/ui/WhatsNewTab.qml:157
-msgid "No Episodes found matching the search term."
-msgstr ""
-
-#: ../app/ui/WhatsNewTab.qml:295
-msgid "Today"
-msgstr ""
-
-#: ../app/ui/WhatsNewTab.qml:299
-msgid "Yesterday"
-msgstr ""
-
-#: ../app/ui/WhatsNewTab.qml:303
-msgid "Older"
-msgstr ""
-
 #: ../app/welcomewizard/Slide1.qml:42
 msgid "Welcome to Podbird"
 msgstr ""