--- a/application/src/PodcastSettingsView.cpp	Sat Nov 13 15:05:16 2010 +0000
+++ b/application/src/PodcastSettingsView.cpp	Mon Nov 22 15:41:41 2010 +0000
@@ -28,7 +28,7 @@
 #include <caknmemoryselectiondialog.h> 
 #include <pathinfo.h>
 #include <aknquerydialog.h>
-
+#include <akntitle.h>
 
 class CIapSetting: public CAknEnumeratedTextPopupSettingItem 
 { 
@@ -231,6 +231,9 @@
 		
 		DP1("Download automatically: %d", iAutoDownload);
 		se.SetDownloadAutomatically(iAutoDownload);
+
+		DP1("Delete automatically: %d", iAutoDownload);
+		se.SetDeleteAutomatically((TAutoDeleteSetting)iAutoDelete);
 		se.SaveSettingsL();
 		DP("StoreSettings END");
 	}
@@ -262,6 +265,7 @@
 
 	void  EditItemL (TInt aIndex, TBool aCalledFromMenu)
 		{
+		DP("EditItemL BEGIN");
 		if (aIndex == 0) {
 			CAknMemorySelectionDialog* memDlg = 
 				CAknMemorySelectionDialog::NewL(ECFDDialogTypeNormal, ETrue);
@@ -303,7 +307,7 @@
 		else {
 			CAknSettingItemList::EditItemL(aIndex,aCalledFromMenu);
 		}
-				StoreSettingsL();
+			StoreSettingsL();
 			UpdateSettingVisibility();
 		DP("EditItemL END");
 		}
@@ -358,6 +362,7 @@
 //			}
 									
 		iAutoDownload = se.DownloadAutomatically();
+		iAutoDelete = se.DeleteAutomatically();
 			
 		switch(aSettingId)
 			{
@@ -384,6 +389,11 @@
 				iSettingAutoDownload = new (ELeave) CAknBinaryPopupSettingItem (aSettingId, iAutoDownload);
 				return iSettingAutoDownload;
 				break;
+			case EPodcastSettingAutoDelete:
+				DP("EPodcastSettingAutoDelete");
+				iSettingAutoDelete = new (ELeave) CAknEnumeratedTextPopupSettingItem (aSettingId, iAutoDelete);
+				return iSettingAutoDelete;
+				break;
 			default:
 				return CAknSettingItemList::CreateSettingItemL(aSettingId);
 				break;
@@ -400,6 +410,9 @@
 	TInt iAutoDownload;
 	CAknSettingItem *iSettingAutoDownload; 
 
+	TInt iAutoDelete;
+	CAknSettingItem *iSettingAutoDelete; 
+
 //	TInt iConnection;
 	
 	TInt iIap;
@@ -470,10 +483,13 @@
 	DP("Creating navipane");
 	iNaviPane =( CAknNavigationControlContainer * ) StatusPane()->ControlL( TUid::Uid( EEikStatusPaneUidNavi ) );
 		
-	HBufC *titleBuffer = iEikonEnv->AllocReadResourceL(R_SETTINGS_TITLE);
-	iNaviDecorator  = iNaviPane->CreateNavigationLabelL(*titleBuffer);
-	delete titleBuffer;
-
+	CAknTitlePane* titlePane = static_cast<CAknTitlePane*>
+			  ( StatusPane()->ControlL( TUid::Uid( EEikStatusPaneUidTitle ) ) );
+		 
+	HBufC *titleBuffer = iEikonEnv->AllocReadResourceLC(R_SETTINGS_TITLE);
+	titlePane->SetTextL(*titleBuffer);
+	CleanupStack::PopAndDestroy(titleBuffer);
+	
 	DP("Updating listbox");
 	AppUi()->AddToStackL(*this, iListbox);
 	iListbox->UpdateSettingVisibility();
@@ -486,6 +502,7 @@
 		iNaviPane->PushL(*iNaviDecorator);
 		}
 
+	((CPodcastAppUi*)AppUi())->SetTabsDimmed(ETrue);
 	DP("CPodcastSettingsView::DoActivateL END");
 }
 
@@ -505,6 +522,8 @@
 		delete iNaviDecorator;
 		iNaviDecorator = NULL;
 		}
+	
+	((CPodcastAppUi*)AppUi())->SetTabsDimmed(EFalse);
 	DP("CPodcastSettingsView::DoDeactivate END");
 	}