--- a/application/data/PodcastClient_english.rls	Thu Mar 11 21:45:01 2010 +0000
+++ b/application/data/PodcastClient_english.rls	Fri Mar 12 00:20:10 2010 +0000
@@ -38,8 +38,8 @@
 rls_string STRING_r_tabgroup_queue_counter "Queue (%d)"
 
 // Question dialogs
-rls_string STRING_r_add_feed_prompt "Enter search terms or feed URL"
-rls_string STRING_r_edit_feed_prompt "Feed URL"
+rls_string STRING_r_add_feed_prompt "Enter search terms or feed address"
+rls_string STRING_r_edit_feed_prompt "Feed address"
 rls_string STRING_r_add_feed_title_prompt "Feed title"
 rls_string STRING_r_remove_feed_prompt "Remove feed '%S'?"
 rls_string STRING_r_enable_downloads_prompt "There are shows in the download queue. Do you want to download now?"
@@ -68,7 +68,7 @@
 
 // Auto download settings
 rls_string STRING_r_on "On"
-rls_string STRING_r_on "Off"
+rls_string STRING_r_off "Off"
 
 // Feed import/export
 rls_string STRING_r_view_import_feeds_title "Select OPML file"
@@ -114,7 +114,7 @@
 rls_string STRING_add_feed_success "Feed added. Update now?"
 rls_string STRING_add_feed_error "Could not add feed"
 rls_string STRING_r_add_feed_replace "All existing shows in this feed will be deleted! Continue?" // shown when changing an existing feed URL
-rls_string STRING_r_add_feed_exists "A feed with this URL already exists" // shown when adding or changing a feed to a URL that already exists
+rls_string STRING_r_add_feed_exists "A feed with this address already exists" // shown when adding or changing a feed to a URL that already exists
 
 // Feed searching
 
@@ -136,6 +136,7 @@
 rls_string STRING_r_view_stop_downloads_cmd "Suspend downloading"
 rls_string STRING_r_view_resume_downloads_cmd "Resume downloading"
 rls_string STRING_r_view_remove_all_downloads_cmd_short "Clear"
+rls_string STRING_r_view_remove_all_downloads_cmd "Clear download queue"
 rls_string STRING_r_clear_query "Clear download queue?"
 rls_string STRING_r_view_remove_download_short_cmd "Remove"
-rls_string STRING_r_view_remove_download_cmd "Remove Download"
+rls_string STRING_r_view_remove_download_cmd "Remove download"

--- a/application/inc/PodcastFeedView.h	Thu Mar 11 21:45:01 2010 +0000
+++ b/application/inc/PodcastFeedView.h	Fri Mar 12 00:20:10 2010 +0000
@@ -41,6 +41,7 @@
         void UpdateItemL(TInt aIndex);
 		void CheckResumeDownload();
 		void UpdateToolbar(TBool aVisible=ETrue);
+		TBool ViewingShows();
 
 	protected:
 	    void ConstructL();

--- a/application/inc/PodcastShowsView.h	Thu Mar 11 21:45:01 2010 +0000
+++ b/application/inc/PodcastShowsView.h	Fri Mar 12 00:20:10 2010 +0000
@@ -29,12 +29,9 @@
 #include "PodcastModel.h"
 #include "Podcast.hrh"
 #include "PodcastListView.h"
-#include "Imagehandler.h"
-
-class CImageHandler;
 
 class CPodcastShowsView : public CPodcastListView, public MEikListBoxObserver, 
-	public MFeedEngineObserver, public MShowEngineObserver, public MImageHandlerCallback
+	public MFeedEngineObserver, public MShowEngineObserver
 	{
 public: 
 	static CPodcastShowsView* NewL(CPodcastModel& aPodcastModel);
@@ -104,12 +101,6 @@
 private:
 	void GetShowIcons(CShowInfo* aShowInfo, TInt& aIconIndex);
 	void DisplayShowInfoDialogL();
-	/*
-	 * Called by CImageHandler when an image has been loaded.
-	 * @param aError Error code given by the CImageHandler or 0 (zero) if the
-	 *   image was loaded successfully.
-	 */
-	virtual void ImageOperationCompleteL(TInt aError, TUint aHandle);
 	void HandleSetShowPlayed(TBool aPlayed);
 	void HandleDeleteShow();
 	void UpdateViewTitleL();
@@ -120,8 +111,6 @@
 	
 	CPodcastModel& iPodcastModel;
 	TBool iProgressAdded;	
-	TInt iLastImageHandlerError;
-	TBool iSetTitlebarImage;
 	};
 
 #endif // PODCASTSHOWSVIEWH

Binary file application/sis/podcatcher_udeb.sis has changed

Binary file application/sis/podcatcher_udeb_signed.sis has changed

Binary file application/sis/podcatcher_urel.sis has changed

Binary file application/sis/podcatcher_urel_signed.sis has changed

