Merge lp:~nik90/podbird/8.6-aboutpage into lp:podbird

[Nekhelesh Ramananthan]

Added about page to provide information about the licensing, version and also the contributors of Podbird.

Added about page to provide information about the licensing, version and also the contributors of Podbird.

[lp:~nik90/podbird/8.6-aboutpage]

79. By Nekhelesh Ramananthan on 2015-04-11

merged prerequisite

80. By Nekhelesh Ramananthan on 2015-04-11

Split the credits and about page as otherwise it exposes a SDK bug

81. By Nekhelesh Ramananthan on 2015-04-12

Merged prerequisite

82. By Nekhelesh Ramananthan on 2015-04-13

merged prerequisite fix

83. By Nekhelesh Ramananthan on 2015-04-15

merged prerequisite

84. By Nekhelesh Ramananthan on 2015-04-15

Fixed version

85. By Nekhelesh Ramananthan on 2015-04-15

changed version to beta1

86. By Nekhelesh Ramananthan on 2015-04-15

merged prerequsiite

87. By Nekhelesh Ramananthan on 2015-04-16

merged prerequisite

88. By Nekhelesh Ramananthan on 2015-04-16

updated to v0.6.b2

89. By Nekhelesh Ramananthan on 2015-04-18

merged prerequisite lp:~nik90/podbird/8.5-usermetrics

90. By Nekhelesh Ramananthan on 2015-04-18

Adjusted link color to be more visible in the dark theme throughout the app

Unmerged revisions

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-01-04 10:20:41 +0000
+++ CMakeLists.txt	2015-04-11 21:39:04 +0000
@@ -28,7 +28,7 @@
 set(APP_ID            "com.mikeasoft.podbird")
 set(PODBIRD_DIR "share/qml/podbird")
 set(MAIN_QML          "podbird.qml")
-set(ICON              "graphics/podbird.png")
+set(ICON              "podbird.png")
 
 # Set install paths
 set(CMAKE_INSTALL_PREFIX /)
@@ -49,7 +49,7 @@
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json
         DESTINATION ${CMAKE_INSTALL_PREFIX})
 
-install(DIRECTORY "app/graphics" DESTINATION ${DATA_DIR})
+install(FILES "podbird.png" DESTINATION ${DATA_DIR})
 install(FILES "Podbird.apparmor" DESTINATION ${DATA_DIR})
 
 add_subdirectory(app)

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

=== modified file 'app/CMakeLists.txt'
--- app/CMakeLists.txt	2015-03-03 22:44:29 +0000
+++ app/CMakeLists.txt	2015-04-11 21:39:04 +0000
@@ -11,4 +11,6 @@
 
 add_subdirectory(ui)
 add_subdirectory(themes)
-
+add_subdirectory(welcomewizard)
+add_subdirectory(graphics)
+add_subdirectory(settings)

=== added file 'app/graphics/CMakeLists.txt'
--- app/graphics/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ app/graphics/CMakeLists.txt	2015-04-11 21:39:04 +0000
@@ -0,0 +1,7 @@
+file(GLOB GRAPHIC_FILES *.png *.jpg *.svg)
+
+# Make the files visible in the qtcreator tree
+add_custom_target(podbird_GRAPHICFiles ALL SOURCES ${GRAPHIC_FILES})
+
+install(FILES ${GRAPHIC_FILES} DESTINATION ${PODBIRD_DIR}/graphics)
+

=== added file 'app/graphics/discover.png'
Binary files app/graphics/discover.png	1970-01-01 00:00:00 +0000 and app/graphics/discover.png	2015-04-11 21:39:04 +0000 differ
=== added file 'app/graphics/gift.png'
Binary files app/graphics/gift.png	1970-01-01 00:00:00 +0000 and app/graphics/gift.png	2015-04-11 21:39:04 +0000 differ
=== added file 'app/graphics/language.png'
Binary files app/graphics/language.png	1970-01-01 00:00:00 +0000 and app/graphics/language.png	2015-04-11 21:39:04 +0000 differ
=== added file 'app/graphics/notFound.svg'
--- app/graphics/notFound.svg	1970-01-01 00:00:00 +0000
+++ app/graphics/notFound.svg	2015-04-11 21:39:04 +0000
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="383.80545"
+   height="214.75534"
+   id="svg12819"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="notFound.svg"
+   inkscape:export-filename="/home/kevin/Documents/Development/app screenshots/owlSearch.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs12821" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.41521"
+     inkscape:cx="388.73869"
+     inkscape:cy="44.241833"
+     inkscape:document-units="px"
+     inkscape:current-layer="g15020"
+     showgrid="false"
+     fit-margin-top="10"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="10"
+     inkscape:window-width="1920"
+     inkscape:window-height="1056"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata12824">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-174.89943,-164.11232)">
+    <g
+       style="display:inline"
+       id="g14777"
+       transform="matrix(0.69639553,0,0,0.69639553,-479.44734,119.33528)">
+      <g
+         id="g15020"
+         transform="matrix(0.63322219,0,0,0.63322219,-295.2311,987.63072)">
+        <g
+           id="g15082"
+           transform="translate(0,82.828838)">
+          <path
+             sodipodi:type="arc"
+             style="fill:none;stroke:#808080;stroke-width:46.75191879;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+             id="path14966-8"
+             sodipodi:cx="1962.8733"
+             sodipodi:cy="-378.12149"
+             sodipodi:rx="136.36804"
+             sodipodi:ry="136.36804"
+             d="m 2099.2413,-378.12149 c 0,75.31399 -61.054,136.36804 -136.368,136.36804 -75.314,0 -136.3681,-61.05405 -136.3681,-136.36804 0,-75.31399 61.0541,-136.36804 136.3681,-136.36804 75.314,0 136.368,61.05405 136.368,136.36804 z"
+             transform="matrix(1.2126303,0,0,1.2126303,246.51638,-866.06892)" />
+          <path
+             sodipodi:type="arc"
+             style="fill:#808080;fill-opacity:1;fill-rule:evenodd;stroke:none"
+             id="path14988"
+             sodipodi:cx="2108.5391"
+             sodipodi:cy="-525.33698"
+             sodipodi:rx="41.840195"
+             sodipodi:ry="41.840195"
+             d="m 2150.3793,-525.33698 c 0,23.10771 -18.7325,41.8402 -41.8402,41.8402 -23.1077,0 -41.8402,-18.73249 -41.8402,-41.8402 0,-23.1077 18.7325,-41.84019 41.8402,-41.84019 23.1077,0 41.8402,18.73249 41.8402,41.84019 z"
+             transform="matrix(1.4359656,0,0,1.4359656,-645.94974,-626.80514)" />
+          <path
+             inkscape:connector-curvature="0"
+             style="fill:#808080;fill-opacity:1;stroke:none"
+             d="m 2089.4375,-438.03125 0,103.3125 17.9063,0 c 7.3889,-17.02228 24.323,-28.9375 44.0624,-28.9375 19.7395,0 36.7049,11.91522 44.0938,28.9375 l 17.9062,0 0,-103.3125 -123.9687,0 z"
+             transform="matrix(1.4359656,0,0,1.4359656,-707.51452,-787.38294)"
+             id="rect14986" />
+          <path
+             sodipodi:type="arc"
+             style="fill:none;stroke:#808080;stroke-width:46.75191879;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+             id="path14966-8-2"
+             sodipodi:cx="1962.8733"
+             sodipodi:cy="-378.12149"
+             sodipodi:rx="136.36804"
+             sodipodi:ry="136.36804"
+             d="m 2099.2413,-378.12149 c 0,75.31399 -61.054,136.36804 -136.368,136.36804 -75.314,0 -136.3681,-61.05405 -136.3681,-136.36804 0,-75.31399 61.0541,-136.36804 136.3681,-136.36804 75.314,0 136.368,61.05405 136.368,136.36804 z"
+             transform="matrix(1.2126303,0,0,1.2126303,-236.42299,-866.06892)" />
+        </g>
+        <rect
+           style="fill:#808080;fill-opacity:1;stroke:none"
+           id="rect15091"
+           width="129.21298"
+           height="129.21298"
+           x="856.36871"
+           y="-2520.2727"
+           transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)" />
+        <path
+           style="fill:#808080;fill-opacity:1;fill-rule:evenodd;stroke:none"
+           d="m 103.71875,171.6875 -33.5625,16.21875 c 2.149792,8.13106 9.568126,14.125 18.375,14.125 10.489627,0 18.96875,-8.51037 18.96875,-19 0,-4.26924 -1.40349,-8.17188 -3.78125,-11.34375 z"
+           transform="matrix(2.267712,0,0,2.267712,1943.0825,-1656.8514)"
+           id="path15093"
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#808080;fill-opacity:1;fill-rule:evenodd;stroke:none;display:inline"
+           d="m 2592.9883,-1268.3362 76.1101,36.7795 c -4.8751,18.4389 -21.6977,32.0314 -41.6692,32.0314 -23.7874,0 -43.0156,-19.2991 -43.0156,-43.0865 0,-9.6814 3.1827,-18.5315 8.5747,-25.7244 z"
+           id="path15093-2" />
+      </g>
+    </g>
+  </g>
+</svg>

=== added file 'app/graphics/owlSearch.svg'
--- app/graphics/owlSearch.svg	1970-01-01 00:00:00 +0000
+++ app/graphics/owlSearch.svg	2015-04-11 21:39:04 +0000
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="383.80545"
+   height="214.75534"
+   id="svg12819"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="owlSearch.svg"
+   inkscape:export-filename="/home/kevin/Documents/Development/app screenshots/owlSearch.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs12821" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.990625"
+     inkscape:cx="153.4653"
+     inkscape:cy="131.99307"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="10"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="10"
+     inkscape:window-width="1920"
+     inkscape:window-height="1056"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata12824">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-174.89943,-164.11232)">
+    <g
+       style="display:inline"
+       id="g14777"
+       transform="matrix(0.69639553,0,0,0.69639553,-479.44734,119.33528)">
+      <g
+         id="g15020"
+         transform="matrix(0.63322219,0,0,0.63322219,-295.2311,987.63072)">
+        <g
+           id="g15082"
+           transform="translate(0,82.828838)">
+          <path
+             sodipodi:type="arc"
+             style="fill:none;stroke:#808080;stroke-width:46.75191879;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+             id="path14966-8"
+             sodipodi:cx="1962.8733"
+             sodipodi:cy="-378.12149"
+             sodipodi:rx="136.36804"
+             sodipodi:ry="136.36804"
+             d="m 2099.2413,-378.12149 c 0,75.31399 -61.054,136.36804 -136.368,136.36804 -75.314,0 -136.3681,-61.05405 -136.3681,-136.36804 0,-75.31399 61.0541,-136.36804 136.3681,-136.36804 75.314,0 136.368,61.05405 136.368,136.36804 z"
+             transform="matrix(1.2126303,0,0,1.2126303,246.51638,-866.06892)" />
+          <path
+             sodipodi:type="arc"
+             style="fill:#808080;fill-opacity:1;fill-rule:evenodd;stroke:none"
+             id="path14988"
+             sodipodi:cx="2108.5391"
+             sodipodi:cy="-525.33698"
+             sodipodi:rx="41.840195"
+             sodipodi:ry="41.840195"
+             d="m 2150.3793,-525.33698 c 0,23.10771 -18.7325,41.8402 -41.8402,41.8402 -23.1077,0 -41.8402,-18.73249 -41.8402,-41.8402 0,-23.1077 18.7325,-41.84019 41.8402,-41.84019 23.1077,0 41.8402,18.73249 41.8402,41.84019 z"
+             transform="matrix(1.4359656,0,0,1.4359656,-645.94974,-626.80514)" />
+          <path
+             inkscape:connector-curvature="0"
+             style="fill:#808080;fill-opacity:1;stroke:none"
+             d="m 2089.4375,-438.03125 0,103.3125 17.9063,0 c 7.3889,-17.02228 24.323,-28.9375 44.0624,-28.9375 19.7395,0 36.7049,11.91522 44.0938,28.9375 l 17.9062,0 0,-103.3125 -123.9687,0 z"
+             transform="matrix(1.4359656,0,0,1.4359656,-707.51452,-787.38294)"
+             id="rect14986" />
+          <path
+             sodipodi:type="arc"
+             style="fill:none;stroke:#808080;stroke-width:46.75191879;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+             id="path14966-8-2"
+             sodipodi:cx="1962.8733"
+             sodipodi:cy="-378.12149"
+             sodipodi:rx="136.36804"
+             sodipodi:ry="136.36804"
+             d="m 2099.2413,-378.12149 c 0,75.31399 -61.054,136.36804 -136.368,136.36804 -75.314,0 -136.3681,-61.05405 -136.3681,-136.36804 0,-75.31399 61.0541,-136.36804 136.3681,-136.36804 75.314,0 136.368,61.05405 136.368,136.36804 z"
+             transform="matrix(1.2126303,0,0,1.2126303,-236.42299,-866.06892)" />
+        </g>
+        <rect
+           style="fill:#808080;fill-opacity:1;stroke:none"
+           id="rect15091"
+           width="129.21298"
+           height="129.21298"
+           x="856.36871"
+           y="-2520.2727"
+           transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)" />
+        <path
+           sodipodi:type="arc"
+           style="fill:#808080;fill-opacity:1;fill-rule:evenodd;stroke:none"
+           id="path15093"
+           sodipodi:cx="1206.7955"
+           sodipodi:cy="673.53888"
+           sodipodi:rx="18.993151"
+           sodipodi:ry="18.993151"
+           d="m 1225.7887,673.53888 c 0,10.48963 -8.5035,18.99315 -18.9932,18.99315 -10.4896,0 -18.9931,-8.50352 -18.9931,-18.99315 0,-10.48963 8.5035,-18.99315 18.9931,-18.99315 10.4897,0 18.9932,8.50352 18.9932,18.99315 z"
+           transform="matrix(2.267712,0,0,2.267712,-592.84807,-2769.1539)" />
+        <path
+           sodipodi:type="arc"
+           style="fill:#808080;fill-opacity:1;fill-rule:evenodd;stroke:none;display:inline"
+           id="path15093-0"
+           sodipodi:cx="1206.7955"
+           sodipodi:cy="673.53888"
+           sodipodi:rx="18.993151"
+           sodipodi:ry="18.993151"
+           d="m 1225.7887,673.53888 c 0,10.48963 -8.5035,18.99315 -18.9932,18.99315 -10.4896,0 -18.9931,-8.50352 -18.9931,-18.99315 0,-10.48963 8.5035,-18.99315 18.9931,-18.99315 10.4897,0 18.9932,8.50352 18.9932,18.99315 z"
+           transform="matrix(2.267712,0,0,2.267712,-109.9087,-2769.1539)" />
+      </g>
+    </g>
+  </g>
+</svg>

