WinGui

- Removed undeeded activate call for show queue
- Moved re-add job to the toolbar Queue menu.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2246 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 07828e81af3296f82464a530ca345c3edcc570e5..4ec8b2892ef9eb3ec683517ba8e2bdaee0d1b64f 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -645,7 +645,6 @@ namespace Handbrake
         private void btn_showQueue_Click(object sender, EventArgs e)\r
         {\r
             queueWindow.Show();\r
-            queueWindow.Activate();\r
         }\r
         private void tb_preview_Click(object sender, EventArgs e)\r
         {\r

diff --git a/win/C#/frmQueue.Designer.cs b/win/C#/frmQueue.Designer.cs
index c67872b8bb35469fba09209832543d3996e3c5b2..0f09bf69ed28873ab42d430536624ae718332b7d 100644 (file)
--- a/win/C#/frmQueue.Designer.cs
+++ b/win/C#/frmQueue.Designer.cs
@@ -40,7 +40,6 @@ namespace Handbrake
             this.btn_up = new System.Windows.Forms.Button();\r
             this.btn_delete = new System.Windows.Forms.Button();\r
             this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);\r
-            this.btn_re_add = new System.Windows.Forms.Button();\r
             this.label4 = new System.Windows.Forms.Label();\r
             this.lbl_chapt = new System.Windows.Forms.Label();\r
             this.lbl_title = new System.Windows.Forms.Label();\r
@@ -58,6 +57,8 @@ namespace Handbrake
             this.mnu_batch = new System.Windows.Forms.ToolStripMenuItem();\r
             this.mnu_import = new System.Windows.Forms.ToolStripMenuItem();\r
             this.mnu_export = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();\r
+            this.mnu_readd = new System.Windows.Forms.ToolStripMenuItem();\r
             this.SaveFile = new System.Windows.Forms.SaveFileDialog();\r
             this.list_queue = new System.Windows.Forms.ListView();\r
             this.Title = new System.Windows.Forms.ColumnHeader();\r
@@ -128,22 +129,6 @@ namespace Handbrake
             this.btn_delete.UseVisualStyleBackColor = true;\r
             this.btn_delete.Click += new System.EventHandler(this.btn_delete_Click);\r
             // \r
-            // btn_re_add\r
-            // \r
-            this.btn_re_add.BackColor = System.Drawing.SystemColors.ControlLight;\r
-            this.btn_re_add.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
-            this.btn_re_add.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.btn_re_add.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_re_add.Location = new System.Drawing.Point(607, 39);\r
-            this.btn_re_add.Name = "btn_re_add";\r
-            this.btn_re_add.Size = new System.Drawing.Size(157, 22);\r
-            this.btn_re_add.TabIndex = 71;\r
-            this.btn_re_add.TabStop = false;\r
-            this.btn_re_add.Text = "Re-Add Current";\r
-            this.toolTip1.SetToolTip(this.btn_re_add, "Re-add the current or last job to the queue");\r
-            this.btn_re_add.UseVisualStyleBackColor = true;\r
-            this.btn_re_add.Click += new System.EventHandler(this.btn_re_add_Click);\r
-            // \r
             // label4\r
             // \r
             this.label4.AutoSize = true;\r
@@ -251,7 +236,7 @@ namespace Handbrake
             this.btn_encode.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;\r
             this.btn_encode.ImageTransparentColor = System.Drawing.Color.Magenta;\r
             this.btn_encode.Name = "btn_encode";\r
-            this.btn_encode.Size = new System.Drawing.Size(78, 36);\r
+            this.btn_encode.Size = new System.Drawing.Size(84, 36);\r
             this.btn_encode.Text = "Encode";\r
             this.btn_encode.Click += new System.EventHandler(this.btn_encode_Click);\r
             // \r
@@ -262,7 +247,7 @@ namespace Handbrake
             this.btn_pause.ImageTransparentColor = System.Drawing.Color.Magenta;\r
             this.btn_pause.Name = "btn_pause";\r
             this.btn_pause.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never;\r
-            this.btn_pause.Size = new System.Drawing.Size(72, 36);\r
+            this.btn_pause.Size = new System.Drawing.Size(75, 36);\r
             this.btn_pause.Text = "Pause";\r
             this.btn_pause.Visible = false;\r
             this.btn_pause.Click += new System.EventHandler(this.btn_pause_Click);\r
