Merge lp:~nik90/podbird/5-auto-download-option into lp:podbird

[Nekhelesh Ramananthan]

This branch adds the most requested feature which is auto-download new episodes on app startup. By default this is disabled, but can be easily enabled from the settings page. It also now provides a settings option to only download when on wifi.

Please test this on your BQ device with 3G only and wifi only to see if the settings options are obeyed.

I also cleaned up the settings page which now looks way better in my opinion.

[lp:~nik90/podbird/5-auto-download-option]

49. By Nekhelesh Ramananthan on 2015-03-30

First sort episode list by desc published date before proceeding to download the most recent one

50. By Nekhelesh Ramananthan on 2015-03-31

Removed left-over code in settings.qml and also changed days to months/year appropriately

51. By Nekhelesh Ramananthan on 2015-04-01

Merged prerequisite lp:~nik90/podbird/4-add-welcome-wizard

52. By Nekhelesh Ramananthan on 2015-04-01

Added more log statements to allow for easier debugging

53. By Nekhelesh Ramananthan on 2015-04-06

Dynamically load/unload the settings page to optimize app startup time

54. By Nekhelesh Ramananthan on 2015-04-07

Disable autodownload on wifi option until user enabled autodownload itself

55. By Nekhelesh Ramananthan on 2015-04-11

merged prerequisite

56. By Nekhelesh Ramananthan on 2015-04-11

Removed dividers from the settings listitems

57. By Nekhelesh Ramananthan on 2015-04-15

merged prerequisite fix

58. By Nekhelesh Ramananthan on 2015-04-15

merged trunk

59. By Nekhelesh Ramananthan on 2015-04-15

merged lp:podbird

60. By Nekhelesh Ramananthan on 2015-04-15

Removed expandable list item component since we dont use it anymore in Podbird

[Michael Sheldon (michael-sheldon)]

NetworkingStatus.limitedBandwith is always returning false for me regardless of whether I'm on wifi or 3G, looks like this might need a work around until that's fixed. I'll try to investigate this a bit more tomorrow, file a bug against the connectivity api and see what we can do about it.

There's also one inline comment about a slightly ambiguous log message.

Other than those issues this is looking good.

review: Needs Fixing

[Michael Sheldon (michael-sheldon)]

Looks like there's already a bug open for this here: https://bugs.launchpad.net/connectivity-api/+bug/1362592

[Michael Sheldon (michael-sheldon)]

I think we should probably just hide the "Wifi only" option until this is fixed in the connectivity API, at least that way we aren't promising the user something we can't offer.

[Michael Sheldon (michael-sheldon)]

Added missing inline comment

[lp:~nik90/podbird/5-auto-download-option]

61. By Nekhelesh Ramananthan on 2015-04-15

Removed the limited bandwidth detection as it is not working on krillin. Also fixed log statement

62. By Nekhelesh Ramananthan on 2015-04-16

Fixed a string not being internationalized

63. By Nekhelesh Ramananthan on 2015-04-16

merged lp:podbird

[Michael Sheldon (michael-sheldon)]

Looks good!

review: Approve

=== modified file 'Podbird.apparmor'
--- Podbird.apparmor	2015-01-30 00:16:10 +0000
+++ Podbird.apparmor	2015-04-16 10:24:04 +0000
@@ -1,7 +1,8 @@
 {
     "policy_groups": [
         "networking",
-        "audio"
+        "audio",
+        "connectivity"
     ],
     "policy_version": 1.2
-}
\ No newline at end of file
+}

=== modified file 'app/CMakeLists.txt'
--- app/CMakeLists.txt	2015-03-29 22:42:48 +0000
+++ app/CMakeLists.txt	2015-04-16 10:24:04 +0000
@@ -13,3 +13,4 @@
 add_subdirectory(themes)
 add_subdirectory(welcomewizard)
 add_subdirectory(graphics)
+add_subdirectory(settings)

=== modified file 'app/podbird.qml'
--- app/podbird.qml	2015-04-11 01:22:32 +0000
+++ app/podbird.qml	2015-04-16 10:24:04 +0000
@@ -19,6 +19,7 @@
 import QtQuick 2.3
 import Podbird 1.0
 import QtMultimedia 5.0
