# HG changeset patch
# User Sebastian Brannstrom <sebastianb@symbian.org>
# Date 1289739995 0
# Node ID bd7f3de174434f14b6e33bf4a8db77e7a6744a6c
# Parent  b8d687bb7ca1f666952cea7a4d1ab6b42f3ac581
Fixes

diff -r b8d687bb7ca1 -r bd7f3de17443 application/data/PodcastClient_english.rls
--- a/application/data/PodcastClient_english.rls	Sat Nov 13 22:05:25 2010 +0000
+++ b/application/data/PodcastClient_english.rls	Sun Nov 14 13:06:35 2010 +0000
@@ -160,4 +160,5 @@
 rls_string STRING_r_search_feed_prompt "Enter search terms:"
 rls_string STRING_r_new_shows "New shows"
 rls_string STRING_r_download_queue "Download queue"
-
+rls_string STRING_r_mark_all_old_query "Mark all shows old?"
+rls_string STRING_r_download_all_query "Add all shows to download queue?"
diff -r b8d687bb7ca1 -r bd7f3de17443 application/data/PodcastStrings.ra
--- a/application/data/PodcastStrings.ra	Sat Nov 13 22:05:25 2010 +0000
+++ b/application/data/PodcastStrings.ra	Sun Nov 14 13:06:35 2010 +0000
@@ -80,3 +80,5 @@
 RESOURCE TBUF r_podcast_searchfeed_prompt {buf = STRING_r_search_feed_prompt;}
 RESOURCE TBUF r_new_shows {buf = STRING_r_new_shows;}
 RESOURCE TBUF r_download_queue {buf = STRING_r_download_queue;}
+RESOURCE TBUF r_download_all_query {buf = STRING_r_download_all_query;}
+RESOURCE TBUF r_mark_all_old_query {buf = STRING_r_mark_all_old_query;}
diff -r b8d687bb7ca1 -r bd7f3de17443 application/data/images/tab_new.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/application/data/images/tab_new.svg	Sun Nov 14 13:06:35 2010 +0000
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1"
+	 id="svg3426" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:svg="http://www.w3.org/2000/svg" inkscape:version="0.47 r22583" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:cc="http://creativecommons.org/ns#" sodipodi:docname="Audio_downloading.svg"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="32px" height="32px"
+	 viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
+<path fill="#F1F2F2" d="M19.475,11.701l-2.645-5.007c0,0-0.004,0-0.004-0.001l-0.58-1.1c-0.406-0.768-0.985-0.756-1.35,0.035
+	l-1.295,2.81l0,0l-1.597,3.469l-6.433,1.115l0,0L5.13,13.098c-0.854,0.149-0.997,0.65-0.359,1.24l0.601,0.554l0,0l4.527,4.176
+	l-0.414,2.888l-0.566,3.903c-0.124,0.857,0.397,1.216,1.154,0.791l0.64-0.36h0.002l3.183-1.784l0.146-0.082l0,0l2.018-1.132
+	l6.317,3.537c0.781,0.384,1.415-0.021,1.244-0.873l-1.646-7.218l5.325-5.193c0.604-0.624,0.336-1.27-0.523-1.373L19.475,11.701z"/>
+</svg>
diff -r b8d687bb7ca1 -r bd7f3de17443 application/data/images/toolbars/markold_all.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/application/data/images/toolbars/markold_all.svg	Sun Nov 14 13:06:35 2010 +0000
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="32"
+   height="32"
+   viewBox="0 0 32 32"
+   id="svg3426"
+   xml:space="preserve"><metadata
+   id="metadata3064"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+   id="defs3062" />
+<path
+   d="m 22.625268,12.226679 -6.60105,-0.421267 -2.390191,-4.5263567 h -0.0036 L 13.106088,6.284649 C 12.739061,5.5894686 12.213834,5.6003167 11.88568,6.3153852 l -1.170687,2.5402558 0,0 -1.4446015,3.135092 -5.8136608,1.006158 -0.4031865,0.07051 c -0.7720209,0.134697 -0.9012937,0.587604 -0.3245381,1.120967 l 0.5433074,0.501723 4.0924339,3.774224 -0.3751623,2.609865 -0.5107633,3.529238 c -0.1130007,0.775637 0.3588903,1.099271 1.0423186,0.71326 l 0.5794677,-0.324538 0.00181,0.0018 2.8783539,-1.614554 0.131985,-0.07503 1.824284,-1.023335 5.713316,3.20018 c 0.70422,0.346235 1.278264,-0.02079 1.124583,-0.791909 l -1.487993,-6.522401 4.812926,-4.698118 c 0.546923,-0.563195 0.305554,-1.148991 -0.474603,-1.242103 z m -6.64625,7.878409 c -0.355274,0.355275 -0.837109,0.398667 -1.150799,0.08498 l -1.939997,-1.901124 -1.906548,1.901124 C 10.666176,20.506467 10.180725,20.460363 9.829067,20.105992 9.5217051,19.798631 9.3779682,19.323124 9.7468025,18.954289 L 11.646119,17.047741 9.7097383,15.148425 c -0.3706424,-0.368834 -0.2269055,-0.845245 0.082265,-1.151703 0.3525617,-0.35437 0.8371097,-0.397763 1.1535117,-0.08317 l 1.937284,1.899316 1.911068,-1.899316 c 0.315498,-0.314594 0.798237,-0.269393 1.148992,0.08227 0.30917,0.306458 0.451098,0.783773 0.08588,1.151703 l -1.901123,1.908356 1.938187,1.901124 c 0.365219,0.366123 0.220578,0.840726 -0.08678,1.148087 z"
+   id="path3058"
+   style="fill:#f1f2f2" />
+<g
+   transform="matrix(1.6922196,0,0,1.6922196,0.65580907,-12.542473)"
+   id="g3095"><circle
+     cx="15.433"
+     cy="12.156"
+     r="1.226"
+     id="circle3097"
+     style="fill:#f1f2f2" /><circle
+     cx="15.433"
+     cy="16.646"
+     r="1.226"
+     id="circle3099"
+     style="fill:#f1f2f2" /><circle
+     cx="15.433"
+     cy="21.136999"
+     r="1.227"
+     id="circle3101"
+     style="fill:#f1f2f2" /></g></svg>
\ No newline at end of file
diff -r b8d687bb7ca1 -r bd7f3de17443 application/inc/Podcast.hrh
--- a/application/inc/Podcast.hrh	Sat Nov 13 22:05:25 2010 +0000
+++ b/application/inc/Podcast.hrh	Sun Nov 14 13:06:35 2010 +0000
@@ -63,12 +63,6 @@
 	EPodcastSearch,
 	EPodcastAddSearchResult,
 	EPodcastResetDb,
