# HG changeset patch # User Sebastian Brannstrom # Date 1287841196 -3600 # Node ID 4f37d00ca76e612f93233f070f12edc8dbf69131 # Parent ff6cd24e77e243e8a1a8302083601cca8b51f4f5 Switched to icons in tabs diff -r ff6cd24e77e2 -r 4f37d00ca76e application/data/Podcast.rss --- a/application/data/Podcast.rss Fri Oct 22 14:28:27 2010 +0100 +++ b/application/data/Podcast.rss Sat Oct 23 14:39:56 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" diff -r ff6cd24e77e2 -r 4f37d00ca76e application/data/PodcastClient_english.rls --- a/application/data/PodcastClient_english.rls Fri Oct 22 14:28:27 2010 +0100 +++ b/application/data/PodcastClient_english.rls Sat Oct 23 14:39:56 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?" @@ -159,4 +159,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:" diff -r ff6cd24e77e2 -r 4f37d00ca76e application/data/images/tab_feeds.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/images/tab_feeds.svg Sat Oct 23 14:39:56 2010 +0100 @@ -0,0 +1,114 @@ + + + +image/svg+xml + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -r ff6cd24e77e2 -r 4f37d00ca76e application/data/images/tab_queue.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/images/tab_queue.svg Sat Oct 23 14:39:56 2010 +0100 @@ -0,0 +1,29 @@ + + + +image/svg+xml + + + + + + + \ No newline at end of file diff -r ff6cd24e77e2 -r 4f37d00ca76e application/data/images/tab_queue1.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/images/tab_queue1.svg Sat Oct 23 14:39:56 2010 +0100 @@ -0,0 +1,35 @@ + + + +image/svg+xml + + + + + + + \ No newline at end of file diff -r ff6cd24e77e2 -r 4f37d00ca76e application/data/images/tab_queue2.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/images/tab_queue2.svg Sat Oct 23 14:39:56 2010 +0100 @@ -0,0 +1,41 @@ + + + +image/svg+xml + + + + + + + \ No newline at end of file diff -r ff6cd24e77e2 -r 4f37d00ca76e application/data/images/tab_queue3.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/images/tab_queue3.svg Sat Oct 23 14:39:56 2010 +0100 @@ -0,0 +1,46 @@ + + + +image/svg+xml + + + + + + + \ No newline at end of file diff -r ff6cd24e77e2 -r 4f37d00ca76e application/data/images/tab_queue_.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/images/tab_queue_.svg Sat Oct 23 14:39:56 2010 +0100 @@ -0,0 +1,114 @@ + + + +image/svg+xml + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -r ff6cd24e77e2 -r 4f37d00ca76e application/data/images/toolbars/add_pod.svg --- a/application/data/images/toolbars/add_pod.svg Fri Oct 22 14:28:27 2010 +0100 +++ b/application/data/images/toolbars/add_pod.svg Sat Oct 23 14:39:56 2010 +0100 @@ -2,33 +2,33 @@ - + - + - + - - - - + + diff -r ff6cd24e77e2 -r 4f37d00ca76e application/data/images/toolbars/cancel.svg --- a/application/data/images/toolbars/cancel.svg Fri Oct 22 14:28:27 2010 +0100 +++ b/application/data/images/toolbars/cancel.svg Sat Oct 23 14:39:56 2010 +0100 @@ -2,20 +2,20 @@ - + - - + diff -r ff6cd24e77e2 -r 4f37d00ca76e application/data/images/toolbars/delete.svg --- a/application/data/images/toolbars/delete.svg Fri Oct 22 14:28:27 2010 +0100 +++ b/application/data/images/toolbars/delete.svg Sat Oct 23 14:39:56 2010 +0100 @@ -2,13 +2,13 @@ - - + s2.8-1.682,7.188-1.682c4.39,0,7.188,0.996,7.188,1.682S20.388,9.973,16,9.973z"/> + diff -r ff6cd24e77e2 -r 4f37d00ca76e application/data/images/toolbars/download.svg --- a/application/data/images/toolbars/download.svg Fri Oct 22 14:28:27 2010 +0100 +++ b/application/data/images/toolbars/download.svg Sat Oct 23 14:39:56 2010 +0100 @@ -2,23 +2,23 @@ - + - + - + - diff -r ff6cd24e77e2 -r 4f37d00ca76e application/data/images/toolbars/dwn_pause.svg --- a/application/data/images/toolbars/dwn_pause.svg Fri Oct 22 14:28:27 2010 +0100 +++ b/application/data/images/toolbars/dwn_pause.svg Sat Oct 23 14:39:56 2010 +0100 @@ -2,31 +2,31 @@ - + - + - + - - + + - diff -r ff6cd24e77e2 -r 4f37d00ca76e application/data/images/toolbars/dwn_start.svg --- a/application/data/images/toolbars/dwn_start.svg Fri Oct 22 14:28:27 2010 +0100 +++ b/application/data/images/toolbars/dwn_start.svg Sat Oct 23 14:39:56 2010 +0100 @@ -2,27 +2,27 @@ - + - + - + - - + diff -r ff6cd24e77e2 -r 4f37d00ca76e application/data/images/toolbars/marknew.svg --- a/application/data/images/toolbars/marknew.svg Fri Oct 22 14:28:27 2010 +0100 +++ b/application/data/images/toolbars/marknew.svg Sat Oct 23 14:39:56 2010 +0100 @@ -2,11 +2,11 @@ - + diff -r ff6cd24e77e2 -r 4f37d00ca76e application/data/images/toolbars/markold.svg --- a/application/data/images/toolbars/markold.svg Fri Oct 22 14:28:27 2010 +0100 +++ b/application/data/images/toolbars/markold.svg Sat Oct 23 14:39:56 2010 +0100 @@ -2,15 +2,15 @@ - + diff -r ff6cd24e77e2 -r 4f37d00ca76e application/data/images/toolbars/reload.svg --- a/application/data/images/toolbars/reload.svg Fri Oct 22 14:28:27 2010 +0100 +++ b/application/data/images/toolbars/reload.svg Sat Oct 23 14:39:56 2010 +0100 @@ -2,14 +2,14 @@ - + diff -r ff6cd24e77e2 -r 4f37d00ca76e application/data/images/toolbars/reload_all.svg --- a/application/data/images/toolbars/reload_all.svg Fri Oct 22 14:28:27 2010 +0100 +++ b/application/data/images/toolbars/reload_all.svg Sat Oct 23 14:39:56 2010 +0100 @@ -2,19 +2,19 @@ - - - - + + + diff -r ff6cd24e77e2 -r 4f37d00ca76e application/data/images/toolbars/remove.svg --- a/application/data/images/toolbars/remove.svg Fri Oct 22 14:28:27 2010 +0100 +++ b/application/data/images/toolbars/remove.svg Sat Oct 23 14:39:56 2010 +0100 @@ -2,13 +2,13 @@ - - + s2.8-1.682,7.188-1.682c4.39,0,7.188,0.996,7.188,1.682S20.388,9.973,16,9.973z"/> + diff -r ff6cd24e77e2 -r 4f37d00ca76e application/data/images/toolbars/remove_all.svg --- a/application/data/images/toolbars/remove_all.svg Fri Oct 22 14:28:27 2010 +0100 +++ b/application/data/images/toolbars/remove_all.svg Sat Oct 23 14:39:56 2010 +0100 @@ -2,25 +2,25 @@ - + - + - + - + diff -r ff6cd24e77e2 -r 4f37d00ca76e application/data/images/toolbars/settings.svg --- a/application/data/images/toolbars/settings.svg Fri Oct 22 14:28:27 2010 +0100 +++ b/application/data/images/toolbars/settings.svg Sat Oct 23 14:39:56 2010 +0100 @@ -2,29 +2,29 @@ - + - + - + - - + diff -r ff6cd24e77e2 -r 4f37d00ca76e application/group/icons.mk --- a/application/group/icons.mk Fri Oct 22 14:28:27 2010 +0100 +++ b/application/group/icons.mk Sat Oct 23 14:39:56 2010 +0100 @@ -56,6 +56,11 @@ $(TPATH)\download.svg\ $(TPATH)\markold.svg\ $(TPATH)\marknew.svg\ + $(DPATH)\tab_feeds.svg\ + $(DPATH)\tab_queue.svg\ + $(DPATH)\tab_queue1.svg\ + $(DPATH)\tab_queue2.svg\ + $(DPATH)\tab_queue3.svg\ FREEZE : do_nothing diff -r ff6cd24e77e2 -r 4f37d00ca76e application/inc/Podcast.hrh --- a/application/inc/Podcast.hrh Fri Oct 22 14:28:27 2010 +0100 +++ b/application/inc/Podcast.hrh Sat Oct 23 14:39:56 2010 +0100 @@ -67,7 +67,10 @@ EPodcastFilterShowsAll, EPodcastFilterShowsNew, EPodcastFilterShowsDownloaded, - EPodcastFilterShowsNewAndDownloaded + EPodcastFilterShowsNewAndDownloaded, + // Tabs + EPodcastTabFeeds, + EPodcastTabQueue }; enum TPodcastControl diff -r ff6cd24e77e2 -r 4f37d00ca76e application/inc/buildno.h --- a/application/inc/buildno.h Fri Oct 22 14:28:27 2010 +0100 +++ b/application/inc/buildno.h Sat Oct 23 14:39:56 2010 +0100 @@ -1,2 +1,2 @@ // Build number generated by increment_buildno.py, do not edit manually -#define BUILD_NO 30 \ No newline at end of file +#define BUILD_NO 31 \ No newline at end of file diff -r ff6cd24e77e2 -r 4f37d00ca76e application/sis/buildno.txt --- a/application/sis/buildno.txt Fri Oct 22 14:28:27 2010 +0100 +++ b/application/sis/buildno.txt Sat Oct 23 14:39:56 2010 +0100 @@ -1,1 +1,1 @@ -30 \ No newline at end of file +31 \ No newline at end of file diff -r ff6cd24e77e2 -r 4f37d00ca76e application/sis/podcatcher_udeb.pkg --- a/application/sis/podcatcher_udeb.pkg Fri Oct 22 14:28:27 2010 +0100 +++ b/application/sis/podcatcher_udeb.pkg Sat Oct 23 14:39:56 2010 +0100 @@ -1,7 +1,7 @@ &EN,SP :"Symbian Foundation" %{"Podcatcher","Podcatcher"} -#{"Podcatcher","Podcatcher"},(0xA0009D00), 1, 00, 30, TYPE=SA +#{"Podcatcher","Podcatcher"},(0xA0009D00), 1, 00, 31, TYPE=SA ;Supports Symbian^1 [0x1028315F], 0, 0, 0, {"Series60ProductID","Series60ProductID"} diff -r ff6cd24e77e2 -r 4f37d00ca76e application/sis/podcatcher_udeb.sis Binary file application/sis/podcatcher_udeb.sis has changed diff -r ff6cd24e77e2 -r 4f37d00ca76e application/sis/podcatcher_udeb_signed.sis Binary file application/sis/podcatcher_udeb_signed.sis has changed diff -r ff6cd24e77e2 -r 4f37d00ca76e application/sis/podcatcher_urel.pkg --- a/application/sis/podcatcher_urel.pkg Fri Oct 22 14:28:27 2010 +0100 +++ b/application/sis/podcatcher_urel.pkg Sat Oct 23 14:39:56 2010 +0100 @@ -1,7 +1,7 @@ &EN :"Symbian Foundation" %{"Podcatcher"} -#{"Podcatcher"},(0xA0009D00), 1, 00, 30, TYPE=SA +#{"Podcatcher"},(0xA0009D00), 1, 00, 31, TYPE=SA ;Supports S60 3rd edition [0x101F7961], 0, 0, 0, {"Series60ProductID"} diff -r ff6cd24e77e2 -r 4f37d00ca76e application/src/PodcastAppui.cpp --- a/application/src/PodcastAppui.cpp Fri Oct 22 14:28:27 2010 +0100 +++ b/application/src/PodcastAppui.cpp Sat Oct 23 14:39:56 2010 +0100 @@ -32,6 +32,7 @@ #include #include #include +#include "Podcast.mbg" const TUint KDelayLaunch = 1000; @@ -204,30 +205,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()); } @@ -282,22 +284,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); } } diff -r ff6cd24e77e2 -r 4f37d00ca76e application/src/PodcastFeedView.cpp --- a/application/src/PodcastFeedView.cpp Fri Oct 22 14:28:27 2010 +0100 +++ b/application/src/PodcastFeedView.cpp Sat Oct 23 14:39:56 2010 +0100 @@ -656,6 +656,7 @@ HBufC* prompt = iEikonEnv->AllocReadResourceLC(R_PODCAST_SEARCHFEED_PROMPT); dlg->SetPromptL(*prompt); + dlg->SetPredictiveTextInputPermitted(ETrue); CleanupStack::PopAndDestroy(prompt); if(dlg->RunLD())