# HG changeset patch # User teknolog # Date 1272444783 -3600 # Node ID bb78b150af5ef86248d273c7ddad3f3413e377e5 # Parent 31e34b8e2878047a9638213a04dff6d03fdc4b08# Parent f491d534ef9c9f68b10d3415dd83ba8a72cbf489 merge diff -r f491d534ef9c -r bb78b150af5e application/data/PodcastQueueView.ra --- a/application/data/PodcastQueueView.ra Sat Mar 13 21:28:08 2010 +0000 +++ b/application/data/PodcastQueueView.ra Wed Apr 28 09:53:03 2010 +0100 @@ -140,11 +140,6 @@ { items = { - /* STYLUS_POPUP_MENU_ITEM - { - txt = STRING_r_view_show_info_cmd; - command = EPodcastShowInfo; - },*/ STYLUS_POPUP_MENU_ITEM { txt = STRING_r_view_remove_download_short_cmd; diff -r f491d534ef9c -r bb78b150af5e application/group/Podcast.mmp --- a/application/group/Podcast.mmp Sat Mar 13 21:28:08 2010 +0000 +++ b/application/group/Podcast.mmp Wed Apr 28 09:53:03 2010 +0100 @@ -16,7 +16,7 @@ * */ -//MACRO SYMBIAN1_UI +MACRO SYMBIAN1_UI TARGET Podcast.exe TARGETTYPE exe diff -r f491d534ef9c -r bb78b150af5e application/sis/podcatcher_udeb.sis Binary file application/sis/podcatcher_udeb.sis has changed diff -r f491d534ef9c -r bb78b150af5e application/sis/podcatcher_udeb_signed.sis Binary file application/sis/podcatcher_udeb_signed.sis has changed diff -r f491d534ef9c -r bb78b150af5e application/sis/podcatcher_urel.sis Binary file application/sis/podcatcher_urel.sis has changed diff -r f491d534ef9c -r bb78b150af5e application/sis/podcatcher_urel_signed.sis Binary file application/sis/podcatcher_urel_signed.sis has changed diff -r f491d534ef9c -r bb78b150af5e application/src/PodcastListView.cpp --- a/application/src/PodcastListView.cpp Sat Mar 13 21:28:08 2010 +0000 +++ b/application/src/PodcastListView.cpp Wed Apr 28 09:53:03 2010 +0100 @@ -384,16 +384,17 @@ void CPodcastListView::HandleLongTapEventL( const TPoint& aPenEventLocation, const TPoint& /* aPenEventScreenLocation */) { DP("CPodcastListView::HandleLongTapEventL BEGIN"); - iListContainer->SetLongTapDetectedL(ETrue); const TInt KListboxDefaultHeight = 19; // for some reason it returns 19 for an empty listbox in S^1 TInt lbHeight = iListContainer->Listbox()->CalcHeightBasedOnNumOfItems( iListContainer->Listbox()->Model()->NumberOfItems()) - KListboxDefaultHeight; if(iStylusPopupMenu && aPenEventLocation.iY < lbHeight) { + iListContainer->SetLongTapDetectedL(ETrue); iStylusPopupMenu->ShowMenu(); iStylusPopupMenu->SetPosition(aPenEventLocation); } + DP("CPodcastListView::HandleLongTapEventL END"); } diff -r f491d534ef9c -r bb78b150af5e application/src/PodcastQueueView.cpp --- a/application/src/PodcastQueueView.cpp Sat Mar 13 21:28:08 2010 +0000 +++ b/application/src/PodcastQueueView.cpp Wed Apr 28 09:53:03 2010 +0100 @@ -126,12 +126,15 @@ iPodcastModel.FeedEngine().AddObserver(this); iPodcastModel.ShowEngine().AddObserver(this); - + + // no popup options apply to S^1 +#ifndef SYMBIAN1_UI iStylusPopupMenu = CAknStylusPopUpMenu::NewL( this , TPoint(0,0)); TResourceReader reader; iCoeEnv->CreateResourceReaderLC(reader,R_QUEUEVIEW_POPUP_MENU); iStylusPopupMenu->ConstructFromResourceL(reader); CleanupStack::PopAndDestroy(); +#endif SetEmptyTextL(R_PODCAST_EMPTY_QUEUE); } diff -r f491d534ef9c -r bb78b150af5e application/src/PodcastSearchView.cpp --- a/application/src/PodcastSearchView.cpp Sat Mar 13 21:28:08 2010 +0000 +++ b/application/src/PodcastSearchView.cpp Wed Apr 28 09:53:03 2010 +0100 @@ -131,6 +131,8 @@ iPreviousView = TVwsViewId(KUidPodcast, KUidPodcastFeedViewID); ((CPodcastAppUi*)AppUi())->NaviSetTextL(R_SEARCH_RESULTS); + + UpdateListboxItemsL(); UpdateToolbar(); } @@ -269,8 +271,7 @@ void CPodcastSearchView::OpmlParsingComplete(TInt /*aError*/, TUint /*aNumFeedsImported*/) { DP("CPodcastSearchView::OpmlParsingComplete BEGIN"); - UpdateListboxItemsL(); - UpdateToolbar(); + DP("CPodcastSearchView::OpmlParsingComplete END"); } diff -r f491d534ef9c -r bb78b150af5e engine/src/PodcastModel.cpp --- a/engine/src/PodcastModel.cpp Sat Mar 13 21:28:08 2010 +0000 +++ b/engine/src/PodcastModel.cpp Wed Apr 28 09:53:03 2010 +0100 @@ -239,6 +239,7 @@ sqlite3* CPodcastModel::DB() { + DP("CPodcastModel::DB BEGIN"); if (iDB == NULL) { TFileName dbFileName; iFsSession.PrivatePath(dbFileName); @@ -256,7 +257,8 @@ TBuf8 filename8; filename8.Copy(dbFileName); - int rc = rc = sqlite3_open((const char*) filename8.PtrZ(), &iDB); + DP("Before sqlite3_open"); + int rc = sqlite3_open((const char*) filename8.PtrZ(), &iDB); if( rc != SQLITE_OK){ DP("Error loading DB"); User::Panic(_L("Podcatcher"), 10); @@ -264,6 +266,7 @@ } + DP("CPodcastModel::DB END"); return iDB; }