-	EPodcastFilterShows,
-	EPodcastFilterShowsAll,
-	EPodcastFilterShowsNew,
-	EPodcastFilterShowsDownloaded,
-	EPodcastFilterShowsNewAndDownloaded,
-	// Tabs
 	EPodcastTabFeeds,
 	EPodcastTabQueue,
 	EPodcastTabNew
diff -r b8d687bb7ca1 -r bd7f3de17443 application/src/PodcastAppui.cpp
--- a/application/src/PodcastAppui.cpp	Sat Nov 13 22:05:25 2010 +0000
+++ b/application/src/PodcastAppui.cpp	Sun Nov 14 13:06:35 2010 +0000
@@ -142,11 +142,13 @@
 			const TUid KUidFastSwap = { 0x10207218 };
 			if (activeAppUid == KUidFastSwap)
 				{
+				DP("Exit called by task manager");
 				// closed by task manager
 				Exit();
 				}
 			else
         		{
+				DP("Red button pressed, going into background");
         		// red button pressed
 				TApaTask task(iEikonEnv->WsSession());
 				task.SetWgId(iEikonEnv->RootWin().Identifier());
@@ -227,16 +229,13 @@
 		TUid messageUid = TUid::Uid(0);
 		if (aIndex == KTabIdFeeds) 
 			{
-			DP("one");
 			if (iFeedView->ViewingShows())
 				{
-				DP("two");
 				newview = KUidPodcastShowsViewID;
 				messageUid = TUid::Uid(2);
 				}
 			else
 				{
-				DP("three");
 				newview = KUidPodcastFeedViewID;
 				}
 			} 
@@ -256,7 +255,6 @@
 		
 		if(newview.iUid != 0)
 			{			
-			DP("four");
 			ActivateLocalViewL(newview,  messageUid, KNullDesC8());
 			}
 		}
diff -r b8d687bb7ca1 -r bd7f3de17443 application/src/PodcastListView.cpp
--- a/application/src/PodcastListView.cpp	Sat Nov 13 22:05:25 2010 +0000
+++ b/application/src/PodcastListView.cpp	Sun Nov 14 13:06:35 2010 +0000
@@ -154,6 +154,7 @@
 		iListbox->ScrollToMakeItemVisible(iListbox->CurrentItemIndex());
 	}
 }
