WinGui:

[handbrake-jp/handbrake-jp-git.git] / win / C# / frmQueue.cs

diff --git a/win/C#/frmQueue.cs b/win/C#/frmQueue.cs
index b5a37bc..2684772 100644 (file)
--- a/win/C#/frmQueue.cs
+++ b/win/C#/frmQueue.cs
@@ -62,6 +62,8 @@ namespace Handbrake
 \r
             queue.EncodeStarted += new EventHandler(queue_EncodeStarted);\r
             queue.EncodeEnded += new EventHandler(queue_EncodeEnded);\r
+\r
+            drp_completeOption.Text = Properties.Settings.Default.CompletionOption;\r
         }\r
 \r
         /// <summary>\r
@@ -129,7 +131,7 @@ namespace Handbrake
                 string.Format(\r
                 "Encoding: Pass {0} of {1}, {2:00.00}% Time Remaining: {3}",\r
                 e.Task,\r
-                e.Task,\r
+                e.TaskCount,\r
                 e.PercentComplete,\r
                 e.EstimatedTimeLeft);\r
         }\r
@@ -423,6 +425,7 @@ namespace Handbrake
         }\r
 \r
         /* Right Click Menu */\r
+\r
         /// <summary>\r
         /// Handle the Move Up Menu Item\r
         /// </summary>\r
@@ -504,7 +507,7 @@ namespace Handbrake
         /// </param>\r
         private void ListQueueDeleteKey(object sender, KeyEventArgs e)\r
         {\r
-            if (e.KeyCode == Keys.Delete)\r
+            if (e.KeyCode == Keys.Delete && e.Modifiers == Keys.None)\r
                 DeleteSelectedItems();\r
         }\r
 \r
@@ -662,7 +665,7 @@ namespace Handbrake
         /// </param>\r
         private void MnuReaddClick(object sender, EventArgs e)\r
         {\r
-            if (!queue.LastEncode.IsEmpty)\r
+            if (queue.LastEncode != null && !queue.LastEncode.IsEmpty)\r
             {\r
                 queue.Add(\r
                     queue.LastEncode.Query, \r
@@ -687,5 +690,21 @@ namespace Handbrake
             this.Hide();\r
             base.OnClosing(e);\r
         }\r
+\r
+        /// <summary>\r
+        /// Change the OnComplete option setting.\r
+        /// </summary>\r
+        /// <param name="sender">\r
+        /// The sender.\r
+        /// </param>\r
+        /// <param name="e">\r
+        /// The EventArgs.\r
+        /// </param>\r
+        private void CompleteOptionChanged(object sender, EventArgs e)\r
+        {\r
+            Properties.Settings.Default.CompletionOption = drp_completeOption.Text;\r
+            HandBrake.ApplicationServices.Init.CompletionOption = drp_completeOption.Text;\r
+            Properties.Settings.Default.Save();\r
+        }\r
     }\r
 }
\ No newline at end of file