+import Ubuntu.Connectivity 1.0
 import Qt.labs.settings 1.0
 import Ubuntu.Components 1.1
 import QtQuick.LocalStorage 2.0
@@ -49,10 +50,17 @@
         var today = new Date()
         // Only perform cleanup of old episodes once a day
         if (Math.floor((today - settings.lastCheck)/86400000) >= 1 && settings.retentionDays !== -1) {
-            console.log("[LOG]: Starting cleanup of old episodes..")
             cleanUp(today, settings.retentionDays)
             settings.lastCheck = today
         }
+
+        if (!NetworkingStatus.online || settings.maxEpisodeDownload === -1) {
+            console.log("[LOG]: Skipped autodownloading of new episodes...")
+            console.log("[LOG]: Online connectivity: " + NetworkingStatus.online)
+            console.log("[LOG]: User settings (maxEpisodeDownload): " + settings.maxEpisodeDownload)
+        } else {
+            autoDownloadEpisodes(settings.maxEpisodeDownload)
+        }
     }
 
     property string currentName
@@ -74,6 +82,7 @@
         property int retentionDays: -1
         property var lastCheck: new Date()
         property bool firstRun: true
+        property int maxEpisodeDownload: -1
     }
 
     FileManager {
@@ -163,9 +172,18 @@
                 objectName: "searchTab"
             }
 
-            SettingsTab {
+            Tab {
                 id: settingsTab
-                objectName: "settingsTab"
+
+                title: i18n.tr("Settings")
+
+                page: Loader {
+                    parent: settingsTab
+                    anchors.left: parent.left
+                    anchors.right: parent.right
+                    anchors.bottom: parent.bottom
+                    source: (tabs.selectedTab === settingsTab) ? Qt.resolvedUrl("ui/SettingsPage.qml") : ""
+                }
             }
         }
     }
@@ -199,6 +217,7 @@
     }
 
     function cleanUp(today, retentionDays) {
+        console.log("[LOG]: Cleaning up old episodes")
         var dayToMs = 86400000; //1 * 24 * 60 * 60 * 1000
         var db = Podcasts.init()
         db.transaction(function (tx) {
@@ -216,4 +235,22 @@
             }
         });
     }
+
+    function autoDownloadEpisodes(maxEpisodeDownload) {
+        console.log("[LOG]: Auto-downloading new episodes")
+        var db = Podcasts.init()
+        db.transaction(function (tx) {
+            var rs = tx.executeSql("SELECT rowid, * FROM Podcast ORDER BY name ASC");
+            for (var 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]);
+                var loopCount = maxEpisodeDownload > rs2.rows.length ? rs2.rows.length : maxEpisodeDownload
+                for (var j=0; j < loopCount; j++) {
+                    if (!rs2.rows.item(j).downloadedfile && !rs2.rows.item(j).listened) {
+                        downloader.addDownload(rs2.rows.item(j).guid, rs2.rows.item(j).audiourl)
+                    }
+                }
+            }
+        });
+    }
 }

=== added directory 'app/settings'
=== added file 'app/settings/CMakeLists.txt'
--- app/settings/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ app/settings/CMakeLists.txt	2015-04-16 10:24:04 +0000
@@ -0,0 +1,7 @@
+file(GLOB SETTING_FILES *.qml)
+
+# Make the files visible in the qtcreator tree
+add_custom_target(podbird_SETTINGFiles ALL SOURCES ${SETTING_FILES})
+
+install(FILES ${SETTING_FILES} DESTINATION ${PODBIRD_DIR}/settings)
+