--- a/application/src/PodcastAppui.cpp	Thu Mar 11 21:45:01 2010 +0000
+++ b/application/src/PodcastAppui.cpp	Fri Mar 12 00:20:10 2010 +0000
@@ -216,14 +216,25 @@
 		{
 		TUid newview = TUid::Uid(0);
 		TUid messageUid = TUid::Uid(0);
-		
-		if (aIndex == KTabIdFeeds) {
-			newview = KUidPodcastFeedViewID;
-		} else if (aIndex == KTabIdQueue) {
+		if (aIndex == KTabIdFeeds) 
+			{
+			if (iFeedView->ViewingShows())
+				{
+				newview = KUidPodcastShowsViewID;
+				}
+			else
+				{
+				newview = KUidPodcastFeedViewID;
+				} 
+			} 
+		else if (aIndex == KTabIdQueue)
+			{
 			newview = KUidPodcastQueueViewID;
-		} else {
+			} 
+		else 
+			{
 			User::Leave(KErrTooBig);
-		}
+			}
 		
 		if(newview.iUid != 0)
 			{			

--- a/application/src/PodcastFeedView.cpp	Thu Mar 11 21:45:01 2010 +0000
+++ b/application/src/PodcastFeedView.cpp	Fri Mar 12 00:20:10 2010 +0000
@@ -175,28 +175,19 @@
 	                                  const TDesC8& aCustomMessage)
 	{
 	CPodcastListView::DoActivateL(aPrevViewId, aCustomMessageId, aCustomMessage);
-
+	if (iFirstActivateAfterLaunch)
+		{
+		iFirstActivateAfterLaunch = EFalse;
+		}
+	
 	if (aPrevViewId.iViewUid == KUidPodcastShowsViewID)
 		{
 		// back key from shows view
 		iViewingShows = EFalse;
 		}
 	
-	if (iViewingShows)
-		{
-		// go to shows view
-		AppUi()->ActivateLocalViewL(KUidPodcastShowsViewID,  TUid::Uid(0), KNullDesC8());
-		} 
-	else 
-		{
-		UpdateListboxItemsL();		
-		UpdateToolbar();
-
-		if (iFirstActivateAfterLaunch)
-			{
-			iFirstActivateAfterLaunch = EFalse;
-			}
-		}
+	UpdateListboxItemsL();		
+	UpdateToolbar();
 	}
 
 void CPodcastFeedView::DoDeactivate()
@@ -988,3 +979,8 @@
     }
 	DP("CPodcastListView::HandleLongTapEventL END");
 }
+
+TBool CPodcastFeedView::ViewingShows()
+	{
+	return iViewingShows;
+	}

--- a/application/src/PodcastListView.cpp	Thu Mar 11 21:45:01 2010 +0000
+++ b/application/src/PodcastListView.cpp	Fri Mar 12 00:20:10 2010 +0000
@@ -29,6 +29,7 @@
 #include <akntoolbarextension.h>
 #include <aknquerydialog.h>
 #include <barsread.h>
+#include <akntitle.h>
 
 const TInt KDefaultGran = 5;
 
@@ -262,6 +263,11 @@
 		AppUi()->AddToStackL(*this, iListContainer);
 		iListContainer->MakeVisible(ETrue);
 	}
+	
+	CAknTitlePane* titlePane = static_cast<CAknTitlePane*>
+		      ( StatusPane()->ControlL( TUid::Uid( EEikStatusPaneUidTitle ) ) );
+	titlePane->SetTextToDefaultL();
+
 	DP("CPodcastListView::DoActivateL() END");
 
 }
@@ -296,10 +302,9 @@
 	case EAknSoftkeyBack:
 		{
 		AppUi()->ActivateViewL(iPreviousView);
-		if (iPreviousView.iViewUid == KUidPodcastFeedViewID) {
-			((CPodcastAppUi*)AppUi())->SetActiveTab(KTabIdFeeds);
+		((CPodcastAppUi*)AppUi())->SetActiveTab(KTabIdFeeds);
 		}
-		}break;
+		break;
 	case EPodcastSettings:
 		AppUi()->ActivateLocalViewL(KUidPodcastSettingsViewID);
 		break;

--- a/application/src/PodcastQueueView.cpp	Thu Mar 11 21:45:01 2010 +0000
+++ b/application/src/PodcastQueueView.cpp	Fri Mar 12 00:20:10 2010 +0000
@@ -25,7 +25,6 @@
 #include "imagehandler.h"
 #include "PodcastShowsView.h"
 
-#include <akntitle.h>
 #include <podcast.rsg>
 #include <podcast.mbg>
 #include <gulicon.h>
@@ -200,7 +199,7 @@
 	DP("CPodcastQueueView::DoActivateL BEGIN");
 	
 	CPodcastListView::DoActivateL(aPrevViewId, aCustomMessageId, aCustomMessage);
-	iPreviousView = TVwsViewId(KUidPodcast, KUidPodcastFeedViewID);
+	iPreviousView = aPrevViewId;
 	
 	UpdateFeedUpdateStateL();
 	UpdateToolbar();

