# HG changeset patch # User teknolog # Date 1268343901 0 # Node ID f8fd68d71cfdafa2a8feff974dbf6c7018a756d1 # Parent e5a309826d691b7953f26f1402ee3b4d5eef79e1 Fixed context sensitive help. Ticket #2089 diff -r e5a309826d69 -r f8fd68d71cfd application/inc/PodcastListView.h --- a/application/inc/PodcastListView.h Thu Mar 11 20:29:28 2010 +0000 +++ b/application/inc/PodcastListView.h Thu Mar 11 21:45:01 2010 +0000 @@ -87,7 +87,8 @@ public: ~CPodcastListView(); virtual void UpdateToolbar(TBool aVisible=ETrue) = 0; - + TBool IsVisible(); + protected: void ConstructL(); CPodcastListView(); diff -r e5a309826d69 -r f8fd68d71cfd application/sis/podcatcher_udeb.sis Binary file application/sis/podcatcher_udeb.sis has changed diff -r e5a309826d69 -r f8fd68d71cfd application/sis/podcatcher_udeb_signed.sis Binary file application/sis/podcatcher_udeb_signed.sis has changed diff -r e5a309826d69 -r f8fd68d71cfd application/sis/podcatcher_urel.sis Binary file application/sis/podcatcher_urel.sis has changed diff -r e5a309826d69 -r f8fd68d71cfd application/sis/podcatcher_urel_signed.sis Binary file application/sis/podcatcher_urel_signed.sis has changed diff -r e5a309826d69 -r f8fd68d71cfd application/src/PodcastAppui.cpp --- a/application/src/PodcastAppui.cpp Thu Mar 11 20:29:28 2010 +0000 +++ b/application/src/PodcastAppui.cpp Thu Mar 11 21:45:01 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); diff -r e5a309826d69 -r f8fd68d71cfd application/src/PodcastListView.cpp --- a/application/src/PodcastListView.cpp Thu Mar 11 20:29:28 2010 +0000 +++ b/application/src/PodcastListView.cpp Thu Mar 11 21:45:01 2010 +0000 @@ -311,6 +311,10 @@ } } +TBool CPodcastListView::IsVisible() + { + return iListContainer->IsVisible(); + } void CPodcastListView::RunAboutDialogL() {