=== modified file 'app/graphics/podbird.png'
Binary files app/graphics/podbird.png	2015-01-04 10:20:41 +0000 and app/graphics/podbird.png	2015-04-11 21:39:04 +0000 differ
=== added file 'app/graphics/smart.png'
Binary files app/graphics/smart.png	1970-01-01 00:00:00 +0000 and app/graphics/smart.png	2015-04-11 21:39:04 +0000 differ
=== added file 'app/graphics/support.png'
Binary files app/graphics/support.png	1970-01-01 00:00:00 +0000 and app/graphics/support.png	2015-04-11 21:39:04 +0000 differ
=== modified file 'app/podbird.qml'
--- app/podbird.qml	2015-03-27 15:38:43 +0000
+++ app/podbird.qml	2015-04-11 21:39:04 +0000
@@ -18,7 +18,9 @@
 
 import QtQuick 2.3
 import Podbird 1.0
+import UserMetrics 0.1
 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
@@ -41,18 +43,35 @@
     backgroundColor: theme.background
 
     Component.onDestruction: {
-        console.log("Download cancelled");
+        console.log("[LOG]: Download cancelled");
         downloader.cancel();
+        var db = Podcasts.init()
+        db.transaction(function (tx) {
+            tx.executeSql('UPDATE Episode SET queued=0 WHERE queued=1');
+        })
     }
 
     Component.onCompleted: {
+        var db = Podcasts.init()
+        db.transaction(function (tx) {
+            tx.executeSql('UPDATE Episode SET queued=0 WHERE queued=1');
+        })
+
         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.limitedBandwith && settings.onlyWifiDownload || !NetworkingStatus.online || settings.maxEpisodeDownload === -1) {
+            console.log("[LOG]: Skipped autodownloading due to missing wifi connectivity and only download on wifi preference.")
+            console.log("[LOG]: Detecting limited bandwidth: " + NetworkingStatus.limitedBandwith)
+            console.log("[LOG]: Detecting online connectivity: " + NetworkingStatus.online)
+            console.log("[LOG]: User settings (onlywifidownload & maxEpisodeDownload): " + settings.onlyWifiDownload + ", " + settings.maxEpisodeDownload)
+        } else {
+            autoDownloadEpisodes(settings.maxEpisodeDownload)
+        }
     }
 
     property string currentName
@@ -73,6 +92,11 @@
         property string themeName: "Light.qml"
         property int retentionDays: -1
         property var lastCheck: new Date()
+        property bool firstRun: true
+        property bool onlyWifiDownload: true
+        property int maxEpisodeDownload: -1
+        property bool hideListened: false
+        property bool showListView: true
     }
 
     FileManager {
@@ -100,7 +124,7 @@
             var db = Podcasts.init();
             var finalLocation = fileManager.saveDownload(path);
             db.transaction(function (tx) {
-                tx.executeSql("UPDATE Episode SET downloadedfile=? WHERE guid=?", [finalLocation, downloadingGuid]);
+                tx.executeSql("UPDATE Episode SET downloadedfile=?, queued=0 WHERE guid=?", [finalLocation, downloadingGuid]);
                 queue.shift();
                 if (queue.length > 0) {
                     downloadingGuid = queue[0][0];
@@ -120,13 +144,36 @@
         }
     }
 
+    // UserMetrics to show Podbird stats on welcome screen
+    Metric {
+        id: podcastsMetric
+        name: "podcast-metrics"
+        // TRANSLATORS: this refers to a number of songs greater than one. The actual number will be prepended to the string automatically (plural forms are not yet fully supported in usermetrics, the library that displays that string)
+        format: "<b>%1</b> " + i18n.tr("podcasts listened today")
+        emptyFormat: i18n.tr("No podcasts listened today")
+        domain: "com.mikeasoft.podbird"
+    }
+
     MediaPlayer {
         id: player
+
+        property bool podcastCounted: false
+
+        onSourceChanged: {
+            podcastCounted = false
+        }
+
         onPositionChanged: {
             if (currentGuid == "" || duration <= 0) {
                 return;
             }
 
+            if (position > 10000 && !podcastCounted) {
+                podcastCounted = true
+                podcastsMetric.increment()
+                console.log("[LOG]: Podcast User metric incremented")
+            }
+
             var db = Podcasts.init();
             db.transaction(function (tx) {
                 tx.executeSql("UPDATE Episode SET position=? WHERE guid=?", [position >= duration ? 120 : position, currentGuid]);
@@ -139,7 +186,16 @@
 
     PageStack {
         id: mainStack
-        Component.onCompleted: push(tabs)
+        Component.onCompleted: {
+            // Show the welcome wizard only when running the app for the first time
+            if (settings.firstRun) {
+                console.log("[LOG]: Detecting first time run by user. Starting welcome wizard.")
+                push(Qt.resolvedUrl("welcomewizard/WelcomeWizard.qml"))
+            } else {
+                push(tabs)
+            }
+        }
+
         Tabs {
             id: tabs
 
@@ -148,14 +204,32 @@
                 objectName: "podcastsTab"
             }
 
-            SearchTab {
+            Tab {
                 id: searchTab
-                objectName: "searchTab"
+
+                title: i18n.tr("Find New Podcasts")
+
+                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") : ""
+                }
             }
 
-            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") : ""
+                }
             }
         }
     }
@@ -189,6 +263,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) {
@@ -206,4 +281,23 @@
             }
         });
     }
+
+    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)
+                        tx.executeSql("UPDATE Episode SET queued=1 WHERE guid = ?", [rs2.rows.item(j).guid]);
+                    }
+                }
+            }
+        });
+    }
 }

=== modified file 'app/podcasts.js'
--- app/podcasts.js	2015-02-28 09:46:48 +0000
+++ app/podcasts.js	2015-04-11 21:39:04 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Michael Sheldon <[e-mail]>
+ * Copyright 2015 Podbird Team
  *
  * This file is part of Podbird.
  *
@@ -17,11 +17,24 @@
  */
 
 function init() {
-    var db = LocalStorage.openDatabaseSync("Podbird", "1.0", "Database of subscribed podcasts and their episodes", 1000000);
+    var db = LocalStorage.openDatabaseSync("Podbird", "", "Database of subscribed podcasts and their episodes", 1000000);
+
     db.transaction(function(tx) {
         tx.executeSql('CREATE TABLE IF NOT EXISTS Podcast(artist TEXT, name TEXT, description TEXT, feed TEXT, image TEXT, lastupdate TIMESTAMP)');
-        tx.executeSql('CREATE TABLE IF NOT EXISTS Episode(guid TEXT, podcast INTEGER, name TEXT, subtitle TEXT, description TEXT, duration INTEGER, audiourl TEXT, downloadedfile TEXT, published TIMESTAMP, listened BOOLEAN, position INTEGER, FOREIGN KEY(podcast) REFERENCES Podcast(rowid))');
+        tx.executeSql('CREATE TABLE IF NOT EXISTS Episode(guid TEXT, podcast INTEGER, name TEXT, subtitle TEXT, description TEXT, duration INTEGER, audiourl TEXT, downloadedfile TEXT, published TIMESTAMP, queued BOOLEAN, listened BOOLEAN, position INTEGER, FOREIGN KEY(podcast) REFERENCES Podcast(rowid))');
     });
+
+    /*
+     Schema Upgrade to v1.1 which adds a new queued boolean variable which is needed to track the queued status
+     of a episode properly.
+    */
+    if (db.version == "1.0") {
+        db.changeVersion("1.0", "1.1", function(tx) {
+            tx.executeSql('ALTER TABLE Episode ADD queued BOOLEAN');
+            tx.executeSql('UPDATE Episode SET queued=0');
+        });
+    }
+
     return db;
 }
 

