# HG changeset patch # User Sebastian Brannstrom # Date 1287844583 -3600 # Node ID e6d095ba6756f799847c32fae342030aae58dc53 # Parent 12799e9aba73262702cbdebb5cde543b9028c6dd Icons in tabs diff -r 12799e9aba73 -r e6d095ba6756 application/data/Podcast.rss --- 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" diff -r 12799e9aba73 -r e6d095ba6756 application/data/PodcastClient_english.rls --- 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:" diff -r 12799e9aba73 -r e6d095ba6756 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 15:36:23 2010 +0100 @@ -0,0 +1,114 @@ + + + +image/svg+xml + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -r 12799e9aba73 -r e6d095ba6756 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 15:36:23 2010 +0100 @@ -0,0 +1,29 @@ + + + +image/svg+xml + + + + + + + \ No newline at end of file diff -r 12799e9aba73 -r e6d095ba6756 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 15:36:23 2010 +0100 @@ -0,0 +1,35 @@ + + + +image/svg+xml + + + + + + + \ No newline at end of file diff -r 12799e9aba73 -r e6d095ba6756 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 15:36:23 2010 +0100 @@ -0,0 +1,41 @@ + + + +image/svg+xml + + + + + + + \ No newline at end of file diff -r 12799e9aba73 -r e6d095ba6756 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 15:36:23 2010 +0100 @@ -0,0 +1,46 @@ + + + +image/svg+xml + + + + + + + \ No newline at end of file diff -r 12799e9aba73 -r e6d095ba6756 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 15:36:23 2010 +0100 @@ -0,0 +1,114 @@ + + + +image/svg+xml + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -r 12799e9aba73 -r e6d095ba6756 application/group/bld.inf --- 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 diff -r 12799e9aba73 -r e6d095ba6756 application/inc/Podcast.hrh --- 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 diff -r 12799e9aba73 -r e6d095ba6756 application/src/PodcastAppui.cpp --- 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 #include #include +#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); } } diff -r 12799e9aba73 -r e6d095ba6756 application/src/PodcastFeedView.cpp --- 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())