=== added file 'app/settings/CleanSetting.qml'
--- app/settings/CleanSetting.qml	1970-01-01 00:00:00 +0000
+++ app/settings/CleanSetting.qml	2015-04-16 10:24:04 +0000
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2015 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.3
+import Ubuntu.Components 1.1
+import Ubuntu.Components.ListItems 1.0 as ListItem
+
+Page {
+    id: cleanSettingPage
+
+    visible: false
+    title: i18n.tr("Delete older than")
+
+    ListModel {
+        id: cleanupModel
+        Component.onCompleted: initialize()
+        function initialize() {
+            cleanupModel.append({ name: i18n.tr("Never"), value: -1 })
+            cleanupModel.append({ name: i18n.tr("%1 day", "%1 days", 7).arg(7), value: 7 })
+            cleanupModel.append({ name: i18n.tr("%1 month", "%1 months", 1).arg(1), value: 31 })
+            cleanupModel.append({ name: i18n.tr("%1 month", "%1 months", 3).arg(3), value: 90 })
+            cleanupModel.append({ name: i18n.tr("%1 month", "%1 months", 6).arg(6), value: 180 })
+            cleanupModel.append({ name: i18n.tr("%1 year", "%1 years", 1).arg(1), value: 360 })
+        }
+    }
+
+    UbuntuListView {
+        id: cleanup
+
+        model: cleanupModel
+        anchors.fill: parent
+
+        delegate: ListItem.Standard {
+            text: model.name
+            onClicked: {
+                podbird.settings.retentionDays = model.value
+            }
+
+            Icon {
+                width: units.gu(2)
+                height: width
+                name: "ok"
+                visible: podbird.settings.retentionDays === model.value
+                anchors.right: parent.right
+                anchors.rightMargin: units.gu(3)
+                anchors.verticalCenter: parent.verticalCenter
+            }
+        }
+    }
+}

=== added file 'app/settings/DownloadSetting.qml'
--- app/settings/DownloadSetting.qml	1970-01-01 00:00:00 +0000
+++ app/settings/DownloadSetting.qml	2015-04-16 10:24:04 +0000
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2015 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.3
+import Ubuntu.Components 1.1
+import Ubuntu.Components.ListItems 1.0 as ListItem
+
+Page {
+    id: downloadSetting
+
+    visible: false
+    title: i18n.tr("Download at most")
+
+    ListModel {
+        id: episodeDownloadNumber
+        Component.onCompleted: initialize()
+        function initialize() {
+            episodeDownloadNumber.append({ name: i18n.tr("Never"), value: -1 })
+            episodeDownloadNumber.append({ name: i18n.tr("%1 episode", "%1 episodes", 1).arg(1), value: 1 })
+            episodeDownloadNumber.append({ name: i18n.tr("%1 episode", "%1 episodes", 3).arg(3), value: 3 })
+            episodeDownloadNumber.append({ name: i18n.tr("%1 episode", "%1 episodes", 5).arg(5), value: 5 })
+            episodeDownloadNumber.append({ name: i18n.tr("%1 episode", "%1 episodes", 10).arg(10), value: 10 })
+        }
+    }
+
+    UbuntuListView {
+        id: download
+
+        model: episodeDownloadNumber
+        anchors.fill: parent
+
+        delegate: ListItem.Standard {
+            text: model.name
+            onClicked: {
+                podbird.settings.maxEpisodeDownload = model.value
+            }
+
+            Icon {
+                width: units.gu(2)
+                height: width
+                name: "ok"
+                visible: podbird.settings.maxEpisodeDownload === model.value
+                anchors.right: parent.right
+                anchors.rightMargin: units.gu(3)
+                anchors.verticalCenter: parent.verticalCenter
+            }
+        }
+    }
+}

=== added file 'app/settings/ThemeSetting.qml'
--- app/settings/ThemeSetting.qml	1970-01-01 00:00:00 +0000
+++ app/settings/ThemeSetting.qml	2015-04-16 10:24:04 +0000
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2015 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.3
+import Ubuntu.Components 1.1
+import Ubuntu.Components.ListItems 1.0 as ListItem
+
+Page {
+    id: themeSettingPage
+
+    visible: false
+    title: i18n.tr("Theme")
+
+    ListModel {
+        id: themeModel
+        Component.onCompleted: initialize()
+        function initialize() {
+            themeModel.append({ name: i18n.tr("Light"), file: "Light.qml" })
+            themeModel.append({ name: i18n.tr("Dark"), file: "Dark.qml" })
+        }
+    }
+
+    UbuntuListView {
+        id: themes
+
+        model: themeModel
+        anchors.fill: parent
+
+        delegate: ListItem.Standard {
+            text: model.name
+            onClicked: {
+                var themeElement = model.file
+                podbird.settings.themeName = themeElement
+                podbird.themeManager.source = themeElement
+            }
+
+            Icon {
+                width: units.gu(2)
+                height: width
+                name: "ok"
+                visible: podbird.settings.themeName === model.file
+                anchors.right: parent.right
+                anchors.rightMargin: units.gu(3)
+                anchors.verticalCenter: parent.verticalCenter
+            }
+        }
+    }
+}

