# HG changeset patch
# User Sebastian Brannstrom <sebastianb@symbian.org>
# Date 1290125815 0
# Node ID f5de49b27caf3cb54027d273069fa36991fc9177
# Parent  ad9eb3eed0563fad546640d9a044b8fe714bc18a
Popup menus tweaked

diff -r ad9eb3eed056 -r f5de49b27caf application/data/PodcastClient_english.rls
--- a/application/data/PodcastClient_english.rls	Tue Nov 16 18:03:06 2010 +0000
+++ b/application/data/PodcastClient_english.rls	Fri Nov 19 00:16:55 2010 +0000
@@ -134,7 +134,9 @@
 rls_string STRING_r_view_mark_as_unplayed_cmd "Mark show new"
 rls_string STRING_r_view_mark_as_unplayed_cmd_short "Mark  new"
 rls_string STRING_r_view_download_show_cmd "Download show"
+rls_string STRING_r_view_download_show_cmd_short "Download"
 rls_string STRING_r_view_delete_show_cmd "Delete show"
+rls_string STRING_r_view_delete_show_cmd_short "Delete"
 rls_string STRING_r_view_show_info_cmd "Info"
 rls_string STRING_r_error_playback_failed "Could not play show"
 
diff -r ad9eb3eed056 -r f5de49b27caf application/data/PodcastQueueView.ra
--- a/application/data/PodcastQueueView.ra	Tue Nov 16 18:03:06 2010 +0000
+++ b/application/data/PodcastQueueView.ra	Fri Nov 19 00:16:55 2010 +0000
@@ -164,6 +164,11 @@
 				},
 			STYLUS_POPUP_MENU_ITEM
 				{
+				txt = STRING_r_view_remove_download_short_cmd;
+				command = EPodcastRemoveDownload;
+				},
+			STYLUS_POPUP_MENU_ITEM
+				{
 					txt = STRING_r_view_move_up_short_cmd;
 					command = EPodcastMoveDownloadUp;
 				},
diff -r ad9eb3eed056 -r f5de49b27caf application/data/PodcastShowsView.ra
--- a/application/data/PodcastShowsView.ra	Tue Nov 16 18:03:06 2010 +0000
+++ b/application/data/PodcastShowsView.ra	Fri Nov 19 00:16:55 2010 +0000
@@ -258,8 +258,17 @@
 				{
 					txt = STRING_r_view_mark_as_played_cmd_short;
 					command = EPodcastMarkAsPlayed;
+				},
+			STYLUS_POPUP_MENU_ITEM
+				{
+				txt = STRING_r_view_download_show_cmd_short;
+				command = EPodcastDownloadShow;
+				},
+			STYLUS_POPUP_MENU_ITEM
+				{
+				txt = STRING_r_view_delete_show_cmd_short;
+				command = EPodcastDeleteShow;
 				}
-
 		};
 	}
 
diff -r ad9eb3eed056 -r f5de49b27caf application/src/PodcastQueueView.cpp
--- a/application/src/PodcastQueueView.cpp	Tue Nov 16 18:03:06 2010 +0000
+++ b/application/src/PodcastQueueView.cpp	Fri Nov 19 00:16:55 2010 +0000
@@ -400,7 +400,6 @@
 
 		iStylusPopupMenu->SetItemDimmed(EPodcastMarkAsPlayed, info->PlayState() != ENeverPlayed);
 		iStylusPopupMenu->SetItemDimmed(EPodcastMarkAsUnplayed, info->PlayState() == ENeverPlayed);
-	
 		iStylusPopupMenu->ShowMenu();
 		iStylusPopupMenu->SetPosition(aPenEventLocation);
     }
diff -r ad9eb3eed056 -r f5de49b27caf application/src/PodcastShowsView.cpp
--- a/application/src/PodcastShowsView.cpp	Tue Nov 16 18:03:06 2010 +0000
+++ b/application/src/PodcastShowsView.cpp	Fri Nov 19 00:16:55 2010 +0000
@@ -914,8 +914,8 @@
 			TBool hideDeleteShowCmd = info->DownloadState() != EDownloaded;
 			TBool hideMarkOld = info->PlayState() == EPlayed;
 			
-			iStylusPopupMenu->SetItemDimmed(EPodcastMarkAsPlayed, hideMarkOld || !iShowNewShows);
-			iStylusPopupMenu->SetItemDimmed(EPodcastMarkAsUnplayed, !hideMarkOld || !iShowNewShows);
+			iStylusPopupMenu->SetItemDimmed(EPodcastMarkAsPlayed, hideMarkOld);
+			iStylusPopupMenu->SetItemDimmed(EPodcastMarkAsUnplayed, !hideMarkOld);
 						
 			iStylusPopupMenu->SetItemDimmed(EPodcastDownloadShow, hideDownloadShowCmd);
 			iStylusPopupMenu->SetItemDimmed(EPodcastDeleteShow, hideDeleteShowCmd);