diff -r d15654dbe9b8 -r f94dbd678dda application/src/PodcastQueueView.cpp --- a/application/src/PodcastQueueView.cpp Wed Jul 07 10:29:00 2010 +0100 +++ b/application/src/PodcastQueueView.cpp Wed Jul 07 14:10:58 2010 +0100 @@ -67,12 +67,11 @@ iPodcastModel.FeedEngine().AddObserver(this); iPodcastModel.ShowEngine().AddObserver(this); - - // no popup options apply to S^1 iStylusPopupMenu = CAknStylusPopUpMenu::NewL( this , TPoint(0,0)); TResourceReader reader; iCoeEnv->CreateResourceReaderLC(reader,R_QUEUEVIEW_POPUP_MENU); iStylusPopupMenu->ConstructFromResourceL(reader); + CleanupStack::PopAndDestroy(); SetEmptyTextL(R_PODCAST_EMPTY_QUEUE); @@ -322,30 +321,33 @@ } void CPodcastQueueView::DynInitMenuPaneL(TInt aResourceId,CEikMenuPane* aMenuPane) -{ + { if(aResourceId == R_PODCAST_SHOWSVIEW_MENU) { aMenuPane->SetItemDimmed(EPodcastMarkAllPlayed, ETrue); } -} + } void CPodcastQueueView::UpdateToolbar(TBool aVisible) -{ + { CAknToolbar* toolbar = Toolbar(); - if (toolbar) { + if (toolbar) + { RShowInfoArray &fItems = iPodcastModel.ActiveShowList(); TInt itemCnt = fItems.Count(); - if (iListContainer->IsVisible()) { + if (iListContainer->IsVisible()) + { toolbar->SetToolbarVisibility(aVisible); - } + } + toolbar->HideItem(EPodcastRemoveAllDownloads, EFalse, ETrue); toolbar->SetItemDimmed(EPodcastRemoveAllDownloads, itemCnt == 0, ETrue); toolbar->HideItem(EPodcastSuspendDownloads,iPodcastModel.SettingsEngine().DownloadSuspended(), ETrue); toolbar->HideItem(EPodcastResumeDownloads,!iPodcastModel.SettingsEngine().DownloadSuspended(), ETrue); toolbar->SetItemDimmed(EPodcastRemoveDownload, itemCnt == 0, ETrue); + } } -} void CPodcastQueueView::HandleLongTapEventL( const TPoint& aPenEventLocation, const TPoint& /* aPenEventScreenLocation */) {