--- a/application/src/PodcastSearchView.cpp	Thu Mar 11 21:45:01 2010 +0000
+++ b/application/src/PodcastSearchView.cpp	Fri Mar 12 00:20:10 2010 +0000
@@ -37,7 +37,6 @@
 #include <pathinfo.h> 
 #include <f32file.h>
 #include <akntoolbarextension.h>
-#include <akntitle.h>
 
 const TInt KMaxFeedNameLength = 100;
 const TInt KDefaultGran = 5;
@@ -128,23 +127,16 @@
 	                                  TUid aCustomMessageId,
 	                                  const TDesC8& aCustomMessage)
 {
-	UpdateToolbar();
-	
-	 CAknTitlePane* titlePane = static_cast<CAknTitlePane*>
-		      ( StatusPane()->ControlL( TUid::Uid( EEikStatusPaneUidTitle ) ) );
-
-    ((CPodcastAppUi*)AppUi())->NaviSetTextL(R_SEARCH_RESULTS);
-
 	CPodcastListView::DoActivateL(aPrevViewId, aCustomMessageId, aCustomMessage);
 	iPreviousView = TVwsViewId(KUidPodcast, KUidPodcastFeedViewID);
+	
+    ((CPodcastAppUi*)AppUi())->NaviSetTextL(R_SEARCH_RESULTS);
+	UpdateToolbar();
 }
 
 void CPodcastSearchView::DoDeactivate()
 {
 	CPodcastListView::DoDeactivate();
-	CAknTitlePane* titlePane = static_cast<CAknTitlePane*>
-		     ( StatusPane()->ControlL( TUid::Uid( EEikStatusPaneUidTitle ) ) );
-	titlePane->SetTextToDefaultL();
 	((CPodcastAppUi*)AppUi())->NaviShowTabGroupL();
 }
 

--- a/application/src/PodcastSettingsView.cpp	Thu Mar 11 21:45:01 2010 +0000
+++ b/application/src/PodcastSettingsView.cpp	Fri Mar 12 00:20:10 2010 +0000
@@ -511,6 +511,7 @@
 		{
 		iNaviPane->PushL(*iNaviDecorator);
 		}
+
 	DP("CPodcastSettingsView::DoActivateL END");
 }
 

--- a/application/src/PodcastShowsView.cpp	Thu Mar 11 21:45:01 2010 +0000
+++ b/application/src/PodcastShowsView.cpp	Fri Mar 12 00:20:10 2010 +0000
@@ -203,12 +203,11 @@
 		TUid aCustomMessageId, const TDesC8& aCustomMessage)
 	{
 	DP("CPodcastShowsView::DoActivateL BEGIN");
+	CPodcastListView::DoActivateL(aPrevViewId, aCustomMessageId, aCustomMessage);
+	
+	iPreviousView = TVwsViewId(KUidPodcast, KUidPodcastFeedViewID);
 	
 	UpdateViewTitleL();
-	
-	CPodcastListView::DoActivateL(aPrevViewId, aCustomMessageId, aCustomMessage);
-	iPreviousView = TVwsViewId(KUidPodcast, KUidPodcastFeedViewID);
-	
 	UpdateFeedUpdateStateL();
 	UpdateToolbar();
 	DP("CPodcastShowsView::DoActivateL END");
@@ -216,12 +215,6 @@
 
 void CPodcastShowsView::DoDeactivate()
 	{
-	CAknTitlePane* titlePane = static_cast<CAknTitlePane*>
-		     ( StatusPane()->ControlL( TUid::Uid( EEikStatusPaneUidTitle ) ) );
-	
-//	titlePane->SetSmallPicture(NULL, NULL, ETrue);
-	titlePane->SetPicture(NULL, NULL);
-	titlePane->SetTextToDefaultL();
 	CPodcastListView::DoDeactivate();
 	}
 
@@ -628,30 +621,6 @@
 		}
 }
 	
-void CPodcastShowsView::ImageOperationCompleteL(TInt aError, TUint /*aHandle*/)
-	{
-	iLastImageHandlerError = aError;
-	if(iSetTitlebarImage)
-		{
-		iSetTitlebarImage = EFalse;
-		if(aError == KErrNone)
-			{
-			CAknTitlePane* titlePane = static_cast<CAknTitlePane*>
-						 ( StatusPane()->ControlL( TUid::Uid( EEikStatusPaneUidTitle ) ) );
-			titlePane->SetSmallPicture(iPodcastModel.ImageHandler().ScaledBitmap(), NULL, ETrue);
-			}
-		else
-			{
-			iPodcastModel.ImageHandler().ScaledBitmap();
-			}
-			
-		}
-	else
-		{
-		CActiveScheduler::Stop();
-		}
-	}
-	
 void CPodcastShowsView::DisplayShowInfoDialogL()
 	{
 	TInt index = iListContainer->Listbox()->CurrentItemIndex();
@@ -855,7 +824,6 @@
 			}
 		else
 			{
-			titlePane->SetPicture(NULL, NULL);
 			titlePane->SetTextToDefaultL();
 			}