# HG changeset patch # User teknolog # Date 1268386448 0 # Node ID e7b10d6d7ba32d14ce34b946529c6a2d45215916 # Parent 43e204e6ae2e53e2df97baabc32b59d748bb764e# Parent 56d4e0784e5db146fb4f64a38253a5e713403423 Merge with symbian1 branch diff -r 56d4e0784e5d -r e7b10d6d7ba3 application/data/PodcastClient_english.rls --- a/application/data/PodcastClient_english.rls Wed Mar 10 23:33:02 2010 +0000 +++ b/application/data/PodcastClient_english.rls Fri Mar 12 09:34:08 2010 +0000 @@ -38,8 +38,8 @@ rls_string STRING_r_tabgroup_queue_counter "Queue (%d)" // Question dialogs -rls_string STRING_r_add_feed_prompt "Enter search terms or feed URL" -rls_string STRING_r_edit_feed_prompt "Feed URL" +rls_string STRING_r_add_feed_prompt "Enter search terms or 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?" @@ -69,6 +69,10 @@ rls_string STRING_podcast_autoupdate_option4 "Twice a day" rls_string STRING_podcast_autoupdate_option5 "Daily" +// Auto download settings +rls_string STRING_r_on "On" +rls_string STRING_r_off "Off" + // Feed import/export rls_string STRING_r_view_import_feeds_title "Select OPML file" rls_string STRING_r_enter_filename "Enter file name" @@ -113,7 +117,7 @@ rls_string STRING_add_feed_success "Feed added. Update now?" rls_string STRING_add_feed_error "Could not add feed" rls_string STRING_r_add_feed_replace "All existing shows in this feed will be deleted! Continue?" // shown when changing an existing feed URL -rls_string STRING_r_add_feed_exists "A feed with this URL already exists" // shown when adding or changing a feed to a URL that already exists +rls_string STRING_r_add_feed_exists "A feed with this address already exists" // shown when adding or changing a feed to a URL that already exists // Feed searching @@ -135,6 +139,7 @@ rls_string STRING_r_view_stop_downloads_cmd "Suspend downloading" rls_string STRING_r_view_resume_downloads_cmd "Resume downloading" rls_string STRING_r_view_remove_all_downloads_cmd_short "Clear" +rls_string STRING_r_view_remove_all_downloads_cmd "Clear download queue" rls_string STRING_r_clear_query "Clear download queue?" rls_string STRING_r_view_remove_download_short_cmd "Remove" -rls_string STRING_r_view_remove_download_cmd "Remove Download" +rls_string STRING_r_view_remove_download_cmd "Remove download" diff -r 56d4e0784e5d -r e7b10d6d7ba3 application/inc/PodcastFeedView.h diff -r 56d4e0784e5d -r e7b10d6d7ba3 application/inc/PodcastListView.h --- a/application/inc/PodcastListView.h Wed Mar 10 23:33:02 2010 +0000 +++ b/application/inc/PodcastListView.h Fri Mar 12 09:34:08 2010 +0000 @@ -87,7 +87,8 @@ public: ~CPodcastListView(); virtual void UpdateToolbar(TBool aVisible=ETrue) = 0; - + TBool IsVisible(); + protected: void ConstructL(); CPodcastListView(); diff -r 56d4e0784e5d -r e7b10d6d7ba3 application/inc/PodcastShowsView.h --- a/application/inc/PodcastShowsView.h Wed Mar 10 23:33:02 2010 +0000 +++ b/application/inc/PodcastShowsView.h Fri Mar 12 09:34:08 2010 +0000 @@ -29,12 +29,9 @@ #include "PodcastModel.h" #include "Podcast.hrh" #include "PodcastListView.h" -#include "Imagehandler.h" - -class CImageHandler; class CPodcastShowsView : public CPodcastListView, public MEikListBoxObserver, - public MFeedEngineObserver, public MShowEngineObserver, public MImageHandlerCallback + public MFeedEngineObserver, public MShowEngineObserver { public: static CPodcastShowsView* NewL(CPodcastModel& aPodcastModel); @@ -104,12 +101,6 @@ private: void GetShowIcons(CShowInfo* aShowInfo, TInt& aIconIndex); void DisplayShowInfoDialogL(); - /* - * Called by CImageHandler when an image has been loaded. - * @param aError Error code given by the CImageHandler or 0 (zero) if the - * image was loaded successfully. - */ - virtual void ImageOperationCompleteL(TInt aError, TUint aHandle); void HandleSetShowPlayedL(TBool aPlayed); void HandleDeleteShowL(); void UpdateViewTitleL(); @@ -120,8 +111,6 @@ CPodcastModel& iPodcastModel; TBool iProgressAdded; - TInt iLastImageHandlerError; - TBool iSetTitlebarImage; }; #endif // PODCASTSHOWSVIEWH diff -r 56d4e0784e5d -r e7b10d6d7ba3 application/sis/podcatcher_udeb.sis Binary file application/sis/podcatcher_udeb.sis has changed diff -r 56d4e0784e5d -r e7b10d6d7ba3 application/sis/podcatcher_udeb_signed.sis Binary file application/sis/podcatcher_udeb_signed.sis has changed diff -r 56d4e0784e5d -r e7b10d6d7ba3 application/sis/podcatcher_urel.sis Binary file application/sis/podcatcher_urel.sis has changed diff -r 56d4e0784e5d -r e7b10d6d7ba3 application/sis/podcatcher_urel_signed.sis Binary file application/sis/podcatcher_urel_signed.sis has changed diff -r 56d4e0784e5d -r e7b10d6d7ba3 application/src/PodcastAppui.cpp --- a/application/src/PodcastAppui.cpp Wed Mar 10 23:33:02 2010 +0000 +++ b/application/src/PodcastAppui.cpp Fri Mar 12 09:34:08 2010 +0000 @@ -133,9 +133,8 @@ break; } case EPodcastHelp: - { - CArrayFix* buf = CPodcastAppUi::AppHelpContextL(); - HlpLauncher::LaunchHelpApplicationL(iEikonEnv->WsSession(), buf); + { + HlpLauncher::LaunchHelpApplicationL(iEikonEnv->WsSession(), HelpContextL()); } break; default: @@ -148,11 +147,15 @@ CArrayFixFlat* array = new(ELeave)CArrayFixFlat(1); CleanupStack::PushL(array); - // todo: view detection doesn't seem to work - if (ViewShown(KUidPodcastSearchViewID)) { + + if (iFeedView->IsVisible()) { + array->AppendL(TCoeHelpContext(KUidPodcast,KContextFeedsView)); + } else if (iShowsView->IsVisible()) { + array->AppendL(TCoeHelpContext(KUidPodcast,KContextShowsView)); + } else if (iQueueView->IsVisible()) { + array->AppendL(TCoeHelpContext(KUidPodcast,KContextDownloadQueue)); + } else { array->AppendL(TCoeHelpContext(KUidPodcast,KContextSettings)); - } else { - array->AppendL(TCoeHelpContext(KUidPodcast,KContextApplication)); } CleanupStack::Pop(array); @@ -213,9 +216,9 @@ { TUid newview = TUid::Uid(0); TUid messageUid = TUid::Uid(0); - - if (aIndex == KTabIdFeeds) { - if (iFeedView->ViewingShows()) + if (aIndex == KTabIdFeeds) + { + if (iFeedView->ViewingShows()) { newview = KUidPodcastShowsViewID; } @@ -223,11 +226,15 @@ { newview = KUidPodcastFeedViewID; } - } else if (aIndex == KTabIdQueue) { + } + else if (aIndex == KTabIdQueue) + { newview = KUidPodcastQueueViewID; - } else { + } + else + { User::Leave(KErrTooBig); - } + } if(newview.iUid != 0) { diff -r 56d4e0784e5d -r e7b10d6d7ba3 application/src/PodcastFeedView.cpp --- a/application/src/PodcastFeedView.cpp Wed Mar 10 23:33:02 2010 +0000 +++ b/application/src/PodcastFeedView.cpp Fri Mar 12 09:34:08 2010 +0000 @@ -175,7 +175,7 @@ const TDesC8& aCustomMessage) { CPodcastListView::DoActivateL(aPrevViewId, aCustomMessageId, aCustomMessage); - + if (aPrevViewId.iViewUid == KUidPodcastShowsViewID) { // back key from shows view @@ -185,10 +185,10 @@ UpdateListboxItemsL(); UpdateToolbar(); - if (iFirstActivateAfterLaunch) - { - iFirstActivateAfterLaunch = EFalse; - } + if (iFirstActivateAfterLaunch) + { + iFirstActivateAfterLaunch = EFalse; + } } void CPodcastFeedView::DoDeactivate() diff -r 56d4e0784e5d -r e7b10d6d7ba3 application/src/PodcastListView.cpp --- a/application/src/PodcastListView.cpp Wed Mar 10 23:33:02 2010 +0000 +++ b/application/src/PodcastListView.cpp Fri Mar 12 09:34:08 2010 +0000 @@ -29,6 +29,7 @@ #include #include #include +#include const TInt KDefaultGran = 5; @@ -262,6 +263,11 @@ AppUi()->AddToStackL(*this, iListContainer); iListContainer->MakeVisible(ETrue); } + + CAknTitlePane* titlePane = static_cast + ( StatusPane()->ControlL( TUid::Uid( EEikStatusPaneUidTitle ) ) ); + titlePane->SetTextToDefaultL(); + DP("CPodcastListView::DoActivateL() END"); } @@ -296,10 +302,9 @@ case EAknSoftkeyBack: { AppUi()->ActivateViewL(iPreviousView); - if (iPreviousView.iViewUid == KUidPodcastFeedViewID) { - ((CPodcastAppUi*)AppUi())->SetActiveTab(KTabIdFeeds); + ((CPodcastAppUi*)AppUi())->SetActiveTab(KTabIdFeeds); } - }break; + break; case EPodcastSettings: AppUi()->ActivateLocalViewL(KUidPodcastSettingsViewID); break; @@ -311,6 +316,10 @@ } } +TBool CPodcastListView::IsVisible() + { + return iListContainer->IsVisible(); + } void CPodcastListView::RunAboutDialogL() { diff -r 56d4e0784e5d -r e7b10d6d7ba3 application/src/PodcastQueueView.cpp --- a/application/src/PodcastQueueView.cpp Wed Mar 10 23:33:02 2010 +0000 +++ b/application/src/PodcastQueueView.cpp Fri Mar 12 09:34:08 2010 +0000 @@ -25,7 +25,6 @@ #include "imagehandler.h" #include "PodcastShowsView.h" -#include #include #include #include @@ -559,6 +558,7 @@ CPodcastListView::HandleCommandL(aCommand); break; } + iListContainer->SetLongTapDetectedL(EFalse); // in case we got here by long tapping UpdateToolbar(); } diff -r 56d4e0784e5d -r e7b10d6d7ba3 application/src/PodcastSearchView.cpp --- a/application/src/PodcastSearchView.cpp Wed Mar 10 23:33:02 2010 +0000 +++ b/application/src/PodcastSearchView.cpp Fri Mar 12 09:34:08 2010 +0000 @@ -37,7 +37,6 @@ #include #include #include -#include const TInt KMaxFeedNameLength = 100; const TInt KDefaultGran = 5; @@ -128,23 +127,16 @@ TUid aCustomMessageId, const TDesC8& aCustomMessage) { - UpdateToolbar(); - - CAknTitlePane* titlePane = static_cast - ( StatusPane()->ControlL( TUid::Uid( EEikStatusPaneUidTitle ) ) ); - - ((CPodcastAppUi*)AppUi())->NaviSetTextL(R_SEARCH_RESULTS); - CPodcastListView::DoActivateL(aPrevViewId, aCustomMessageId, aCustomMessage); iPreviousView = TVwsViewId(KUidPodcast, KUidPodcastFeedViewID); + + ((CPodcastAppUi*)AppUi())->NaviSetTextL(R_SEARCH_RESULTS); + UpdateToolbar(); } void CPodcastSearchView::DoDeactivate() { CPodcastListView::DoDeactivate(); - CAknTitlePane* titlePane = static_cast - ( StatusPane()->ControlL( TUid::Uid( EEikStatusPaneUidTitle ) ) ); - titlePane->SetTextToDefaultL(); ((CPodcastAppUi*)AppUi())->NaviShowTabGroupL(); } diff -r 56d4e0784e5d -r e7b10d6d7ba3 application/src/PodcastSettingsView.cpp --- a/application/src/PodcastSettingsView.cpp Wed Mar 10 23:33:02 2010 +0000 +++ b/application/src/PodcastSettingsView.cpp Fri Mar 12 09:34:08 2010 +0000 @@ -511,6 +511,7 @@ { iNaviPane->PushL(*iNaviDecorator); } + DP("CPodcastSettingsView::DoActivateL END"); } diff -r 56d4e0784e5d -r e7b10d6d7ba3 application/src/PodcastShowsView.cpp --- a/application/src/PodcastShowsView.cpp Wed Mar 10 23:33:02 2010 +0000 +++ b/application/src/PodcastShowsView.cpp Fri Mar 12 09:34:08 2010 +0000 @@ -203,12 +203,11 @@ TUid aCustomMessageId, const TDesC8& aCustomMessage) { DP("CPodcastShowsView::DoActivateL BEGIN"); + CPodcastListView::DoActivateL(aPrevViewId, aCustomMessageId, aCustomMessage); + + iPreviousView = TVwsViewId(KUidPodcast, KUidPodcastFeedViewID); UpdateViewTitleL(); - - CPodcastListView::DoActivateL(aPrevViewId, aCustomMessageId, aCustomMessage); - iPreviousView = TVwsViewId(KUidPodcast, KUidPodcastFeedViewID); - UpdateFeedUpdateStateL(); UpdateToolbar(); DP("CPodcastShowsView::DoActivateL END"); @@ -216,12 +215,6 @@ void CPodcastShowsView::DoDeactivate() { - CAknTitlePane* titlePane = static_cast - ( StatusPane()->ControlL( TUid::Uid( EEikStatusPaneUidTitle ) ) ); - -// titlePane->SetSmallPicture(NULL, NULL, ETrue); - titlePane->SetPicture(NULL, NULL); - titlePane->SetTextToDefaultL(); CPodcastListView::DoDeactivate(); } @@ -628,30 +621,6 @@ } } -void CPodcastShowsView::ImageOperationCompleteL(TInt aError, TUint /*aHandle*/) - { - iLastImageHandlerError = aError; - if(iSetTitlebarImage) - { - iSetTitlebarImage = EFalse; - if(aError == KErrNone) - { - CAknTitlePane* titlePane = static_cast - ( StatusPane()->ControlL( TUid::Uid( EEikStatusPaneUidTitle ) ) ); - titlePane->SetSmallPicture(iPodcastModel.ImageHandler().ScaledBitmap(), NULL, ETrue); - } - else - { - iPodcastModel.ImageHandler().ScaledBitmap(); - } - - } - else - { - CActiveScheduler::Stop(); - } - } - void CPodcastShowsView::DisplayShowInfoDialogL() { TInt index = iListContainer->Listbox()->CurrentItemIndex(); @@ -855,7 +824,6 @@ } else { - titlePane->SetPicture(NULL, NULL); titlePane->SetTextToDefaultL(); }