@@ -277,19 +262,21 @@ namespace Handbrake
             this.drop_button_queue.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
             this.mnu_batch,\r
             this.mnu_import,\r
-            this.mnu_export});\r
+            this.mnu_export,\r
+            this.toolStripSeparator2,\r
+            this.mnu_readd});\r
             this.drop_button_queue.Image = global::Handbrake.Properties.Resources.ActivityWindow;\r
             this.drop_button_queue.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;\r
             this.drop_button_queue.ImageTransparentColor = System.Drawing.Color.Magenta;\r
             this.drop_button_queue.Name = "drop_button_queue";\r
-            this.drop_button_queue.Size = new System.Drawing.Size(84, 36);\r
+            this.drop_button_queue.Size = new System.Drawing.Size(89, 36);\r
             this.drop_button_queue.Text = "Queue";\r
             // \r
             // mnu_batch\r
             // \r
             this.mnu_batch.Image = global::Handbrake.Properties.Resources.Output_Small;\r
             this.mnu_batch.Name = "mnu_batch";\r
-            this.mnu_batch.Size = new System.Drawing.Size(190, 22);\r
+            this.mnu_batch.Size = new System.Drawing.Size(207, 22);\r
             this.mnu_batch.Text = "Generate Batch Script";\r
             this.mnu_batch.Click += new System.EventHandler(this.mnu_batch_Click);\r
             // \r
@@ -297,7 +284,7 @@ namespace Handbrake
             // \r
             this.mnu_import.Image = global::Handbrake.Properties.Resources.folder;\r
             this.mnu_import.Name = "mnu_import";\r
-            this.mnu_import.Size = new System.Drawing.Size(190, 22);\r
+            this.mnu_import.Size = new System.Drawing.Size(207, 22);\r
             this.mnu_import.Text = "Import Queue";\r
             this.mnu_import.Click += new System.EventHandler(this.mnu_import_Click);\r
             // \r
@@ -305,10 +292,22 @@ namespace Handbrake
             // \r
             this.mnu_export.Image = global::Handbrake.Properties.Resources.save;\r
             this.mnu_export.Name = "mnu_export";\r
-            this.mnu_export.Size = new System.Drawing.Size(190, 22);\r
+            this.mnu_export.Size = new System.Drawing.Size(207, 22);\r
             this.mnu_export.Text = "Export Queue";\r
             this.mnu_export.Click += new System.EventHandler(this.mnu_export_Click);\r
             // \r
+            // toolStripSeparator2\r
+            // \r
+            this.toolStripSeparator2.Name = "toolStripSeparator2";\r
+            this.toolStripSeparator2.Size = new System.Drawing.Size(204, 6);\r
+            // \r
+            // mnu_readd\r
+            // \r
+            this.mnu_readd.Name = "mnu_readd";\r
+            this.mnu_readd.Size = new System.Drawing.Size(207, 22);\r
+            this.mnu_readd.Text = "Re-Add Current Job";\r
+            this.mnu_readd.Click += new System.EventHandler(this.mnu_readd_Click);\r
+            // \r
             // SaveFile\r
             // \r
             this.SaveFile.Filter = "Batch|.bat";\r
@@ -380,7 +379,7 @@ namespace Handbrake
             this.lbl_encodesPending.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;\r
             this.lbl_encodesPending.Margin = new System.Windows.Forms.Padding(0, 3, 10, 2);\r
             this.lbl_encodesPending.Name = "lbl_encodesPending";\r
-            this.lbl_encodesPending.Size = new System.Drawing.Size(105, 17);\r
+            this.lbl_encodesPending.Size = new System.Drawing.Size(122, 17);\r
             this.lbl_encodesPending.Text = "0 encode(s) pending";\r
             // \r
             // OpenFile\r
@@ -398,7 +397,6 @@ namespace Handbrake
             // \r
             // splitContainer1.Panel1\r
             // \r
-            this.splitContainer1.Panel1.Controls.Add(this.btn_re_add);\r
             this.splitContainer1.Panel1.Controls.Add(this.label3);\r
             this.splitContainer1.Panel1.Controls.Add(this.label1);\r
             this.splitContainer1.Panel1.Controls.Add(this.btn_down);\r
