diff -r cd124c4eb6b9 -r 1c8b56cb6409 application/src/PodcastFeedView.cpp --- 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 #include #include -#include +//#include #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 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 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 message; - TBuf templ; - iEikonEnv->ReadResourceL(templ, R_EXPORT_FEED_SUCCESS); - message.Format(templ, numFeeds); - ShowOkMessageL(message); - } - else - { - TBuf 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 message; +// TBuf templ; +// iEikonEnv->ReadResourceL(templ, R_EXPORT_FEED_SUCCESS); +// message.Format(templ, numFeeds); +// ShowOkMessageL(message); +// } +// else +// { +// TBuf message; +// iEikonEnv->ReadResourceL(message, R_EXPORT_FEED_FAILURE); +// ShowErrorMessageL(message); +// } +// } +// CleanupStack::PopAndDestroy(title); } void CPodcastFeedView::CheckResumeDownloadL()