=== added directory 'app/settings'
=== added file 'app/settings/About.qml'
--- app/settings/About.qml	1970-01-01 00:00:00 +0000
+++ app/settings/About.qml	2015-04-11 21:39:04 +0000
@@ -0,0 +1,151 @@
+/*
+ * 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: aboutPage
+
+    title: i18n.tr("About")
+    visible: false
+
+    head.sections.model: [i18n.tr("About"), i18n.tr("Credits")]
+
+    VisualItemModel {
+        id: tabs
+
+        Item {
+            width: tabView.width
+            height: tabView.height
+
+            Column {
+                spacing: units.gu(4)
+                anchors.centerIn: parent
+                width: parent.width > units.gu(50) ? units.gu(50) : parent.width
+
+                Image {
+                    height: width
+                    width: parent.width/2
+                    source: "../graphics/podbird.png"
+                    anchors.horizontalCenter: parent.horizontalCenter
+                }
+
+                Column {
+                    width: parent.width
+                    Label {
+                        width: parent.width
+                        fontSize: "x-large"
+                        font.weight: Font.DemiBold
+                        horizontalAlignment: Text.AlignHCenter
+                        text: "Podbird"
+                    }
+                    Label {
+                        width: parent.width
+                        horizontalAlignment: Text.AlignHCenter
+                        text: qsTr("Version %1").arg(0.6)
+                    }
+                }
+
+                Column {
+                    anchors {
+                        left: parent.left
+                        right: parent.right
+                        margins: units.gu(2)
+                    }
+                    Label {
+                        width: parent.width
+                        wrapMode: Text.WordWrap
+                        horizontalAlignment: Text.AlignHCenter
+                        text: "(C) 2015 Podbird Team"
+                    }
+                    Label {
+                        fontSize: "small"
+                        width: parent.width
+                        wrapMode: Text.WordWrap
+                        horizontalAlignment: Text.AlignHCenter
+                        text: i18n.tr("Released under the terms of the GNU GPL v3")
+                    }
+                }
+
+                Label {
+                    width: parent.width
+                    wrapMode: Text.WordWrap
+                    fontSize: "small"
+                    horizontalAlignment: Text.AlignHCenter
+                    text: i18n.tr("Source code available on %1").arg("<a href=\"https://launchpad.net/podbird\">launchpad.net</a>")
+                    onLinkActivated: Qt.openUrlExternally(link)
+                }
+            }
+        }
+
+        Item {
+            width: tabView.width
+            height: tabView.height
+
+            Column {
+                anchors.topMargin: units.gu(1)
+                anchors.fill: parent
+
+                ListItem.Header {
+                    text: i18n.tr("Developers")
+                }
+
+                ListItem.Standard {
+                    showDivider: false
+                    text: "Michael Sheldon (Creator)"
+                }
+
+                ListItem.Standard {
+                    showDivider: false
+                    text: "Nekhelesh Ramananthan"
+                }
+
+                ListItem.Header {
+                    text: i18n.tr("Designer")
+                }
+
+                ListItem.Standard {
+                    showDivider: false
+                    text: "Kevin Feyder"
+                }
+
+                ListItem.Header {
+                    text: i18n.tr("Translators")
+                }
+
+                ListItem.Standard {
+                    showDivider: false
+                    text: "Ubuntu Translators Team"
+                }
+            }
+        }
+    }
+
+    ListView {
+        id: tabView
+        model: tabs
+        interactive: false
+        anchors.fill: parent
+        orientation: Qt.Horizontal
+        snapMode: ListView.SnapOneItem
+        currentIndex: aboutPage.head.sections.selectedIndex
+        highlightMoveDuration: UbuntuAnimation.SlowDuration
+    }
+}

=== added file 'app/settings/CMakeLists.txt'
--- app/settings/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ app/settings/CMakeLists.txt	2015-04-11 21:39: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-11 21:39: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-11 21:39: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-11 21:39: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
+            }
+        }
+    }
+}

=== modified file 'app/themes/Dark.qml'
--- app/themes/Dark.qml	2015-03-04 02:58:36 +0000
+++ app/themes/Dark.qml	2015-04-11 21:39:04 +0000
@@ -21,12 +21,12 @@
 
 QtObject {
     // MainView
-    property color background: "#1E1E23"
+    property color background: "#242423"
 
     // Main Text Colors
     property color baseText: "White"
     property color baseSubText: "#999999"
-    property color focusText: "#FF9900"
+    property color focusText: "#35AF44"
 
     // Icon Colors
     property color baseIcon: "White"
@@ -37,8 +37,8 @@
     property color neutralActionButton: UbuntuColors.coolGrey
 
     // Bottom Player Bar Colors
-    property color bottomBarBackground: "#0F0F0F"
+    property color bottomBarBackground: "#15141A"
 
     // Highlight Color
-    property color hightlightListView: "#2C2C34"
+    property color hightlightListView: "#333533"
 }

=== modified file 'app/themes/Light.qml'
--- app/themes/Light.qml	2015-03-04 02:58:36 +0000
+++ app/themes/Light.qml	2015-04-11 21:39:04 +0000
@@ -21,12 +21,12 @@
 
 QtObject {
     // MainView
-    property color background: "#EEEEEE"
+    property color background: "#ECECEC"
 
     // Main Text Colors
     property color baseText: UbuntuColors.darkGrey
     property color baseSubText: "#999999"
-    property color focusText: UbuntuColors.orange
+    property color focusText: "#35AF44"
 
     // Icon Colors
     property color baseIcon: UbuntuColors.darkGrey
@@ -37,8 +37,8 @@
     property color neutralActionButton: UbuntuColors.coolGrey
 
     // Bottom Player Bar Colors
-    property color bottomBarBackground: "#0F0F0F"
+    property color bottomBarBackground: "#323435"
 
     // Highlight Color
-    property color hightlightListView: "#D8D8D8"
+    property color hightlightListView: "#F5F5F5"
 }

=== modified file 'app/ui/ActionButton.qml'
--- app/ui/ActionButton.qml	2015-03-08 11:10:07 +0000
+++ app/ui/ActionButton.qml	2015-04-11 21:39:04 +0000
@@ -22,7 +22,8 @@
 AbstractButton {
     id: abstractButton
 
-    property string iconName
+    property alias iconName: _icon.name
+    property alias color: _icon.color
 
     Rectangle {
         visible: abstractButton.pressed
@@ -35,7 +36,6 @@
         width: units.gu(2.5)
         height: width
         anchors.centerIn: parent
-        name: abstractButton.iconName
         color: podbird.theme.baseIcon
     }
 }

=== modified file 'app/ui/BlurredBackground.qml'
--- app/ui/BlurredBackground.qml	2015-02-10 06:57:54 +0000
+++ app/ui/BlurredBackground.qml	2015-04-11 21:39:04 +0000
@@ -25,15 +25,8 @@
 Item {
     width: parent.width
 
-    property string art  // : player.currentMetaFile === "" ? Qt.resolvedUrl("../images/[e-mail]") : player.currentMetaArt
-
-    // dark layer
-    Rectangle {
-        anchors {
-            fill: parent
-        }
-        color: "black" 
-    }
+    property string art
+    property real backgroundStrength: 0.4
 
     // the album art
     Image {
@@ -44,16 +37,6 @@
         fillMode: Image.PreserveAspectCrop
         height: parent.height
         source: art // this has to be fixed for the default cover art to work - cant find in this dir
-
-        // TODO: This should be investigated once http://pad.lv/1391368
-        //       is resolved. Once it is, these can either be set to
-        //       "height" and "width" or a property exposed via the
-        //       SDK or Thumbnailer to avoid a regression caused by
-        //       these hardcoded values changing in the Thumbnailer.
-        //       512 is size of the "xlarge" thumbnails in pixels.
-        sourceSize.height: 512
-        sourceSize.width: 512
-
         visible: false
         width: Math.max(parent.height, parent.width)
     }
@@ -63,8 +46,8 @@
         id: backgroundBlur
         anchors.fill: backgroundImage
         source: backgroundImage
-        radius: units.dp(42)
-        opacity: 0.2
+        radius: units.dp(30)
+        opacity: backgroundStrength
     }
     onArtChanged: {
         // TODO: This is a work around for LP:1261078 and LP:1306845. Ideally,

=== added file 'app/ui/Card.qml'
--- app/ui/Card.qml	1970-01-01 00:00:00 +0000
+++ app/ui/Card.qml	2015-04-11 21:39:04 +0000
@@ -0,0 +1,139 @@
+/*
+ * Copyright (C) 2014
+ *      Andrew Hayzen <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.3
+import Ubuntu.Components 1.1
+
+Item {
+    id: card
+
+    /* Required by ColumnFlow */
+    property int index
+    property var model
+
+    property alias coverArt: imgFrame.source
+    property alias primaryText: primaryLabel.text
+    property alias secondaryText: secondaryLabel.text
+    property alias secondaryTextVisible: secondaryLabel.visible
+
+    signal clicked(var mouse)
+    signal pressAndHold(var mouse)
+
+    height: cardColumn.childrenRect.height + 2 * bg.anchors.margins
+
+    /* Background for card */
+    Rectangle {
+        id: bg
+        anchors.fill: parent
+        anchors.margins: units.gu(1)
+        color: podbird.theme.hightlightListView
+    }
+
+    /* Column containing image and labels */
+    Column {
+        id: cardColumn
+
+        anchors.fill: bg
+        spacing: units.gu(0.5)
+
+        Image {
+            id: imgFrame
+            width: parent.width
+            height: width
+            sourceSize.height: width
+            sourceSize.width: width
+        }
+
+        Item {
+            height: units.gu(1)
+            width: units.gu(1)
+        }
+
+        Label {
+            id: primaryLabel
+            anchors {
+                left: parent.left
+                right: parent.right
+                margins: units.gu(1)
+            }
+            color: podbird.theme.baseText
+            elide: Text.ElideRight
+            fontSize: "small"
+            opacity: 1.0
+            wrapMode: Text.WordWrap
+            horizontalAlignment: Text.AlignHCenter
+        }
+
+        Label {
+            id: secondaryLabel
+            anchors {
+                left: parent.left
+                leftMargin: units.gu(1)
+                right: parent.right
+                rightMargin: units.gu(1)
+            }
+            color: podbird.theme.baseSubText
+            elide: Text.ElideRight
+            fontSize: "small"
+            opacity: 1.0
+            wrapMode: Text.WordWrap
+            horizontalAlignment: Text.AlignHCenter
+        }
+
+        Item {
+            height: units.gu(1.5)
+            width: units.gu(1)
+        }
+    }
+
+    /* Overlay for when card is pressed */
+    Rectangle {
+        id: overlay
+        anchors.fill: bg
+        color: "#000"
+        opacity: 0
+
+        Behavior on opacity {
+            UbuntuNumberAnimation {}
+        }
+    }
+
+    /* Capture mouse events */
+    MouseArea {
+        anchors.fill: parent
+        onClicked: card.clicked(mouse)
+        onPressAndHold: card.pressAndHold(mouse)
+        onPressedChanged: overlay.opacity = pressed ? 0.3 : 0
+    }
+
+    /* Animations */
+    Behavior on height {
+        UbuntuNumberAnimation {}
+    }
+
+    Behavior on width {
+        UbuntuNumberAnimation {}
+    }
+
+    Behavior on x {
+        UbuntuNumberAnimation {}
+    }
+
+    Behavior on y {
+        UbuntuNumberAnimation {}
+    }
+}

=== added file 'app/ui/CardView.qml'
--- app/ui/CardView.qml	1970-01-01 00:00:00 +0000
+++ app/ui/CardView.qml	2015-04-11 21:39:04 +0000
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2014
+ *      Andrew Hayzen <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.3
+import Ubuntu.Components 1.1
+
+Flickable {
+    id: cardViewFlickable
+    anchors {
+        fill: parent
+        margins: units.gu(1)
+    }
+
+    // dont use flow.contentHeight as it is inaccurate due to height of labels
+    // changing as they load
+    contentHeight: flow.contentHeight + flow.anchors.margins * 2 + units.gu(8)
+    contentWidth: width
+
+    property alias count: flow.count
+    property alias delegate: flow.delegate
+    property var getter
+    property alias model: flow.model
+    property real itemWidth: units.gu(15)
+
+    onGetterChanged: flow.getter = getter  // cannot use alias to set a function (must be var)
+
+    ColumnFlow {
+        id: flow
+        anchors.fill: parent
+        columns: parseInt(cardViewFlickable.width / itemWidth) || 1  // never drop to 0
+        flickable: cardViewFlickable
+    }
+
+    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;
+    }
+}

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

=== modified file 'app/ui/EmptyState.qml'
--- app/ui/EmptyState.qml	2015-03-04 03:27:26 +0000
+++ app/ui/EmptyState.qml	2015-04-11 21:39:04 +0000
@@ -31,14 +31,18 @@
     property alias iconName: emptyIcon.name
     property alias title: emptyLabel.text
     property alias subTitle: emptySublabel.text
+    property alias iconSource: emptyIcon.source
+
+    property real iconHeight: units.gu(10)
+    property real iconWidth: units.gu(10)
 
     height: childrenRect.height
     width: parent.width
 
     Icon {
         id: emptyIcon
-        width: height
-        height: units.gu(10)
+        width: parent.iconWidth
+        height: parent.iconHeight
         color: podbird.theme.baseIcon
         anchors.horizontalCenter: parent.horizontalCenter
     }

=== modified file 'app/ui/EpisodesPage.qml'
--- app/ui/EpisodesPage.qml	2015-03-29 15:33:26 +0000
+++ app/ui/EpisodesPage.qml	2015-04-11 21:39:04 +0000
@@ -30,17 +30,21 @@
     id: episodesPage
 
     visible: false
-    title: episodeName
+    title: i18n.tr("Podcast")
+    flickable: null
 
     property string episodeName
     property string episodeId
     property string episodeArtist
     property string episodeImage
+    property string tempGuid: "NULL"
 
     property bool episodesUpdating: false;
 
     Component.onCompleted: {
         loadEpisodes(episodeId, episodeArtist, episodeImage)
+        if (downloader.downloadingGuid != "")
+            tempGuid = downloader.downloadingGuid
     }
 
     /*
@@ -95,7 +99,7 @@
                     onTriggered: {
                         var db = Podcasts.init();
                         db.transaction(function (tx) {
-                            tx.executeSql("UPDATE Episode SET listened=1 WHERE podcast=?", [episodeModel.pid]);
+                            tx.executeSql("UPDATE Episode SET listened=1 WHERE podcast=?", [episodeId]);
                             refreshModel();
                         });
                     }
@@ -122,6 +126,7 @@
                     episodeList.forceActiveFocus()
                     searchField.text = ""
                     episodesPage.state = "default"
+                    episodeList.positionViewAtBeginning()
                 }
             }
 
@@ -139,7 +144,36 @@
     Connections {
         target: downloader
         onDownloadingGuidChanged: {
-            loadEpisodes(episodeId, episodeArtist, episodeImage);
+            var db = Podcasts.init();
+            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 episodeModel
+                 with the downloadedfile location we just received from the downloader.
+                */
+                if (tempGuid != "NULL") {
+                    var rs2 = tx.executeSql("SELECT downloadedfile, podcast FROM Episode WHERE guid=?", [tempGuid]);
+                    for (var i=0; i<episodeModel.count; i++) {
+                        if (episodeModel.get(i).guid == tempGuid) {
+                            console.log("[LOG]: Setting episode download URL to " + rs2.rows.item(0).downloadedfile)
+                            episodeModel.setProperty(i, "downloadedfile", rs2.rows.item(0).downloadedfile)
+                            break
+                        }
+                    }
+                    tempGuid = "NULL"
+                }
+
+                /*
+                 Here it is checked if the currently downloaded episode belongs to the podcast
+                 page being currently displayed. If it is, then the downloaded episode guid is
+                 stored in the tempGuid variable to track it.
+                */
+                var rs = tx.executeSql("SELECT podcast FROM Episode WHERE guid=?", [downloader.downloadingGuid]);
+
+                if (downloader.downloadingGuid != "" && rs.rows.item(0).podcast == episodeId && tempGuid == "NULL") {
+                    tempGuid = downloader.downloadingGuid
+                }
+            });
         }
     }
 
@@ -155,12 +189,12 @@
                 onClicked: {
                     var db = Podcasts.init();
                     db.transaction(function (tx) {
-                        var rs = tx.executeSql("SELECT downloadedfile FROM Episode WHERE downloadedfile NOT NULL AND podcast=?", [episodeModel.pid]);
+                        var rs = tx.executeSql("SELECT downloadedfile FROM Episode WHERE downloadedfile NOT NULL AND podcast=?", [episodeId]);
                         for(var i = 0; i < rs.rows.length; i++) {
                             fileManager.deleteFile(rs.rows.item(i).downloadedfile);
                         }
-                        tx.executeSql("DELETE FROM Episode WHERE podcast=?", [episodeModel.pid]);
-                        tx.executeSql("DELETE FROM Podcast WHERE rowid=?", [episodeModel.pid]);
+                        tx.executeSql("DELETE FROM Episode WHERE podcast=?", [episodeId]);
+                        tx.executeSql("DELETE FROM Podcast WHERE rowid=?", [episodeId]);
                         mainStack.pop()
                         PopupUtils.close(dialogInternal)
                     });
@@ -176,20 +210,135 @@
         }
     }
 
