--- a/application/data/Podcast.rss Sat Oct 23 15:20:49 2010 +0100
+++ b/application/data/Podcast.rss Sat Oct 23 15:36:23 2010 +0100
@@ -39,6 +39,20 @@
RESOURCE EIK_APP_INFO
{
+ status_pane = r_app_status_pane;
+ }
+
+RESOURCE STATUS_PANE_APP_MODEL r_app_status_pane
+ {
+ panes=
+ {
+ SPANE_PANE
+ {
+ id = EEikStatusPaneUidNavi;
+ type = EAknCtNaviPane;
+ resource = r_navi_decorator;
+ }
+ };
}
RESOURCE LOCALISABLE_APP_INFO r_podcast_localisable_app_info
@@ -76,6 +90,32 @@
}
+RESOURCE NAVI_DECORATOR r_navi_decorator
+ {
+ type = ENaviDecoratorControlTabGroup;
+ control = TAB_GROUP
+ {
+ tab_width = EAknTabWidthWithTwoTabs;
+ active = 0;
+ tabs = {
+ TAB
+ {
+ id = EPodcastTabFeeds;
+
+ bmpfile = APPICON;
+ bmpid = EMbmPodcastTab_feeds;
+ bmpmask = EMbmPodcastTab_feeds_mask;
+ },
+ TAB
+ {
+ id = EPodcastTabQueue;
+ bmpfile = APPICON;
+ bmpid = EMbmPodcastTab_queue;
+ bmpmask = EMbmPodcastTab_queue_mask;
+ }
+ };
+ };
+ }
#include "PodcastStrings.ra"
#include "PodcastFeedView.ra"
--- a/application/data/PodcastClient_english.rls Sat Oct 23 15:20:49 2010 +0100
+++ b/application/data/PodcastClient_english.rls Sat Oct 23 15:36:23 2010 +0100
@@ -38,9 +38,9 @@
rls_string STRING_r_tabgroup_queue_counter "Queue (%d)"
// Question dialogs
-rls_string STRING_r_add_feed_prompt "Enter feed address"
-rls_string STRING_r_edit_feed_prompt "Feed address"
-rls_string STRING_r_add_feed_title_prompt "Feed title"
+rls_string STRING_r_add_feed_prompt "Enter feed address:"
+rls_string STRING_r_edit_feed_prompt "Feed address:"
+rls_string STRING_r_add_feed_title_prompt "Feed title:"
rls_string STRING_r_remove_feed_prompt "Remove feed '%S'?"
rls_string STRING_r_enable_downloads_prompt "There are shows in the download queue. Do you want to download now?"
rls_string STRING_r_update_new_feed_prompt "Do you want to update the feed now?"
@@ -75,7 +75,7 @@
// Feed import/export
rls_string STRING_r_view_import_feeds_title "Select OPML file"
-rls_string STRING_r_enter_filename "Enter file name"
+rls_string STRING_r_enter_filename "Enter file name:"
rls_string STRING_r_view_export_feeds_title "Select folder"
rls_string STRING_r_view_export_feeds_softkey "Select"
rls_string STRING_import_feed_success "%d feeds imported. Update all feeds now?"
@@ -155,4 +155,4 @@
rls_string STRING_r_add_url_or_search "Add feed"
rls_string STRING_r_add_url "Enter URL"
rls_string STRING_r_add_search "Search for feed"
-rls_string STRING_r_search_feed_prompt "Enter search terms"
+rls_string STRING_r_search_feed_prompt "Enter search terms:"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/application/data/images/tab_feeds.svg Sat Oct 23 15:36:23 2010 +0100
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363) -->
+
+<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"
+ version="1.1"
+ id="svg3426"
+ inkscape:version="0.48.0 r9654"
+ sodipodi:docname="tab_feeds.svg"
+ x="0px"
+ y="0px"
+ width="32px"
+ height="32px"
+ viewBox="0 0 32 32"
+ enable-background="new 0 0 32 32"
+ xml:space="preserve"><metadata
+ id="metadata3081"><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></dc:title></cc:Work></rdf:RDF></metadata><defs
+ id="defs3079">
+
+ <sodipodi:namedview
+ inkscape:window-maximized="0"
+ showgrid="false"
+ inkscape:window-height="659"
+ inkscape:window-width="885"
+ inkscape:pageshadow="2"
+ inkscape:window-x="300"
+ inkscape:cy="16.00177"
+ inkscape:cx="16.00177"
+ objecttolerance="10"
+ inkscape:window-y="0"
+ borderopacity="1"
+ inkscape:pageopacity="0"
+ inkscape:current-layer="svg3426"
+ gridtolerance="10"
+ inkscape:zoom="10.44997"
+ guidetolerance="10"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ id="namedview3470">
+ </sodipodi:namedview>
+ <defs
+ id="defs3065">
+
+
+ <inkscape:perspective
+ inkscape:persp3d-origin="16 : 10.666667 : 1"
+ inkscape:vp_z="32 : 16 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 16 : 1"
+ sodipodi:type="inkscape:persp3d"
+ id="perspective3474">
+ </inkscape:perspective>
+
+ <inkscape:perspective
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d"
+ id="perspective3984">
+ </inkscape:perspective>
+ </defs>
+
+
+
+
+</defs><sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="640"
+ inkscape:window-height="480"
+ id="namedview3077"
+ showgrid="false"
+ inkscape:zoom="8.0625"
+ inkscape:cx="16"
+ inkscape:cy="16"
+ inkscape:window-x="320"
+ inkscape:window-y="55"
+ inkscape:window-maximized="0"
+ inkscape:current-layer="svg3426" />
+<path
+ style="fill:#f1f2f2"
+ inkscape:connector-curvature="0"
+ id="path3069"
+ d="m 27.617745,30.062876 0,0 c -1.278173,0 -2.319474,-1.037783 -2.319474,-2.318301 0,-5.567675 -2.169376,-10.803494 -6.10826,-14.741205 C 15.254645,9.0656586 10.018826,6.8951096 4.448806,6.8951096 c -1.282864,0 -2.319474,-1.0366101 -2.319474,-2.3171284 0,-1.2781731 1.03661,-2.3171285 2.319474,-2.3171285 6.808323,0 13.20857,2.6513297 18.016377,7.4638273 4.816015,4.812497 7.466172,11.212744 7.463827,18.018722 0.0047,1.281691 -1.030747,2.319474 -2.311265,2.319474 l 0,0 z" /><path
+ style="fill:#f1f2f2"
+ inkscape:connector-curvature="0"
+ id="path3071"
+ d="m 18.470012,30.062876 c -1.281691,0 -2.319473,-1.037783 -2.319473,-2.318301 0,-3.123902 -1.217196,-6.064873 -3.427615,-8.275291 -2.210418,-2.210419 -5.150216,-3.428787 -8.275291,-3.428787 -0.0012,0 -0.0012,0 -0.0023,0 -1.282859,0 -2.319469,-1.040128 -2.319469,-2.319474 0,-1.280518 1.03661,-2.318301 2.319474,-2.318301 0,0 0,0 0.0023,0 4.36455,0 8.465258,1.699149 11.550463,4.787872 3.086378,3.085205 4.7867,7.187085 4.7867,11.551636 0.0035,1.282863 -1.035438,2.320646 -2.314784,2.320646 l 0,0 z" /><circle
+ style="fill:#f1f2f2"
+ sodipodi:ry="2.6719999"
+ sodipodi:rx="2.6719999"
+ sodipodi:cy="27.408001"
+ sodipodi:cx="6.0580001"
+ id="circle3073"
+ r="2.6719999"
+ cy="27.408001"
+ cx="6.0580001"
+ transform="matrix(1.1726358,0,0,1.1726358,-1.239651,-5.7717028)" />
+</svg>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/application/data/images/tab_queue.svg Sat Oct 23 15:36:23 2010 +0100
@@ -0,0 +1,29 @@
+<?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"
+ version="1.1"
+ width="32"
+ height="32"
+ viewBox="0 0 32 32"
+ id="svg3426"
+ xml:space="preserve"><metadata
+ id="metadata3305"><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></dc:title></cc:Work></rdf:RDF></metadata><defs
+ id="defs3303">
+
+
+
+</defs>
+
+
+<path
+ d="m 19.944737,15.324689 c -0.413331,-0.130194 -3.027307,-0.13525 -4.023348,-0.13525 -0.328644,0 -0.630741,-0.249011 -0.606726,-0.680038 0.247746,-4.815884 0.286931,-5.5755555 0.382996,-10.2625105 -0.01644,-0.4209159 -0.175697,-0.6699262 -0.45378,-0.65223 -3.053852,0.032864 -4.614907,0.032864 -7.6649676,0 -0.279346,-0.017696 -0.439876,0.2313141 -0.44746,0.65223 0.08595,4.686955 0.131457,5.4478905 0.371619,10.2625105 0.02654,0.432292 -0.278082,0.680038 -0.605461,0.680038 -0.993513,0 -3.608753,0.0063 -4.023349,0.13525 -0.540997,0.174433 -0.09607,0.800118 -0.09607,0.800118 L 10.44063,27.32395 c 0.519509,0.747032 1.312044,0.815288 1.944049,0 l 7.662444,-11.199143 c -0.0037,0 0.442404,-0.624421 -0.10239,-0.800118 z"
+ id="path3151"
+ style="fill:#f1f2f2" /></svg>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/application/data/images/tab_queue1.svg Sat Oct 23 15:36:23 2010 +0100
@@ -0,0 +1,35 @@
+<?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"
+ version="1.1"
+ width="32"
+ height="32"
+ viewBox="0 0 32 32"
+ id="svg3426"
+ xml:space="preserve"><metadata
+ id="metadata3305"><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></dc:title></cc:Work></rdf:RDF></metadata><defs
+ id="defs3303">
+
+
+
+</defs>
+
+
+<circle
+ cx="15.433"
+ cy="12.156"
+ r="1.226"
+ transform="matrix(2.1478172,0,0,2.1478172,-6.2900995,-20.002774)"
+ id="circle3295"
+ style="fill:#f1f2f2" /><path
+ d="m 19.944737,15.324689 c -0.413331,-0.130194 -3.027307,-0.13525 -4.023348,-0.13525 -0.328644,0 -0.630741,-0.249011 -0.606726,-0.680038 0.247746,-4.815884 0.286931,-5.5755555 0.382996,-10.2625105 -0.01644,-0.4209159 -0.175697,-0.6699262 -0.45378,-0.65223 -3.053852,0.032864 -4.614907,0.032864 -7.6649676,0 -0.279346,-0.017696 -0.439876,0.2313141 -0.44746,0.65223 0.08595,4.686955 0.131457,5.4478905 0.371619,10.2625105 0.02654,0.432292 -0.278082,0.680038 -0.605461,0.680038 -0.993513,0 -3.608753,0.0063 -4.023349,0.13525 -0.540997,0.174433 -0.09607,0.800118 -0.09607,0.800118 L 10.44063,27.32395 c 0.519509,0.747032 1.312044,0.815288 1.944049,0 l 7.662444,-11.199143 c -0.0037,0 0.442404,-0.624421 -0.10239,-0.800118 z"
+ id="path3151"
+ style="fill:#f1f2f2" /></svg>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/application/data/images/tab_queue2.svg Sat Oct 23 15:36:23 2010 +0100
@@ -0,0 +1,41 @@
+<?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"
+ version="1.1"
+ width="32"
+ height="32"
+ viewBox="0 0 32 32"
+ id="svg3426"
+ xml:space="preserve"><metadata
+ id="metadata3305"><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></dc:title></cc:Work></rdf:RDF></metadata><defs
+ id="defs3303">
+
+
+
+</defs>
+
+
+<circle
+ cx="15.433"
+ cy="12.156"
+ r="1.226"
+ transform="matrix(2.1478172,0,0,2.1478172,-6.2900995,-20.002774)"
+ id="circle3295"
+ style="fill:#f1f2f2" /><circle
+ cx="15.433"
+ cy="16.646"
+ r="1.226"
+ transform="matrix(2.1478172,0,0,2.1478172,-6.2900995,-20.002774)"
+ id="circle3297"
+ style="fill:#f1f2f2" /><path
+ d="m 19.944737,15.324689 c -0.413331,-0.130194 -3.027307,-0.13525 -4.023348,-0.13525 -0.328644,0 -0.630741,-0.249011 -0.606726,-0.680038 0.247746,-4.815884 0.286931,-5.5755555 0.382996,-10.2625105 -0.01644,-0.4209159 -0.175697,-0.6699262 -0.45378,-0.65223 -3.053852,0.032864 -4.614907,0.032864 -7.6649676,0 -0.279346,-0.017696 -0.439876,0.2313141 -0.44746,0.65223 0.08595,4.686955 0.131457,5.4478905 0.371619,10.2625105 0.02654,0.432292 -0.278082,0.680038 -0.605461,0.680038 -0.993513,0 -3.608753,0.0063 -4.023349,0.13525 -0.540997,0.174433 -0.09607,0.800118 -0.09607,0.800118 L 10.44063,27.32395 c 0.519509,0.747032 1.312044,0.815288 1.944049,0 l 7.662444,-11.199143 c -0.0037,0 0.442404,-0.624421 -0.10239,-0.800118 z"
+ id="path3151"
+ style="fill:#f1f2f2" /></svg>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/application/data/images/tab_queue3.svg Sat Oct 23 15:36:23 2010 +0100
@@ -0,0 +1,46 @@
+<?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"
+ version="1.1"
+ width="32"
+ height="32"
+ viewBox="0 0 32 32"
+ id="svg3426"
+ xml:space="preserve"><metadata
+ id="metadata3305"><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></dc:title></cc:Work></rdf:RDF></metadata><defs
+ id="defs3303" />
+
+
+<g
+ transform="matrix(2.1478172,0,0,2.1478172,-6.2900995,-20.002774)"
+ id="g3293">
+ <circle
+ cx="15.433"
+ cy="12.156"
+ r="1.226"
+ id="circle3295"
+ style="fill:#f1f2f2" />
+ <circle
+ cx="15.433"
+ cy="16.646"
+ r="1.226"
+ id="circle3297"
+ style="fill:#f1f2f2" />
+ <circle
+ cx="15.433"
+ cy="21.136999"
+ r="1.227"
+ id="circle3299"
+ style="fill:#f1f2f2" />
+</g><path
+ d="m 19.944737,15.324689 c -0.413331,-0.130194 -3.027307,-0.13525 -4.023348,-0.13525 -0.328644,0 -0.630741,-0.249011 -0.606726,-0.680038 0.247746,-4.815884 0.286931,-5.5755555 0.382996,-10.2625105 -0.01644,-0.4209159 -0.175697,-0.6699262 -0.45378,-0.65223 -3.053852,0.032864 -4.614907,0.032864 -7.6649676,0 -0.279346,-0.017696 -0.439876,0.2313141 -0.44746,0.65223 0.08595,4.686955 0.131457,5.4478905 0.371619,10.2625105 0.02654,0.432292 -0.278082,0.680038 -0.605461,0.680038 -0.993513,0 -3.608753,0.0063 -4.023349,0.13525 -0.540997,0.174433 -0.09607,0.800118 -0.09607,0.800118 L 10.44063,27.32395 c 0.519509,0.747032 1.312044,0.815288 1.944049,0 l 7.662444,-11.199143 c -0.0037,0 0.442404,-0.624421 -0.10239,-0.800118 z"
+ id="path3151"
+ style="fill:#f1f2f2" /></svg>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/application/data/images/tab_queue_.svg Sat Oct 23 15:36:23 2010 +0100
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363) -->
+
+<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"
+ version="1.1"
+ id="svg3426"
+ inkscape:version="0.48.0 r9654"
+ sodipodi:docname="tab_feeds.svg"
+ x="0px"
+ y="0px"
+ width="32px"
+ height="32px"
+ viewBox="0 0 32 32"
+ enable-background="new 0 0 32 32"
+ xml:space="preserve"><metadata
+ id="metadata3081"><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></dc:title></cc:Work></rdf:RDF></metadata><defs
+ id="defs3079">
+
+ <sodipodi:namedview
+ inkscape:window-maximized="0"
+ showgrid="false"
+ inkscape:window-height="659"
+ inkscape:window-width="885"
+ inkscape:pageshadow="2"
+ inkscape:window-x="300"
+ inkscape:cy="16.00177"
+ inkscape:cx="16.00177"
+ objecttolerance="10"
+ inkscape:window-y="0"
+ borderopacity="1"
+ inkscape:pageopacity="0"
+ inkscape:current-layer="svg3426"
+ gridtolerance="10"
+ inkscape:zoom="10.44997"
+ guidetolerance="10"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ id="namedview3470">
+ </sodipodi:namedview>
+ <defs
+ id="defs3065">
+
+
+ <inkscape:perspective
+ inkscape:persp3d-origin="16 : 10.666667 : 1"
+ inkscape:vp_z="32 : 16 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 16 : 1"
+ sodipodi:type="inkscape:persp3d"
+ id="perspective3474">
+ </inkscape:perspective>
+
+ <inkscape:perspective
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d"
+ id="perspective3984">
+ </inkscape:perspective>
+ </defs>
+
+
+
+
+</defs><sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="640"
+ inkscape:window-height="480"
+ id="namedview3077"
+ showgrid="false"
+ inkscape:zoom="8.0625"
+ inkscape:cx="16"
+ inkscape:cy="16"
+ inkscape:window-x="320"
+ inkscape:window-y="55"
+ inkscape:window-maximized="0"
+ inkscape:current-layer="svg3426" />
+<path
+ style="fill:#f1f2f2"
+ inkscape:connector-curvature="0"
+ id="path3069"
+ d="m 27.617745,30.062876 0,0 c -1.278173,0 -2.319474,-1.037783 -2.319474,-2.318301 0,-5.567675 -2.169376,-10.803494 -6.10826,-14.741205 C 15.254645,9.0656586 10.018826,6.8951096 4.448806,6.8951096 c -1.282864,0 -2.319474,-1.0366101 -2.319474,-2.3171284 0,-1.2781731 1.03661,-2.3171285 2.319474,-2.3171285 6.808323,0 13.20857,2.6513297 18.016377,7.4638273 4.816015,4.812497 7.466172,11.212744 7.463827,18.018722 0.0047,1.281691 -1.030747,2.319474 -2.311265,2.319474 l 0,0 z" /><path
+ style="fill:#f1f2f2"
+ inkscape:connector-curvature="0"
+ id="path3071"
+ d="m 18.470012,30.062876 c -1.281691,0 -2.319473,-1.037783 -2.319473,-2.318301 0,-3.123902 -1.217196,-6.064873 -3.427615,-8.275291 -2.210418,-2.210419 -5.150216,-3.428787 -8.275291,-3.428787 -0.0012,0 -0.0012,0 -0.0023,0 -1.282859,0 -2.319469,-1.040128 -2.319469,-2.319474 0,-1.280518 1.03661,-2.318301 2.319474,-2.318301 0,0 0,0 0.0023,0 4.36455,0 8.465258,1.699149 11.550463,4.787872 3.086378,3.085205 4.7867,7.187085 4.7867,11.551636 0.0035,1.282863 -1.035438,2.320646 -2.314784,2.320646 l 0,0 z" /><circle
+ style="fill:#f1f2f2"
+ sodipodi:ry="2.6719999"
+ sodipodi:rx="2.6719999"
+ sodipodi:cy="27.408001"
+ sodipodi:cx="6.0580001"
+ id="circle3073"
+ r="2.6719999"
+ cy="27.408001"
+ cx="6.0580001"
+ transform="matrix(1.1726358,0,0,1.1726358,-1.239651,-5.7717028)" />
+</svg>
\ No newline at end of file
--- a/application/group/bld.inf Sat Oct 23 15:20:49 2010 +0100
+++ b/application/group/bld.inf Sat Oct 23 15:36:23 2010 +0100
@@ -64,5 +64,10 @@
-c16,1 remove_all.svg\
-c16,1 download.svg\
-c16,1 markold.svg\
- -c16,1 marknew.svg
+ -c16,1 marknew.svg\
+ -c16,1 tab_feeds.svg\
+ -c16,1 tab_queue.svg\
+ -c16,1 tab_queue1.svg\
+ -c16,1 tab_queue2.svg\
+ -c16,1 tab_queue3.svg
END
--- a/application/inc/Podcast.hrh Sat Oct 23 15:20:49 2010 +0100
+++ b/application/inc/Podcast.hrh Sat Oct 23 15:36:23 2010 +0100
@@ -62,7 +62,9 @@
EPodcastHelp,
EPodcastSearch,
EPodcastAddSearchResult,
- EPodcastResetDb
+ EPodcastResetDb,
+ EPodcastTabFeeds,
+ EPodcastTabQueue
};
enum TPodcastControl
--- a/application/src/PodcastAppui.cpp Sat Oct 23 15:20:49 2010 +0100
+++ b/application/src/PodcastAppui.cpp Sat Oct 23 15:36:23 2010 +0100
@@ -32,6 +32,7 @@
#include <APGWGNAM.H>
#include <HLPLCH.H>
#include <avkon.hrh>
+#include "Podcast.mbg"
const TUint KDelayLaunch = 1000;
@@ -205,30 +206,31 @@
void CPodcastAppUi::NaviShowTabGroupL()
{
- if (iNaviStyle != ENaviEmpty) {
- iNaviPane->Pop();
- }
-
- iNaviTabGroup = iNaviPane->CreateTabGroupL();
-
- iTabGroup = STATIC_CAST(CAknTabGroup*, iNaviTabGroup->DecoratedControl());
- iTabGroup->SetTabFixedWidthL(EAknTabWidthWithTwoTabs);
+// if (iNaviStyle != ENaviEmpty) {
+// iNaviPane->Pop();
+// }
+//
+// iNaviTabGroup = iNaviPane->CreateTabGroupL();
- HBufC *label1 = iEikonEnv->AllocReadResourceLC(R_TABGROUP_FEEDS);
- iTabGroup->AddTabL(KTabIdFeeds,*label1);
-
- HBufC *label3 = iEikonEnv->AllocReadResourceLC(R_TABGROUP_QUEUE);
- iTabGroup->AddTabL(KTabIdQueue,*label3);
-
- CleanupStack::PopAndDestroy(label3);
- CleanupStack::PopAndDestroy(label1);
+ iTabGroup = STATIC_CAST(CAknTabGroup*, iNaviPane->ResourceDecorator()->DecoratedControl());
+ iTabGroup->SetObserver(this);
- iTabGroup->SetActiveTabByIndex(0);
- iTabGroup->SetObserver(this);
-
- iNaviPane->PushL(*iNaviTabGroup);
+// iTabGroup->SetTabFixedWidthL(EAknTabWidthWithTwoTabs);
+//
+// HBufC *label1 = iEikonEnv->AllocReadResourceLC(R_TABGROUP_FEEDS);
+// iTabGroup->AddTabL(KTabIdFeeds,*label1);
+//
+// HBufC *label3 = iEikonEnv->AllocReadResourceLC(R_TABGROUP_QUEUE);
+// iTabGroup->AddTabL(KTabIdQueue,*label3);
+//
+// CleanupStack::PopAndDestroy(label3);
+// CleanupStack::PopAndDestroy(label1);
+//
+// iTabGroup->SetActiveTabByIndex(0);
+//
+// iNaviPane->PushL(*iNaviTabGroup);
iNaviStyle = ENaviTabGroup;
-
+//
UpdateQueueTabL(iPodcastModel->ShowEngine().GetNumDownloadingShows());
}
@@ -283,22 +285,45 @@
{
if (iNaviStyle == ENaviTabGroup)
{
+ CFbsBitmap* bitmap;
+ CFbsBitmap* mask;
if (aQueueLength == 0)
{
- HBufC *queue = iEikonEnv->AllocReadResourceLC(R_TABGROUP_QUEUE);
- iTabGroup->ReplaceTabL(KTabIdQueue, *queue);
- CleanupStack::PopAndDestroy(queue);
+ AknIconUtils::CreateIconL(bitmap,
+ mask,
+ iEikonEnv->EikAppUi()->Application()->BitmapStoreName(),
+ EMbmPodcastTab_queue,
+ EMbmPodcastTab_queue_mask);
+ }
+ else if (aQueueLength == 1)
+ {
+
+ AknIconUtils::CreateIconL(bitmap,
+ mask,
+ iEikonEnv->EikAppUi()->Application()->BitmapStoreName(),
+ EMbmPodcastTab_queue1,
+ EMbmPodcastTab_queue1_mask);
+ }
+ else if (aQueueLength == 2)
+ {
+
+ AknIconUtils::CreateIconL(bitmap,
+ mask,
+ iEikonEnv->EikAppUi()->Application()->BitmapStoreName(),
+ EMbmPodcastTab_queue2,
+ EMbmPodcastTab_queue2_mask);
}
else
{
- HBufC *queueTemplate = iEikonEnv->AllocReadResourceLC(R_TABGROUP_QUEUE_COUNTER);
- HBufC *queueCounter = HBufC::NewLC(queueTemplate->Length()+2);
- queueCounter->Des().Format(*queueTemplate, aQueueLength);
-
- iTabGroup->ReplaceTabL(KTabIdQueue, *queueCounter);
- CleanupStack::PopAndDestroy(queueCounter);
- CleanupStack::PopAndDestroy(queueTemplate);
+
+ AknIconUtils::CreateIconL(bitmap,
+ mask,
+ iEikonEnv->EikAppUi()->Application()->BitmapStoreName(),
+ EMbmPodcastTab_queue3,
+ EMbmPodcastTab_queue3_mask);
}
+
+ iTabGroup->ReplaceTabL(EPodcastTabQueue, bitmap, mask);
}
}
--- a/application/src/PodcastFeedView.cpp Sat Oct 23 15:20:49 2010 +0100
+++ b/application/src/PodcastFeedView.cpp Sat Oct 23 15:36:23 2010 +0100
@@ -649,6 +649,7 @@
HBufC* prompt = iEikonEnv->AllocReadResourceLC(R_PODCAST_SEARCHFEED_PROMPT);
dlg->SetPromptL(*prompt);
+ dlg->SetPredictiveTextInputPermitted(ETrue);
CleanupStack::PopAndDestroy(prompt);
if(dlg->RunLD())
