Fixed context sensitive help. Ticket #2089
--- 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();
Binary file application/sis/podcatcher_udeb.sis has changed
Binary file application/sis/podcatcher_udeb_signed.sis has changed
Binary file application/sis/podcatcher_urel.sis has changed
Binary file application/sis/podcatcher_urel_signed.sis has changed
--- 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<TCoeHelpContext>* buf = CPodcastAppUi::AppHelpContextL();
- HlpLauncher::LaunchHelpApplicationL(iEikonEnv->WsSession(), buf);
+ {
+ HlpLauncher::LaunchHelpApplicationL(iEikonEnv->WsSession(), HelpContextL());
}
break;
default:
@@ -148,11 +147,15 @@
CArrayFixFlat<TCoeHelpContext>* array =
new(ELeave)CArrayFixFlat<TCoeHelpContext>(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);
--- 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()
{