+    Component {
+        id: popoverComponent
+
+        Popover {
+            id: popover
+
+            property bool queued: false
+            property bool listened: false
+            property string downloadedfile: ""
+            property string guid: ""
+            property string audiourl: ""
+            property int index: -1
+
+            contentWidth: mainColumn.width
+
+            Column {
+                id: mainColumn
+
+                width: Math.max(download.width, listen.width)
+                anchors.top: parent.top
+
+                ListItem.Empty {
+                    id: download
+
+                    width: Math.max(row.width, row2.width)
+
+                    Row {
+                        id: row
+
+                        spacing: units.gu(3)
+                        anchors.left: parent.left
+                        anchors.leftMargin: units.gu(2)
+                        anchors.verticalCenter: parent.verticalCenter
+                        width: downloadIcon.width + downloadText.implicitWidth + row.spacing + units.gu(4)
+
+                        Icon {
+                            id: downloadIcon
+                            width: height
+                            height: downloadText.height
+                            name: popover.downloadedfile ? "delete" : (popover.queued && downloader.downloadingGuid !== popover.guid ? "history" : "save")
+                        }
+
+                        Label {
+                            id: downloadText
+                            color: UbuntuColors.darkGrey
+                            text: popover.downloadedfile ? i18n.tr("Delete local file")
+                                                         : (popover.queued && downloader.downloadingGuid !== popover.guid ? i18n.tr("Episode queued for download")
+                                                                                                                          : i18n.tr("Download episode"))
+                        }
+                    }
+
+                    enabled: downloader.downloadingGuid !== popover.guid
+                    onClicked: {
+                        var db = Podcasts.init();
+                        if (popover.downloadedfile) {
+                            fileManager.deleteFile(popover.downloadedfile);
+                            db.transaction(function (tx) {
+                                tx.executeSql("UPDATE Episode SET downloadedfile = NULL WHERE guid = ?", [popover.guid]);
+                            });
+                            episodeModel.setProperty(popover.index, "downloadedfile", "")
+                        } else {
+                            db.transaction(function (tx) {
+                                tx.executeSql("UPDATE Episode SET queued=1 WHERE guid = ?", [popover.guid]);
+                            });
+                            episodeModel.setProperty(popover.index, "queued", 1)
+                            downloader.addDownload(popover.guid, popover.audiourl);
+                        }
+                        PopupUtils.close(popover)
+                    }
+                }
+
+                ListItem.Empty {
+                    id: listen
+
+                    showDivider: false
+                    width: Math.max(row.width, row2.width)
+
+                    Row {
+                        id: row2
+
+                        spacing: units.gu(3)
+                        anchors.left: parent.left
+                        anchors.leftMargin: units.gu(2)
+                        anchors.verticalCenter: parent.verticalCenter
+                        width: listenIcon.width + listenText.implicitWidth + row2.spacing + units.gu(4)
+
+                        Icon {
+                            id: listenIcon
+                            width: height
+                            height: listenText.height
+                            name: popover.listened ? "view-collapse" : "select"
+                        }
+
+                        Label {
+                            id: listenText
+                            color: UbuntuColors.darkGrey
+                            text: popover.listened ? "Mark episode unlistened" : "Mark episode listened"
+                        }
+                    }
+
+                    onClicked: {
+                        var db = Podcasts.init();
+                        db.transaction(function (tx) {
+                            if (popover.listened)
+                                tx.executeSql("UPDATE Episode SET listened=0 WHERE guid=?", [popover.guid])
+                            else
+                                tx.executeSql("UPDATE Episode SET listened=1 WHERE guid=?", [popover.guid])
+                            refreshModel();
+                        });
+                        PopupUtils.close(popover)
+                    }
+                }
+            }
+        }
+    }
+
     EmptyState {
         anchors.centerIn: parent
         anchors.verticalCenterOffset: Qt.inputMethod.visible ? units.gu(4) : 0
-        visible: episodesPage.state === "search" && sortedEpisodeModel.count === 0
-        iconName: "music-app-symbolic"
-        title: i18n.tr("No Episodes found")
-        subTitle: i18n.tr("No episodes found matching the search term.")
+        visible: (episodesPage.state === "search" && sortedEpisodeModel.count === 0) || (episodeModel.count === 0 && podbird.settings.hideListened)
+        iconHeight: units.gu(12)
+        iconWidth: iconHeight + units.gu(10)
+        iconSource: Qt.resolvedUrl("../graphics/notFound.svg")
+        title: podbird.settings.hideListened ? i18n.tr("No more episodes") : i18n.tr("No Episodes found")
+        subTitle: podbird.settings.hideListened ? i18n.tr("All episodes have been listened to.") : i18n.tr("No episodes found matching the search term.")
     }
 
     ListModel {
         id: episodeModel
-        property string pid;
-        property string artist;
-        property string image;
     }
 
     SortFilterModel {
@@ -199,12 +348,126 @@
         filter.pattern: RegExp(searchField.text, "gi")
     }
 
-    ListView {
+    function formatTime(seconds) {
+        var time = Podcasts.getTimeDiff(seconds)
+        var hour = time[0]
+        var minute = time[1]
+        // TRANSLATORS: the first argument is the number of hours,
+        // followed by minute (eg. 20h 3m)
+        if(hour > 0 &&  minute > 0) {
+            // xgettext: no-c-format
+            return (i18n.tr("%1 hr %2 min"))
+            .arg(hour)
+            .arg(minute)
+        }
+
+        // TRANSLATORS: this string indicates the number of hours
+        // eg. 20h (no plural state required)
+        else if(hour > 0 && minute === 0) {
+            // xgettext: no-c-format
+            return (i18n.tr("%1 hr"))
+            .arg(hour)
+        }
+
+        // TRANSLATORS: this string indicates the number of minutes
+        // eg. 15m (no plural state required)
+        else if(hour === 0 && minute > 0) {
+            // xgettext: no-c-format
+            return (i18n.tr("%1 min"))
+            .arg(minute)
+        }
+
+        else {
+            return Podcasts.formatTime(seconds)
+        }
+    }
+
+    UbuntuListView {
         id: episodeList
 
+        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;
+        }
+
+        anchors.fill: parent
+        model: sortedEpisodeModel
+
         clip: true
-        anchors.fill: parent
-        model: sortedEpisodeModel
+        section.property: "listened"
+        section.labelPositioning: ViewSection.InlineLabels
+
+        section.delegate: Rectangle {
+            width: parent.width
+            color: section === "0" ? podbird.theme.hightlightListView : "Transparent"
+            height: header.implicitHeight + units.gu(2)
+            Label {
+                id: header
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                    margins: units.gu(2)
+                    verticalCenter: parent.verticalCenter
+                }
+                fontSize: "x-large"
+                text: section === "0" ? i18n.tr("Unheard") : i18n.tr("Listened")
+            }
+        }
+
+        header: BlurredBackground {
+            id: blurredBackground
+
+            art: episodeImage
+            width: parent.width
+            visible: episodesPage.state !== "search" && sortedEpisodeModel.count !== 0
+            height: episodesPage.state !== "search" && sortedEpisodeModel.count !== 0 ? cover.height + units.gu(4) : 0
+            backgroundStrength: podbird.settings.themeName === "Light.qml" ? 0.3 : 0.6
+
+            Image {
+                id:cover
+                width: units.gu(12)
+                height: width
+                sourceSize.height: width
+                sourceSize.width: width
+                source: episodeImage
+                anchors {
+                    left: parent.left
+                    top: parent.top
+                    margins: units.gu(2)
+                }
+            }
+
+            Column {
+                id: podcastTitle
+
+                anchors {
+                    left: cover.right
+                    right: parent.right
+                    bottom: parent.bottom
+                    margins: units.gu(2)
+                }
+
+                Label {
+                    text: episodeName
+                    width: parent.width
+                    wrapMode: Text.WordWrap
+                    maximumLineCount: 2
+                    elide: Text.ElideRight
+                    color: podbird.theme.baseText
+                }
+
+                Label {
+                    text: i18n.tr("%1 episode", "%1 episodes", episodeList.count).arg(episodeList.count)
+                    width: parent.width
+                    elide: Text.ElideRight
+                    fontSize: "x-small"
+                    color: podbird.theme.baseText
+                }
+            }
+        }
 
         footer: Item {
             width: parent.width
@@ -214,51 +477,41 @@
         delegate: ListItem.Empty {
             id: listItem
 
-            property bool expanded: false
+            property bool expanded
 
-            width: parent.width
-            height: mainColumn.height
+            height: dataColumn.height + units.gu(2)
             highlightWhenPressed: false
+            showDivider: false
 
-            onClicked: listItem.expanded = !listItem.expanded
+            onClicked: {
+                expanded = !expanded;
+            }
 
             Rectangle {
-                anchors.fill: parent
-                color: listItem.pressed ? podbird.theme.hightlightListView : "transparent"
+                visible: !model.listened
+                width: parent.width
+                height: dataColumn.height + units.gu(2)
+                color: podbird.theme.hightlightListView
             }
 
             Column {
-                id: mainColumn
-
-                anchors {
-                    top: parent.top
-                    left: parent.left
-                    right: parent.right
-                    margins: units.gu(2)
-                    topMargin: units.gu(1)
-                }
+                id: dataColumn
 
                 spacing: units.gu(1)
+                anchors.left: parent.left
+                anchors.right: parent.right
+                anchors.margins: units.gu(2)
+                anchors.top: parent.top
+                anchors.topMargin: units.gu(0.5)
 
                 RowLayout {
-                    id: titleRow
+                    id: rowlayout
 
                     width: parent.width
-                    spacing: units.gu(2)
-
-                    Image {
-                        id: imgFrame
-                        width: units.gu(6)
-                        height: width
-                        sourceSize.height: width
-                        sourceSize.width: width
-                        source: model.image
-                    }
+                    height: titleColumn.height
 
                     Column {
-                        id: detailColumn
-
-                        anchors.verticalCenter: imgFrame.verticalCenter
+                        id: titleColumn
                         Layout.fillWidth: true
 
                         Label {
@@ -267,19 +520,88 @@
                             maximumLineCount: 2
                             wrapMode: Text.WordWrap
                             elide: Text.ElideRight
-                            color: currentGuid === model.guid ? podbird.theme.focusText
-                                                              : podbird.theme.baseText
+                            color: listItem.expanded || currentGuid === model.guid || downloader.downloadingGuid === model.guid ? podbird.theme.focusText
+                                                                                                                                : podbird.theme.baseText
                         }
 
                         Label {
                             id: episodePublishDate
                             width: parent.width
-                            text: Qt.formatDate(new Date(model.published), "MMM d, yyyy")
+                            text: formatTime(model.duration) + " | " + Qt.formatDate(new Date(model.published), "MMM d, yyyy")
                             fontSize: "x-small"
-                            color: currentGuid === model.guid ? podbird.theme.focusText
-                                                              : podbird.theme.baseText
                             elide: Text.ElideRight
-                        }
+                            color: podbird.theme.baseSubText
+                        }
+                    }
+
+                    ActionButton {
+                        id: contextualMenu
+
+                        width: units.gu(5)
+                        height: units.gu(4)
+
+                        iconName: "contextual-menu"
+                        color: progressBar.visible || listItem.expanded ? podbird.theme.focusText
+                                                                        : podbird.theme.baseIcon
+                        onClicked: {
+                            var popover = PopupUtils.open(popoverComponent, contextualMenu)
+                            popover.queued = Qt.binding(function() { return model.queued })
+                            popover.listened = Qt.binding(function() { return model.listened })
+                            popover.guid = Qt.binding(function() { return model.guid })
+                            popover.audiourl = Qt.binding(function() { return model.audiourl })
+                            popover.downloadedfile = Qt.binding(function() { return episodeModel.get(index).downloadedfile })
+                            popover.index = Qt.binding(function() { return index })
+                        }
+                    }
+
+                    ActionButton {
+                        width: units.gu(4)
+                        height: units.gu(4)
+
+                        iconName: player.playbackState === MediaPlayer.PlayingState && currentGuid === model.guid ? "media-playback-pause"
+                                                                                                                  : "media-playback-start"
+                        color: player.playbackState === MediaPlayer.PlayingState && currentGuid === model.guid ? podbird.theme.focusText
+                                                                                                               : podbird.theme.baseIcon
+
+                        onClicked: {
+                            var db = Podcasts.init();
+                            db.transaction(function (tx) {
+                                if (currentGuid === model.guid) {
+                                    if (player.playbackState === MediaPlayer.PlayingState) {
+                                        player.pause()
+                                    } else {
+                                        player.play()
+                                    }
+                                } else {
+                                    currentGuid = "";
+                                    player.source = model.downloadedfile ? model.downloadedfile : model.audiourl;
+                                    var rs = tx.executeSql("SELECT position FROM Episode WHERE guid=?", [model.guid]);
+                                    player.play();
+                                    player.seek(rs.rows.item(0).position);
+                                    currentName = model.name;
+                                    currentArtist = model.artist;
+                                    currentImage = model.image;
+                                    currentGuid = model.guid;
+                                }
+                            });
+                        }
+                    }
+                }
+
+                Rectangle {
+                    id: progressBar
+                    radius: width/3
+                    width: parent.width
+                    height: units.dp(5)
+                    color: Theme.palette.normal.base
+                    visible: downloader.downloadingGuid === model.guid
+                    Rectangle {
+                        height: parent.height
+                        radius: parent.radius
+                        anchors.left: parent.left
+                        anchors.top: parent.top
+                        color: podbird.theme.focusText
+                        width: downloader.progress > 0 ? Math.min((downloader.progress / 100) * parent.width, parent.width) : 0
                     }
                 }
 
@@ -288,184 +610,15 @@
                     text: model.description
                     textFormat: Text.RichText
                     clip: true
-                    height: listItem.expanded ? contentHeight : units.gu(4)
+                    height: listItem.expanded ? contentHeight : 0
                     wrapMode: Text.WordWrap
                     width: parent.width
-                    elide: Text.ElideRight
                     fontSize: "small"
                     color: podbird.theme.baseSubText
                     Behavior on height {
                         UbuntuNumberAnimation {
-                            duration: UbuntuAnimation.SlowDuration
-                        }
-                    }
-
-                }
-
-                Item {
-                    id: statusBox
-
-                    width: parent.width
-                    height: units.gu(6)
-
-                    function formatTime(seconds) {
-                        var time = Podcasts.getTimeDiff(seconds)
-                        var hour = time[0]
-                        var minute = time[1]
-                        // TRANSLATORS: the first argument is the number of hours,
-                        // followed by minute (eg. 20h 3m)
-                        if(hour > 0 &&  minute > 0) {
-                            // xgettext: no-c-format
-                            return (i18n.tr("%1h %2m"))
-                            .arg(hour)
-                            .arg(minute)
-                        }
-
-                        // TRANSLATORS: this string indicates the number of hours
-                        // eg. 20h (no plural state required)
-                        else if(hour > 0 && minute === 0) {
-                            // xgettext: no-c-format
-                            return (i18n.tr("%1h"))
-                            .arg(hour)
-                        }
-
-                        // TRANSLATORS: this string indicates the number of minutes
-                        // eg. 15m (no plural state required)
-                        else if(hour === 0 && minute > 0) {
-                            // xgettext: no-c-format
-                            return (i18n.tr("%1m"))
-                            .arg(minute)
-                        }
-
-                        else {
-                            return Podcasts.formatTime(model.duration)
-                        }
-                    }
-
-                    Rectangle {
-                        id: listened
-                        border.color: UbuntuColors.lightGrey
-                        height: units.gu(2.5)
-                        width: height
-                        radius: width / 2
-                        anchors.right: durationIcon.left
-                        anchors.rightMargin: units.gu(2)
-                        anchors.verticalCenter: actionRow.verticalCenter
-                        visible: model.listened
-                        Icon {
-                            id: tick
-                            name: "tick"
-                            anchors.centerIn: parent
-                            anchors.verticalCenterOffset: units.gu(0.1)
-                            height: units.gu(1.4)
-                            width: height
-                        }
-                    }
-
-                    Icon {
-                        id: durationIcon
-                        width: units.gu(2.5)
-                        height: width
-                        name: "alarm-clock"
-                        visible: duration.text !== ""
-                        anchors.right: duration.left
-                        anchors.rightMargin: units.gu(0.5)
-                        anchors.verticalCenter: actionRow.verticalCenter
-                        color: podbird.theme.baseIcon
-                    }
-
-                    Label {
-                        id: duration
-                        color: podbird.theme.baseText
-                        anchors.right: parent.right
-                        anchors.verticalCenter: durationIcon.verticalCenter
-                        fontSize: "small"
-                        text: !isNaN(model.duration) && model.duration !== 0 ? statusBox.formatTime(model.duration) : ""
-                    }
-
-                    Row {
-                        id: actionRow
-
-                        anchors.left: parent.left
-                        anchors.leftMargin: units.gu(-1.5)
-
-                        ActionButton {
-                            width: units.gu(5)
-                            height: units.gu(4)
-
-                            iconName: player.playbackState === MediaPlayer.PlayingState && currentGuid === model.guid ? "media-playback-pause"
-                                                                                                                      : "media-playback-start"
-
-                            onClicked: {
-                                var db = Podcasts.init();
-                                db.transaction(function (tx) {
-                                    if (currentGuid === model.guid) {
-                                        if (player.playbackState === MediaPlayer.PlayingState) {
-                                            player.pause()
-                                        } else {
-                                            player.play()
-                                        }
-                                    } else {
-                                        currentGuid = "";
-                                        player.source = model.downloadedfile ? model.downloadedfile : model.audiourl;
-                                        var rs = tx.executeSql("SELECT position FROM Episode WHERE guid=?", [model.guid]);
-                                        player.play();
-                                        player.seek(rs.rows.item(0).position);
-                                        currentName = model.name;
-                                        currentArtist = model.artist;
-                                        currentImage = model.image;
-                                        currentGuid = model.guid;
-                                    }
-                                });
-                            }
-                        }
-
-                        ActionButton {
-                            id: downloadButton
-
-                            width: units.gu(5)
-                            height: units.gu(4)
-
-                            property bool queued: false
-
-                            iconName: model.downloadedfile ? "delete" : (queued && downloader.downloadingGuid !== model.guid ? "history" : "save")
-                            opacity: downloader.downloadingGuid === model.guid ? 0.4 : 1.0
-                            enabled: downloader.downloadingGuid !== model.guid
-
-                            ActivityIndicator {
-                                anchors.centerIn: parent
-                                visible: downloader.downloadingGuid === model.guid
-                                running: visible
-                            }
-
-                            onClicked: {
-                                if (model.downloadedfile) {
-                                    fileManager.deleteFile(model.downloadedfile);
-                                    var db = Podcasts.init();
-                                    db.transaction(function (tx) {
-                                        tx.executeSql("UPDATE Episode SET downloadedfile = NULL WHERE guid = ?", [model.guid]);
-                                    });
-                                    loadEpisodes(episodeModel.pid, episodeModel.artist, episodeModel.image);
-                                } else {
-                                    downloadButton.queued = true;
-                                    downloader.addDownload(model.guid, model.audiourl);
-                                }
-                            }
-                        }
-                    }
-
-
-                    ProgressBar {
-                        visible: downloader.downloadingGuid === model.guid
-                        minimumValue: 0
-                        maximumValue: 100
-                        anchors.left: actionRow.right
-                        anchors.right: model.listened ? listened.left : durationIcon.left
-                        anchors.leftMargin: units.gu(2)
-                        anchors.rightMargin: units.gu(2)
-                        anchors.verticalCenter: actionRow.verticalCenter
-                        height: units.gu(2.6)
-                        value: downloader.progress
+                            duration: UbuntuAnimation.BriskDuration
+                        }
                     }
                 }
             }