=== removed file 'app/ui/ExpandableListItem.qml'
--- app/ui/ExpandableListItem.qml	2015-03-27 15:04:39 +0000
+++ app/ui/ExpandableListItem.qml	1970-01-01 00:00:00 +0000
@@ -1,87 +0,0 @@
-/*
- * Copyright 2015 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.3
-import Ubuntu.Components 1.1
-import Ubuntu.Components.ListItems 1.0 as ListItem
-
-ListItem.Expandable {
-    id: expandableListItem
-
-    property ListModel model
-    property Component delegate
-    property alias text: expandableHeader.text
-    property alias subText: expandableHeader.subText
-    property alias listViewHeight: expandableList.height
-
-    anchors {
-        left: parent.left
-        right: parent.right
-        margins: units.gu(-2)
-    }
-
-    collapseOnClick: true
-    expandedHeight: contentColumn.height + units.gu(1)
-
-    Column {
-        id: contentColumn
-
-        anchors {
-            left: parent.left
-            right: parent.right
-        }
-
-        Item {
-            width: parent.width
-            height: expandableListItem.collapsedHeight
-
-            ListItem.Subtitled {
-                id: expandableHeader
-
-                onClicked: expandableListItem.expanded = true
-
-                Icon {
-                    id: arrow
-
-                    width: units.gu(2)
-                    height: width
-                    anchors.right: parent.right
-                    anchors.verticalCenter: parent.verticalCenter
-
-                    name: "go-down"
-                    color: "Grey"
-                    rotation: expandableListItem.expanded ? 180 : 0
-
-                    Behavior on rotation {
-                        UbuntuNumberAnimation {}
-                    }
-                }
-            }
-        }
-
-        ListView {
-            id: expandableList
-
-            height: units.gu(11)
-            width: parent.width
-            interactive: false
-            model: expandableListItem.model
-            delegate: expandableListItem.delegate
-        }
-    }
-}

=== renamed file 'app/ui/SettingsTab.qml' => 'app/ui/SettingsPage.qml'
--- app/ui/SettingsTab.qml	2015-03-27 15:38:43 +0000
+++ app/ui/SettingsPage.qml	2015-04-16 10:24:04 +0000
@@ -20,98 +20,80 @@
 import Ubuntu.Components 1.1
 import Ubuntu.Components.ListItems 1.0 as ListItem
 
-Tab {
-    id: tab
-
-    title: i18n.tr("Settings")
-
-    page: Page {
-        id: settingsPage
-
-        ListModel {
-            id: themeModel
-            Component.onCompleted: initialize()
-            function initialize() {
-                themeModel.append({ name: i18n.tr("Light"), file: "Light.qml" })
-                themeModel.append({ name: i18n.tr("Dark"), file: "Dark.qml" })
-            }
-        }
-
-        ListModel {
-            id: cleanupModel
-            Component.onCompleted: initialize()
-            function initialize() {
-                cleanupModel.append({ name: i18n.tr("Never"), value: -1 })
-                cleanupModel.append({ name: i18n.tr("7 days"), value: 7 })
-                cleanupModel.append({ name: i18n.tr("31 days"), value: 31 })
-                cleanupModel.append({ name: i18n.tr("90 days"), value: 90 })
-                cleanupModel.append({ name: i18n.tr("180 days"), value: 180 })
-                cleanupModel.append({ name: i18n.tr("360 days"), value: 360 })
-            }
-        }
-
-        Column {
-            id: settingsColumn
-
-            anchors.fill: parent
-
-            ExpandableListItem {
-                id: themeSetting
-
-                model: themeModel
-                text: i18n.tr("Theme")
-                subText: podbird.settings.themeName.split(".qml")[0]
-
-                delegate: ListItem.Standard {
-                    text: model.name
-
-                    onClicked: {
-                        var themeElement = model.file
-                        podbird.settings.themeName = themeElement
-                        podbird.themeManager.source = themeElement
-                        themeSetting.expanded = false
-                    }
-
-                    Icon {
-                        width: units.gu(2)
-                        height: width
-                        name: "ok"
-                        visible: podbird.settings.themeName === model.file
-                        anchors.right: parent.right
-                        anchors.rightMargin: units.gu(2)
-                        anchors.verticalCenter: parent.verticalCenter
-                    }
-                }
-            }
-
-            ExpandableListItem {
-                id: cleanupSetting
-
-                listViewHeight: units.gu(36)
-                model: cleanupModel
-                text: i18n.tr("Remove episodes older than")
-                subText: podbird.settings.retentionDays === -1 ? i18n.tr("Never")
-                                                                : i18n.tr("%1 days").arg(podbird.settings.retentionDays)
-
-                delegate: ListItem.Standard {
-                    text: model.name
-
-                    onClicked: {
-                        podbird.settings.retentionDays = model.value
-                        cleanupSetting.expanded = false
-                    }
-
-                    Icon {
-                        width: units.gu(2)
-                        height: width
-                        name: "ok"
-                        visible: podbird.settings.retentionDays === model.value
-                        anchors.right: parent.right
-                        anchors.rightMargin: units.gu(2)
-                        anchors.verticalCenter: parent.verticalCenter
-                    }
+Page {
+    id: settingsPage
+
+    Column {
+        id: settingsColumn
+
+        anchors.fill: parent
+
+        ListItem.Header {
+            text: i18n.tr("General Settings")
+        }
+
+        ListItem.SingleValue {
+            progression: true
+            showDivider: false
+            text: i18n.tr("Theme")
+            value: podbird.settings.themeName.split(".qml")[0] === "Light" ? i18n.tr("Light") : i18n.tr("Dark")
+            onClicked: mainStack.push(Qt.resolvedUrl("../settings/ThemeSetting.qml"))
+        }
+
+        ListItem.Header {
+            text: i18n.tr("Podcast Episode Settings")
+        }
+
+        ListItem.Base {
+            height: units.gu(10)
+            progression: true
+            showDivider: false
+            onClicked: mainStack.push(Qt.resolvedUrl("../settings/CleanSetting.qml"))
+            Column {
+                anchors.verticalCenter: parent.verticalCenter
+                anchors.right: parent.right
+                anchors.left: parent.left
+                Label {
+                    width: parent.width
+                    wrapMode: Text.WordWrap
+                    text: i18n.tr("Automatically delete old episodes")
+                }
+
+                Label {
+                    fontSize: "small"
+                    color: podbird.theme.baseSubText
+                    width: parent.width
+                    wrapMode: Text.WordWrap
+                    text: i18n.tr("Delete episodes that are older than a given number of days for each podcast")
+                }
+            }
+        }
+
+        ListItem.Base {
+            height: units.gu(10)
+            progression: true
+            showDivider: false
+            onClicked: mainStack.push(Qt.resolvedUrl("../settings/DownloadSetting.qml"))
+            Column {
+                anchors.verticalCenter: parent.verticalCenter
+                anchors.right: parent.right
+                anchors.left: parent.left
+                Label {
+                    width: parent.width
+                    wrapMode: Text.WordWrap
+                    text: i18n.tr("Automatically download new episodes")
+                }
+
+                Label {
+                    fontSize: "small"
+                    color: podbird.theme.baseSubText
+                    width: parent.width
+                    wrapMode: Text.WordWrap
+                    text: i18n.tr("Default number of new episodes to download for each podcast")
                 }
             }
         }
     }
 }
+
+

=== modified file 'po/com.mikeasoft.podbird.pot'
--- po/com.mikeasoft.podbird.pot	2015-04-15 21:52:55 +0000
+++ po/com.mikeasoft.podbird.pot	2015-04-16 10:24:04 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-15 22:50+0100\n"
+"POT-Creation-Date: 2015-04-16 12:16+0200\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,6 +18,66 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
+#: ../app/podbird.qml:178
+msgid "Settings"
+msgstr ""
+
+#: ../app/settings/CleanSetting.qml:27
+msgid "Delete older than"
+msgstr ""
+
+#: ../app/settings/CleanSetting.qml:33 ../app/settings/DownloadSetting.qml:33
+msgid "Never"
+msgstr ""
+
+#: ../app/settings/CleanSetting.qml:34
+#, 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
+#, qt-format
+msgid "%1 month"
+msgid_plural "%1 months"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../app/settings/CleanSetting.qml:38
+#, qt-format
+msgid "%1 year"
+msgid_plural "%1 years"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../app/settings/DownloadSetting.qml:27
+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
+#, qt-format
+msgid "%1 episode"
+msgid_plural "%1 episodes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../app/settings/ThemeSetting.qml:27 ../app/ui/SettingsPage.qml:38
+msgid "Theme"
+msgstr ""
+
+#: ../app/settings/ThemeSetting.qml:33 ../app/ui/SettingsPage.qml:39
+msgid "Light"
+msgstr ""
+
+#: ../app/settings/ThemeSetting.qml:34 ../app/ui/SettingsPage.qml:39
+msgid "Dark"
+msgstr ""
+
 #: ../app/ui/EpisodesPage.qml:85
 msgid "Search Episode"
 msgstr ""
@@ -160,53 +220,29 @@
 msgid "Subscribe"
 msgstr ""
 
-#: ../app/ui/SettingsTab.qml:26
-msgid "Settings"
-msgstr ""
-
-#: ../app/ui/SettingsTab.qml:35
-msgid "Light"
-msgstr ""
-
-#: ../app/ui/SettingsTab.qml:36
-msgid "Dark"
-msgstr ""
-
-#: ../app/ui/SettingsTab.qml:44 ../app/ui/SettingsTab.qml:93
-msgid "Never"
-msgstr ""
-
-#: ../app/ui/SettingsTab.qml:45
-msgid "7 days"
-msgstr ""
-
-#: ../app/ui/SettingsTab.qml:46
-msgid "31 days"
-msgstr ""
-
-#: ../app/ui/SettingsTab.qml:47
-msgid "90 days"
-msgstr ""
-
-#: ../app/ui/SettingsTab.qml:48
-msgid "180 days"
-msgstr ""
-
-#: ../app/ui/SettingsTab.qml:49
-msgid "360 days"
-msgstr ""
-
-#: ../app/ui/SettingsTab.qml:62
-msgid "Theme"
-msgstr ""
-
-#: ../app/ui/SettingsTab.qml:92
-msgid "Remove episodes older than"
-msgstr ""
-
-#: ../app/ui/SettingsTab.qml:94
-#, qt-format
-msgid "%1 days"
+#: ../app/ui/SettingsPage.qml:32
+msgid "General Settings"
+msgstr ""
+
+#: ../app/ui/SettingsPage.qml:44
+msgid "Podcast Episode Settings"
+msgstr ""
+
+#: ../app/ui/SettingsPage.qml:59
+msgid "Automatically delete old episodes"
+msgstr ""
+
+#: ../app/ui/SettingsPage.qml:67
+msgid ""
+"Delete episodes that are older than a given number of days for each podcast"
+msgstr ""
+
+#: ../app/ui/SettingsPage.qml:84
+msgid "Automatically download new episodes"
+msgstr ""
+
+#: ../app/ui/SettingsPage.qml:92
+msgid "Default number of new episodes to download for each podcast"
 msgstr ""
 
 #: ../app/ui/Walkthrough.qml:87
@@ -287,6 +323,6 @@
 msgid "Finish"
 msgstr ""
 
-#: /home/mike/src/build-podbird-Ubuntu_Device3_GCC_armhf_ubuntu_sdk_14_10_utopic-Default/po/Podbird.desktop.in.h:1
+#: /home/krnekhelesh/Documents/Ubuntu-Projects/MP-Reviews/builddir/build-5-auto-download-option-UbuntuSDK_for_armhf_GCC_ubuntu_sdk_14_10_utopic-Default/po/Podbird.desktop.in.h:1
 msgid "Podbird"
 msgstr ""