WinGui:

- Fixed Queue not encoding the full list
- Fixed Subtitle dropdown not having a "None" Option
- Fixed Audio dropdown not having an "Automatic" option
- Fixed Destination browse not showing files
- Added Alert when queue has finished.

git-svn-id: svn://localhost/HandBrake/trunk@693 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index 3193355..59c864c 100644 (file)
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -76,6 +76,7 @@ namespace Handbrake
             this.mnu_about = new System.Windows.Forms.ToolStripMenuItem();\r
             this.frmMainMenu = new System.Windows.Forms.MenuStrip();\r
             this.GroupBox1 = new System.Windows.Forms.GroupBox();\r
+            this.lbl_chptWarn = new System.Windows.Forms.Label();\r
             this.Label13 = new System.Windows.Forms.Label();\r
             this.RadioDVD = new System.Windows.Forms.RadioButton();\r
             this.btn_Browse = new System.Windows.Forms.Button();\r
@@ -169,7 +170,6 @@ namespace Handbrake
             this.btn_queue = new System.Windows.Forms.Button();\r
             this.btn_encode = new System.Windows.Forms.Button();\r
             this.Version = new System.Windows.Forms.Label();\r
-            this.lbl_chptWarn = new System.Windows.Forms.Label();\r
             Label38 = new System.Windows.Forms.Label();\r
             this.frmMainMenu.SuspendLayout();\r
             this.GroupBox1.SuspendLayout();\r
@@ -196,7 +196,7 @@ namespace Handbrake
             // DVD_Save\r
             // \r
             this.DVD_Save.DefaultExt = "mp4";\r
-            this.DVD_Save.Filter = "mp4|*.mp4 |m4v|*.m4v |avi|*.avi |ogm|*.ogm |mkv|*.mkv";\r
+            this.DVD_Save.Filter = ".mp4|*.mp4| .m4v|*.m4v |.avi|*.avi |.ogm|*.ogm |.mkv|*.mkv";\r
             // \r
             // File_Save\r
             // \r
@@ -571,6 +571,16 @@ namespace Handbrake
             this.GroupBox1.TabStop = false;\r
             this.GroupBox1.Text = "Source";\r
             // \r
+            // lbl_chptWarn\r
+            // \r
+            this.lbl_chptWarn.AutoSize = true;\r
+            this.lbl_chptWarn.Location = new System.Drawing.Point(287, 85);\r
+            this.lbl_chptWarn.Name = "lbl_chptWarn";\r
+            this.lbl_chptWarn.Size = new System.Drawing.Size(77, 13);\r
+            this.lbl_chptWarn.TabIndex = 43;\r
+            this.lbl_chptWarn.Text = "{Warning}";\r
+            this.lbl_chptWarn.Visible = false;\r
+            // \r
             // Label13\r
             // \r
             this.Label13.AutoSize = true;\r
@@ -1701,16 +1711,6 @@ namespace Handbrake
             this.Version.TabIndex = 415;\r
             this.Version.Text = "Version 2.3";\r
             // \r
-            // lbl_chptWarn\r
-            // \r
-            this.lbl_chptWarn.AutoSize = true;\r
-            this.lbl_chptWarn.Location = new System.Drawing.Point(287, 85);\r
-            this.lbl_chptWarn.Name = "lbl_chptWarn";\r
-            this.lbl_chptWarn.Size = new System.Drawing.Size(77, 13);\r
-            this.lbl_chptWarn.TabIndex = 43;\r
-            this.lbl_chptWarn.Text = "{Warning}";\r
-            this.lbl_chptWarn.Visible = false;\r
-            // \r
             // frmMain\r
             // \r
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);\r
@@ -1754,7 +1754,6 @@ namespace Handbrake
 \r
         #endregion\r
 \r
-        private System.Windows.Forms.SaveFileDialog DVD_Save;\r
         internal System.Windows.Forms.SaveFileDialog File_Save;\r
         internal System.Windows.Forms.ToolTip ToolTip;\r
         internal System.Windows.Forms.FolderBrowserDialog DVD_Open;\r
@@ -1893,6 +1892,7 @@ namespace Handbrake
         internal System.Windows.Forms.Button btn_encode;\r
         internal System.Windows.Forms.Label Version;\r
         private System.Windows.Forms.Label lbl_chptWarn;\r
+        internal System.Windows.Forms.SaveFileDialog DVD_Save;\r
 \r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index c3ccc3e..5361a34 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -1011,6 +1011,7 @@ namespace Handbrake
                 }\r
 \r
                 drp_audioChannels.Items.Clear();\r
+                drp_subtitle.Items.Add("Automatic");\r
                 drp_audioChannels.Items.AddRange(selectedTitle.AudioTracks.ToArray());\r
                 if (drp_audioChannels.Items.Count > 0)\r
                 {\r
@@ -1018,6 +1019,7 @@ namespace Handbrake
                 }\r
 \r
                 drp_subtitle.Items.Clear();\r
+                drp_subtitle.Items.Add("None");\r
                 drp_subtitle.Items.AddRange(selectedTitle.Subtitles.ToArray());\r
                 if (drp_subtitle.Items.Count > 0)\r
                 {\r
@@ -1328,6 +1330,8 @@ namespace Handbrake
             return querySource+ queryDestination+ queryPictureSettings+ queryVideoSettings+ h264Settings+ queryAudioSettings+ queryAdvancedSettings+ verbose;\r
         }\r
 \r
+\r
+\r
         // This is the END of the road ------------------------------------------------------------------------------\r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/frmQueue.cs b/win/C#/frmQueue.cs
index 67251cc..09b3f19 100644 (file)
--- a/win/C#/frmQueue.cs
+++ b/win/C#/frmQueue.cs
@@ -73,10 +73,10 @@ namespace Handbrake
 \r
         private void startProc(object state)\r
         {\r
-            // Reminder: There is still a bug here where the loop suddenly halts for no good reson. UpdateUIelements runs, then the loop finishes several items early.\r
-            for (int i = 0; i < list_queue.Items.Count; i++)\r
+            int initialListCount = list_queue.Items.Count;\r
+            for (int i = 0; i < initialListCount; i++)\r
             {\r
-                string query = list_queue.Items[0] as string;\r
+                string query = list_queue.Items[0].ToString();\r
                 Process hbProc = new Process();\r
                 hbProc.StartInfo.FileName = "hbcli.exe";\r
                 hbProc.StartInfo.Arguments = query;\r
@@ -110,7 +110,7 @@ namespace Handbrake
                 hbProc.WaitForExit();\r
                 hbProc.Close();\r
                 hbProc.Dispose();\r
-                \r
+\r
 \r
                 updateUIElements();\r
             }\r
@@ -127,6 +127,11 @@ namespace Handbrake
             progressBar.PerformStep();\r
             lbl_progressValue.Text = string.Format("{0} %", progressBar.Value);\r
             progressBar.Update();\r
+\r
+            if (progressBar.Value == 100)\r
+            {\r
+                MessageBox.Show("Encode Queue Completed!", "Alert", MessageBoxButtons.OK, MessageBoxIcon.Asterisk);\r
+            }\r
         }\r
     }\r
 }
\ No newline at end of file