@@ -512,6 +510,7 @@ namespace Handbrake
         private System.Windows.Forms.Panel panel2;\r
         private System.Windows.Forms.Panel panel1;\r
         private System.Windows.Forms.Panel panel3;\r
-        internal System.Windows.Forms.Button btn_re_add;\r
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;\r
+        private System.Windows.Forms.ToolStripMenuItem mnu_readd;\r
     }\r
 }\r

diff --git a/win/C#/frmQueue.cs b/win/C#/frmQueue.cs
index ceb127fb4f574bcae27429d0ec91145e32a00c7c..26fd97311a89340a7554f76a84037d7a24b8b673 100644 (file)
--- a/win/C#/frmQueue.cs
+++ b/win/C#/frmQueue.cs
@@ -165,7 +165,19 @@ namespace Handbrake
                 item.SubItems.Add(queue_item.Source); // Source\r
                 item.SubItems.Add(queue_item.Destination); // Destination\r
                 item.SubItems.Add(parsed.VideoEncoder); // Video\r
-                item.SubItems.Add(parsed.AudioEncoder1); // Audio\r
+\r
+                // Display the first 4 audio tracks.\r
+                String audio = parsed.AudioEncoder1;\r
+                if (parsed.AudioEncoder2 != null)\r
+                    audio += ", " + parsed.AudioEncoder2;\r
+\r
+                if (parsed.AudioEncoder3 != null)\r
+                    audio += ", " + parsed.AudioEncoder3;\r
+\r
+                if (parsed.AudioEncoder4 != null)\r
+                    audio += ", " + parsed.AudioEncoder4;\r
+\r
+                item.SubItems.Add(audio); // Audio\r
 \r
                 list_queue.Items.Add(item);\r
             }\r
@@ -208,7 +220,17 @@ namespace Handbrake
                 }\r
 \r
                 lbl_vEnc.Text = parsed.VideoEncoder;\r
-                lbl_aEnc.Text = parsed.AudioEncoder1;\r
+                String audio = parsed.AudioEncoder1;\r
+                if (parsed.AudioEncoder2 != null)\r
+                    audio += ", " + parsed.AudioEncoder2;\r
+\r
+                if (parsed.AudioEncoder3 != null)\r
+                    audio += ", " + parsed.AudioEncoder3;\r
+\r
+                if (parsed.AudioEncoder4 != null)\r
+                    audio += ", " + parsed.AudioEncoder4;\r
+\r
+                lbl_aEnc.Text = audio;\r
             }\r
             catch (Exception)\r
             {\r
@@ -246,15 +268,6 @@ namespace Handbrake
         }\r
 \r
         // Queue Management\r
-        private void btn_re_add_Click(object sender, EventArgs e)\r
-        {\r
-            if (queue.getLastQueryItem() != null)\r
-            {\r
-                queue.add(queue.getLastQueryItem().Query, queue.getLastQueryItem().Source, queue.getLastQueryItem().Destination);\r
-                queue.write2disk("hb_queue_recovery.xml"); // Update the queue recovery file\r
-                updateUIElements();\r
-            }\r
-        }\r
         private void btn_up_Click(object sender, EventArgs e)\r
         {\r
             // If there are selected items and the first item is not selected\r
@@ -344,6 +357,15 @@ namespace Handbrake
                 queue.recoverQueue(OpenFile.FileName);\r
             updateUIElements();\r
         }\r
+        private void mnu_readd_Click(object sender, EventArgs e)\r
+        {\r
+            if (queue.getLastQueryItem() != null)\r
+            {\r
+                queue.add(queue.getLastQueryItem().Query, queue.getLastQueryItem().Source, queue.getLastQueryItem().Destination);\r
+                queue.write2disk("hb_queue_recovery.xml"); // Update the queue recovery file\r
+                updateUIElements();\r
+            }\r
+        }\r
 \r
         // Hide's the window when the user tries to "x" out of the window instead of closing it.\r
         protected override void OnClosing(CancelEventArgs e)\r
@@ -354,5 +376,6 @@ namespace Handbrake
         }\r
 \r
         \r
+       \r
     }\r
 }\r