@@ -483,21 +636,28 @@
 
     function refreshModel() {
         var db = Podcasts.init();
-        loadEpisodes(episodeModel.pid, episodeModel.artist, episodeModel.image);
+        loadEpisodes(episodeId, episodeArtist, episodeImage);
         episodesUpdating = false;
     }
 
     function loadEpisodes(pid, artist, img) {
+        var i, episode;
+        var newCount = 0;
+
+        episodeModel.clear();
+
         var db = Podcasts.init();
         db.transaction(function (tx) {
-            episodeModel.clear();
             var rs = tx.executeSql("SELECT rowid, * FROM Episode WHERE podcast=? ORDER BY published DESC", [pid]);
-            for(var i = 0; i < rs.rows.length; i++) {
-                var episode = rs.rows.item(i);
-                episodeModel.pid = pid;
-                episodeModel.artist = artist;
-                episodeModel.image = img;
-                episodeModel.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" : img, "artist" : artist, "audiourl" : episode.audiourl});
+            for(i = 0; i < rs.rows.length; i++) {
+                episode = rs.rows.item(i);
+                //console.log(episode.queued)
+                if (!episode.listened) {
+                    episodeModel.insert(newCount, {"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" : img, "artist" : artist, "audiourl" : episode.audiourl, "queued": episode.queued});
+                    newCount++;
+                } else if (!podbird.settings.hideListened) {
+                    episodeModel.insert(i,{"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" : img, "artist" : artist, "audiourl" : episode.audiourl, "queued": episode.queued});
+                }
             }
         });
     }
@@ -558,12 +718,13 @@
                                             db.transaction(function(tx2) {
                                                 var ers = tx2.executeSql("SELECT rowid FROM Episode WHERE guid=?", [track.guid]);
                                                 if (ers.rows.length === 0) {
-                                                    tx2.executeSql("INSERT INTO Episode(podcast, name, description, audiourl, guid, listened, duration, published) VALUES(?, ?, ? , ?, ?, ?, ?, ?)", [pid,
+                                                    tx2.executeSql("INSERT INTO Episode(podcast, name, description, audiourl, guid, listened, queued, duration, published) VALUES(?, ?, ? , ?, ?, ?, ?, ?)", [pid,
                                                                                                                                                                                                       track.name,
                                                                                                                                                                                                       track.description,
                                                                                                                                                                                                       track.audiourl,
                                                                                                                                                                                                       track.guid,
                                                                                                                                                                                                       false,
+                                                                                                                                                                                                      false,
                                                                                                                                                                                                       track.duration,
                                                                                                                                                                                                       track.published]);
                                                 }

=== modified file 'app/ui/ExpandableListItem.qml'
--- app/ui/ExpandableListItem.qml	2015-03-27 15:04:39 +0000
+++ app/ui/ExpandableListItem.qml	2015-04-11 21:39:04 +0000
@@ -61,6 +61,7 @@
                     width: units.gu(2)
                     height: width
                     anchors.right: parent.right
+                    anchors.rightMargin: units.gu(1)
                     anchors.verticalCenter: parent.verticalCenter
 
                     name: "go-down"

=== modified file 'app/ui/NowPlayingPage.qml'
--- app/ui/NowPlayingPage.qml	2015-03-08 11:10:07 +0000
+++ app/ui/NowPlayingPage.qml	2015-04-11 21:39:04 +0000
@@ -101,6 +101,11 @@
         function formatValue(v) { return Podcasts.formatTime(v/1000); }
     }
 
+    Connections {
+        target: player
+        onPositionChanged: scrubber.value = player.position
+    }
+
     Label {
         id: startTime
         fontSize: "small"

=== modified file 'app/ui/PlayerControls.qml'
--- app/ui/PlayerControls.qml	2015-03-08 11:10:07 +0000
+++ app/ui/PlayerControls.qml	2015-04-11 21:39:04 +0000
@@ -53,7 +53,7 @@
             id: progressBarHint
             anchors.left: parent.left
             anchors.top: cover.bottom
-            color: UbuntuColors.orange
+            color: podbird.theme.focusText
             height: units.gu(0.25)
             width: player.duration > 0 ? (player.position / player.duration) * parent.width : 0
         }
@@ -72,7 +72,7 @@
                 color: "white"
                 elide: Text.ElideRight
                 maximumLineCount: 2
-                wrapMode: Text.WrapAnywhere
+                wrapMode: Text.WordWrap
                 text: currentName
             }
 

=== modified file 'app/ui/PodcastsTab.qml'
--- app/ui/PodcastsTab.qml	2015-03-29 15:33:26 +0000
+++ app/ui/PodcastsTab.qml	2015-04-11 21:39:04 +0000
@@ -36,6 +36,8 @@
     page: Page {
         id: podcastPage
 
+        flickable: viewLoader.item
+
         /*
          #FIXME: The following lines of code is necessary due to a upstream bug
          in the SDK http://pad.lv/1400297. This bug is still present in the rtm.
@@ -74,6 +76,14 @@
                             podcastPage.state = "search"
                             searchField.forceActiveFocus()
                         }
+                    },
+
+                    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
+                        }
                     }
                 ]
             },
@@ -85,7 +95,7 @@
                     iconName: "back"
                     text: i18n.tr("Back")
                     onTriggered: {
-                        view.forceActiveFocus()
+                        viewLoader.item.forceActiveFocus()
                         searchField.text = ""
                         podcastPage.state = "default"
                     }
@@ -108,7 +118,7 @@
                     iconName: "back"
                     text: i18n.tr("Back")
                     onTriggered: {
-                        view.forceActiveFocus()
+                        viewLoader.item.forceActiveFocus()
                         feedUrlField.text = ""
                         podcastPage.state = "default"
                     }
@@ -119,7 +129,7 @@
                         iconName: "ok"
                         text: i18n.tr("Save Podcast")
                         onTriggered: {
-                            view.forceActiveFocus()
+                            viewLoader.item.forceActiveFocus()
                             subscribeFromFeed(feedUrlField.text);
                             feedUrlField.text = ""
                             podcastPage.state = "default"
@@ -134,7 +144,7 @@
                     anchors.left: parent ? parent.left : undefined
                     anchors.right: parent ? parent.right : undefined
                     onAccepted: {
-                        view.forceActiveFocus()
+                        viewLoader.item.forceActiveFocus()
                         subscribeFromFeed(feedUrlField.text);
                         feedUrlField.text = ""
                         podcastPage.state = "default"
@@ -167,8 +177,10 @@
         EmptyState {
             anchors.centerIn: parent
             anchors.verticalCenterOffset: Qt.inputMethod.visible ? units.gu(4) : 0
+            iconHeight: units.gu(12)
+            iconWidth: iconHeight + units.gu(10)
+            iconSource: Qt.resolvedUrl("../graphics/notFound.svg")
             visible: podcastModel.count === 0 || sortedPodcastModel.count === 0
-            iconName: "music-app-symbolic"
             title: podcastModel.count === 0 ? i18n.tr("No Podcast Subscriptions")
                                             : i18n.tr("No Podcasts Found")
             subTitle: podcastModel.count === 0 ? i18n.tr("You haven't subscribed to any podcasts yet, visit the 'Find New Podcasts' page to add some.")
@@ -186,122 +198,158 @@
             filter.pattern: RegExp(searchField.text, "gi")
         }
 
-        ListModel {
-            id: episodeModel
-            property string pid;
-            property string artist;
-            property string image;
-        }
-
-        ListView {
-            id: view
-
-            clip: true
-            model: sortedPodcastModel
+        Loader {
+            id: viewLoader
             anchors.fill: parent
-
-            footer: Item {
-                width: parent.width
-                height: units.gu(8)
-            }
-
-            delegate: ListItem.Empty {
-                id: listItem
-
-                property bool expanded: false
-
-                height: units.gu(8)
-                removable: true
-                confirmRemoval: true
-                highlightWhenPressed: false
-
-                onItemRemoved: {
-                    var db = Podcasts.init();
-                    db.transaction(function (tx) {
-                        var rs = tx.executeSql("SELECT downloadedfile FROM Episode WHERE downloadedfile NOT NULL AND podcast=?", [model.id]);
-                        for(var i = 0; i < rs.rows.length; i++) {
-                            fileManager.deleteFile(rs.rows.item(i).downloadedfile);
-                        }
-                        tx.executeSql("DELETE FROM Episode WHERE podcast=?", [model.id]);
-                        tx.executeSql("DELETE FROM Podcast WHERE rowid=?", [model.id]);
-                        refreshModel()
-                    });
-                }
-
-                Rectangle {
-                    anchors.fill: parent
-                    color: listItem.pressed ? podbird.theme.hightlightListView : "transparent"
-                }
-
-                onClicked: {
-                    if(podcastPage.state === "search") {
-                        view.forceActiveFocus()
-                        searchField.text = ""
-                        podcastPage.state = "default"
-                    }
-                    mainStack.push(Qt.resolvedUrl("EpisodesPage.qml"), {"episodeName": model.name, "episodeId": model.id, "episodeArtist": model.artist, "episodeImage": model.image})
-                }
-
-                Column {
-                    id: mainColumn
-
-                    anchors.left: parent.left
-                    anchors.right: parent.right
-                    anchors.margins: units.gu(2)
-                    anchors.verticalCenter: parent.verticalCenter
-                    spacing: units.gu(1)
-
-                    RowLayout {
-                        id: titleRow
-
-                        width: parent.width
-                        spacing: units.gu(2)
-
-                        Image {
-                            id: imgFrame
-                            width: units.gu(6)
-                            height: width
-                            sourceSize.height: width
-                            sourceSize.width: width
-                            source: model.image
-                        }
-
-                        Column {
-                            id: detailColumn
-
-                            anchors.verticalCenter: imgFrame.verticalCenter
-                            Layout.fillWidth: true
-
-                            Label {
-                                id: podcastTitle
-                                textFormat: Text.PlainText
-                                text: model.name.trim()
-                                width: parent.width
-                                fontSize: "small"
-                                elide: Text.ElideRight
-                                color: podbird.theme.baseText
-                            }
-
-                            Label {
-                                id: episodeCount
-                                width: parent.width
-                                fontSize: "x-small"
-                                color: podbird.theme.baseSubText
-                                visible: model.episodeCount > 0
-                                text: i18n.tr("%1 unheard episode", "%1 unheard episodes", model.episodeCount).arg(model.episodeCount)
-                            }
-                        }
-                    }
-                }
-            }
-
-            PullToRefresh {
-                refreshing: episodesUpdating
-                onRefresh: updateEpisodes();
-            }
-        }
-        Scrollbar {
-            flickableItem: view
+            sourceComponent: podbird.settings.showListView ? listviewComponent : cardviewComponent
+        }
+
+        Component {
+            id: cardviewComponent
+
+            CardView {
+                id: cardView
+                model: sortedPodcastModel
+                delegate: Card {
+                    id: albumCard
+                    coverArt: model.image
+                    primaryText: model.name.trim()
+                    secondaryText: i18n.tr("%1 unheard episode", "%1 unheard episodes", model.episodeCount).arg(model.episodeCount)
+                    onClicked: {
+                        if(podcastPage.state === "search") {
+                            cardView.forceActiveFocus()
+                            searchField.text = ""
+                            podcastPage.state = "default"
+                        }
+                        mainStack.push(Qt.resolvedUrl("EpisodesPage.qml"), {"episodeName": model.name, "episodeId": model.id, "episodeArtist": model.artist, "episodeImage": model.image})
+                    }
+                }
+            }
+        }
+
+        Component {
+            id: listviewComponent
+
+            ListView {
+                id: listView
+
+                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: sortedPodcastModel
+                anchors.fill: parent
+
+                footer: Item {
+                    width: parent.width
+                    height: units.gu(8)
+                }
+
+                delegate: ListItem.Empty {
+                    id: listItem
+
+                    property bool expanded: false
+
+                    height: units.gu(8)
+                    removable: true
+                    confirmRemoval: true
+                    showDivider: false
+                    highlightWhenPressed: false
+
+                    onItemRemoved: {
+                        var db = Podcasts.init();
+                        db.transaction(function (tx) {
+                            var rs = tx.executeSql("SELECT downloadedfile FROM Episode WHERE downloadedfile NOT NULL AND podcast=?", [model.id]);
+                            for(var i = 0; i < rs.rows.length; i++) {
+                                fileManager.deleteFile(rs.rows.item(i).downloadedfile);
+                            }
+                            tx.executeSql("DELETE FROM Episode WHERE podcast=?", [model.id]);
+                            tx.executeSql("DELETE FROM Podcast WHERE rowid=?", [model.id]);
+                            podcastModel.remove(index, 1)
+                        });
+                    }
+
+                    Rectangle {
+                        anchors.fill: parent
+                        opacity: 0.3
+                        color: index % 2 === 0 ? podbird.theme.hightlightListView : "Transparent"
+                    }
+
+                    onClicked: {
+                        if(podcastPage.state === "search") {
+                            listView.forceActiveFocus()
+                            searchField.text = ""
+                            podcastPage.state = "default"
+                        }
+                        mainStack.push(Qt.resolvedUrl("EpisodesPage.qml"), {"episodeName": model.name, "episodeId": model.id, "episodeArtist": model.artist, "episodeImage": model.image})
+                    }
+
+                    Column {
+                        id: mainColumn
+
+                        anchors.left: parent.left
+                        anchors.right: parent.right
+                        anchors.margins: units.gu(2)
+                        anchors.verticalCenter: parent.verticalCenter
+                        spacing: units.gu(1)
+
+                        RowLayout {
+                            id: titleRow
+
+                            width: parent.width
+                            spacing: units.gu(2)
+
+                            Image {
+                                id: imgFrame
+                                width: units.gu(6)
+                                height: width
+                                sourceSize.height: width
+                                sourceSize.width: width
+                                source: model.image
+                            }
+
+                            Column {
+                                id: detailColumn
+
+                                anchors.verticalCenter: imgFrame.verticalCenter
+                                Layout.fillWidth: true
+
+                                Label {
+                                    id: podcastTitle
+                                    textFormat: Text.PlainText
+                                    text: model.name.trim()
+                                    width: parent.width
+                                    fontSize: "small"
+                                    elide: Text.ElideRight
+                                    color: podbird.theme.baseText
+                                }
+
+                                Label {
+                                    id: episodeCount
+                                    width: parent.width
+                                    fontSize: "x-small"
+                                    color: podbird.theme.baseSubText
+                                    visible: model.episodeCount > 0
+                                    text: i18n.tr("%1 unheard episode", "%1 unheard episodes", model.episodeCount).arg(model.episodeCount)
+                                }
+                            }
+                        }
+                    }
+                }
+
+                Scrollbar {
+                    flickableItem: listView
+                }
+
+                PullToRefresh {
+                    refreshing: episodesUpdating
+                    onRefresh: updateEpisodes();
+                }
+            }
         }
     }
 

=== renamed file 'app/ui/SearchTab.qml' => 'app/ui/SearchPage.qml'
--- app/ui/SearchTab.qml	2015-03-29 15:33:26 +0000
+++ app/ui/SearchPage.qml	2015-04-11 21:39:04 +0000
@@ -23,24 +23,64 @@
 import Ubuntu.Components.ListItems 1.0 as ListItem
 import "../podcasts.js" as Podcasts
 
-Tab {
-    title: i18n.tr("Find New Podcasts")
+Page {
+    id: searchPage
 
     property var xhr: new XMLHttpRequest;
 
-    page: Page {
-        Column {
-            spacing: units.gu(2)
-            anchors.fill: parent
-            anchors.topMargin: units.gu(2)
-
-            TextField {
+    /*
+         #FIXME: The following lines of code is necessary due to a upstream bug
+         in the SDK http://pad.lv/1400297. This bug is still present in the rtm.
+         Once it is fixed, this following property and connection can be remvoed.
+        */
+    property Item __oldContents: null
+    Connections {
+        target: searchPage.head
+        onContentsChanged: {
+            if (searchPage.__oldContents) {
+                searchPage.__oldContents.parent = null;
+            }
+            searchPage.__oldContents = searchPage.head.contents;
+        }
+    }
+
+    state: "default"
+    states: [
+        PageHeadState {
+            name: "default"
+            head: searchPage.head
+            actions: [
+                Action {
+                    iconName: "search"
+                    text: i18n.tr("Search Episode")
+                    onTriggered: {
+                        searchPage.state = "search"
+                        searchField.forceActiveFocus()
+                    }
+                }
+            ]
+        },
+
+        PageHeadState {
+            name: "search"
+            head: searchPage.head
+            backAction: Action {
+                iconName: "back"
+                text: i18n.tr("Back")
+                onTriggered: {
+                    resultsView.forceActiveFocus()
+                    searchField.text = ""
+                    searchPage.state = "default"
+                }
+            }
+
+            contents: TextField {
                 id: searchField
-                anchors.left: parent.left
-                anchors.right: parent.right
-                anchors.margins: units.gu(2)
+                inputMethodHints: Qt.ImhNoPredictiveText
                 placeholderText: i18n.tr("Search...")
-                inputMethodHints: Qt.ImhNoPredictiveText;
+                anchors.left: parent ? parent.left : undefined
+                anchors.right: parent ? parent.right : undefined
+                anchors.rightMargin: units.gu(2)
                 onTextChanged: {
                     if (text.length > 2) {
                         search(text)
@@ -49,94 +89,113 @@
                     }
                 }
             }
-
-            ListView {
-                id: resultsView
-                clip: true
-                width: parent.width
-                model: searchResults
-                height: parent.height - searchField.height - units.gu(2)
-
-                footer: Item {
-                    width: parent.width
-                    height: units.gu(7)
-                }
-
-                delegate: ListItem.Empty {
-                    id: listItem
-
-                    height: units.gu(8)
-                    highlightWhenPressed: false
-
-                    Rectangle {
-                        anchors.fill: parent
-                        color: listItem.pressed ? podbird.theme.hightlightListView : "transparent"
-                    }
-
-                    RowLayout {
-                        id: titleRow
-
-                        anchors.left: parent.left
-                        anchors.right: parent.right
-                        anchors.margins: units.gu(2)
-                        anchors.verticalCenter: parent.verticalCenter
-
-                        spacing: units.gu(2)
-
-                        Image {
-                            id: imgFrame
-                            width: units.gu(6)
-                            height: width
-                            sourceSize.height: width
-                            sourceSize.width: width
-                            source: model.image
-                        }
-
-                        Column {
-                            id: detailColumn
-
-                            anchors.verticalCenter: imgFrame.verticalCenter
-                            Layout.fillWidth: true
-
-                            Label {
-                                id: podcastTitle
-                                textFormat: Text.PlainText
-                                text: model.name
-                                width: parent.width
-                                fontSize: "small"
-                                elide: Text.ElideRight
-                            }
-
-                            Label {
-                                id: episodeCount
-                                width: parent.width
-                                color: "#999999"
-                                text: model.artist
-                                fontSize: "x-small"
-                                elide: Text.ElideRight
-                            }
-                        }
-
-                        Button {
-                            anchors.right: parent.right
-                            text: i18n.tr("Subscribe")
-                            color: UbuntuColors.green
-                            onClicked: {
-                                Podcasts.subscribe(model.artist, model.name, model.feed, model.image);
-                                imageDownloader.feed = model.feed;
-                                imageDownloader.download(model.image);
-                                tabs.selectedTabIndex = 0;
-                                searchField.text = ""
-                            }
-                        }
-                    }
-                }
-
-                Scrollbar {
-                    flickableItem: resultsView
-                }
-
-            }
+        }
+    ]
+
+    EmptyState {
+        anchors.centerIn: parent
+        anchors.verticalCenterOffset: Qt.inputMethod.visible ? units.gu(4) : 0
+        iconHeight: units.gu(12)
+        iconWidth: iconHeight + units.gu(10)
+        visible: searchPage.state !== "search" ? true : searchResults.count === 0 && searchField.text.length > 2
+        iconSource: searchPage.state !== "search" ? Qt.resolvedUrl("../graphics/owlSearch.svg") : Qt.resolvedUrl("../graphics/notFound.svg")
+        title: searchPage.state !== "search" ? i18n.tr("Looking for a new Podcast?") : i18n.tr("No Podcasts found")
+        subTitle: searchPage.state !== "search" ? i18n.tr("Click the 'magnifier' at the top to search.") : i18n.tr("No podcasts found matching the search term.")
+    }
+
+    ListView {
+        id: resultsView
+
+        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: searchResults
+        anchors.fill: parent
+
+        footer: Item {
+            width: parent.width
+            height: units.gu(7)
+        }
+
+        delegate: ListItem.Empty {
+            id: listItem
+
+            height: units.gu(8)
+            showDivider: false
+            highlightWhenPressed: false
+
+            Rectangle {
+                anchors.fill: parent
+                opacity: 0.3
+                color: index % 2 === 0 ? podbird.theme.hightlightListView : "Transparent"
+            }
+
+            RowLayout {
+                id: titleRow
+
+                anchors.left: parent.left
+                anchors.right: parent.right
+                anchors.margins: units.gu(2)
+                anchors.verticalCenter: parent.verticalCenter
+
+                spacing: units.gu(2)
+
+                Image {
+                    id: imgFrame
+                    width: units.gu(6)
+                    height: width
+                    sourceSize.height: width
+                    sourceSize.width: width
+                    source: model.image
+                }
+
+                Column {
+                    id: detailColumn
+
+                    anchors.verticalCenter: imgFrame.verticalCenter
+                    Layout.fillWidth: true
+
+                    Label {
+                        id: podcastTitle
+                        textFormat: Text.PlainText
+                        text: model.name
+                        width: parent.width
+                        fontSize: "medium"
+                        elide: Text.ElideRight
+                    }
+
+                    Label {
+                        id: episodeCount
+                        width: parent.width
+                        color: "#999999"
+                        text: model.artist
+                        fontSize: "x-small"
+                        elide: Text.ElideRight
+                    }
+                }
+
+                Button {
+                    anchors.right: parent.right
+                    text: i18n.tr("Subscribe")
+                    color: UbuntuColors.green
+                    onClicked: {
+                        Podcasts.subscribe(model.artist, model.name, model.feed, model.image);
+                        imageDownloader.feed = model.feed;
+                        imageDownloader.download(model.image);
+                        tabs.selectedTabIndex = 0;
+                        searchField.text = ""
+                    }
+                }
+            }
+        }
+
+        Scrollbar {
+            flickableItem: resultsView
         }
     }
 

=== 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-11 21:39:04 +0000
@@ -20,98 +20,131 @@
 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 })
-            }
-        }
+Page {
+    id: settingsPage
+
+    Flickable {
+        id: flickable
+
+        anchors.fill: parent
+        contentHeight: settingsColumn.height + units.gu(8)
+        contentWidth: parent.width
 
         Column {
             id: settingsColumn
 
-            anchors.fill: parent
-
-            ExpandableListItem {
-                id: themeSetting
-
-                model: themeModel
+            anchors {
+                top: parent.top
+                left: parent.left
+                right: parent.right
+            }
+
+            ListItem.Header {
+                text: i18n.tr("General Settings")
+            }
+
+            ListItem.SingleValue {
+                progression: true
+                showDivider: false
                 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
-                    }
-                }
+                value: podbird.settings.themeName.split(".qml")[0]
+                onClicked: mainStack.push(Qt.resolvedUrl("../settings/ThemeSetting.qml"))
+            }
+
+            ListItem.Header {
+                text: i18n.tr("Podcast Episode Settings")
+            }
+
+            ListItem.Standard {
+                showDivider: false
+                text: i18n.tr("Hide listened episodes")
+                control: Switch {
+                    checked: podbird.settings.hideListened
+                    onClicked: podbird.settings.hideListened = checked
+                }
+            }
+
+            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")
+                    }
+                }
+            }
+
+            ListItem.Standard {
+                showDivider: false
+                text: i18n.tr("Auto download on WiFi only")
+                enabled: podbird.settings.maxEpisodeDownload !== -1
+                control: Switch {
+                    checked: podbird.settings.onlyWifiDownload
+                    onClicked: {
+                        podbird.settings.onlyWifiDownload = checked
+                    }
+                }
+            }
+
+            ListItem.Header {
+                text: i18n.tr("Misc.")
+            }
+
+            ListItem.Standard {
+                progression: true
+                showDivider: false
+                text: i18n.tr("About")
+                onClicked: mainStack.push(Qt.resolvedUrl("../settings/About.qml"))
+            }
+
+            ListItem.Standard {
+                progression: true
+                showDivider: false
+                text: i18n.tr("Report Bug")
+                onClicked: Qt.openUrlExternally("https://bugs.launchpad.net/podbird/+filebug")
             }
         }
     }
 }
