# HG changeset patch
# User teknolog
# Date 1275948377 -3600
# Node ID 70b2f592a460425399c3699c435d67e00a431f02
# Parent  e3f9b65d6910adbe904c7319eba44d09c222191e
Enabled Brendan's download queue operations; Fixed minor bug in queue swapping method

diff -r e3f9b65d6910 -r 70b2f592a460 application/data/PodcastQueueView.ra
--- a/application/data/PodcastQueueView.ra	Thu Jun 03 23:38:58 2010 +0100
+++ b/application/data/PodcastQueueView.ra	Mon Jun 07 23:06:17 2010 +0100
@@ -142,7 +142,7 @@
 				{
 					txt = STRING_r_view_remove_download_short_cmd;
 					command = EPodcastRemoveDownload;
-				}/*,
+				},
 			STYLUS_POPUP_MENU_ITEM
 				{
 					txt = STRING_r_view_move_up_short_cmd;
@@ -153,6 +153,5 @@
 					txt = STRING_r_view_move_down_short_cmd;
 					command = EPodcastMoveDownloadDown;
 				}
-				*/
 		};
 	}
diff -r e3f9b65d6910 -r 70b2f592a460 application/inc/buildno.h
--- a/application/inc/buildno.h	Thu Jun 03 23:38:58 2010 +0100
+++ b/application/inc/buildno.h	Mon Jun 07 23:06:17 2010 +0100
@@ -1,2 +1,2 @@
 // Build number generated by increment_buildno.py, do not edit manually

-#define BUILD_NO 25
\ No newline at end of file
+#define BUILD_NO 26
\ No newline at end of file
diff -r e3f9b65d6910 -r 70b2f592a460 application/sis/buildno.txt
--- a/application/sis/buildno.txt	Thu Jun 03 23:38:58 2010 +0100
+++ b/application/sis/buildno.txt	Mon Jun 07 23:06:17 2010 +0100
@@ -1,1 +1,1 @@
-25
\ No newline at end of file
+26
\ No newline at end of file
diff -r e3f9b65d6910 -r 70b2f592a460 application/sis/podcatcher_udeb.pkg
--- a/application/sis/podcatcher_udeb.pkg	Thu Jun 03 23:38:58 2010 +0100
+++ b/application/sis/podcatcher_udeb.pkg	Mon Jun 07 23:06:17 2010 +0100
@@ -1,7 +1,7 @@
 &EN
 :"Symbian Foundation"
 %{"Podcatcher"}
-#{"Podcatcher"},(0xA0009D00), 1, 00, 25, TYPE=SA
+#{"Podcatcher"},(0xA0009D00), 1, 00, 26, TYPE=SA
 
 ;Supports S60 3rd edition
 [0x101F7961], 0, 0, 0, {"Series60ProductID"}
diff -r e3f9b65d6910 -r 70b2f592a460 application/sis/podcatcher_udeb.sis
Binary file application/sis/podcatcher_udeb.sis has changed
diff -r e3f9b65d6910 -r 70b2f592a460 application/sis/podcatcher_udeb_signed.sis
Binary file application/sis/podcatcher_udeb_signed.sis has changed
diff -r e3f9b65d6910 -r 70b2f592a460 application/sis/podcatcher_urel.pkg
--- a/application/sis/podcatcher_urel.pkg	Thu Jun 03 23:38:58 2010 +0100
+++ b/application/sis/podcatcher_urel.pkg	Mon Jun 07 23:06:17 2010 +0100
@@ -1,7 +1,7 @@
 &EN
 :"Symbian Foundation"
 %{"Podcatcher"}
-#{"Podcatcher"},(0xA0009D00), 1, 00, 25, TYPE=SA
+#{"Podcatcher"},(0xA0009D00), 1, 00, 26, TYPE=SA
 
 ;Supports S60 3rd edition
 [0x101F7961], 0, 0, 0, {"Series60ProductID"}
diff -r e3f9b65d6910 -r 70b2f592a460 application/src/PodcastQueueView.cpp
--- a/application/src/PodcastQueueView.cpp	Thu Jun 03 23:38:58 2010 +0100
+++ b/application/src/PodcastQueueView.cpp	Mon Jun 07 23:06:17 2010 +0100
@@ -255,25 +255,47 @@
 			break;
 		case EPodcastMoveDownloadUp:
 			{
-			//iPodcastModel.ShowEngine().SuspendDownloads();
 			TInt index = iListContainer->Listbox()->CurrentItemIndex();
+			TBool resumeAfterMove = EFalse;
+			if (index == 1 && !iPodcastModel.SettingsEngine().DownloadSuspended())
+				{
+				iPodcastModel.ShowEngine().SuspendDownloads();
+				resumeAfterMove = ETrue;
+				}
+			
 			if (index >= 0 && index < iPodcastModel.ActiveShowList().Count())
 				{
 				TRAP_IGNORE(iPodcastModel.ShowEngine().MoveDownloadUpL(iPodcastModel.ActiveShowList()[index]->Uid()));
 				}
-			//iPodcastModel.ShowEngine().ResumeDownloadsL();
+			
+			if(resumeAfterMove)
+				{
+				iPodcastModel.ShowEngine().ResumeDownloadsL();
+				}
+				
 			UpdateListboxItemsL();
 			}
 			break;
 		case EPodcastMoveDownloadDown:
 			{
-			//iPodcastModel.ShowEngine().SuspendDownloads();			
 			TInt index = iListContainer->Listbox()->CurrentItemIndex();
+			TBool resumeAfterMove = EFalse;
+			if (index == 0 && !iPodcastModel.SettingsEngine().DownloadSuspended())
+				{
+				iPodcastModel.ShowEngine().SuspendDownloads();
+				resumeAfterMove = ETrue;
+				}
+			
 			if (index >= 0 && index < iPodcastModel.ActiveShowList().Count())
 				{
 				TRAP_IGNORE(iPodcastModel.ShowEngine().MoveDownloadDownL(iPodcastModel.ActiveShowList()[index]->Uid()));
 				}
-			//iPodcastModel.ShowEngine().ResumeDownloadsL();
+			
+			if(resumeAfterMove)
+				{
+				iPodcastModel.ShowEngine().ResumeDownloadsL();
+				}
+			
 			UpdateListboxItemsL();
 			}
 			break;
diff -r e3f9b65d6910 -r 70b2f592a460 engine/src/ShowEngine.cpp
--- a/engine/src/ShowEngine.cpp	Thu Jun 03 23:38:58 2010 +0100
+++ b/engine/src/ShowEngine.cpp	Mon Jun 07 23:06:17 2010 +0100
@@ -1045,7 +1045,7 @@
 void CShowEngine::DBSwapDownloadsL(TDownload aFirstDL, TDownload aSecondDL)
 	{
 	DP("CShowEngine::DBSwapDownloadsL");
-	_LIT(KSqlStatement, "update downloads set uid=%d where dl_index=%d");
+	_LIT(KSqlStatement, "update downloads set uid=%u where dl_index=%d");
 	
 	iSqlBuffer.Format(KSqlStatement, aFirstDL.iUid, aSecondDL.iIndex);
 	sqlite3_stmt *st;