--- a/application/data/PodcastFeedView.ra Fri Jul 09 23:58:47 2010 +0100
+++ b/application/data/PodcastFeedView.ra Sat Jul 10 13:35:21 2010 +0100
@@ -92,91 +92,91 @@
hotkeys = r_podcast_feedview_hotkeys;
menubar = r_podcast_feedview_menubar;
cba = r_podcast_cba;
- toolbar = r_feedview_toolbar;
+// toolbar = r_feedview_toolbar;
}
-RESOURCE AVKON_TOOLBAR r_feedview_toolbar
- {
- flags = KAknToolbarFixed;
- items =
- {
- TBAR_CTRL
- {
- type = EAknCtButton;
- id = EPodcastUpdateAllFeeds;
- control = AVKON_BUTTON
- {
- states =
- {
- AVKON_BUTTON_STATE
- {
- //bmpfile = AVKON_BITMAP_FILE;
- //bmpid = EMbmAvkonQgn_indi_find_goto;
- txt = STRING_r_update_feed_short_cmd;
- helptxt = STRING_r_update_all_feeds_cmd;
- }
- };
- };
- },
- TBAR_CTRL
- {
- type = EAknCtButton;
- id = EPodcastCancelUpdateAllFeeds;
- control = AVKON_BUTTON
- {
- states =
- {
- AVKON_BUTTON_STATE
- {
- //bmpfile = AVKON_BITMAP_FILE;
- //bmpid = EMbmAvkonQgn_indi_find_goto;
- txt = STRING_r_cancel_update_all_feeds_short_cmd;
- helptxt = STRING_r_cancel_update_all_feeds_cmd;
- }
- };
- };
- },
- TBAR_CTRL
- {
- type = EAknCtButton;
- id = EPodcastAddFeed;
- control = AVKON_BUTTON
- {
- flags = KAknButtonTextInsideFrame;
- states =
- {
- AVKON_BUTTON_STATE
- {
- //bmpfile = AVKON_BITMAP_FILE;
- //bmpid = EMbmAvkonQgn_indi_find_goto;
- //press_bmpid = EMbmAvkonQgn_indi_find_goto;
- txt = STRING_r_view_add_feed_cmd_short;
- helptxt = STRING_r_view_add_feed_cmd;
- }
- };
- };
- },
- TBAR_CTRL
- {
- type = EAknCtButton;
- id = EPodcastSettings;
- control = AVKON_BUTTON
- {
- states =
- {
- AVKON_BUTTON_STATE
- {
- //bmpfile = AVKON_BITMAP_FILE;
- //bmpid = EMbmAvkonQgn_indi_find_goto;
- //press_bmpid = EMbmAvkonQgn_indi_find_goto;
- txt = STRING_r_settings_cmd;
- helptxt = STRING_r_settings_cmd;
- }
- };
- };
- }
- };// items
- }
+//RESOURCE AVKON_TOOLBAR r_feedview_toolbar
+// {
+// flags = KAknToolbarFixed;
+// items =
+// {
+// TBAR_CTRL
+// {
+// type = EAknCtButton;
+// id = EPodcastUpdateAllFeeds;
+// control = AVKON_BUTTON
+// {
+// states =
+// {
+// AVKON_BUTTON_STATE
+// {
+// //bmpfile = AVKON_BITMAP_FILE;
+// //bmpid = EMbmAvkonQgn_indi_find_goto;
+// txt = STRING_r_update_feed_short_cmd;
+// helptxt = STRING_r_update_all_feeds_cmd;
+// }
+// };
+// };
+// },
+// TBAR_CTRL
+// {
+// type = EAknCtButton;
+// id = EPodcastCancelUpdateAllFeeds;
+// control = AVKON_BUTTON
+// {
+// states =
+// {
+// AVKON_BUTTON_STATE
+// {
+// //bmpfile = AVKON_BITMAP_FILE;
+// //bmpid = EMbmAvkonQgn_indi_find_goto;
+// txt = STRING_r_cancel_update_all_feeds_short_cmd;
+// helptxt = STRING_r_cancel_update_all_feeds_cmd;
+// }
+// };
+// };
+// },
+// TBAR_CTRL
+// {
+// type = EAknCtButton;
+// id = EPodcastAddFeed;
+// control = AVKON_BUTTON
+// {
+// flags = KAknButtonTextInsideFrame;
+// states =
+// {
+// AVKON_BUTTON_STATE
+// {
+// //bmpfile = AVKON_BITMAP_FILE;
+// //bmpid = EMbmAvkonQgn_indi_find_goto;
+// //press_bmpid = EMbmAvkonQgn_indi_find_goto;
+// txt = STRING_r_view_add_feed_cmd_short;
+// helptxt = STRING_r_view_add_feed_cmd;
+// }
+// };
+// };
+// },
+// TBAR_CTRL
+// {
+// type = EAknCtButton;
+// id = EPodcastSettings;
+// control = AVKON_BUTTON
+// {
+// states =
+// {
+// AVKON_BUTTON_STATE
+// {
+// //bmpfile = AVKON_BITMAP_FILE;
+// //bmpid = EMbmAvkonQgn_indi_find_goto;
+// //press_bmpid = EMbmAvkonQgn_indi_find_goto;
+// txt = STRING_r_settings_cmd;
+// helptxt = STRING_r_settings_cmd;
+// }
+// };
+// };
+// }
+// };// items
+// }
RESOURCE DIALOG r_podcast_add_feed_dlg
{
--- a/application/data/PodcastQueueView.ra Fri Jul 09 23:58:47 2010 +0100
+++ b/application/data/PodcastQueueView.ra Sat Jul 10 13:35:21 2010 +0100
@@ -20,7 +20,6 @@
{
menubar = r_podcast_queueview_menubar;
cba = R_AVKON_SOFTKEYS_OPTIONS_BACK;
- toolbar = r_queueview_toolbar;
}
RESOURCE MENU_BAR r_podcast_queueview_menubar
@@ -53,86 +52,86 @@
};
}
-RESOURCE AVKON_TOOLBAR r_queueview_toolbar
- {
- flags = KAknToolbarFixed;
- items =
- {
-
- TBAR_CTRL
- {
- type = EAknCtButton;
- id =EPodcastSuspendDownloads;
- control = AVKON_BUTTON
- {
- states =
- {
- AVKON_BUTTON_STATE
- {
- //bmpfile = AVKON_BITMAP_FILE;
- //bmpid = EMbmAvkonQgn_indi_find_goto;
- txt = STRING_r_suspend_download_cmd;
- helptxt = STRING_r_view_stop_downloads_cmd;
- }
- };
- };
- },
- TBAR_CTRL
- {
- type = EAknCtButton;
- id =EPodcastResumeDownloads;
- control = AVKON_BUTTON
- {
- states =
- {
- AVKON_BUTTON_STATE
- {
- //bmpfile = AVKON_BITMAP_FILE;
- //bmpid = EMbmAvkonQgn_indi_find_goto;
- txt = STRING_r_view_resume_short_dls_cmd;
- helptxt = STRING_r_view_resume_downloads_cmd;
- }
- };
- };
- },
- TBAR_CTRL
- {
- type = EAknCtButton;
- id = EPodcastRemoveDownload;
- control = AVKON_BUTTON
- {
- states =
- {
- AVKON_BUTTON_STATE
- {
- //bmpfile = AVKON_BITMAP_FILE;
- //bmpid = EMbmAvkonQgn_indi_find_goto;
- txt = STRING_r_view_remove_download_short_cmd;
- helptxt = STRING_r_view_remove_download_cmd;
- }
- };
- };
- },
- TBAR_CTRL
- {
- type = EAknCtButton;
- id =EPodcastRemoveAllDownloads;
- control = AVKON_BUTTON
- {
- states =
- {
- AVKON_BUTTON_STATE
- {
- //bmpfile = AVKON_BITMAP_FILE;
- //bmpid = EMbmAvkonQgn_indi_find_goto;
- txt = STRING_r_view_remove_all_downloads_cmd_short;
- helptxt = STRING_r_view_remove_all_downloads_cmd;
- }
- };
- };
- }
- };
- }
+//RESOURCE AVKON_TOOLBAR r_queueview_toolbar
+// {
+// flags = KAknToolbarFixed;
+// items =
+// {
+//
+// TBAR_CTRL
+// {
+// type = EAknCtButton;
+// id =EPodcastSuspendDownloads;
+// control = AVKON_BUTTON
+// {
+// states =
+// {
+// AVKON_BUTTON_STATE
+// {
+// //bmpfile = AVKON_BITMAP_FILE;
+// //bmpid = EMbmAvkonQgn_indi_find_goto;
+// txt = STRING_r_suspend_download_cmd;
+// helptxt = STRING_r_view_stop_downloads_cmd;
+// }
+// };
+// };
+// },
+// TBAR_CTRL
+// {
+// type = EAknCtButton;
+// id =EPodcastResumeDownloads;
+// control = AVKON_BUTTON
+// {
+// states =
+// {
+// AVKON_BUTTON_STATE
+// {
+// //bmpfile = AVKON_BITMAP_FILE;
+// //bmpid = EMbmAvkonQgn_indi_find_goto;
+// txt = STRING_r_view_resume_short_dls_cmd;
+// helptxt = STRING_r_view_resume_downloads_cmd;
+// }
+// };
+// };
+// },
+// TBAR_CTRL
+// {
+// type = EAknCtButton;
+// id = EPodcastRemoveDownload;
+// control = AVKON_BUTTON
+// {
+// states =
+// {
+// AVKON_BUTTON_STATE
+// {
+// //bmpfile = AVKON_BITMAP_FILE;
+// //bmpid = EMbmAvkonQgn_indi_find_goto;
+// txt = STRING_r_view_remove_download_short_cmd;
+// helptxt = STRING_r_view_remove_download_cmd;
+// }
+// };
+// };
+// },
+// TBAR_CTRL
+// {
+// type = EAknCtButton;
+// id =EPodcastRemoveAllDownloads;
+// control = AVKON_BUTTON
+// {
+// states =
+// {
+// AVKON_BUTTON_STATE
+// {
+// //bmpfile = AVKON_BITMAP_FILE;
+// //bmpid = EMbmAvkonQgn_indi_find_goto;
+// txt = STRING_r_view_remove_all_downloads_cmd_short;
+// helptxt = STRING_r_view_remove_all_downloads_cmd;
+// }
+// };
+// };
+// }
+// };
+// }
RESOURCE STYLUS_POPUP_MENU r_queueview_popup_menu
{
--- a/application/data/PodcastSearchView.ra Fri Jul 09 23:58:47 2010 +0100
+++ b/application/data/PodcastSearchView.ra Sat Jul 10 13:35:21 2010 +0100
@@ -55,67 +55,67 @@
}
-RESOURCE AVKON_TOOLBAR r_searchview_toolbar
- {
- flags = KAknToolbarFixed;
- items =
- {
- TBAR_CTRL
- {
- type = EAknCtButton;
- id = EPodcastSearch;
- control = AVKON_BUTTON
- {
- states =
- {
- AVKON_BUTTON_STATE
- {
- //bmpfile = AVKON_BITMAP_FILE;
- //bmpid = EMbmAvkonQgn_indi_find_goto;
- txt = STRING_r_search;
- helptxt = STRING_r_update_all_feeds_cmd;
- }
- };
- };
- },
- TBAR_CTRL
- {
- type = EAknCtButton;
- id = EPodcastCancelUpdateAllFeeds;
- control = AVKON_BUTTON
- {
- states =
- {
- AVKON_BUTTON_STATE
- {
- //bmpfile = AVKON_BITMAP_FILE;
- //bmpid = EMbmAvkonQgn_indi_find_goto;
- txt = STRING_r_cancel_update_all_feeds_short_cmd;
- helptxt = STRING_r_cancel_update_all_feeds_cmd;
- }
- };
- };
- }/*,
- TBAR_CTRL
- {
- type = EAknCtButton;
- id = EPodcastAddSearchResult;
- control = AVKON_BUTTON
- {
- states =
- {
- AVKON_BUTTON_STATE
- {
- //bmpfile = AVKON_BITMAP_FILE;
- //bmpid = EMbmAvkonQgn_indi_find_goto;
- txt = STRING_r_view_add_feed_cmd_short;
- helptxt = STRING_r_view_add_feed_cmd;
- }
- };
- };
- }*/
- };// items
- }
+//RESOURCE AVKON_TOOLBAR r_searchview_toolbar
+// {
+// flags = KAknToolbarFixed;
+// items =
+// {
+// TBAR_CTRL
+// {
+// type = EAknCtButton;
+// id = EPodcastSearch;
+// control = AVKON_BUTTON
+// {
+// states =
+// {
+// AVKON_BUTTON_STATE
+// {
+// //bmpfile = AVKON_BITMAP_FILE;
+// //bmpid = EMbmAvkonQgn_indi_find_goto;
+// txt = STRING_r_search;
+// helptxt = STRING_r_update_all_feeds_cmd;
+// }
+// };
+// };
+// },
+// TBAR_CTRL
+// {
+// type = EAknCtButton;
+// id = EPodcastCancelUpdateAllFeeds;
+// control = AVKON_BUTTON
+// {
+// states =
+// {
+// AVKON_BUTTON_STATE
+// {
+// //bmpfile = AVKON_BITMAP_FILE;
+// //bmpid = EMbmAvkonQgn_indi_find_goto;
+// txt = STRING_r_cancel_update_all_feeds_short_cmd;
+// helptxt = STRING_r_cancel_update_all_feeds_cmd;
+// }
+// };
+// };
+// }/*,
+// TBAR_CTRL
+// {
+// type = EAknCtButton;
+// id = EPodcastAddSearchResult;
+// control = AVKON_BUTTON
+// {
+// states =
+// {
+// AVKON_BUTTON_STATE
+// {
+// //bmpfile = AVKON_BITMAP_FILE;
+// //bmpid = EMbmAvkonQgn_indi_find_goto;
+// txt = STRING_r_view_add_feed_cmd_short;
+// helptxt = STRING_r_view_add_feed_cmd;
+// }
+// };
+// };
+// }*/
+// };// items
+// }
RESOURCE CBA r_podcast_search_cba
--- a/application/data/PodcastShowsView.ra Fri Jul 09 23:58:47 2010 +0100
+++ b/application/data/PodcastShowsView.ra Sat Jul 10 13:35:21 2010 +0100
@@ -20,7 +20,7 @@
{
menubar = r_podcast_showsview_menubar;
cba = R_AVKON_SOFTKEYS_OPTIONS_BACK;
- toolbar = r_showsview_toolbar;
+// toolbar = r_showsview_toolbar;
}
RESOURCE MENU_BAR r_podcast_showsview_menubar
@@ -90,124 +90,124 @@
};
}
-RESOURCE AVKON_TOOLBAR r_showsview_toolbar
- {
- flags = KAknToolbarFixed;
- items =
- {
- TBAR_CTRL
- {
- type = EAknCtButton;
- id = EPodcastUpdateFeed;
- control = AVKON_BUTTON
- {
- states =
- {
- AVKON_BUTTON_STATE
- {
- //bmpfile = AVKON_BITMAP_FILE;
- //bmpid = EMbmAvkonQgn_indi_find_goto;
- txt = STRING_r_update_feed_short_cmd;
- helptxt = STRING_r_update_feed_cmd;
- }
- };
- };
- },
- TBAR_CTRL
- {
- type = EAknCtButton;
- id = EPodcastCancelUpdateAllFeeds;
- control = AVKON_BUTTON
- {
- states =
- {
- AVKON_BUTTON_STATE
- {
- //bmpfile = AVKON_BITMAP_FILE;
- //bmpid = EMbmAvkonQgn_indi_find_goto;
- txt = STRING_r_cancel_update_all_feeds_short_cmd;
- helptxt = STRING_r_cancel_update_all_feeds_cmd;
- }
- };
- };
- },
-// we keep the download toolbar button in S^3, but always disable it
-// because there are drawing issues with only one item in the toolbar
- TBAR_CTRL
- {
- type = EAknCtButton;
- id = EPodcastDownloadShow;
- control = AVKON_BUTTON
- {
- states =
- {
- AVKON_BUTTON_STATE
- {
- //bmpfile = AVKON_BITMAP_FILE;
- //bmpid = EMbmAvkonQgn_indi_find_goto;
- txt = STRING_r_view_download_show_cmd;
- helptxt = STRING_r_view_download_show_cmd;
- }
- };
- };
- }
- ,
- TBAR_CTRL
- {
- type = EAknCtButton;
- id =EPodcastDeleteShow;
- control = AVKON_BUTTON
- {
- states =
- {
- AVKON_BUTTON_STATE
- {
- //bmpfile = AVKON_BITMAP_FILE;
- //bmpid = EMbmAvkonQgn_indi_find_goto;
- txt = STRING_r_view_delete_show_cmd;
- helptxt = STRING_r_view_delete_show_cmd;
- }
- };
- };
- },
- TBAR_CTRL
- {
- type = EAknCtButton;
- id = EPodcastMarkAsPlayed;
- control = AVKON_BUTTON
- {
- states =
- {
- AVKON_BUTTON_STATE
- {
- //bmpfile = AVKON_BITMAP_FILE;
- //bmpid = EMbmAvkonQgn_indi_find_goto;
- txt = STRING_r_view_mark_as_played_cmd_short;
- helptxt = STRING_r_view_mark_as_played_cmd_short;
- }
- };
- };
- },
- TBAR_CTRL
- {
- type = EAknCtButton;
- id =EPodcastMarkAsUnplayed;
- control = AVKON_BUTTON
- {
- states =
- {
- AVKON_BUTTON_STATE
- {
- //bmpfile = AVKON_BITMAP_FILE;
- //bmpid = EMbmAvkonQgn_indi_find_goto;
- txt = STRING_r_view_mark_as_unplayed_cmd_short;
- helptxt = STRING_r_view_mark_as_unplayed_cmd_short;
- }
- };
- };
- }
- };
- }
+//RESOURCE AVKON_TOOLBAR r_showsview_toolbar
+// {
+// flags = KAknToolbarFixed;
+// items =
+// {
+// TBAR_CTRL
+// {
+// type = EAknCtButton;
+// id = EPodcastUpdateFeed;
+// control = AVKON_BUTTON
+// {
+// states =
+// {
+// AVKON_BUTTON_STATE
+// {
+// //bmpfile = AVKON_BITMAP_FILE;
+// //bmpid = EMbmAvkonQgn_indi_find_goto;
+// txt = STRING_r_update_feed_short_cmd;
+// helptxt = STRING_r_update_feed_cmd;
+// }
+// };
+// };
+// },
+// TBAR_CTRL
+// {
+// type = EAknCtButton;
+// id = EPodcastCancelUpdateAllFeeds;
+// control = AVKON_BUTTON
+// {
+// states =
+// {
+// AVKON_BUTTON_STATE
+// {
+// //bmpfile = AVKON_BITMAP_FILE;
+// //bmpid = EMbmAvkonQgn_indi_find_goto;
+// txt = STRING_r_cancel_update_all_feeds_short_cmd;
+// helptxt = STRING_r_cancel_update_all_feeds_cmd;
+// }
+// };
+// };
+// },
+//// we keep the download toolbar button in S^3, but always disable it
+//// because there are drawing issues with only one item in the toolbar
+// TBAR_CTRL
+// {
+// type = EAknCtButton;
+// id = EPodcastDownloadShow;
+// control = AVKON_BUTTON
+// {
+// states =
+// {
+// AVKON_BUTTON_STATE
+// {
+// //bmpfile = AVKON_BITMAP_FILE;
+// //bmpid = EMbmAvkonQgn_indi_find_goto;
+// txt = STRING_r_view_download_show_cmd;
+// helptxt = STRING_r_view_download_show_cmd;
+// }
+// };
+// };
+// }
+// ,
+// TBAR_CTRL
+// {
+// type = EAknCtButton;
+// id =EPodcastDeleteShow;
+// control = AVKON_BUTTON
+// {
+// states =
+// {
+// AVKON_BUTTON_STATE
+// {
+// //bmpfile = AVKON_BITMAP_FILE;
+// //bmpid = EMbmAvkonQgn_indi_find_goto;
+// txt = STRING_r_view_delete_show_cmd;
+// helptxt = STRING_r_view_delete_show_cmd;
+// }
+// };
+// };
+// },
+// TBAR_CTRL
+// {
+// type = EAknCtButton;
+// id = EPodcastMarkAsPlayed;
+// control = AVKON_BUTTON
+// {
+// states =
+// {
+// AVKON_BUTTON_STATE
+// {
+// //bmpfile = AVKON_BITMAP_FILE;
+// //bmpid = EMbmAvkonQgn_indi_find_goto;
+// txt = STRING_r_view_mark_as_played_cmd_short;
+// helptxt = STRING_r_view_mark_as_played_cmd_short;
+// }
+// };
+// };
+// },
+// TBAR_CTRL
+// {
+// type = EAknCtButton;
+// id =EPodcastMarkAsUnplayed;
+// control = AVKON_BUTTON
+// {
+// states =
+// {
+// AVKON_BUTTON_STATE
+// {
+// //bmpfile = AVKON_BITMAP_FILE;
+// //bmpid = EMbmAvkonQgn_indi_find_goto;
+// txt = STRING_r_view_mark_as_unplayed_cmd_short;
+// helptxt = STRING_r_view_mark_as_unplayed_cmd_short;
+// }
+// };
+// };
+// }
+// };
+// }
RESOURCE STYLUS_POPUP_MENU r_showview_popup_menu
{
--- a/application/group/Podcast.mmp Fri Jul 09 23:58:47 2010 +0100
+++ b/application/group/Podcast.mmp Sat Jul 10 13:35:21 2010 +0100
@@ -74,7 +74,7 @@
LIBRARY commdb.lib
LIBRARY esock.lib
LIBRARY mmfcontrollerframework.lib
-LIBRARY cmmanager.lib
+//LIBRARY cmmanager.lib
LIBRARY imageconversion.lib
LIBRARY bitmaptransforms.lib
LIBRARY euser.lib
--- a/application/inc/PodcastListView.h Fri Jul 09 23:58:47 2010 +0100
+++ b/application/inc/PodcastListView.h Sat Jul 10 13:35:21 2010 +0100
@@ -118,9 +118,6 @@
*/
void HandleCommandL(TInt aCommand);
- void OfferToolbarEventL(TInt aCommand);
- void DynInitToolbarL (TInt aResourceId, CAknToolbar *aToolbar);
-
virtual void UpdateListboxItemsL() = 0;
void RunAboutDialogL();
--- a/application/src/PodcastFeedView.cpp Fri Jul 09 23:58:47 2010 +0100
+++ b/application/src/PodcastFeedView.cpp Sat Jul 10 13:35:21 2010 +0100
@@ -31,7 +31,7 @@
#include <aknquerydialog.h>
#include <BAUTILS.H>
#include <pathinfo.h>
-#include <akncommondialogsdynmem.h>
+//#include <akncommondialogsdynmem.h>
#include "Podcatcher.pan"
const TInt KMaxFeedNameLength = 100;
@@ -710,72 +710,72 @@
void CPodcastFeedView::HandleImportFeedsL()
{
- TFileName fileName;
- fileName.Zero();
- TFileName startFolder;
- startFolder.Zero();
- TInt types = AknCommonDialogsDynMem::EMemoryTypePhone | AknCommonDialogsDynMem::EMemoryTypeMMC |AknCommonDialogsDynMem::EMemoryTypeInternalMassStorage| AknCommonDialogsDynMem::EMemoryTypeRemote;
-
- HBufC *title = iCoeEnv->AllocReadResourceLC(R_PODCAST_SELECT_OPML);
- if (AknCommonDialogsDynMem::RunSelectDlgLD (types, fileName,
- startFolder, NULL, NULL, *title))
- {
-
- if(fileName.Length()>0)
- {
- HBufC *waitText = iEikonEnv->AllocReadResourceLC(R_IMPORTING);
- iOpmlState = EOpmlImporting;
- ShowWaitDialogL(*waitText);
- CleanupStack::PopAndDestroy(waitText);
-
- TRAPD(err, iPodcastModel.FeedEngine().ImportFeedsL(fileName));
-
- if (err != KErrNone) {
- TBuf<KMaxMessageLength> message;
- iEikonEnv->ReadResourceL(message, R_IMPORT_FEED_FAILURE);
- ShowErrorMessageL(message);
- }
- }
-
- }
- CleanupStack::PopAndDestroy(title);
+// TFileName fileName;
+// fileName.Zero();
+// TFileName startFolder;
+// startFolder.Zero();
+// TInt types = AknCommonDialogsDynMem::EMemoryTypePhone | AknCommonDialogsDynMem::EMemoryTypeMMC |AknCommonDialogsDynMem::EMemoryTypeInternalMassStorage| AknCommonDialogsDynMem::EMemoryTypeRemote;
+//
+// HBufC *title = iCoeEnv->AllocReadResourceLC(R_PODCAST_SELECT_OPML);
+// if (AknCommonDialogsDynMem::RunSelectDlgLD (types, fileName,
+// startFolder, NULL, NULL, *title))
+// {
+//
+// if(fileName.Length()>0)
+// {
+// HBufC *waitText = iEikonEnv->AllocReadResourceLC(R_IMPORTING);
+// iOpmlState = EOpmlImporting;
+// ShowWaitDialogL(*waitText);
+// CleanupStack::PopAndDestroy(waitText);
+//
+// TRAPD(err, iPodcastModel.FeedEngine().ImportFeedsL(fileName));
+//
+// if (err != KErrNone) {
+// TBuf<KMaxMessageLength> message;
+// iEikonEnv->ReadResourceL(message, R_IMPORT_FEED_FAILURE);
+// ShowErrorMessageL(message);
+// }
+// }
+//
+// }
+// CleanupStack::PopAndDestroy(title);
}
void CPodcastFeedView::HandleExportFeedsL()
{
- TFileName fileName;
- fileName.Copy(_L("feeds.opml"));
- TFileName startFolder;
- startFolder.Zero();
- TInt types = AknCommonDialogsDynMem::EMemoryTypePhone | AknCommonDialogsDynMem::EMemoryTypeMMC |AknCommonDialogsDynMem::EMemoryTypeInternalMassStorage| AknCommonDialogsDynMem::EMemoryTypeRemote;
-
- HBufC *title = iCoeEnv->AllocReadResourceLC(R_PODCAST_SELECT_FOLDER);
- if (AknCommonDialogsDynMem::RunSaveDlgLD (types, fileName,
- startFolder, NULL, NULL, *title))
- {
- TFileName temp;
- TRAPD(err, iPodcastModel.FeedEngine().ExportFeedsL(temp));
- BaflUtils::CopyFile(iEikonEnv->FsSession(), temp, fileName);
- BaflUtils::DeleteFile(iEikonEnv->FsSession(),temp);
- if (err == KErrNone)
- {
- UpdateListboxItemsL();
- TInt numFeeds = iPodcastModel.FeedEngine().GetSortedFeeds().Count();
-
- TBuf<KMaxMessageLength> message;
- TBuf<KMaxMessageLength> templ;
- iEikonEnv->ReadResourceL(templ, R_EXPORT_FEED_SUCCESS);
- message.Format(templ, numFeeds);
- ShowOkMessageL(message);
- }
- else
- {
- TBuf<KMaxMessageLength> message;
- iEikonEnv->ReadResourceL(message, R_EXPORT_FEED_FAILURE);
- ShowErrorMessageL(message);
- }
- }
- CleanupStack::PopAndDestroy(title);
+// TFileName fileName;
+// fileName.Copy(_L("feeds.opml"));
+// TFileName startFolder;
+// startFolder.Zero();
+// TInt types = AknCommonDialogsDynMem::EMemoryTypePhone | AknCommonDialogsDynMem::EMemoryTypeMMC |AknCommonDialogsDynMem::EMemoryTypeInternalMassStorage| AknCommonDialogsDynMem::EMemoryTypeRemote;
+//
+// HBufC *title = iCoeEnv->AllocReadResourceLC(R_PODCAST_SELECT_FOLDER);
+// if (AknCommonDialogsDynMem::RunSaveDlgLD (types, fileName,
+// startFolder, NULL, NULL, *title))
+// {
+// TFileName temp;
+// TRAPD(err, iPodcastModel.FeedEngine().ExportFeedsL(temp));
+// BaflUtils::CopyFile(iEikonEnv->FsSession(), temp, fileName);
+// BaflUtils::DeleteFile(iEikonEnv->FsSession(),temp);
+// if (err == KErrNone)
+// {
+// UpdateListboxItemsL();
+// TInt numFeeds = iPodcastModel.FeedEngine().GetSortedFeeds().Count();
+//
+// TBuf<KMaxMessageLength> message;
+// TBuf<KMaxMessageLength> templ;
+// iEikonEnv->ReadResourceL(templ, R_EXPORT_FEED_SUCCESS);
+// message.Format(templ, numFeeds);
+// ShowOkMessageL(message);
+// }
+// else
+// {
+// TBuf<KMaxMessageLength> message;
+// iEikonEnv->ReadResourceL(message, R_EXPORT_FEED_FAILURE);
+// ShowErrorMessageL(message);
+// }
+// }
+// CleanupStack::PopAndDestroy(title);
}
void CPodcastFeedView::CheckResumeDownloadL()
--- a/application/src/PodcastListView.cpp Fri Jul 09 23:58:47 2010 +0100
+++ b/application/src/PodcastListView.cpp Sat Jul 10 13:35:21 2010 +0100
@@ -346,17 +346,6 @@
// Pass the pointer event to Long tap detector component
}
-
-void CPodcastListView::DynInitToolbarL (TInt /*aResourceId*/, CAknToolbar * /*aToolbar*/)
- {
- }
-
-
-void CPodcastListView::OfferToolbarEventL(TInt aCommand)
- {
- HandleCommandL(aCommand);
- }
-
void CPodcastListView::ShowWaitDialogL(TDesC &aWaitText)
{
DP("CPodcastListView::ShowWaitDialogL BEGIN");
--- a/application/src/PodcastSearchView.cpp Fri Jul 09 23:58:47 2010 +0100
+++ b/application/src/PodcastSearchView.cpp Sat Jul 10 13:35:21 2010 +0100
@@ -192,7 +192,6 @@
*/
void CPodcastSearchView::HandleCommandL(TInt aCommand)
{
- //CloseToolbarExtension();
switch(aCommand)
{
case EPodcastAddSearchResult:
--- a/application/src/PodcastSettingsView.cpp Fri Jul 09 23:58:47 2010 +0100
+++ b/application/src/PodcastSettingsView.cpp Sat Jul 10 13:35:21 2010 +0100
@@ -25,7 +25,7 @@
#include <podcast.rsg>
#include "SettingsEngine.h"
-#include <akncommondialogsdynmem.h>
+//#include <akncommondialogsdynmem.h>
#include <pathinfo.h>
#include <aknquerydialog.h>
@@ -288,40 +288,40 @@
void EditItemL (TInt aIndex, TBool aCalledFromMenu)
{
DP("EditItemL BEGIN");
- if (aIndex == 0) {
- TFileName selectedFolder;
- selectedFolder.Copy(iShowDir);
- TFileName startFolder;
- startFolder.Zero();
- TInt types = AknCommonDialogsDynMem::EMemoryTypePhone | AknCommonDialogsDynMem::EMemoryTypeMMC |AknCommonDialogsDynMem::EMemoryTypeInternalMassStorage| AknCommonDialogsDynMem::EMemoryTypeRemote;
-
- HBufC *title = iCoeEnv->AllocReadResourceLC(R_PODCAST_SELECT_FOLDER);
- if (AknCommonDialogsDynMem::RunFolderSelectDlgLD (types, selectedFolder,
- startFolder, NULL, NULL, *title))
- {
- _LIT(KPodcastsDir, "Podcasts");
- TInt pos = selectedFolder.Find(KPodcastsDir);
- if (pos == KErrNotFound || pos != selectedFolder.Length()-9)
- {
- // append "Podcasts" if the folder isn't already called this
- selectedFolder.Append(KPodcastsDir);
- }
-
- if (selectedFolder[selectedFolder.Length()-1] != '\\')
- {
- selectedFolder.Append(_L("\\"));
- }
-
- iShowDir.Copy(selectedFolder);
- LoadSettingsL();
- }
- CleanupStack::PopAndDestroy(title);
- }
- else {
- CAknSettingItemList::EditItemL(aIndex,aCalledFromMenu);
- }
- StoreSettingsL();
- UpdateSettingVisibility();
+// if (aIndex == 0) {
+// TFileName selectedFolder;
+// selectedFolder.Copy(iShowDir);
+// TFileName startFolder;
+// startFolder.Zero();
+// TInt types = AknCommonDialogsDynMem::EMemoryTypePhone | AknCommonDialogsDynMem::EMemoryTypeMMC |AknCommonDialogsDynMem::EMemoryTypeInternalMassStorage| AknCommonDialogsDynMem::EMemoryTypeRemote;
+//
+// HBufC *title = iCoeEnv->AllocReadResourceLC(R_PODCAST_SELECT_FOLDER);
+// if (AknCommonDialogsDynMem::RunFolderSelectDlgLD (types, selectedFolder,
+// startFolder, NULL, NULL, *title))
+// {
+// _LIT(KPodcastsDir, "Podcasts");
+// TInt pos = selectedFolder.Find(KPodcastsDir);
+// if (pos == KErrNotFound || pos != selectedFolder.Length()-9)
+// {
+// // append "Podcasts" if the folder isn't already called this
+// selectedFolder.Append(KPodcastsDir);
+// }
+//
+// if (selectedFolder[selectedFolder.Length()-1] != '\\')
+// {
+// selectedFolder.Append(_L("\\"));
+// }
+//
+// iShowDir.Copy(selectedFolder);
+// LoadSettingsL();
+// }
+// CleanupStack::PopAndDestroy(title);
+// }
+// else {
+// CAknSettingItemList::EditItemL(aIndex,aCalledFromMenu);
+// }
+// StoreSettingsL();
+// UpdateSettingVisibility();
DP("EditItemL END");
}
--- a/engine/group/bld.inf Fri Jul 09 23:58:47 2010 +0100
+++ b/engine/group/bld.inf Sat Jul 10 13:35:21 2010 +0100
@@ -22,12 +22,12 @@
WINSCW
PRJ_MMPFILES
-..\sqlite\group\sqlite.mmp
+//..\sqlite\group\sqlite.mmp
engine.mmp
PRJ_EXPORTS
// export pre-build sqlite
-//..\sqlite\sqlite_podcatcher_winscw.lib \epoc32\release\winscw\udeb\sqlite_podcatcher.lib
+..\sqlite\sqlite_podcatcher_winscw.lib \epoc32\release\winscw\udeb\sqlite_podcatcher.lib
//..\sqlite\sqlite_podcatcher_gcce.lib \epoc32\release\armv5\udeb\sqlite_podcatcher.lib
//..\sqlite\sqlite_podcatcher_gcce.lib \epoc32\release\armv5\urel\sqlite_podcatcher.lib
--- a/engine/group/engine.mmp Fri Jul 09 23:58:47 2010 +0100
+++ b/engine/group/engine.mmp Sat Jul 10 13:35:21 2010 +0100
@@ -23,7 +23,7 @@
SOURCEPATH ..\src
USERINCLUDE ..\inc
SYSTEMINCLUDE \epoc32\include
-SYSTEMINCLUDE ..\..\engine\sqlite\inc
+INCLUDE ..\..\engine\sqlite\inc
// Engine
SOURCE HttpClient.cpp
--- a/engine/inc/ConnectionEngine.h Fri Jul 09 23:58:47 2010 +0100
+++ b/engine/inc/ConnectionEngine.h Sat Jul 10 13:35:21 2010 +0100
@@ -24,10 +24,10 @@
#include <in_sock.h>
#include <connpref.h>
#include <commdbconnpref.h>
-#include <comms-infras/cs_mobility_apiext.h>
+//#include <comms-infras/cs_mobility_apiext.h>
// Using connection manager settings UI
-#include <cmapplicationsettingsui.h>
+//#include <cmapplicationsettingsui.h>
class CPodcastModel;
class MConnectionObserver
@@ -43,7 +43,7 @@
* This class helps to connect using three available methods
* SNAP, Mobility extension and Connection manager UI
*/
-class CConnectionEngine:public CActive, public MMobilityProtocolResp
+class CConnectionEngine:public CActive
{
public:
enum TConnectionType
@@ -98,11 +98,6 @@
private:
RConnection iConnection;
RSocketServ iSocketServer;
- // Connect using mobility extension
- CActiveCommsMobilityApiExt* iMobility;
-
- // Using connection manager settings UI
- TCmSettingSelection iUserSelection;
// Connect using Commdb
TCommDbConnPref iCommdbPreference;
--- a/engine/inc/FeedEngine.h Fri Jul 09 23:58:47 2010 +0100
+++ b/engine/inc/FeedEngine.h Sat Jul 10 13:35:21 2010 +0100
@@ -28,7 +28,7 @@
#include "Constants.h"
#include "FeedEngineObserver.h"
#include "FeedTimer.h"
-#include <sqlite3.h>
+#include "sqlite3.h"
class CPodcastModel;
class COpmlParser;
--- a/engine/inc/PodcastModel.h Fri Jul 09 23:58:47 2010 +0100
+++ b/engine/inc/PodcastModel.h Sat Jul 10 13:35:21 2010 +0100
@@ -24,14 +24,14 @@
#include <CommDbConnPref.h>
#include <es_sock.h>
#include <http/rhttpsession.h>
-#include <cmmanager.h>
+//#include <cmmanager.h>
#include <aknserverapp.h> // MAknServerAppExitObserver
#include <DocumentHandler.h>
#include "FeedInfo.h"
#include "ShowInfo.h"
#include "debug.h"
-#include <sqlite3.h>
+#include "sqlite3.h"
#include "ImageHandler.h"
// SQLite leaks memory when sorting, so to test our own memory leaks we need to disable this
@@ -133,7 +133,7 @@
CCommsDatabase* iCommDB;
sqlite3* iDB;
- RCmManager iCmManager;
+// RCmManager iCmManager;
TBool iIsFirstStartup;
CImageHandler* iImageHandler;
CDocumentHandler* iDocHandler;
--- a/engine/inc/PodcastUtils.h Fri Jul 09 23:58:47 2010 +0100
+++ b/engine/inc/PodcastUtils.h Sat Jul 10 13:35:21 2010 +0100
@@ -20,7 +20,7 @@
#define PODCASTUTILS_H_
#include <e32cmn.h>
-#include <sqlite3.h>
+#include "sqlite3.h"
// Cleanup stack macro for SQLite3
static void Cleanup_sqlite3_finalize_wrapper(TAny* handle)
--- a/engine/inc/ShowEngine.h Fri Jul 09 23:58:47 2010 +0100
+++ b/engine/inc/ShowEngine.h Sat Jul 10 13:35:21 2010 +0100
@@ -27,7 +27,7 @@
#include "HttpClient.h"
#include "ShowEngineObserver.h"
#include "MetaDataReader.h"
-#include <sqlite3.h>
+#include "sqlite3.h"
struct TDownload
{
Binary file engine/sqlite/sqlite_podcatcher_winscw.lib has changed
--- a/engine/src/ConnectionEngine.cpp Fri Jul 09 23:58:47 2010 +0100
+++ b/engine/src/ConnectionEngine.cpp Sat Jul 10 13:35:21 2010 +0100
@@ -31,8 +31,6 @@
CConnectionEngine::~CConnectionEngine()
{
- delete iMobility;
-
Cancel();
iConnection.Close();
@@ -56,15 +54,15 @@
void CConnectionEngine::RunL()
{
- if ( iStatus.Int() == KErrNone )
- {
- delete iMobility;
- iMobility = NULL;
- iMobility = CActiveCommsMobilityApiExt::NewL( iConnection, *this );
- }
-
- iConnectionState = iStatus.Int() == KErrNone?CConnectionEngine::EConnected:CConnectionEngine::ENotConnected;
- ReportConnectionL( iStatus.Int() );
+// if ( iStatus.Int() == KErrNone )
+// {
+// delete iMobility;
+// iMobility = NULL;
+// iMobility = CActiveCommsMobilityApiExt::NewL( iConnection, *this );
+// }
+//
+// iConnectionState = iStatus.Int() == KErrNone?CConnectionEngine::EConnected:CConnectionEngine::ENotConnected;
+// ReportConnectionL( iStatus.Int() );
}
void CConnectionEngine::DoCancel()
@@ -96,7 +94,7 @@
{
// Sockets have to be closed at this point.
- iMobility->MigrateToPreferredCarrier();
+// iMobility->MigrateToPreferredCarrier();
}
}
@@ -113,7 +111,7 @@
// Sockets have to be re-opened and check they can connect
// to their server at this point.
- iMobility->NewCarrierAccepted();
+// iMobility->NewCarrierAccepted();
}
}
@@ -125,22 +123,22 @@
TBool CConnectionEngine::ConnectionSettingL()
{
TBool selected( EFalse );
-
- CCmApplicationSettingsUi* settings = CCmApplicationSettingsUi::NewL();
- CleanupStack::PushL( settings );
-
- TUint listedItems =
- CMManager::EShowDefaultConnection |
- CMManager::EShowDestinations;
-
- TBearerFilterArray filter;
- ReportConnectionSelectionStart();
- selected = settings->RunApplicationSettingsL( iUserSelection,
- listedItems,
- filter );
-
- CleanupStack::PopAndDestroy( settings );
- ReportConnectionSelectionEnd();
+//
+// CCmApplicationSettingsUi* settings = CCmApplicationSettingsUi::NewL();
+// CleanupStack::PushL( settings );
+//
+// TUint listedItems =
+// CMManager::EShowDefaultConnection |
+// CMManager::EShowDestinations;
+//
+// TBearerFilterArray filter;
+// ReportConnectionSelectionStart();
+// selected = settings->RunApplicationSettingsL( iUserSelection,
+// listedItems,
+// filter );
+//
+// CleanupStack::PopAndDestroy( settings );
+// ReportConnectionSelectionEnd();
return selected;
}
@@ -151,59 +149,59 @@
iConnection.Close();
User::LeaveIfError( iConnection.Open( iSocketServer ) );
- // Connect using UI Setting
- if(aConnectionType == EDefaultConnection)
- {
- iConnection.Start( iStatus );
- SetActive();
- }
- else if(aConnectionType == EUserSelectConnection)
- {
- TBool selected = ConnectionSettingL();
-
- if ( selected )
- {
- switch ( iUserSelection.iResult )
- {
- case CMManager::EDestination:
- {
- iSnapPreference.SetSnap( iUserSelection.iId );
- iConnection.Start( iSnapPreference, iStatus );
- aConnectionType = ESNAPConnection;
- break;
- }
- default: // CMManager::EAlwaysAsk
- case CMManager::EDefaultConnection:
- {
- iConnection.Start( iStatus );
- break;
- }
- }
- }
- else
- {
- TRequestStatus* status = &iStatus;
- User::RequestComplete(status, KErrCancel);
- }
-
- SetActive();
- }
- else if (aConnectionType == EIAPConnection)
- {
- iCommdbPreference.SetIapId((iPodcastModel.SettingsEngine().SpecificIAP()& KUseIAPMask));
- iCommdbPreference.SetDialogPreference(ECommDbDialogPrefDoNotPrompt);
- iCommdbPreference.SetDirection(ECommDbConnectionDirectionOutgoing);
- iConnection.Start( iCommdbPreference, iStatus );
- SetActive();
- }
- // Connect using SNAP
- else
- {
- iSnapPreference.SetSnap(iPodcastModel.SettingsEngine().SpecificIAP());
- iConnection.Start( iSnapPreference, iStatus );
- SetActive();
- }
-
+// // Connect using UI Setting
+// if(aConnectionType == EDefaultConnection)
+// {
+// iConnection.Start( iStatus );
+// SetActive();
+// }
+// else if(aConnectionType == EUserSelectConnection)
+// {
+// TBool selected = ConnectionSettingL();
+//
+// if ( selected )
+// {
+// switch ( iUserSelection.iResult )
+// {
+// case CMManager::EDestination:
+// {
+// iSnapPreference.SetSnap( iUserSelection.iId );
+// iConnection.Start( iSnapPreference, iStatus );
+// aConnectionType = ESNAPConnection;
+// break;
+// }
+// default: // CMManager::EAlwaysAsk
+// case CMManager::EDefaultConnection:
+// {
+// iConnection.Start( iStatus );
+// break;
+// }
+// }
+// }
+// else
+// {
+// TRequestStatus* status = &iStatus;
+// User::RequestComplete(status, KErrCancel);
+// }
+//
+// SetActive();
+// }
+// else if (aConnectionType == EIAPConnection)
+// {
+// iCommdbPreference.SetIapId((iPodcastModel.SettingsEngine().SpecificIAP()& KUseIAPMask));
+// iCommdbPreference.SetDialogPreference(ECommDbDialogPrefDoNotPrompt);
+// iCommdbPreference.SetDirection(ECommDbConnectionDirectionOutgoing);
+// iConnection.Start( iCommdbPreference, iStatus );
+// SetActive();
+// }
+// // Connect using SNAP
+// else
+// {
+// iSnapPreference.SetSnap(iPodcastModel.SettingsEngine().SpecificIAP());
+// iConnection.Start( iSnapPreference, iStatus );
+// SetActive();
+// }
+//
iConnectionType = aConnectionType;
iConnectionState = CConnectionEngine::EConnecting;
}
--- a/engine/src/PodcastModel.cpp Fri Jul 09 23:58:47 2010 +0100
+++ b/engine/src/PodcastModel.cpp Sat Jul 10 13:35:21 2010 +0100
@@ -24,9 +24,6 @@
#include "connectionengine.h"
#include "podcastutils.h"
#include "Podcatcher.pan"
-
-#include <cmdestination.h>
-#include <cmmanager.h>
#include <bautils.h>
#include <aknserverapp.h> // MAknServerAppExitObserver
#include <DocumentHandler.h>
@@ -63,7 +60,6 @@
iActiveShowList.ResetAndDestroy();
iActiveShowList.Close();
delete iConnectionEngine;
- iCmManager.Close();
delete iImageHandler;
delete iDocHandler;
}
@@ -83,19 +79,12 @@
iImageHandler = CImageHandler::NewL(FsSession(), *this);
iDocHandler = CDocumentHandler::NewL(CEikonEnv::Static()->Process());
- TRAPD(err,iCmManager.OpenL());
- DP1("iCmManager.OpenL(),err=%d;", err);
-
- if (err == KErrNone)
- {
- UpdateIAPListL();
- UpdateSNAPListL();
- }
+ UpdateIAPListL();
iSettingsEngine = CSettingsEngine::NewL(*this);
iConnectionEngine = CConnectionEngine::NewL(*this);
- TRAP(err, OpenDBL());
+ TRAPD(err, OpenDBL());
if (err != KErrNone)
{
@@ -143,37 +132,37 @@
EXPORT_C void CPodcastModel::UpdateSNAPListL()
{
- DP("CPodcastModel::UpdateSNAPListL BEGIN");
- iSNAPNameArray->Reset();
- iSNAPIdArray.Reset();
-
- RCmDestination destination;
- TPodcastIAPItem IAPItem;
-
- RArray<TUint32> destArray;
- CleanupClosePushL(destArray);
- iCmManager.AllDestinationsL(destArray);
-
- TInt cnt = destArray.Count();
- DP1("destArray.Count==%d", cnt);
- for(TInt loop = 0;loop<cnt;loop++)
- {
- destination = iCmManager.DestinationL (destArray[loop]);
- CleanupClosePushL(destination);
- if(!destination.IsHidden())
- {
- IAPItem.iIapId = destArray[loop];
- HBufC* name = destination.NameLC();
- DP1(" destination.NameLC==%S", name);
- iSNAPNameArray->AppendL(*name);
- CleanupStack::PopAndDestroy(name);
- iSNAPIdArray.Append(IAPItem);
- }
- CleanupStack::PopAndDestroy();//close destination
- }
- CleanupStack::PopAndDestroy();// close destArray
-
- DP("CPodcastModel::UpdateSNAPListL END");
+// DP("CPodcastModel::UpdateSNAPListL BEGIN");
+// iSNAPNameArray->Reset();
+// iSNAPIdArray.Reset();
+//
+// RCmDestination destination;
+// TPodcastIAPItem IAPItem;
+//
+// RArray<TUint32> destArray;
+// CleanupClosePushL(destArray);
+// iCmManager.AllDestinationsL(destArray);
+//
+// TInt cnt = destArray.Count();
+// DP1("destArray.Count==%d", cnt);
+// for(TInt loop = 0;loop<cnt;loop++)
+// {
+// destination = iCmManager.DestinationL (destArray[loop]);
+// CleanupClosePushL(destination);
+// if(!destination.IsHidden())
+// {
+// IAPItem.iIapId = destArray[loop];
+// HBufC* name = destination.NameLC();
+// DP1(" destination.NameLC==%S", name);
+// iSNAPNameArray->AppendL(*name);
+// CleanupStack::PopAndDestroy(name);
+// iSNAPIdArray.Append(IAPItem);
+// }
+// CleanupStack::PopAndDestroy();//close destination
+// }
+// CleanupStack::PopAndDestroy();// close destArray
+//
+// DP("CPodcastModel::UpdateSNAPListL END");
}
EXPORT_C CDesCArrayFlat* CPodcastModel::IAPNames()