+
+

=== added file 'app/ui/Walkthrough.qml'
--- app/ui/Walkthrough.qml	1970-01-01 00:00:00 +0000
+++ app/ui/Walkthrough.qml	2015-04-11 21:39:04 +0000
@@ -0,0 +1,169 @@
+/*
+ * Copyright 2015 Nekhelesh Ramananthan (UCS)
+ *
+ * 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: walkthrough
+
+    // Property to set the app name used in the walkthrough
+    property string appName
+
+    // Property to check if this is the first run or not
+    property bool isFirstRun: true
+
+    // Property to store the slides shown in the walkthrough (Each slide is a component defined in a separate file for simplicity)
+    property list<Component> model
+
+    // Property to set the color of bottom cirle to indicate the user's progress
+    property color completeColor: "green"
+
+    // Property to set the color of the bottom circle to indicate the slide still left to cover
+    property color inCompleteColor: "lightgrey"
+
+    // Property to set the color of the skip welcome wizard text
+    property color skipTextColor: "grey"
+
+    // Property to signal walkthrough completion
+    signal finished
+
+    // ListView to show the slides
+    ListView {
+        id: listView
+        anchors {
+            left: parent.left
+            right: parent.right
+            top: skipLabel.bottom
+            bottom: slideIndicator.top
+        }
+
+        model: walkthrough.model
+        snapMode: ListView.SnapOneItem
+        orientation: Qt.Horizontal
+        highlightMoveDuration: UbuntuAnimation.FastDuration
+        highlightRangeMode: ListView.StrictlyEnforceRange
+        highlightFollowsCurrentItem: true
+
+        delegate: Item {
+            width: listView.width
+            height: listView.height
+            clip: true
+
+            Loader {
+                anchors {
+                    fill: parent
+                    margins: units.gu(2)
+                }
+
+                sourceComponent: modelData
+            }
+        }
+    }
+
+    // Label to skip the walkthrough. Only visible on the first slide
+    Label {
+        id: skipLabel
+
+        color: skipTextColor
+        fontSize: "small"
+        wrapMode: Text.WordWrap
+        text: i18n.tr("Skip")
+        horizontalAlignment: Text.AlignRight
+
+        anchors {
+            top: parent.top
+            left: parent.left
+            right: parent.right
+            margins: units.gu(2)
+        }
+
+        MouseArea {
+            anchors.fill: parent
+            onClicked: walkthrough.finished()
+        }
+    }
+
+    // Indicator element to represent the current slide of the walkthrough
+    Row {
+        id: slideIndicator
+        height: units.gu(6)
+        spacing: units.gu(2)
+        anchors {
+            bottom: parent.bottom
+            horizontalCenter: parent.horizontalCenter
+        }
+
+        Repeater {
+            model: walkthrough.model.length
+            delegate: Rectangle {
+                height: width
+                radius: width/2
+                width: units.gu(2)
+                antialiasing: true
+                border.width: listView.currentIndex == index ? units.gu(0.2) : units.gu(0)
+                border.color: completeColor
+                anchors.verticalCenter: parent.verticalCenter
+                color: listView.currentIndex == index ? "White"
+                                                      : listView.currentIndex >= index ? completeColor
+                                                                                       : inCompleteColor
+                Behavior on color {
+                    ColorAnimation {
+                        duration: UbuntuAnimation.FastDuration
+                    }
+                }
+            }
+        }
+    }
+
+    ActionButton {
+        id: rightchevron
+
+        width: units.gu(6)
+        height: units.gu(6)
+
+        anchors {
+            bottom: parent.bottom
+            right: parent.right
+        }
+
+        iconName: "chevron"
+        visible: enabled
+        enabled: listView.currentIndex !== listView.count-1
+        onClicked: listView.currentIndex++
+    }
+
+    ActionButton {
+        id: leftchevron
+
+        width: units.gu(6)
+        height: units.gu(6)
+
+        anchors {
+            bottom: parent.bottom
+            left: parent.left
+        }
+
+        iconName: "chevron"
+        rotation: 180
+        visible: enabled
+        enabled: listView.currentIndex !== 0
+        onClicked: listView.currentIndex--
+    }
+}

=== added directory 'app/welcomewizard'
=== added file 'app/welcomewizard/CMakeLists.txt'
--- app/welcomewizard/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ app/welcomewizard/CMakeLists.txt	2015-04-11 21:39:04 +0000
@@ -0,0 +1,8 @@
+file(GLOB WELCOMEWIZARD_QML_JS_FILES *.qml *.js)
+
+# Make the files visible in the qtcreator tree
+add_custom_target(podbird_welcomewizard_QMlFiles ALL SOURCES ${WELCOMEWIZARD_QML_JS_FILES})
+
+install(FILES ${WELCOMEWIZARD_QML_JS_FILES} DESTINATION ${PODBIRD_DIR}/welcomewizard)
+
+

=== added file 'app/welcomewizard/Slide1.qml'
--- app/welcomewizard/Slide1.qml	1970-01-01 00:00:00 +0000
+++ app/welcomewizard/Slide1.qml	2015-04-11 21:39:04 +0000
@@ -0,0 +1,76 @@
+/*
+ * 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
+
+// Slide 1
+Component {
+    id: slide1
+    Item {
+        id: slide1Container
+
+        Image {
+            anchors {
+                top: parent.top
+                bottom: introductionText.top
+                bottomMargin: units.gu(6)
+                horizontalCenter: parent.horizontalCenter
+            }
+            source: Qt.resolvedUrl("../graphics/podbird.png")
+            fillMode: Image.PreserveAspectFit
+            antialiasing: true
+        }
+
+        Label {
+            id: introductionText
+            text: i18n.tr("Welcome to Podbird")
+            fontSize: "x-large"
+            height: contentHeight
+            anchors.centerIn: parent
+        }
+
+        Label {
+            id: bodyText
+            text: i18n.tr("Enjoy your favourite podcasts with Podbird, the one and only podcast \
+manager for Ubuntu Touch.\n\nChirp Chirp..")
+            anchors.left: parent.left
+            anchors.right: parent.right
+            anchors.margins: units.gu(1)
+            anchors.top: introductionText.bottom
+            anchors.topMargin: units.gu(4)
+            anchors.bottom: swipeText.top
+            wrapMode: Text.WordWrap
+            horizontalAlignment: Text.AlignHCenter
+        }
+
+        Label {
+            id: swipeText
+            anchors.left: parent.left
+            anchors.right: parent.right
+            anchors.margins: units.gu(1)
+            anchors.bottom: parent.bottom
+            color: "grey"
+            fontSize: "small"
+            wrapMode: Text.WordWrap
+            horizontalAlignment: Text.AlignHCenter
+            text: i18n.tr("Swipe to move between Pages")
+
+        }
+    }
+}

=== added file 'app/welcomewizard/Slide2.qml'
--- app/welcomewizard/Slide2.qml	1970-01-01 00:00:00 +0000
+++ app/welcomewizard/Slide2.qml	2015-04-11 21:39:04 +0000
@@ -0,0 +1,66 @@
+/*
+ * 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
+
+// Slide 2
+Component {
+    id: slide2
+    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/discover.png")
+        }
+
+        Label {
+            id: introductionText
+            anchors.centerIn: parent
+            elide: Text.ElideRight
+            fontSize: "x-large"
+            maximumLineCount: 2
+            text: i18n.tr("Discover New Podcasts")
+            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)
+            }
+            horizontalAlignment: Text.AlignHCenter
+            text: i18n.tr("Podbird uses the Itunes database to provide access to a huge collections of podcasts. You can also add podcasts by URL.")
+            wrapMode: Text.WordWrap
+        }
+    }
+}

=== added file 'app/welcomewizard/Slide3.qml'
--- app/welcomewizard/Slide3.qml	1970-01-01 00:00:00 +0000
+++ app/welcomewizard/Slide3.qml	2015-04-11 21:39:04 +0000
@@ -0,0 +1,67 @@
+/*
+ * 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
+
+// Slide 3
+Component {
+    id: slide3
+    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/smart.png")
+        }
+
+        Label {
+            id: introductionText
+            anchors.centerIn: parent
+            elide: Text.ElideRight
+            fontSize: "x-large"
+            maximumLineCount: 2
+            text: i18n.tr("Smart Settings")
+            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)
+            }
+            horizontalAlignment: Text.AlignHCenter
+            text: i18n.tr("Podbird automatically downloads new episodes and cleans up old episodes. \
+As a power user you can also tweak these settings to suit your needs.")
+            wrapMode: Text.WordWrap
+        }
+    }
+}

=== added file 'app/welcomewizard/Slide4.qml'
--- app/welcomewizard/Slide4.qml	1970-01-01 00:00:00 +0000
+++ app/welcomewizard/Slide4.qml	2015-04-11 21:39:04 +0000
@@ -0,0 +1,70 @@
+/*
+ * 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
+
+// Slide 4
+Component {
+    id: slide4
+    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/language.png")
+        }
+
+        Label {
+            id: introductionText
+            anchors.centerIn: parent
+            elide: Text.ElideRight
+            fontSize: "x-large"
+            maximumLineCount: 2
+            // TRANSLATORS: This text should be in a language different from the language set by the user.
+            // For instance, if the app was in english, then it is appropriate to set this string as
+            // Hallo or Bonjour etc to symbolize the internationalization feature in podbird.
+            text: i18n.tr("Hallo! Bonjour!")
+            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)
+            }
+            horizontalAlignment: Text.AlignHCenter
+            text: i18n.tr("Podbird is available in over 15 languages and is translated by the \
+Ubuntu Translators community.")
+            wrapMode: Text.WordWrap
+        }
+    }
+}

=== added file 'app/welcomewizard/Slide5.qml'
--- app/welcomewizard/Slide5.qml	1970-01-01 00:00:00 +0000
+++ app/welcomewizard/Slide5.qml	2015-04-11 21:39:04 +0000
@@ -0,0 +1,66 @@
+/*
+ * 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
+
+// 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/support.png")
+        }
+
+        Label {
+            id: introductionText
+            anchors.centerIn: parent
+            elide: Text.ElideRight
+            fontSize: "x-large"
+            maximumLineCount: 2
+            text: i18n.tr("Support")
+            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)
+            }
+            horizontalAlignment: Text.AlignHCenter
+            text: i18n.tr("If you find any bugs or have any feature requests, let us know at our project page https://launchpad.net/podbird.")
+            wrapMode: Text.WordWrap
+        }
+    }
+}

=== added file 'app/welcomewizard/Slide6.qml'
--- app/welcomewizard/Slide6.qml	1970-01-01 00:00:00 +0000
+++ app/welcomewizard/Slide6.qml	2015-04-11 21:39:04 +0000
@@ -0,0 +1,80 @@
+/*
+ * 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
+
+// Slide 6
+Component {
+    id: slide6
+    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/gift.png")
+        }
+
+        Label {
+            id: introductionText
+            anchors.centerIn: parent
+            elide: Text.ElideRight
+            fontSize: "x-large"
+            maximumLineCount: 2
+            text: i18n.tr("Enjoy")
+            horizontalAlignment: Text.AlignHCenter
+            width: parent.width
+            wrapMode: Text.WordWrap
+        }
+
+        Label {
+            id: finalMessage
+            anchors {
+                top: introductionText.bottom
+                bottom: continueButton.top
+                left: parent.left
+                right: parent.right
+                margins: units.gu(1)
+                topMargin: units.gu(4)
+            }
+            horizontalAlignment: Text.AlignHCenter
+            text: i18n.tr("We hope you will enjoy using Podbird!")
+            wrapMode: Text.WordWrap
+        }
+
+        Button {
+            id: continueButton
+            anchors {
+                bottom: parent.bottom
+                bottomMargin: units.gu(3)
+                horizontalCenter: parent.horizontalCenter
+            }
+            height: units.gu(6)
+            width: parent.width/1.3
+            color: UbuntuColors.green
+            text: i18n.tr("Finish")
+            onClicked: finished()
+        }
+    }
+}

=== added file 'app/welcomewizard/WelcomeWizard.qml'
--- app/welcomewizard/WelcomeWizard.qml	1970-01-01 00:00:00 +0000
+++ app/welcomewizard/WelcomeWizard.qml	2015-04-11 21:39:04 +0000
@@ -0,0 +1,41 @@
+/*
+ * 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 "../ui"
+
+// Initial Walkthrough tutorial
+Walkthrough {
+    id: walkthrough
+    appName: "Podbird"
+    onFinished: {
+        console.log("[LOG]: Welcome tour complete")
+        settings.firstRun = false
+        mainStack.pop()
+        mainStack.push(tabs)
+    }
+    model: [
+        Slide1{},
+        Slide2{},
+        Slide3{},
+        Slide4{},
+        Slide5{},
+        Slide6{}
+    ]
+}

=== modified file 'po/com.mikeasoft.podbird.pot'
--- po/com.mikeasoft.podbird.pot	2015-03-29 16:40:52 +0000
+++ po/com.mikeasoft.podbird.pot	2015-04-11 21:39:04 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-29 16:48+0100\n"
+"POT-Creation-Date: 2015-04-11 23:32+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,72 +18,207 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../app/ui/EpisodesPage.qml:85
+#. TRANSLATORS: this refers to a number of songs greater than one. The actual number will be prepended to the string automatically (plural forms are not yet fully supported in usermetrics, the library that displays that string)
+#: ../app/podbird.qml:152
+msgid "podcasts listened today"
+msgstr ""
+
+#: ../app/podbird.qml:153
+msgid "No podcasts listened today"
+msgstr ""
+
+#: ../app/podbird.qml:210
+msgid "Find New Podcasts"
+msgstr ""
+
+#: ../app/podbird.qml:224
+msgid "Settings"
+msgstr ""
+
+#: ../app/settings/About.qml:8 ../app/settings/About.qml:11
+#: ../app/ui/SettingsPage.qml:136
+msgid "About"
+msgstr ""
+
+#: ../app/settings/About.qml:11
+msgid "Credits"
+msgstr ""
+
+#: ../app/settings/About.qml:65
+msgid "Released under the terms of the GNU GPL v3"
+msgstr ""
+
+#: ../app/settings/About.qml:74
+#, qt-format
+msgid "Source code available on %1"
+msgstr ""
+
+#: ../app/settings/About.qml:89
+msgid "Developers"
+msgstr ""
+
+#: ../app/settings/About.qml:103
+msgid "Designer"
+msgstr ""
+
+#: ../app/settings/About.qml:112
+msgid "Translators"
+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 ../app/ui/EpisodesPage.qml:463
+#, qt-format
+msgid "%1 episode"
+msgid_plural "%1 episodes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../app/settings/ThemeSetting.qml:27 ../app/ui/SettingsPage.qml:49
+msgid "Theme"
+msgstr ""
+
+#: ../app/settings/ThemeSetting.qml:33
+msgid "Light"
+msgstr ""
+
+#: ../app/settings/ThemeSetting.qml:34
+msgid "Dark"
+msgstr ""
+
+#: ../app/ui/EpisodesPage.qml:33
+msgid "Podcast"
+msgstr ""
+
+#: ../app/ui/EpisodesPage.qml:89 ../app/ui/SearchPage.qml:55
 msgid "Search Episode"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:94
+#: ../app/ui/EpisodesPage.qml:98
 msgid "Mark all listened"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:105 ../app/ui/EpisodesPage.qml:153
+#: ../app/ui/EpisodesPage.qml:109 ../app/ui/EpisodesPage.qml:187
 msgid "Unsubscribe"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:120 ../app/ui/PodcastsTab.qml:86
-#: ../app/ui/PodcastsTab.qml:109
+#: ../app/ui/EpisodesPage.qml:124 ../app/ui/PodcastsTab.qml:96
+#: ../app/ui/PodcastsTab.qml:119 ../app/ui/SearchPage.qml:69
 msgid "Back"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:131
+#: ../app/ui/EpisodesPage.qml:136
 msgid "Search episode"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:150
+#: ../app/ui/EpisodesPage.qml:184
 msgid "Unsubscribe Confirmation"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:151
+#: ../app/ui/EpisodesPage.qml:185
 #, qt-format
 msgid "Are you sure you want to unsubscribe from <b>%1</b>?"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:170
+#: ../app/ui/EpisodesPage.qml:204
 msgid "Cancel"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:184
+#: ../app/ui/EpisodesPage.qml:258
+msgid "Delete local file"
+msgstr ""
+
+#: ../app/ui/EpisodesPage.qml:259
+msgid "Episode queued for download"
+msgstr ""
+
+#: ../app/ui/EpisodesPage.qml:260
+msgid "Download episode"
+msgstr ""
+
+#: ../app/ui/EpisodesPage.qml:336
+msgid "No more episodes"
+msgstr ""
+
+#: ../app/ui/EpisodesPage.qml:336
 msgid "No Episodes found"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:185
+#: ../app/ui/EpisodesPage.qml:337
+msgid "All episodes have been listened to."
+msgstr ""
+
+#: ../app/ui/EpisodesPage.qml:337
 msgid "No episodes found matching the search term."
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:319
-#, no-c-format, qt-format
-msgid "%1h %2m"
-msgstr ""
-
-#: ../app/ui/EpisodesPage.qml:328
-#, no-c-format, qt-format
-msgid "%1h"
-msgstr ""
-
-#: ../app/ui/EpisodesPage.qml:336
-#, no-c-format, qt-format
-msgid "%1m"
+#: ../app/ui/EpisodesPage.qml:359
+#, no-c-format, qt-format
+msgid "%1 hr %2 min"
+msgstr ""
+
+#: ../app/ui/EpisodesPage.qml:368
+#, no-c-format, qt-format
+msgid "%1 hr"
+msgstr ""
+
+#: ../app/ui/EpisodesPage.qml:376
+#, no-c-format, qt-format
+msgid "%1 min"
+msgstr ""
+
+#: ../app/ui/EpisodesPage.qml:416
+msgid "Unheard"
+msgstr ""
+
+#: ../app/ui/EpisodesPage.qml:416
+msgid "Listened"
 msgstr ""
 
 #: ../app/ui/NowPlayingPage.qml:28
 msgid "Now Playing"
 msgstr ""
 
-#: ../app/ui/NowPlayingPage.qml:145
+#: ../app/ui/NowPlayingPage.qml:150
 msgid "-15s"
 msgstr ""
 
-#: ../app/ui/NowPlayingPage.qml:204
+#: ../app/ui/NowPlayingPage.qml:209
 msgid "+15s"
 msgstr ""
 
@@ -91,124 +226,207 @@
 msgid "Podcasts"
 msgstr ""
 
-#: ../app/ui/PodcastsTab.qml:62
+#: ../app/ui/PodcastsTab.qml:64
 msgid "Add Podcast"
 msgstr ""
 
-#: ../app/ui/PodcastsTab.qml:72
+#: ../app/ui/PodcastsTab.qml:74
 msgid "Search Podcast"
 msgstr ""
 
-#: ../app/ui/PodcastsTab.qml:97
+#: ../app/ui/PodcastsTab.qml:83
+msgid "Grid View"
+msgstr ""
+
+#: ../app/ui/PodcastsTab.qml:83
+msgid "List View"
+msgstr ""
+
+#: ../app/ui/PodcastsTab.qml:107
 msgid "Search podcast"
 msgstr ""
 
-#: ../app/ui/PodcastsTab.qml:120
+#: ../app/ui/PodcastsTab.qml:130
 msgid "Save Podcast"
 msgstr ""
 
-#: ../app/ui/PodcastsTab.qml:133
+#: ../app/ui/PodcastsTab.qml:143
 msgid "Feed URL"
 msgstr ""
 
-#: ../app/ui/PodcastsTab.qml:157
+#: ../app/ui/PodcastsTab.qml:167
 msgid "Unable to subscribe"
 msgstr ""
 
-#: ../app/ui/PodcastsTab.qml:158
+#: ../app/ui/PodcastsTab.qml:168
 msgid "Please check the URL and try again"
 msgstr ""
 
-#: ../app/ui/PodcastsTab.qml:160
+#: ../app/ui/PodcastsTab.qml:170
 msgid "Close"
 msgstr ""
 
-#: ../app/ui/PodcastsTab.qml:172
+#: ../app/ui/PodcastsTab.qml:184
 msgid "No Podcast Subscriptions"
 msgstr ""
 
-#: ../app/ui/PodcastsTab.qml:173
+#: ../app/ui/PodcastsTab.qml:185
 msgid "No Podcasts Found"
 msgstr ""
 
-#: ../app/ui/PodcastsTab.qml:174
+#: ../app/ui/PodcastsTab.qml:186
 msgid ""
 "You haven't subscribed to any podcasts yet, visit the 'Find New Podcasts' "
 "page to add some."
 msgstr ""
 
-#: ../app/ui/PodcastsTab.qml:175
+#: ../app/ui/PodcastsTab.qml:187 ../app/ui/SearchPage.qml:103
 msgid "No podcasts found matching the search term."
 msgstr ""
 
-#: ../app/ui/PodcastsTab.qml:291
+#: ../app/ui/PodcastsTab.qml:217 ../app/ui/PodcastsTab.qml:337
 #, qt-format
 msgid "%1 unheard episode"
 msgid_plural "%1 unheard episodes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../app/ui/SearchTab.qml:27
-msgid "Find New Podcasts"
-msgstr ""
-
-#: ../app/ui/SearchTab.qml:42
+#: ../app/ui/SearchPage.qml:80
 msgid "Search..."
 msgstr ""
 
-#: ../app/ui/SearchTab.qml:122
+#: ../app/ui/SearchPage.qml:102
+msgid "Looking for a new Podcast?"
+msgstr ""
+
+#: ../app/ui/SearchPage.qml:102
+msgid "No Podcasts found"
+msgstr ""
+
+#: ../app/ui/SearchPage.qml:103
+msgid "Click the 'magnifier' at the top to search."
+msgstr ""
+
+#: ../app/ui/SearchPage.qml:184
 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"
-msgstr ""
-
-#: /home/mike/src/build-podbird-Ubuntu_Device_GCC_armhf_ubuntu_sdk_14_10_utopic-Default/po/Podbird.desktop.in.h:1
+#: ../app/ui/SettingsPage.qml:43
+msgid "General Settings"
+msgstr ""
+
+#: ../app/ui/SettingsPage.qml:55
+msgid "Podcast Episode Settings"
+msgstr ""
+
+#: ../app/ui/SettingsPage.qml:60
+msgid "Hide listened episodes"
+msgstr ""
+
+#: ../app/ui/SettingsPage.qml:79
+msgid "Automatically delete old episodes"
+msgstr ""
+
+#: ../app/ui/SettingsPage.qml:87
+msgid ""
+"Delete episodes that are older than a given number of days for each podcast"
+msgstr ""
+
+#: ../app/ui/SettingsPage.qml:104
+msgid "Automatically download new episodes"
+msgstr ""
+
+#: ../app/ui/SettingsPage.qml:112
+msgid "Default number of new episodes to download for each podcast"
+msgstr ""
+
+#: ../app/ui/SettingsPage.qml:119
+msgid "Auto download on WiFi only"
+msgstr ""
+
+#: ../app/ui/SettingsPage.qml:130
+msgid "Misc."
+msgstr ""
+
+#: ../app/ui/SettingsPage.qml:143
+msgid "Report Bug"
+msgstr ""
+
+#: ../app/ui/Walkthrough.qml:87
+msgid "Skip"
+msgstr ""
+
+#: ../app/welcomewizard/Slide1.qml:42
+msgid "Welcome to Podbird"
+msgstr ""
+
+#: ../app/welcomewizard/Slide1.qml:50
+msgid ""
+"Enjoy your favourite podcasts with Podbird, the one and only podcast manager "
+"for Ubuntu Touch.\n"
+"\n"
+"Chirp Chirp.."
+msgstr ""
+
+#: ../app/welcomewizard/Slide1.qml:72
+msgid "Swipe to move between Pages"
+msgstr ""
+
+#: ../app/welcomewizard/Slide2.qml:45
+msgid "Discover New Podcasts"
+msgstr ""
+
+#: ../app/welcomewizard/Slide2.qml:62
+msgid ""
+"Podbird uses the Itunes database to provide access to a huge collections of "
+"podcasts. You can also add podcasts by URL."
+msgstr ""
+
+#: ../app/welcomewizard/Slide3.qml:45
+msgid "Smart Settings"
+msgstr ""
+
+#: ../app/welcomewizard/Slide3.qml:62
+msgid ""
+"Podbird automatically downloads new episodes and cleans up old episodes. As "
+"a power user you can also tweak these settings to suit your needs."
+msgstr ""
+
+#. TRANSLATORS: This text should be in a language different from the language set by the user.
+#. For instance, if the app was in english, then it is appropriate to set this string as
+#. Hallo or Bonjour etc to symbolize the internationalization feature in podbird.
+#: ../app/welcomewizard/Slide4.qml:48
+msgid "Hallo! Bonjour!"
+msgstr ""
+
+#: ../app/welcomewizard/Slide4.qml:65
+msgid ""
+"Podbird is available in over 15 languages and is translated by the Ubuntu "
+"Translators community."
+msgstr ""
+
+#: ../app/welcomewizard/Slide5.qml:45
+msgid "Support"
+msgstr ""
+
+#: ../app/welcomewizard/Slide5.qml:62
+msgid ""
+"If you find any bugs or have any feature requests, let us know at our "
+"project page https://launchpad.net/podbird."
+msgstr ""
+
+#: ../app/welcomewizard/Slide6.qml:45
+msgid "Enjoy"
+msgstr ""
+
+#: ../app/welcomewizard/Slide6.qml:62
+msgid "We hope you will enjoy using Podbird!"
+msgstr ""
+
+#: ../app/welcomewizard/Slide6.qml:76
+msgid "Finish"
+msgstr ""
+
+#: /home/krnekhelesh/Documents/Ubuntu-Projects/MP-Reviews/builddir/build-8.6-aboutpage-UbuntuSDK_for_armhf_GCC_ubuntu_sdk_14_10_utopic-Default/po/Podbird.desktop.in.h:1
 msgid "Podbird"
 msgstr ""

=== added file 'podbird.png'
Binary files podbird.png	1970-01-01 00:00:00 +0000 and podbird.png	2015-04-11 21:39:04 +0000 differ