+
 void CPodcastListContainer::SizeChanged()
 {
 	DP2("CPodcastListContainer::SizeChanged() BEGIN, width=%d, height=%d",Size().iWidth, Size().iHeight);
diff -r b8d687bb7ca1 -r bd7f3de17443 application/src/PodcastSearchView.cpp
--- a/application/src/PodcastSearchView.cpp	Sat Nov 13 22:05:25 2010 +0000
+++ b/application/src/PodcastSearchView.cpp	Sun Nov 14 13:06:35 2010 +0000
@@ -93,6 +93,7 @@
     
 CPodcastSearchView::~CPodcastSearchView()
     {
+	DP("CPodcastSearchView::~CPodcastSearchView BEGIN");
 	iPodcastModel.FeedEngine().RemoveObserver(this);
  
     if(iLongTapDetector)
@@ -101,6 +102,7 @@
     if(iStylusPopupMenu)
         delete iStylusPopupMenu, iStylusPopupMenu = NULL;
 
+	DP("CPodcastSearchView::~CPodcastSearchView END");
     }
 
 TUid CPodcastSearchView::Id() const
diff -r b8d687bb7ca1 -r bd7f3de17443 application/src/PodcastSettingsView.cpp
--- a/application/src/PodcastSettingsView.cpp	Sat Nov 13 22:05:25 2010 +0000
+++ b/application/src/PodcastSettingsView.cpp	Sun Nov 14 13:06:35 2010 +0000
@@ -505,7 +505,7 @@
 	if(iNaviDecorator && iNaviPane)
 		{
 		iNaviPane->PushL(*iNaviDecorator);
-	}
+		}
 
 	((CPodcastAppUi*)AppUi())->SetTabsDimmed(ETrue);
 	DP("CPodcastSettingsView::DoActivateL END");
diff -r b8d687bb7ca1 -r bd7f3de17443 application/src/PodcastShowsView.cpp
--- a/application/src/PodcastShowsView.cpp	Sat Nov 13 22:05:25 2010 +0000
+++ b/application/src/PodcastShowsView.cpp	Sun Nov 14 13:06:35 2010 +0000
@@ -663,22 +663,6 @@
 			{
 			DisplayShowInfoDialogL();
 			}break;
-		case EPodcastFilterShowsAll:
-			iPodcastModel.ShowEngine().SetShowFilter(EAllShows);
-			UpdateListboxItemsL();
-			break;
-		case EPodcastFilterShowsDownloaded:
-			iPodcastModel.ShowEngine().SetShowFilter(EDownloadedShows);
-			UpdateListboxItemsL();
-			break;			
-		case EPodcastFilterShowsNew:
-			iPodcastModel.ShowEngine().SetShowFilter(ENewShows);
-			UpdateListboxItemsL();
-			break;
-		case EPodcastFilterShowsNewAndDownloaded:
-			iPodcastModel.ShowEngine().SetShowFilter(ENewAndDownloadedShows);
-			UpdateListboxItemsL();
-			break;	
 		default:
 			CPodcastListView::HandleCommandL(aCommand);
 			break;
diff -r b8d687bb7ca1 -r bd7f3de17443 engine/inc/ShowEngine.h
--- a/engine/inc/ShowEngine.h	Sat Nov 13 22:05:25 2010 +0000
+++ b/engine/inc/ShowEngine.h	Sun Nov 14 13:06:35 2010 +0000
@@ -34,14 +34,6 @@
 	TUint iIndex;
 	TUint iUid;
 	};
-	
-typedef enum TShowFilter
-	{
-	EAllShows,
-	ENewShows,
-	EDownloadedShows,
-	ENewAndDownloadedShows
-	};
 
 class CShowEngine : public CBase, public MHttpClientObserver, public MMetaDataReaderObserver
 	{
@@ -86,7 +78,6 @@
 
 	IMPORT_C void CheckForDeletedShows(TUint aFeedUid);
 	IMPORT_C CMetaDataReader& MetaDataReader();
-	IMPORT_C void SetShowFilter(TShowFilter aFilter);
 	IMPORT_C void MoveDownloadUpL(TUint aUid);
 	IMPORT_C void MoveDownloadDownL(TUint aUid);
 
@@ -160,7 +151,6 @@
 	
 	sqlite3& iDB;
     TBuf<KDefaultSQLDataBufferLength> iSqlBuffer;
-   	TShowFilter iShowFilter;
 	};
 
 #endif /*SHOWENGINE_H_*/
diff -r b8d687bb7ca1 -r bd7f3de17443 engine/src/PodcastModel.cpp
--- a/engine/src/PodcastModel.cpp	Sat Nov 13 22:05:25 2010 +0000
+++ b/engine/src/PodcastModel.cpp	Sun Nov 14 13:06:35 2010 +0000
@@ -351,15 +351,6 @@
 		// open DB
 		TBuf8<KMaxFileName> filename8;
 		filename8.Copy(dbFileName);
-		
-#ifdef COPY_DB
-		DP("Copying DB to c:\\data");
-		TFileName copyName;
-		copyName.Copy(_L("C:\\data\\"));
-		copyName.Append(KDBFileName);
-		BaflUtils::CopyFile(iFsSession, dbFileName, copyName);
-#endif
-		
 		int rc = sqlite3_open((const char*) filename8.PtrZ(), &iDB);
 		if(rc != SQLITE_OK){
 			User::Leave(KErrCorrupt);