WinGui:

 - The options panel (frmOptions) is now completely wrapped in TableLayoutPanels.
 - The rest of the GUI has been changed to Tahoma, 8pt font.
 - QueueHandler and it's related classes have been refactored and documented.
 - new option has been added that prompts the user before encoding when the query under the "Query Editor" tab does not match the GUI settings. It can be disabled in the options window.
 - A bug where "last_encode_log.txt" failed to be read has been fixed that was caused by exiting the CLI window shortly after starting the encode.

Thansk to darkassassin

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

24 files changed, 1566 insertions, 1070 deletions

diff --git a/win/C#/Controls/AudioPanel.Designer.cs b/win/C#/Controls/AudioPanel.Designer.cs
index ea94567c9..95b938d61 100644
--- a/win/C#/Controls/AudioPanel.Designer.cs
+++ b/win/C#/Controls/AudioPanel.Designer.cs
@@ -137,19 +137,19 @@ namespace Handbrake.Controls
             this.toolStripSeparator2,

             this.audioList_remove});

             this.audioMenu.Name = "audioMenu";

-            this.audioMenu.Size = new System.Drawing.Size(142, 76);

+            this.audioMenu.Size = new System.Drawing.Size(139, 76);

             // 

             // audioList_moveup

             // 

             this.audioList_moveup.Name = "audioList_moveup";

-            this.audioList_moveup.Size = new System.Drawing.Size(141, 22);

+            this.audioList_moveup.Size = new System.Drawing.Size(138, 22);

             this.audioList_moveup.Text = "Move Up";

             this.audioList_moveup.Click += new System.EventHandler(this.audioList_moveup_Click);

             // 

             // audioList_movedown

             // 

             this.audioList_movedown.Name = "audioList_movedown";

-            this.audioList_movedown.Size = new System.Drawing.Size(141, 22);

+            this.audioList_movedown.Size = new System.Drawing.Size(138, 22);

             this.audioList_movedown.Text = "Move Down";

             this.audioList_movedown.TextAlign = System.Drawing.ContentAlignment.MiddleRight;

             this.audioList_movedown.Click += new System.EventHandler(this.audioList_movedown_Click);

@@ -157,12 +157,12 @@ namespace Handbrake.Controls
             // toolStripSeparator2

             // 

             this.toolStripSeparator2.Name = "toolStripSeparator2";

-            this.toolStripSeparator2.Size = new System.Drawing.Size(138, 6);

+            this.toolStripSeparator2.Size = new System.Drawing.Size(135, 6);

             // 

             // audioList_remove

             // 

             this.audioList_remove.Name = "audioList_remove";

-            this.audioList_remove.Size = new System.Drawing.Size(141, 22);

+            this.audioList_remove.Size = new System.Drawing.Size(138, 22);

             this.audioList_remove.Text = "Remove";

             this.audioList_remove.Click += new System.EventHandler(this.audioList_remove_Click);

             // 

@@ -277,6 +277,7 @@ namespace Handbrake.Controls
             // 

             // drp_audenc_1

             // 

+            this.drp_audenc_1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;

             this.drp_audenc_1.FormattingEnabled = true;

             this.drp_audenc_1.Items.AddRange(new object[] {

             "AAC (faac)",

@@ -287,7 +288,6 @@ namespace Handbrake.Controls
             this.drp_audenc_1.Name = "drp_audenc_1";

             this.drp_audenc_1.Size = new System.Drawing.Size(111, 21);

             this.drp_audenc_1.TabIndex = 52;

-            this.drp_audenc_1.Text = "AAC (faac)";

             this.drp_audenc_1.SelectedIndexChanged += new System.EventHandler(this.drp_audenc_1_SelectedIndexChanged);

             // 

             // label27

@@ -302,6 +302,7 @@ namespace Handbrake.Controls
             // 

             // drp_audmix_1

             // 

+            this.drp_audmix_1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;

             this.drp_audmix_1.FormattingEnabled = true;

             this.drp_audmix_1.Items.AddRange(new object[] {

             "Automatic",

@@ -314,11 +315,11 @@ namespace Handbrake.Controls
             this.drp_audmix_1.Name = "drp_audmix_1";

             this.drp_audmix_1.Size = new System.Drawing.Size(129, 21);

             this.drp_audmix_1.TabIndex = 54;

-            this.drp_audmix_1.Text = "Automatic";

             this.drp_audmix_1.SelectedIndexChanged += new System.EventHandler(this.drp_audmix_1_SelectedIndexChanged);

             // 

             // drp_track1Audio

             // 

+            this.drp_track1Audio.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;

             this.drp_track1Audio.FormattingEnabled = true;

             this.drp_track1Audio.Items.AddRange(new object[] {

             "Automatic"});

@@ -326,11 +327,11 @@ namespace Handbrake.Controls
             this.drp_track1Audio.Name = "drp_track1Audio";

             this.drp_track1Audio.Size = new System.Drawing.Size(194, 21);

             this.drp_track1Audio.TabIndex = 50;

-            this.drp_track1Audio.Text = "Automatic";

             this.drp_track1Audio.SelectedIndexChanged += new System.EventHandler(this.drp_track1Audio_SelectedIndexChanged);

             // 

             // drp_audbit_1

             // 

+            this.drp_audbit_1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;

             this.drp_audbit_1.FormattingEnabled = true;

             this.drp_audbit_1.Items.AddRange(new object[] {

             "32",

@@ -347,11 +348,11 @@ namespace Handbrake.Controls
             this.drp_audbit_1.Name = "drp_audbit_1";

             this.drp_audbit_1.Size = new System.Drawing.Size(70, 21);

             this.drp_audbit_1.TabIndex = 58;

-            this.drp_audbit_1.Text = "160";

             this.drp_audbit_1.SelectedIndexChanged += new System.EventHandler(this.drp_audbit_1_SelectedIndexChanged);

             // 

             // drp_audsr_1

             // 

+            this.drp_audsr_1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;

             this.drp_audsr_1.FormattingEnabled = true;

             this.drp_audsr_1.Items.AddRange(new object[] {

             "Auto",

@@ -364,7 +365,6 @@ namespace Handbrake.Controls
             this.drp_audsr_1.Name = "drp_audsr_1";

             this.drp_audsr_1.Size = new System.Drawing.Size(55, 21);

             this.drp_audsr_1.TabIndex = 56;

-            this.drp_audsr_1.Text = "Auto";

             this.drp_audsr_1.SelectedIndexChanged += new System.EventHandler(this.drp_audsr_1_SelectedIndexChanged);

             // 

             // AudioTrackGroup

diff --git a/win/C#/Controls/Filters.Designer.cs b/win/C#/Controls/Filters.Designer.cs
index 6bdd7fbba..216a12d30 100644
--- a/win/C#/Controls/Filters.Designer.cs
+++ b/win/C#/Controls/Filters.Designer.cs
@@ -45,12 +45,16 @@
             this.label8 = new System.Windows.Forms.Label();

             this.lbl_deblockVal = new System.Windows.Forms.Label();

             this.label68 = new System.Windows.Forms.Label();

+            this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();

             ((System.ComponentModel.ISupportInitialize)(this.slider_deblock)).BeginInit();

+            this.tableLayoutPanel1.SuspendLayout();

             this.SuspendLayout();

             // 

             // text_customDT

             // 

-            this.text_customDT.Location = new System.Drawing.Point(288, 32);

+            this.text_customDT.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)

+                        | System.Windows.Forms.AnchorStyles.Right)));

+            this.text_customDT.Location = new System.Drawing.Point(251, 3);

             this.text_customDT.Name = "text_customDT";

             this.text_customDT.Size = new System.Drawing.Size(115, 21);

             this.text_customDT.TabIndex = 47;

@@ -58,9 +62,11 @@
             // 

             // label18

             // 

+            this.label18.Anchor = System.Windows.Forms.AnchorStyles.Left;

             this.label18.AutoSize = true;

             this.label18.BackColor = System.Drawing.Color.Transparent;

-            this.label18.Location = new System.Drawing.Point(13, 35);

+            this.label18.Location = new System.Drawing.Point(0, 7);

+            this.label18.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);

             this.label18.Name = "label18";

             this.label18.Size = new System.Drawing.Size(61, 13);

             this.label18.TabIndex = 46;

@@ -68,21 +74,25 @@
             // 

             // drop_detelecine

             // 

+            this.drop_detelecine.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)

+                        | System.Windows.Forms.AnchorStyles.Right)));

             this.drop_detelecine.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;

             this.drop_detelecine.FormattingEnabled = true;

             this.drop_detelecine.Items.AddRange(new object[] {

             "Off",

             "Default",

             "Custom"});

-            this.drop_detelecine.Location = new System.Drawing.Point(121, 32);

+            this.drop_detelecine.Location = new System.Drawing.Point(71, 3);

             this.drop_detelecine.Name = "drop_detelecine";

-            this.drop_detelecine.Size = new System.Drawing.Size(161, 21);

+            this.drop_detelecine.Size = new System.Drawing.Size(174, 21);

             this.drop_detelecine.TabIndex = 45;

             this.drop_detelecine.SelectedIndexChanged += new System.EventHandler(this.drop_detelecine_SelectedIndexChanged);

             // 

             // text_customDC

             // 

-            this.text_customDC.Location = new System.Drawing.Point(288, 59);

+            this.text_customDC.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)

+                        | System.Windows.Forms.AnchorStyles.Right)));

+            this.text_customDC.Location = new System.Drawing.Point(251, 30);

             this.text_customDC.Name = "text_customDC";

             this.text_customDC.Size = new System.Drawing.Size(115, 21);

             this.text_customDC.TabIndex = 50;

@@ -90,9 +100,11 @@
             // 

             // label1

             // 

+            this.label1.Anchor = System.Windows.Forms.AnchorStyles.Left;

             this.label1.AutoSize = true;

             this.label1.BackColor = System.Drawing.Color.Transparent;

-            this.label1.Location = new System.Drawing.Point(13, 62);

+            this.label1.Location = new System.Drawing.Point(0, 34);

+            this.label1.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);

             this.label1.Name = "label1";

             this.label1.Size = new System.Drawing.Size(49, 13);

             this.label1.TabIndex = 49;

@@ -100,21 +112,25 @@
             // 

             // drop_decomb

             // 

+            this.drop_decomb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)

+                        | System.Windows.Forms.AnchorStyles.Right)));

             this.drop_decomb.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;

             this.drop_decomb.FormattingEnabled = true;

             this.drop_decomb.Items.AddRange(new object[] {

             "Off",

             "Default",

             "Custom"});

-            this.drop_decomb.Location = new System.Drawing.Point(121, 59);

+            this.drop_decomb.Location = new System.Drawing.Point(71, 30);

             this.drop_decomb.Name = "drop_decomb";

-            this.drop_decomb.Size = new System.Drawing.Size(161, 21);

+            this.drop_decomb.Size = new System.Drawing.Size(174, 21);

             this.drop_decomb.TabIndex = 48;

             this.drop_decomb.SelectedIndexChanged += new System.EventHandler(this.drop_decomb_SelectedIndexChanged);

             // 

             // text_customDI

             // 

-            this.text_customDI.Location = new System.Drawing.Point(288, 86);

+            this.text_customDI.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)

+                        | System.Windows.Forms.AnchorStyles.Right)));

+            this.text_customDI.Location = new System.Drawing.Point(251, 57);

             this.text_customDI.Name = "text_customDI";

             this.text_customDI.Size = new System.Drawing.Size(115, 21);

             this.text_customDI.TabIndex = 53;

@@ -122,9 +138,11 @@
             // 

             // label2

             // 

+            this.label2.Anchor = System.Windows.Forms.AnchorStyles.Left;

             this.label2.AutoSize = true;

             this.label2.BackColor = System.Drawing.Color.Transparent;

-            this.label2.Location = new System.Drawing.Point(13, 89);

+            this.label2.Location = new System.Drawing.Point(0, 61);

+            this.label2.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);

             this.label2.Name = "label2";

             this.label2.Size = new System.Drawing.Size(65, 13);

             this.label2.TabIndex = 52;

@@ -132,6 +150,8 @@
             // 

             // drop_deinterlace

             // 

+            this.drop_deinterlace.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)

+                        | System.Windows.Forms.AnchorStyles.Right)));

             this.drop_deinterlace.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;

             this.drop_deinterlace.FormattingEnabled = true;

             this.drop_deinterlace.Items.AddRange(new object[] {

@@ -140,15 +160,17 @@
             "Slow",

             "Slower",

             "Custom"});

-            this.drop_deinterlace.Location = new System.Drawing.Point(121, 86);

+            this.drop_deinterlace.Location = new System.Drawing.Point(71, 57);

             this.drop_deinterlace.Name = "drop_deinterlace";

-            this.drop_deinterlace.Size = new System.Drawing.Size(161, 21);

+            this.drop_deinterlace.Size = new System.Drawing.Size(174, 21);

             this.drop_deinterlace.TabIndex = 51;

             this.drop_deinterlace.SelectedIndexChanged += new System.EventHandler(this.drop_deinterlace_SelectedIndexChanged);

             // 

             // text_customDN

             // 

-            this.text_customDN.Location = new System.Drawing.Point(288, 113);

+            this.text_customDN.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)

+                        | System.Windows.Forms.AnchorStyles.Right)));

+            this.text_customDN.Location = new System.Drawing.Point(251, 84);

             this.text_customDN.Name = "text_customDN";

             this.text_customDN.Size = new System.Drawing.Size(115, 21);

             this.text_customDN.TabIndex = 56;

@@ -156,9 +178,11 @@
             // 

             // label3

             // 

+            this.label3.Anchor = System.Windows.Forms.AnchorStyles.Left;

             this.label3.AutoSize = true;

             this.label3.BackColor = System.Drawing.Color.Transparent;

-            this.label3.Location = new System.Drawing.Point(13, 116);

+            this.label3.Location = new System.Drawing.Point(0, 88);

+            this.label3.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);

             this.label3.Name = "label3";

             this.label3.Size = new System.Drawing.Size(49, 13);

             this.label3.TabIndex = 55;

@@ -166,6 +190,8 @@
             // 

             // drop_denoise

             // 

+            this.drop_denoise.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)

+                        | System.Windows.Forms.AnchorStyles.Right)));

             this.drop_denoise.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;

             this.drop_denoise.FormattingEnabled = true;

             this.drop_denoise.Items.AddRange(new object[] {

@@ -174,15 +200,17 @@
             "Medium",

             "Strong",

             "Custom"});

-            this.drop_denoise.Location = new System.Drawing.Point(121, 113);

+            this.drop_denoise.Location = new System.Drawing.Point(71, 84);

             this.drop_denoise.Name = "drop_denoise";

-            this.drop_denoise.Size = new System.Drawing.Size(161, 21);

+            this.drop_denoise.Size = new System.Drawing.Size(174, 21);

             this.drop_denoise.TabIndex = 54;

             this.drop_denoise.SelectedIndexChanged += new System.EventHandler(this.drop_denoise_SelectedIndexChanged);

             // 

             // slider_deblock

             // 

-            this.slider_deblock.Location = new System.Drawing.Point(121, 140);

+            this.slider_deblock.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)

+                        | System.Windows.Forms.AnchorStyles.Right)));

+            this.slider_deblock.Location = new System.Drawing.Point(71, 111);

             this.slider_deblock.Maximum = 15;

             this.slider_deblock.Minimum = 4;

             this.slider_deblock.Name = "slider_deblock";

@@ -195,7 +223,7 @@
             // 

             this.check_grayscale.AutoSize = true;

             this.check_grayscale.BackColor = System.Drawing.Color.Transparent;

-            this.check_grayscale.Location = new System.Drawing.Point(121, 191);

+            this.check_grayscale.Location = new System.Drawing.Point(71, 162);

             this.check_grayscale.Name = "check_grayscale";

             this.check_grayscale.Size = new System.Drawing.Size(119, 17);

             this.check_grayscale.TabIndex = 57;

@@ -206,7 +234,8 @@
             // 

             this.label8.AutoSize = true;

             this.label8.BackColor = System.Drawing.Color.Transparent;

-            this.label8.Location = new System.Drawing.Point(13, 147);

+            this.label8.Location = new System.Drawing.Point(0, 115);

+            this.label8.Margin = new System.Windows.Forms.Padding(0, 7, 3, 3);

             this.label8.Name = "label8";

             this.label8.Size = new System.Drawing.Size(48, 13);

             this.label8.TabIndex = 60;

@@ -216,7 +245,8 @@
             // 

             this.lbl_deblockVal.AutoSize = true;

             this.lbl_deblockVal.BackColor = System.Drawing.Color.Transparent;

-            this.lbl_deblockVal.Location = new System.Drawing.Point(301, 147);

+            this.lbl_deblockVal.Location = new System.Drawing.Point(251, 115);

+            this.lbl_deblockVal.Margin = new System.Windows.Forms.Padding(3, 7, 3, 3);

             this.lbl_deblockVal.Name = "lbl_deblockVal";

             this.lbl_deblockVal.Size = new System.Drawing.Size(23, 13);

             this.lbl_deblockVal.TabIndex = 59;

@@ -233,31 +263,53 @@
             this.label68.TabIndex = 61;

             this.label68.Text = "Filters";

             // 

+            // tableLayoutPanel1

+            // 

+            this.tableLayoutPanel1.AutoSize = true;

+            this.tableLayoutPanel1.ColumnCount = 3;

+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());

+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());

+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());

+            this.tableLayoutPanel1.Controls.Add(this.label18, 0, 0);

+            this.tableLayoutPanel1.Controls.Add(this.label1, 0, 1);

+            this.tableLayoutPanel1.Controls.Add(this.lbl_deblockVal, 2, 4);

+            this.tableLayoutPanel1.Controls.Add(this.check_grayscale, 1, 5);

+            this.tableLayoutPanel1.Controls.Add(this.text_customDN, 2, 3);

+            this.tableLayoutPanel1.Controls.Add(this.slider_deblock, 1, 4);

+            this.tableLayoutPanel1.Controls.Add(this.text_customDI, 2, 2);

+            this.tableLayoutPanel1.Controls.Add(this.label2, 0, 2);

+            this.tableLayoutPanel1.Controls.Add(this.text_customDC, 2, 1);

+            this.tableLayoutPanel1.Controls.Add(this.label3, 0, 3);

+            this.tableLayoutPanel1.Controls.Add(this.text_customDT, 2, 0);

+            this.tableLayoutPanel1.Controls.Add(this.label8, 0, 4);

+            this.tableLayoutPanel1.Controls.Add(this.drop_detelecine, 1, 0);

+            this.tableLayoutPanel1.Controls.Add(this.drop_denoise, 1, 3);

+            this.tableLayoutPanel1.Controls.Add(this.drop_decomb, 1, 1);

+            this.tableLayoutPanel1.Controls.Add(this.drop_deinterlace, 1, 2);

+            this.tableLayoutPanel1.Location = new System.Drawing.Point(19, 29);

+            this.tableLayoutPanel1.Name = "tableLayoutPanel1";

+            this.tableLayoutPanel1.RowCount = 6;

+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());

+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());

+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());

+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());

+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());

+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());

+            this.tableLayoutPanel1.Size = new System.Drawing.Size(369, 182);

+            this.tableLayoutPanel1.TabIndex = 62;

+            // 

             // Filters

             // 

             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;

             this.BackColor = System.Drawing.Color.Transparent;

+            this.Controls.Add(this.tableLayoutPanel1);

             this.Controls.Add(this.label68);

-            this.Controls.Add(this.slider_deblock);

-            this.Controls.Add(this.check_grayscale);

-            this.Controls.Add(this.label8);

-            this.Controls.Add(this.lbl_deblockVal);

-            this.Controls.Add(this.text_customDN);

-            this.Controls.Add(this.label3);

-            this.Controls.Add(this.drop_denoise);

-            this.Controls.Add(this.text_customDI);

-            this.Controls.Add(this.label2);

-            this.Controls.Add(this.drop_deinterlace);

-            this.Controls.Add(this.text_customDC);

-            this.Controls.Add(this.label1);

-            this.Controls.Add(this.drop_decomb);

-            this.Controls.Add(this.text_customDT);

-            this.Controls.Add(this.label18);

-            this.Controls.Add(this.drop_detelecine);

             this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

             this.Name = "Filters";

             this.Size = new System.Drawing.Size(592, 270);

             ((System.ComponentModel.ISupportInitialize)(this.slider_deblock)).EndInit();

+            this.tableLayoutPanel1.ResumeLayout(false);

+            this.tableLayoutPanel1.PerformLayout();

             this.ResumeLayout(false);

             this.PerformLayout();

 

@@ -282,5 +334,6 @@
         internal System.Windows.Forms.Label label8;

         internal System.Windows.Forms.Label lbl_deblockVal;

         internal System.Windows.Forms.Label label68;

+        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;

     }

 }

diff --git a/win/C#/Controls/x264Panel.Designer.cs b/win/C#/Controls/x264Panel.Designer.cs
index b32f5d395..e43bd809a 100644
--- a/win/C#/Controls/x264Panel.Designer.cs
+++ b/win/C#/Controls/x264Panel.Designer.cs
@@ -649,9 +649,9 @@ namespace Handbrake.Controls
             this.drop_refFrames.Name = "drop_refFrames";

             this.drop_refFrames.Size = new System.Drawing.Size(121, 21);

             this.drop_refFrames.TabIndex = 54;

-            this.ToolTip.SetToolTip(this.drop_refFrames, "Sane values are 1-6. \r\nThe more you add, the higher the quality - but the slower " +

-                    "the encode. Be careful...too many and QuickTime struggle to play the video back." +

-                    "");

+            this.ToolTip.SetToolTip(this.drop_refFrames, "Sane values are 1-6. \r\nThe more you add, the higher the quality, but the slower t" +

+                    "he encode. Be careful... too many and QuickTime struggles to play the video back" +

+                    ".");

             this.drop_refFrames.SelectedIndexChanged += new System.EventHandler(this.drop_refFrames_SelectedIndexChanged);

             // 

             // check_mixedReferences

diff --git a/win/C#/EncodeQueue/Encode.cs b/win/C#/EncodeQueue/Encode.cs
index 248624064..83ebc986b 100644
--- a/win/C#/EncodeQueue/Encode.cs
+++ b/win/C#/EncodeQueue/Encode.cs
@@ -38,7 +38,6 @@ namespace Handbrake.EncodeQueue
                 {

                     cliStart.RedirectStandardOutput = true;

                     cliStart.UseShellExecute = false;

-

                 }

                 if (Properties.Settings.Default.cli_minimized)

                     cliStart.WindowStyle = ProcessWindowStyle.Minimized;

@@ -127,7 +126,7 @@ namespace Handbrake.EncodeQueue
             }

         }

 

-        /// <summary>

+        /// <summar>

         /// Append the CLI query to the start of the log file.

         /// </summary>

         /// <param name="query"></param>

@@ -136,7 +135,7 @@ namespace Handbrake.EncodeQueue
             string logDir = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\HandBrake\\logs";

             string logPath = Path.Combine(logDir, "last_encode_log.txt");

 

-            StreamReader reader = new StreamReader(File.Open(logPath, FileMode.Open, FileAccess.Read));

+            StreamReader reader = new StreamReader(File.Open(logPath, FileMode.Open, FileAccess.Read, FileShare.Read));

             String log = reader.ReadToEnd();

             reader.Close();

 

diff --git a/win/C#/EncodeQueue/Job.cs b/win/C#/EncodeQueue/Job.cs
index 291ef400d..e912fd65a 100644
--- a/win/C#/EncodeQueue/Job.cs
+++ b/win/C#/EncodeQueue/Job.cs
@@ -6,26 +6,34 @@
 

 namespace Handbrake.EncodeQueue

 {

-    public class Job

+    public struct Job

     {

         /// <summary>

-        /// Get or Set the job id.

+        /// Gets or sets the job ID.

         /// </summary>

         public int Id { get; set; }

 

         /// <summary>

-        /// Get or Set the query string.

+        /// Gets or sets the query string.

         /// </summary>

         public string Query { get; set; }

 

         /// <summary>

-        /// Get or set the source file of encoding

+        /// Gets or sets the source file of encoding.

         /// </summary>

         public string Source { get; set; }

 

         /// <summary>

-        /// Get or set the destination for the file to be encoded.

+        /// Gets or sets the destination for the file to be encoded.

         /// </summary>

         public string Destination { get; set; }

+

+        /// <summary>

+        /// Gets whether or not this instance is empty.

+        /// </summary>

+        public bool IsEmpty

+        {

+            get { return Id == 0 && string.IsNullOrEmpty(Query) && string.IsNullOrEmpty(Source) && string.IsNullOrEmpty(Destination); }

+        }

     }

 }
\ No newline at end of file
diff --git a/win/C#/EncodeQueue/QueueHandler.cs b/win/C#/EncodeQueue/QueueHandler.cs
index 6670e9e89..d183af0c5 100644
--- a/win/C#/EncodeQueue/QueueHandler.cs
+++ b/win/C#/EncodeQueue/QueueHandler.cs
@@ -6,87 +6,112 @@
 

 using System;

 using System.Collections.Generic;

+using System.Collections.ObjectModel;

 using System.IO;

+using System.Threading;

 using System.Windows.Forms;

 using System.Xml.Serialization;

-using System.Threading;

 

 namespace Handbrake.EncodeQueue

 {

+    /// <summary>

+    /// Provides a handler for encoding jobs and a queue of those jobs.

+    /// </summary>

     public class QueueHandler

     {

         public Encode encodeHandler = new Encode();

-        private static XmlSerializer ser = new XmlSerializer(typeof(List<Job>));

-        List<Job> queue = new List<Job>();

-        int id; // Unique identifer number for each job

+        private static XmlSerializer serializer = new XmlSerializer(typeof(List<Job>));

+        private List<Job> queue = new List<Job>();

+        private int nextJobId;

 

-        #region Queue Handling

-        public List<Job> getQueue()

+        /// <summary>

+        /// Gets the number of items in the queue.

+        /// </summary>

+        public int Count

         {

-            return queue;

+            get { return queue.Count; }

         }

 

         /// <summary>

-        /// Get's the next CLI query for encoding

+        /// Gets the last encode that was processed.

+        /// </summary>

+        /// <returns></returns>

+        public Job LastEncode { get; set; }

+

+        /// <summary>

+        /// Gets the current state of the encode queue.

         /// </summary>

-        /// <returns>String</returns>

-        private Job getNextJobForEncoding()

+        public ReadOnlyCollection<Job> CurrentQueue

         {

-            Job job = queue[0];

-            lastQueueItem = job;

-            remove(0);    // Remove the item which we are about to pass out.

+            get { return queue.AsReadOnly(); }

+        }

 

-            updateQueueRecoveryFile("hb_queue_recovery.xml");

+        /// <summary>

+        /// Fires when an encode job has been started.

+        /// </summary>

+        public event EventHandler NewJobStarted;

 

-            return job;

-        }

+        /// <summary>

+        /// Fires when a pause to the encode queue has been requested.

+        /// </summary>

+        public event EventHandler QueuePauseRequested;

 

         /// <summary>

-        /// Get the last query that was returned by getNextItemForEncoding()

+        /// Fires when an encode job has been completed.

         /// </summary>

-        /// <returns></returns>

-        public Job lastQueueItem { get; set; }

+        public event EventHandler CurrentJobCompleted;

 

         /// <summary>

-        /// Add's a new item to the queue

+        /// Fires when the entire encode queue has completed.

         /// </summary>

-        /// <param name="query">String</param>

-        /// <param name="source"></param>

-        /// <param name="destination"></param>

-        public void add(string query, string source, string destination)

+        public event EventHandler QueueCompleted;

+

+        #region Queue Handling

+

+        /// <summary>

+        /// Gets and removes the next job in the queue.

+        /// </summary>

+        /// <returns>The job that was removed from the queue.</returns>

+        private Job GetNextJob()

         {

-            Job newJob = new Job { Id = id, Query = query, Source = source, Destination = destination };

-            id++;

+            Job job = queue[0];

+            LastEncode = job;

+            RemoveJob(0); // Remove the item which we are about to pass out.

 

-            queue.Add(newJob);

-            updateQueueRecoveryFile("hb_queue_recovery.xml");

+            WriteQueueStateToFile("hb_queue_recovery.xml");

+

+            return job;

         }

 

         /// <summary>

-        /// Removes an item from the queue.

+        /// Adds an item to the queue.

         /// </summary>

-        /// <param name="index">Index</param>

-        /// <returns>Bolean true if successful</returns>

-        public void remove(int index)

+        /// <param name="query">The query that will be passed to the HandBrake CLI.</param>

+        /// <param name="source">The location of the source video.</param>

+        /// <param name="destination">The location where the encoded video will be.</param>

+        public void AddJob(string query, string source, string destination)

         {

-            queue.RemoveAt(index);

-            updateQueueRecoveryFile("hb_queue_recovery.xml");

+            Job newJob = new Job { Id = nextJobId++, Query = query, Source = source, Destination = destination };

+

+            queue.Add(newJob);

+            WriteQueueStateToFile("hb_queue_recovery.xml");

         }

 

         /// <summary>

-        /// Returns how many items are in the queue

+        /// Removes an item from the queue.

         /// </summary>

-        /// <returns>Int</returns>

-        public int count()

+        /// <param name="index">The zero-based location of the job in the queue.</param>

+        public void RemoveJob(int index)

         {

-            return queue.Count;

+            queue.RemoveAt(index);

+            WriteQueueStateToFile("hb_queue_recovery.xml");

         }

 

         /// <summary>

-        /// Move an item with an index x, up in the queue

+        /// Moves an item up one position in the queue.

         /// </summary>

-        /// <param name="index">Int</param>

-        public void moveUp(int index)

+        /// <param name="index">The zero-based location of the job in the queue.</param>

+        public void MoveUp(int index)

         {

             if (index > 0)

             {

@@ -95,14 +120,15 @@ namespace Handbrake.EncodeQueue
                 queue.RemoveAt(index);

                 queue.Insert((index - 1), item);

             }

-            updateQueueRecoveryFile("hb_queue_recovery.xml"); // Update the queue recovery file

+

+            WriteQueueStateToFile("hb_queue_recovery.xml"); // Update the queue recovery file

         }

 

         /// <summary>

-        /// Move an item with an index x, down in the queue

+        /// Moves an item down one position in the queue.

         /// </summary>

-        /// <param name="index">Int</param>

-        public void moveDown(int index)

+        /// <param name="index">The zero-based location of the job in the queue.</param>

+        public void MoveDown(int index)

         {

             if (index < queue.Count - 1)

             {

@@ -111,14 +137,15 @@ namespace Handbrake.EncodeQueue
                 queue.RemoveAt(index);

                 queue.Insert((index + 1), item);

             }

-            updateQueueRecoveryFile("hb_queue_recovery.xml"); // Update the queue recovery file

+

+            WriteQueueStateToFile("hb_queue_recovery.xml"); // Update the queue recovery file

         }

 

         /// <summary>

-        /// Writes the current queue to disk. hb_queue_recovery.xml

-        /// This function is called after getNextItemForEncoding()

+        /// Writes the current state of the queue to a file.

         /// </summary>

-        public void updateQueueRecoveryFile(string file)

+        /// <param name="file">The location of the file to write the queue to.</param>

+        public void WriteQueueStateToFile(string file)

         {

             string tempPath = file == "hb_queue_recovery.xml" ? Path.Combine(Path.GetTempPath(), "hb_queue_recovery.xml") : file;

 

@@ -126,7 +153,7 @@ namespace Handbrake.EncodeQueue
             {

                 using (FileStream strm = new FileStream(tempPath, FileMode.Create, FileAccess.Write))

                 {

-                    ser.Serialize(strm, queue);

+                    serializer.Serialize(strm, queue);

                     strm.Close();

                     strm.Dispose();

                 }

@@ -139,10 +166,10 @@ namespace Handbrake.EncodeQueue
         }

 

         /// <summary>

-        /// Writes the current queue to disk to the location specified in file

+        /// Writes the current state of the queue in the form of a batch (.bat) file.

         /// </summary>

-        /// <param name="file"></param>

-        public void writeBatchScript(string file)

+        /// <param name="file">The location of the file to write the batch file to.</param>

+        public void WriteBatchScriptToFile(string file)

         {

             string queries = "";

             foreach (Job queue_item in queue)

@@ -163,9 +190,10 @@ namespace Handbrake.EncodeQueue
                 {

                     // Create a StreamWriter and open the file, Write the batch file query to the file and 

                     // Close the stream

-                    StreamWriter line = new StreamWriter(file);

-                    line.WriteLine(strCmdLine);

-                    line.Close();

+                    using (StreamWriter line = new StreamWriter(file))

+                    {

+                        line.WriteLine(strCmdLine);

+                    }

 

                     MessageBox.Show("Your batch script has been sucessfully saved.", "Status", MessageBoxButtons.OK, MessageBoxIcon.Asterisk);

                 }

@@ -178,9 +206,10 @@ namespace Handbrake.EncodeQueue
         }

 

         /// <summary>

-        /// Recover the queue from hb_queue_recovery.xml

+        /// Reads a serialized XML file that represents a queue of encoding jobs.

         /// </summary>

-        public void recoverQueue(string file)

+        /// <param name="file">The location of the file to read the queue from.</param>

+        public void LoadQueueFromFile(string file)

         {

             string tempPath = file == "hb_queue_recovery.xml" ? Path.Combine(Path.GetTempPath(), "hb_queue_recovery.xml") : file;

 

@@ -190,50 +219,55 @@ namespace Handbrake.EncodeQueue
                 {

                     if (strm.Length != 0)

                     {

-                        List<Job> list = ser.Deserialize(strm) as List<Job>;

+                        List<Job> list = serializer.Deserialize(strm) as List<Job>;

 

                         if (list != null)

                             foreach (Job item in list)

                                 queue.Add(item);

 

                         if (file != "hb_queue_recovery.xml")

-                            updateQueueRecoveryFile("hb_queue_recovery.xml");

+                            WriteQueueStateToFile("hb_queue_recovery.xml");

                     }

                 }

             }

         }

 

         /// <summary>

-        /// Check to see if a destination path is already on the queue

+        /// Checks the current queue for an existing instance of the specified destination.

         /// </summary>

-        /// <param name="destination">Destination path</param>

-        /// <returns>Boolean True/False. True = Path Exists</returns>

-        public Boolean checkDestinationPath(string destination)

+        /// <param name="destination">The destination of the encode.</param>

+        /// <returns>Whether or not the supplied destination is already in the queue.</returns>

+        public bool CheckForDestinationDuplicate(string destination)

         {

             foreach (Job checkItem in queue)

             {

                 if (checkItem.Destination.Contains(destination.Replace("\\\\", "\\")))

                     return true;

             }

+

             return false;

         }

+

         #endregion

 

         #region Encoding

 

-        public Boolean isEncodeStarted { get; private set; }

-        public Boolean isPaused { get; private set; }

-        public Boolean isEncoding { get; private set; }

+        public bool PauseRequested { get; private set; }

+        public bool IsEncoding { get; private set; }

 

-        public void startEncode()

+        /// <summary>

+        /// Starts encoding the first job in the queue and continues encoding until all jobs

+        /// have been encoded.

+        /// </summary>

+        public void StartEncodeQueue()

         { 

-            if (this.count() != 0)

+            if (this.Count != 0)

             {

-                if (isPaused)

-                    isPaused = false;

+                if (PauseRequested)

+                    PauseRequested = false;

                 else

                 {

-                    isPaused = false;

+                    PauseRequested = false;

                     try

                     {

                         Thread theQueue = new Thread(startProcess) { IsBackground = true };

@@ -246,86 +280,63 @@ namespace Handbrake.EncodeQueue
                 }

             }

         }

-        public void pauseEncodeQueue()

+

+        /// <summary>

+        /// Requests a pause of the encode queue.

+        /// </summary>

+        public void RequestPause()

         {

-            isPaused = true;

-            EncodePaused(null);

+            PauseRequested = true;

+

+            if (QueuePauseRequested != null)

+                QueuePauseRequested(this, new EventArgs());

         }

-        public void endEncode()

+

+        /// <summary>

+        /// Stops the current job.

+        /// </summary>

+        public void EndEncodeJob()

         {

             encodeHandler.closeCLI();

         }

 

         private void startProcess(object state)

         {

-            try

+            // Run through each item on the queue

+            while (this.Count != 0)

             {

-                // Run through each item on the queue

-                while (this.count() != 0)

-                {

-                    string query = getNextJobForEncoding().Query;

-                    updateQueueRecoveryFile("hb_queue_recovery.xml"); // Update the queue recovery file

+                string query = GetNextJob().Query;

+                WriteQueueStateToFile("hb_queue_recovery.xml"); // Update the queue recovery file

 

-                    encodeHandler.runCli(query);

-                    EncodeStarted(null);

-                    encodeHandler.hbProcess.WaitForExit();

+                encodeHandler.runCli(query);

 

-                    encodeHandler.addCLIQueryToLog(query);

-                    encodeHandler.copyLog(lastQueueItem.Destination);

+                if (NewJobStarted != null)

+                    NewJobStarted(this, new EventArgs());

 

-                    encodeHandler.hbProcess.Close();

-                    encodeHandler.hbProcess.Dispose();

-                    EncodeFinished(null);

+                encodeHandler.hbProcess.WaitForExit();

 

-                    while (isPaused) // Need to find a better way of doing this.

-                    {

-                        Thread.Sleep(5000);

-                    }

-                }

-                EncodeQueueFinished(null);

+                encodeHandler.addCLIQueryToLog(query);

+                encodeHandler.copyLog(LastEncode.Destination);

 

-                // After the encode is done, we may want to shutdown, suspend etc.

-                encodeHandler.afterEncodeAction();

-            }

-            catch (Exception exc)

-            {

-                throw new Exception(exc.ToString());

-            }

-        }

-        #endregion

+                encodeHandler.hbProcess.Close();

+                encodeHandler.hbProcess.Dispose();

 

-        #region Events

-        public event EventHandler OnEncodeStart;

-        public event EventHandler OnPaused;

-        public event EventHandler OnEncodeEnded;

-        public event EventHandler OnQueueFinished;

+                if (CurrentJobCompleted != null)

+                    CurrentJobCompleted(this, new EventArgs());

 

-        // Invoke the Changed event; called whenever encodestatus changes:

-        protected virtual void EncodeStarted(EventArgs e)

-        {

-            if (OnEncodeStart != null)

-                OnEncodeStart(this, e);

+                while (PauseRequested) // Need to find a better way of doing this.

+                {

+                    Thread.Sleep(5000);

+                }

+            }

 

-            isEncoding = true;

-        }

-        protected virtual void EncodePaused(EventArgs e)

-        {

-            if (OnPaused != null)

-                OnPaused(this, e);

-        }

-        protected virtual void EncodeFinished(EventArgs e)

-        {

-            if (OnEncodeEnded != null)

-                OnEncodeEnded(this, e);

+            if (QueueCompleted != null)

+                QueueCompleted(this, new EventArgs());

 

-            isEncoding = false;

+            // After the encode is done, we may want to shutdown, suspend etc.

+            encodeHandler.afterEncodeAction();

         }

-        protected virtual void EncodeQueueFinished(EventArgs e)

-        {

-            if (OnQueueFinished != null)

-                OnQueueFinished(this, e);

-        }

-        #endregion

 

+        #endregion

     }

 }
\ No newline at end of file
diff --git a/win/C#/Properties/Settings.Designer.cs b/win/C#/Properties/Settings.Designer.cs
index ea1296f1c..d74054426 100644
--- a/win/C#/Properties/Settings.Designer.cs
+++ b/win/C#/Properties/Settings.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------

 // <auto-generated>

 //     This code was generated by a tool.

-//     Runtime Version:2.0.50727.3082

+//     Runtime Version:2.0.50727.4918

 //

 //     Changes to this file may cause incorrect behavior and will be lost if

 //     the code is regenerated.

@@ -405,5 +405,17 @@ namespace Handbrake.Properties {
                 this["useM4v"] = value;

             }

         }

+        

+        [global::System.Configuration.UserScopedSettingAttribute()]

+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

+        [global::System.Configuration.DefaultSettingValueAttribute("True")]

+        public bool PromptOnUnmatchingQueries {

+            get {

+                return ((bool)(this["PromptOnUnmatchingQueries"]));

+            }

+            set {

+                this["PromptOnUnmatchingQueries"] = value;

+            }

+        }

     }

 }

diff --git a/win/C#/Properties/Settings.settings b/win/C#/Properties/Settings.settings
index feb65c89a..5f43ded6e 100644
--- a/win/C#/Properties/Settings.settings
+++ b/win/C#/Properties/Settings.settings
@@ -98,5 +98,8 @@
     <Setting Name="useM4v" Type="System.Boolean" Scope="User">

       <Value Profile="(Default)">False</Value>

     </Setting>

+    <Setting Name="PromptOnUnmatchingQueries" Type="System.Boolean" Scope="User">

+      <Value Profile="(Default)">True</Value>

+    </Setting>

   </Settings>

 </SettingsFile>
\ No newline at end of file
diff --git a/win/C#/app.config b/win/C#/app.config
index 3422baf8a..1545f33d4 100644
--- a/win/C#/app.config
+++ b/win/C#/app.config
@@ -103,6 +103,9 @@
             <setting name="useM4v" serializeAs="String">

                 <value>False</value>

             </setting>

+            <setting name="PromptOnUnmatchingQueries" serializeAs="String">

+                <value>True</value>

+            </setting>

         </Handbrake.Properties.Settings>

     </userSettings>

 <startup><supportedRuntime version="v2.0.50727"/></startup></configuration>

diff --git a/win/C#/frmAbout.Designer.cs b/win/C#/frmAbout.Designer.cs
index 887ad7d2d..bcf01c8bb 100644
--- a/win/C#/frmAbout.Designer.cs
+++ b/win/C#/frmAbout.Designer.cs
@@ -36,107 +36,104 @@ namespace Handbrake
         {

             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmAbout));

             this.Label3 = new System.Windows.Forms.Label();

-            this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();

             this.label1 = new System.Windows.Forms.Label();

             this.lbl_HBBuild = new System.Windows.Forms.Label();

             this.PictureBox1 = new System.Windows.Forms.PictureBox();

-            this.tableLayoutPanel1.SuspendLayout();

+            this.button1 = new System.Windows.Forms.Button();

             ((System.ComponentModel.ISupportInitialize)(this.PictureBox1)).BeginInit();

             this.SuspendLayout();

             // 

             // Label3

             // 

             this.Label3.AutoSize = true;

-            this.Label3.Dock = System.Windows.Forms.DockStyle.Bottom;

-            this.Label3.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.Label3.Location = new System.Drawing.Point(3, 23);

+            this.Label3.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.Label3.Location = new System.Drawing.Point(124, 12);

+            this.Label3.Margin = new System.Windows.Forms.Padding(3, 3, 3, 1);

             this.Label3.Name = "Label3";

-            this.Label3.Size = new System.Drawing.Size(325, 18);

+            this.Label3.Size = new System.Drawing.Size(99, 19);

             this.Label3.TabIndex = 25;

             this.Label3.Text = "HandBrake";

             this.Label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;

             // 

-            // tableLayoutPanel1

-            // 

-            this.tableLayoutPanel1.ColumnCount = 1;

-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));

-            this.tableLayoutPanel1.Controls.Add(this.label1, 0, 2);

-            this.tableLayoutPanel1.Controls.Add(this.lbl_HBBuild, 0, 1);

-            this.tableLayoutPanel1.Controls.Add(this.Label3, 0, 0);

-            this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Bottom;

-            this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 83);

-            this.tableLayoutPanel1.Name = "tableLayoutPanel1";

-            this.tableLayoutPanel1.RowCount = 4;

-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 69.44444F));

-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 30.55556F));

-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));

-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));

-            this.tableLayoutPanel1.Size = new System.Drawing.Size(331, 100);

-            this.tableLayoutPanel1.TabIndex = 32;

-            // 

             // label1

             // 

             this.label1.AutoSize = true;

-            this.label1.Dock = System.Windows.Forms.DockStyle.Bottom;

-            this.label1.Location = new System.Drawing.Point(3, 66);

+            this.label1.Location = new System.Drawing.Point(125, 63);

+            this.label1.Margin = new System.Windows.Forms.Padding(3);

             this.label1.Name = "label1";

-            this.label1.Size = new System.Drawing.Size(325, 13);

+            this.label1.Size = new System.Drawing.Size(224, 13);

             this.label1.TabIndex = 33;

-            this.label1.Text = "(C) 2003-2009, HandBrake Developers";

-            this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;

+            this.label1.Text = "Copyright  2003-2009 HandBrake Developers";

+            this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;

             // 

             // lbl_HBBuild

             // 

-            this.lbl_HBBuild.AutoSize = true;

-            this.lbl_HBBuild.Dock = System.Windows.Forms.DockStyle.Bottom;

-            this.lbl_HBBuild.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.lbl_HBBuild.Location = new System.Drawing.Point(3, 46);

+            this.lbl_HBBuild.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.lbl_HBBuild.Location = new System.Drawing.Point(125, 33);

+            this.lbl_HBBuild.Margin = new System.Windows.Forms.Padding(3, 1, 3, 3);

             this.lbl_HBBuild.Name = "lbl_HBBuild";

-            this.lbl_HBBuild.Size = new System.Drawing.Size(325, 13);

+            this.lbl_HBBuild.Size = new System.Drawing.Size(152, 13);

             this.lbl_HBBuild.TabIndex = 32;

             this.lbl_HBBuild.Text = "{Version}";

-            this.lbl_HBBuild.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;

+            this.lbl_HBBuild.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;

             // 

             // PictureBox1

             // 

             this.PictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;

             this.PictureBox1.Image = global::Handbrake.Properties.Resources.logo128;

             this.PictureBox1.InitialImage = null;

-            this.PictureBox1.Location = new System.Drawing.Point(120, 12);

+            this.PictureBox1.Location = new System.Drawing.Point(9, 9);

+            this.PictureBox1.Margin = new System.Windows.Forms.Padding(0);

             this.PictureBox1.Name = "PictureBox1";

-            this.PictureBox1.Size = new System.Drawing.Size(84, 84);

+            this.PictureBox1.Size = new System.Drawing.Size(96, 96);

             this.PictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;

             this.PictureBox1.TabIndex = 33;

             this.PictureBox1.TabStop = false;

             // 

+            // button1

+            // 

+            this.button1.DialogResult = System.Windows.Forms.DialogResult.OK;

+            this.button1.Location = new System.Drawing.Point(274, 82);

+            this.button1.Name = "button1";

+            this.button1.Size = new System.Drawing.Size(75, 23);

+            this.button1.TabIndex = 35;

+            this.button1.Text = "OK";

+            this.button1.UseVisualStyleBackColor = true;

+            // 

             // frmAbout

             // 

-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 13F);

+            this.AcceptButton = this.button1;

+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;

-            this.ClientSize = new System.Drawing.Size(331, 183);

+            this.CancelButton = this.button1;

+            this.ClientSize = new System.Drawing.Size(363, 117);

+            this.Controls.Add(this.button1);

+            this.Controls.Add(this.label1);

             this.Controls.Add(this.PictureBox1);

-            this.Controls.Add(this.tableLayoutPanel1);

-            this.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.Controls.Add(this.lbl_HBBuild);

+            this.Controls.Add(this.Label3);

+            this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;

             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));

             this.MaximizeBox = false;

             this.MinimizeBox = false;

             this.Name = "frmAbout";

+            this.ShowIcon = false;

+            this.ShowInTaskbar = false;

             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;

             this.Text = "About HandBrake";

-            this.tableLayoutPanel1.ResumeLayout(false);

-            this.tableLayoutPanel1.PerformLayout();

             ((System.ComponentModel.ISupportInitialize)(this.PictureBox1)).EndInit();

             this.ResumeLayout(false);

+            this.PerformLayout();

 

         }

 

         #endregion

 

         internal System.Windows.Forms.Label Label3;

-        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;

         internal System.Windows.Forms.Label label1;

         internal System.Windows.Forms.Label lbl_HBBuild;

         internal System.Windows.Forms.PictureBox PictureBox1;

+        private System.Windows.Forms.Button button1;

     }

 }
\ No newline at end of file
diff --git a/win/C#/frmActivityWindow.Designer.cs b/win/C#/frmActivityWindow.Designer.cs
index 9ad5e1630..9d253187d 100644
--- a/win/C#/frmActivityWindow.Designer.cs
+++ b/win/C#/frmActivityWindow.Designer.cs
@@ -64,7 +64,7 @@ namespace Handbrake
             this.rtf_actLog.Location = new System.Drawing.Point(0, 25);

             this.rtf_actLog.Name = "rtf_actLog";

             this.rtf_actLog.ReadOnly = true;

-            this.rtf_actLog.Size = new System.Drawing.Size(471, 530);

+            this.rtf_actLog.Size = new System.Drawing.Size(404, 530);

             this.rtf_actLog.TabIndex = 29;

             this.rtf_actLog.Text = "";

             // 

@@ -74,13 +74,13 @@ namespace Handbrake
             this.mnu_copy_log,

             this.mnu_openLogFolder});

             this.rightClickMenu.Name = "rightClickMenu";

-            this.rightClickMenu.Size = new System.Drawing.Size(247, 48);

+            this.rightClickMenu.Size = new System.Drawing.Size(254, 48);

             // 

             // mnu_copy_log

             // 

             this.mnu_copy_log.Image = global::Handbrake.Properties.Resources.copy;

             this.mnu_copy_log.Name = "mnu_copy_log";

-            this.mnu_copy_log.Size = new System.Drawing.Size(246, 22);

+            this.mnu_copy_log.Size = new System.Drawing.Size(253, 22);

             this.mnu_copy_log.Text = "Copy";

             this.mnu_copy_log.Click += new System.EventHandler(this.mnu_copy_log_Click);

             // 

@@ -88,7 +88,7 @@ namespace Handbrake
             // 

             this.mnu_openLogFolder.Image = global::Handbrake.Properties.Resources.folder;

             this.mnu_openLogFolder.Name = "mnu_openLogFolder";

-            this.mnu_openLogFolder.Size = new System.Drawing.Size(246, 22);

+            this.mnu_openLogFolder.Size = new System.Drawing.Size(253, 22);

             this.mnu_openLogFolder.Text = "Open Individual Log File Directory";

             this.mnu_openLogFolder.Click += new System.EventHandler(this.mnu_openLogFolder_Click);

             // 

@@ -105,7 +105,7 @@ namespace Handbrake
             this.toolStrip1.Location = new System.Drawing.Point(0, 0);

             this.toolStrip1.Name = "toolStrip1";

             this.toolStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional;

-            this.toolStrip1.Size = new System.Drawing.Size(471, 25);

+            this.toolStrip1.Size = new System.Drawing.Size(404, 25);

             this.toolStrip1.TabIndex = 96;

             this.toolStrip1.Text = "toolStrip1";

             // 

@@ -119,14 +119,14 @@ namespace Handbrake
             this.toolStripDropDownButton1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;

             this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta;

             this.toolStripDropDownButton1.Name = "toolStripDropDownButton1";

-            this.toolStripDropDownButton1.Size = new System.Drawing.Size(85, 22);

+            this.toolStripDropDownButton1.Size = new System.Drawing.Size(90, 22);

             this.toolStripDropDownButton1.Text = "Select Log";

             // 

             // btn_encode_log

             // 

             this.btn_encode_log.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;

             this.btn_encode_log.Name = "btn_encode_log";

-            this.btn_encode_log.Size = new System.Drawing.Size(140, 22);

+            this.btn_encode_log.Size = new System.Drawing.Size(152, 22);

             this.btn_encode_log.Text = "Encode Log";

             this.btn_encode_log.Click += new System.EventHandler(this.btn_encode_log_Click);

             // 

@@ -134,7 +134,7 @@ namespace Handbrake
             // 

             this.btn_scan_log.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;

             this.btn_scan_log.Name = "btn_scan_log";

-            this.btn_scan_log.Size = new System.Drawing.Size(140, 22);

+            this.btn_scan_log.Size = new System.Drawing.Size(152, 22);

             this.btn_scan_log.Text = "Scan Log";

             this.btn_scan_log.Click += new System.EventHandler(this.btn_scan_log_Click);

             // 

@@ -144,7 +144,7 @@ namespace Handbrake
             this.btn_copy.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;

             this.btn_copy.ImageTransparentColor = System.Drawing.Color.Magenta;

             this.btn_copy.Name = "btn_copy";

-            this.btn_copy.Size = new System.Drawing.Size(111, 22);

+            this.btn_copy.Size = new System.Drawing.Size(122, 22);

             this.btn_copy.Text = "Copy to clipboard";

             this.btn_copy.Click += new System.EventHandler(this.btn_copy_Click);

             // 

@@ -153,7 +153,7 @@ namespace Handbrake
             this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;

             this.panel1.Location = new System.Drawing.Point(0, 25);

             this.panel1.Name = "panel1";

-            this.panel1.Size = new System.Drawing.Size(471, 552);

+            this.panel1.Size = new System.Drawing.Size(404, 552);

             this.panel1.TabIndex = 97;

             // 

             // statusStrip1

@@ -163,36 +163,37 @@ namespace Handbrake
             this.txt_log});

             this.statusStrip1.Location = new System.Drawing.Point(0, 555);

             this.statusStrip1.Name = "statusStrip1";

-            this.statusStrip1.Size = new System.Drawing.Size(471, 22);

+            this.statusStrip1.Padding = new System.Windows.Forms.Padding(1, 0, 12, 0);

+            this.statusStrip1.Size = new System.Drawing.Size(404, 22);

             this.statusStrip1.TabIndex = 98;

             this.statusStrip1.Text = "statusStrip1";

             // 

             // lbl_slb

             // 

             this.lbl_slb.BackColor = System.Drawing.Color.Transparent;

-            this.lbl_slb.Font = new System.Drawing.Font("Tahoma", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.lbl_slb.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

             this.lbl_slb.Name = "lbl_slb";

-            this.lbl_slb.Size = new System.Drawing.Size(94, 17);

+            this.lbl_slb.Size = new System.Drawing.Size(85, 17);

             this.lbl_slb.Text = "Selected Log: ";

             // 

             // txt_log

             // 

             this.txt_log.BackColor = System.Drawing.Color.Transparent;

             this.txt_log.Name = "txt_log";

-            this.txt_log.Size = new System.Drawing.Size(74, 17);

+            this.txt_log.Size = new System.Drawing.Size(78, 17);

             this.txt_log.Text = "{selected log}";

             // 

             // frmActivityWindow

             // 

-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 13F);

+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;

             this.BackColor = System.Drawing.SystemColors.ControlLight;

-            this.ClientSize = new System.Drawing.Size(471, 577);

+            this.ClientSize = new System.Drawing.Size(404, 577);

             this.Controls.Add(this.rtf_actLog);

             this.Controls.Add(this.statusStrip1);

             this.Controls.Add(this.panel1);

             this.Controls.Add(this.toolStrip1);

-            this.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));

             this.MaximizeBox = false;

             this.MinimizeBox = false;

diff --git a/win/C#/frmActivityWindow.cs b/win/C#/frmActivityWindow.cs
index 76364d7e9..c308990e0 100644
--- a/win/C#/frmActivityWindow.cs
+++ b/win/C#/frmActivityWindow.cs
@@ -68,9 +68,9 @@ namespace Handbrake
             rtf_actLog.AppendText(String.Format("### Install Dir: {0} \n", Application.StartupPath));

             rtf_actLog.AppendText(String.Format("### Data Dir: {0} \n", Application.UserAppDataPath));

             rtf_actLog.AppendText("#########################################\n\n");

-            if (encodeQueue.isEncoding && encodeQueue.lastQueueItem.Query != String.Empty)

+            if (encodeQueue.IsEncoding && encodeQueue.LastEncode.Query != String.Empty)

             {

-                rtf_actLog.AppendText("### CLI Query: " + encodeQueue.lastQueueItem.Query + "\n\n");

+                rtf_actLog.AppendText("### CLI Query: " + encodeQueue.LastEncode.Query + "\n\n");

                 rtf_actLog.AppendText("#########################################\n\n");

             }

         }

@@ -114,7 +114,7 @@ namespace Handbrake
                 updateTextFromThread();

                 while (true)

                 {

-                    if (encodeQueue.isEncoding || mainWin.isScanning)

+                    if (encodeQueue.IsEncoding || mainWin.isScanning)

                         updateTextFromThread();

                     else

                     {

diff --git a/win/C#/frmActivityWindow.resx b/win/C#/frmActivityWindow.resx
index 3d9888b14..833a5194b 100644
--- a/win/C#/frmActivityWindow.resx
+++ b/win/C#/frmActivityWindow.resx
@@ -130,16 +130,15 @@
   <data name="btn_copy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

     <value>

         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8

-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAeVJREFUOE+lk99P

-        kmEYhv1TSsdcdewf0FpZrTbbah7UQVvZOuJAjzpq2WzLNWy0iSHNwtIB9iE0l1KJEIgSYSL2AxfZVrCh

-        7vuURPTDruBlSdCGbj7bffbe1/Pc7/O+NTX7Laf3MwVJ7qiQZTRMv3OKqeB79sQumCvL7Ahwrf0ZE17v

-        7hD7eLTMn9v+TffAK1z+KBdbu3BPeKpDLGMzAuCKgfQBInGFB+aXSD4Fm1fG6pF5PCajH14Reu2bLwf2

-        OwM7E2xu5VDWsiRSaQGorI7BJRpa/DhcoRLEZPOIc33+LXSjCrekn7Q9iTPwZvk/QKsxhXNa4UizA2lk

-        sggx5PMWcq9nVJbkDIuJVT7GlzGNJAWgU8oJRRZWuaxLcrj5BYfOD1Hf9LQIKOTdyKo7nbWmGNcN89y3

-        LpZNoPxSWfixgX9uDaMUQnP2UQmgpLN8+pZi5kuCQOQ77ndfae8rrvfmYBqtIcmlezHO3Z4VMkpBNKd7

-        SoCGU1eoVJt+VgDUfLyUrDIXX2c8rGB/u8LDoQB1jfrq673aMS0A/3b+O0GPbZLa47rqgAs3PGQ2tzEN

-        h+m1hzA+D4rOBbPB4uPgsbvVAY1aV/62rUL1TWY0Z3qpO9lN7YmuvLmTA0fv7P7M9/SZ9nvoD8uZ5Oms

-        OGJjAAAAAElFTkSuQmCC

+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHlSURBVDhPpZPfT5JhGIb9U0rHXHXsH9BaWa0222oe1EFb

+        2TriQI86atlsyzVstIkhzcLSAfYhNJdSiRCIEmEi9gMX2Vawoe77lET0w67gZUnQhm4+23323tfz3O/z

+        vjU1+y2n9zMFSe6okGU0TL9ziqnge/bELpgry+wIcK39GRNe7+4Q+3i0zJ/b/k33wCtc/igXW7twT3iq

+        QyxjMwLgioH0ASJxhQfml0g+BZtXxuqReTwmox9eEXrtmy8H9jsDOxNsbuVQ1rIkUmkBqKyOwSUaWvw4

+        XKESxGTziHN9/i10owq3pJ+0PYkz8Gb5P0CrMYVzWuFIswNpZLIIMeTzFnKvZ1SW5AyLiVU+xpcxjSQF

+        oFPKCUUWVrmsS3K4+QWHzg9R3/S0CCjk3ciqO521phjXDfPcty6WTaD8Uln4sYF/bg2jFEJz9lEJoKSz

+        fPqWYuZLgkDkO+53X2nvK6735mAarSHJpXsxzt2eFTJKQTSne0qAhlNXqFSbflYA1Hy8lKwyF19nPKxg

+        f7vCw6EAdY366uu92jEtAP92/jtBj22S2uO66oALNzxkNrcxDYfptYcwPg+KzgWzweLj4LG71QGNWlf+

+        tq1C9U1mNGd6qTvZTe2Jrry5kwNH7+z+zPf0mfZ76A/LmeTprDhiYwAAAABJRU5ErkJggg==

 </value>

   </data>

   <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

diff --git a/win/C#/frmAddPreset.Designer.cs b/win/C#/frmAddPreset.Designer.cs
index a50372a4f..83783908a 100644
--- a/win/C#/frmAddPreset.Designer.cs
+++ b/win/C#/frmAddPreset.Designer.cs
@@ -43,35 +43,39 @@ namespace Handbrake
             this.check_pictureSettings = new System.Windows.Forms.CheckBox();

             this.toolTip = new System.Windows.Forms.ToolTip(this.components);

             this.label1 = new System.Windows.Forms.Label();

+            this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();

+            this.tableLayoutPanel1.SuspendLayout();

             this.SuspendLayout();

             // 

             // lbl_name

             // 

+            this.lbl_name.Anchor = System.Windows.Forms.AnchorStyles.Left;

             this.lbl_name.AutoSize = true;

-            this.lbl_name.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.lbl_name.Location = new System.Drawing.Point(14, 20);

+            this.lbl_name.Location = new System.Drawing.Point(3, 7);

             this.lbl_name.Name = "lbl_name";

-            this.lbl_name.Size = new System.Drawing.Size(89, 13);

+            this.lbl_name.Size = new System.Drawing.Size(75, 13);

             this.lbl_name.TabIndex = 1;

             this.lbl_name.Text = "Preset Name: ";

             // 

             // txt_preset_name

             // 

-            this.txt_preset_name.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.txt_preset_name.Location = new System.Drawing.Point(109, 17);

+            this.txt_preset_name.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));

+            this.tableLayoutPanel1.SetColumnSpan(this.txt_preset_name, 2);

+            this.txt_preset_name.Location = new System.Drawing.Point(84, 3);

             this.txt_preset_name.Name = "txt_preset_name";

-            this.txt_preset_name.Size = new System.Drawing.Size(241, 21);

+            this.txt_preset_name.Size = new System.Drawing.Size(208, 21);

             this.txt_preset_name.TabIndex = 0;

             // 

             // btn_add

             // 

+            this.btn_add.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));

             this.btn_add.BackColor = System.Drawing.Color.Transparent;

             this.btn_add.FlatAppearance.BorderColor = System.Drawing.Color.Black;

-            this.btn_add.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.btn_add.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

             this.btn_add.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));

-            this.btn_add.Location = new System.Drawing.Point(209, 109);

+            this.btn_add.Location = new System.Drawing.Point(172, 72);

             this.btn_add.Name = "btn_add";

-            this.btn_add.Size = new System.Drawing.Size(66, 22);

+            this.btn_add.Size = new System.Drawing.Size(57, 22);

             this.btn_add.TabIndex = 2;

             this.btn_add.Text = "Add";

             this.btn_add.UseVisualStyleBackColor = false;

@@ -81,11 +85,11 @@ namespace Handbrake
             // 

             this.btn_cancel.BackColor = System.Drawing.Color.Transparent;

             this.btn_cancel.FlatAppearance.BorderColor = System.Drawing.Color.Black;

-            this.btn_cancel.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.btn_cancel.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

             this.btn_cancel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));

-            this.btn_cancel.Location = new System.Drawing.Point(281, 109);

+            this.btn_cancel.Location = new System.Drawing.Point(235, 72);

             this.btn_cancel.Name = "btn_cancel";

-            this.btn_cancel.Size = new System.Drawing.Size(66, 22);

+            this.btn_cancel.Size = new System.Drawing.Size(57, 22);

             this.btn_cancel.TabIndex = 3;

             this.btn_cancel.Text = "Cancel";

             this.btn_cancel.UseVisualStyleBackColor = false;

@@ -93,10 +97,12 @@ namespace Handbrake
             // 

             // check_pictureSettings

             // 

+            this.check_pictureSettings.Anchor = System.Windows.Forms.AnchorStyles.Left;

             this.check_pictureSettings.AutoSize = true;

-            this.check_pictureSettings.Location = new System.Drawing.Point(109, 44);

+            this.tableLayoutPanel1.SetColumnSpan(this.check_pictureSettings, 2);

+            this.check_pictureSettings.Location = new System.Drawing.Point(84, 30);

             this.check_pictureSettings.Name = "check_pictureSettings";

-            this.check_pictureSettings.Size = new System.Drawing.Size(155, 17);

+            this.check_pictureSettings.Size = new System.Drawing.Size(132, 17);

             this.check_pictureSettings.TabIndex = 1;

             this.check_pictureSettings.Text = "Store Cropping Values";

             this.toolTip.SetToolTip(this.check_pictureSettings, "Save Picture Width/Height and Crop Values");

@@ -104,34 +110,64 @@ namespace Handbrake
             // 

             // label1

             // 

+            this.label1.Anchor = System.Windows.Forms.AnchorStyles.Left;

             this.label1.AutoSize = true;

-            this.label1.Location = new System.Drawing.Point(106, 64);

+            this.tableLayoutPanel1.SetColumnSpan(this.label1, 2);

+            this.label1.Location = new System.Drawing.Point(84, 53);

+            this.label1.Margin = new System.Windows.Forms.Padding(3);

             this.label1.Name = "label1";

-            this.label1.Size = new System.Drawing.Size(236, 13);

+            this.label1.Size = new System.Drawing.Size(200, 13);

             this.label1.TabIndex = 4;

             this.label1.Text = "Note: Subtitles are not stored in presets";

             // 

+            // tableLayoutPanel1

+            // 

+            this.tableLayoutPanel1.AutoSize = true;

+            this.tableLayoutPanel1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;

+            this.tableLayoutPanel1.ColumnCount = 3;

+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());

+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));

+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());

+            this.tableLayoutPanel1.Controls.Add(this.lbl_name, 0, 0);

+            this.tableLayoutPanel1.Controls.Add(this.btn_cancel, 2, 3);

+            this.tableLayoutPanel1.Controls.Add(this.label1, 1, 2);

+            this.tableLayoutPanel1.Controls.Add(this.btn_add, 1, 3);

+            this.tableLayoutPanel1.Controls.Add(this.txt_preset_name, 1, 0);

+            this.tableLayoutPanel1.Controls.Add(this.check_pictureSettings, 1, 1);

+            this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;

+            this.tableLayoutPanel1.Location = new System.Drawing.Point(9, 9);

+            this.tableLayoutPanel1.Name = "tableLayoutPanel1";

+            this.tableLayoutPanel1.RowCount = 4;

+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());

+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());

+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());

+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());

+            this.tableLayoutPanel1.Size = new System.Drawing.Size(295, 125);

+            this.tableLayoutPanel1.TabIndex = 5;

+            // 

             // frmAddPreset

             // 

-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 13F);

-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;

-            this.ClientSize = new System.Drawing.Size(365, 143);

-            this.Controls.Add(this.label1);

-            this.Controls.Add(this.check_pictureSettings);

-            this.Controls.Add(this.btn_cancel);

-            this.Controls.Add(this.btn_add);

-            this.Controls.Add(this.txt_preset_name);

-            this.Controls.Add(this.lbl_name);

-            this.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);

+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;

+            this.AutoSize = true;

+            this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;

+            this.ClientSize = new System.Drawing.Size(313, 143);

+            this.Controls.Add(this.tableLayoutPanel1);

+            this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;

             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));

             this.MaximizeBox = false;

             this.MinimizeBox = false;

             this.Name = "frmAddPreset";

+            this.Padding = new System.Windows.Forms.Padding(9);

+            this.ShowIcon = false;

             this.ShowInTaskbar = false;

             this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;

             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;

             this.Text = "Add Preset";

             this.TopMost = true;

+            this.tableLayoutPanel1.ResumeLayout(false);

+            this.tableLayoutPanel1.PerformLayout();

             this.ResumeLayout(false);

             this.PerformLayout();

 

@@ -146,5 +182,6 @@ namespace Handbrake
         private System.Windows.Forms.CheckBox check_pictureSettings;

         private System.Windows.Forms.ToolTip toolTip;

         private System.Windows.Forms.Label label1;

+        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;

     }

 }
\ No newline at end of file
diff --git a/win/C#/frmDownload.Designer.cs b/win/C#/frmDownload.Designer.cs
index 5d0f4523c..f98797950 100644
--- a/win/C#/frmDownload.Designer.cs
+++ b/win/C#/frmDownload.Designer.cs
@@ -37,70 +37,99 @@ namespace Handbrake
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmDownload));

             this.lblProgress = new System.Windows.Forms.Label();

             this.progress_download = new System.Windows.Forms.ProgressBar();

-            this.PictureBox1 = new System.Windows.Forms.PictureBox();

             this.btn_cancel = new System.Windows.Forms.Button();

+            this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();

+            this.PictureBox1 = new System.Windows.Forms.PictureBox();

+            this.tableLayoutPanel1.SuspendLayout();

             ((System.ComponentModel.ISupportInitialize)(this.PictureBox1)).BeginInit();

             this.SuspendLayout();

             // 

             // lblProgress

             // 

             this.lblProgress.AutoSize = true;

-            this.lblProgress.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.lblProgress.Location = new System.Drawing.Point(93, 38);

+            this.lblProgress.Location = new System.Drawing.Point(73, 29);

             this.lblProgress.Name = "lblProgress";

-            this.lblProgress.Size = new System.Drawing.Size(115, 13);

+            this.lblProgress.Size = new System.Drawing.Size(98, 13);

             this.lblProgress.TabIndex = 10;

             this.lblProgress.Text = "Awaiting Download";

             // 

             // progress_download

             // 

-            this.progress_download.Location = new System.Drawing.Point(93, 12);

+            this.progress_download.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));

+            this.progress_download.Location = new System.Drawing.Point(73, 3);

             this.progress_download.Name = "progress_download";

-            this.progress_download.Size = new System.Drawing.Size(318, 23);

+            this.progress_download.Size = new System.Drawing.Size(273, 23);

             this.progress_download.Style = System.Windows.Forms.ProgressBarStyle.Continuous;

             this.progress_download.TabIndex = 9;

             // 

-            // PictureBox1

-            // 

-            this.PictureBox1.Image = global::Handbrake.Properties.Resources.logo64;

-            this.PictureBox1.InitialImage = null;

-            this.PictureBox1.Location = new System.Drawing.Point(12, 12);

-            this.PictureBox1.Name = "PictureBox1";

-            this.PictureBox1.Size = new System.Drawing.Size(75, 64);

-            this.PictureBox1.TabIndex = 25;

-            this.PictureBox1.TabStop = false;

-            // 

             // btn_cancel

             // 

+            this.btn_cancel.Anchor = System.Windows.Forms.AnchorStyles.Right;

             this.btn_cancel.FlatAppearance.BorderColor = System.Drawing.Color.Black;

-            this.btn_cancel.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.btn_cancel.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

             this.btn_cancel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));

-            this.btn_cancel.Location = new System.Drawing.Point(321, 54);

+            this.btn_cancel.Location = new System.Drawing.Point(275, 45);

             this.btn_cancel.Name = "btn_cancel";

-            this.btn_cancel.Size = new System.Drawing.Size(90, 22);

-            this.btn_cancel.TabIndex = 56;

+            this.btn_cancel.Size = new System.Drawing.Size(71, 22);

+            this.btn_cancel.TabIndex = 26;

+            this.btn_cancel.TabStop = false;

             this.btn_cancel.Text = "Cancel";

-            this.btn_cancel.UseVisualStyleBackColor = false;

+            this.btn_cancel.UseVisualStyleBackColor = true;

             this.btn_cancel.Click += new System.EventHandler(this.btn_cancel_Click);

             // 

+            // tableLayoutPanel1

+            // 

+            this.tableLayoutPanel1.ColumnCount = 2;

+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());

+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());

+            this.tableLayoutPanel1.Controls.Add(this.PictureBox1, 0, 0);

+            this.tableLayoutPanel1.Controls.Add(this.btn_cancel, 1, 2);

+            this.tableLayoutPanel1.Controls.Add(this.progress_download, 1, 0);

+            this.tableLayoutPanel1.Controls.Add(this.lblProgress, 1, 1);

+            this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;

+            this.tableLayoutPanel1.Location = new System.Drawing.Point(9, 9);

+            this.tableLayoutPanel1.Name = "tableLayoutPanel1";

+            this.tableLayoutPanel1.RowCount = 3;

+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());

+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());

+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());

+            this.tableLayoutPanel1.Size = new System.Drawing.Size(349, 70);

+            this.tableLayoutPanel1.TabIndex = 27;

+            // 

+            // PictureBox1

+            // 

+            this.PictureBox1.Image = global::Handbrake.Properties.Resources.logo64;

+            this.PictureBox1.InitialImage = null;

+            this.PictureBox1.Location = new System.Drawing.Point(3, 3);

+            this.PictureBox1.Name = "PictureBox1";

+            this.tableLayoutPanel1.SetRowSpan(this.PictureBox1, 3);

+            this.PictureBox1.Size = new System.Drawing.Size(64, 64);

+            this.PictureBox1.TabIndex = 25;

+            this.PictureBox1.TabStop = false;

+            // 

             // frmDownload

             // 

-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 13F);

+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;

-            this.ClientSize = new System.Drawing.Size(426, 87);

-            this.Controls.Add(this.btn_cancel);

-            this.Controls.Add(this.PictureBox1);

-            this.Controls.Add(this.lblProgress);

-            this.Controls.Add(this.progress_download);

-            this.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.AutoSize = true;

+            this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;

+            this.ClientSize = new System.Drawing.Size(367, 88);

+            this.Controls.Add(this.tableLayoutPanel1);

+            this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;

             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));

+            this.MaximizeBox = false;

+            this.MinimizeBox = false;

             this.Name = "frmDownload";

+            this.Padding = new System.Windows.Forms.Padding(9);

             this.ShowIcon = false;

+            this.ShowInTaskbar = false;

             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;

             this.Text = "Downloading Update";

+            this.tableLayoutPanel1.ResumeLayout(false);

+            this.tableLayoutPanel1.PerformLayout();

             ((System.ComponentModel.ISupportInitialize)(this.PictureBox1)).EndInit();

             this.ResumeLayout(false);

-            this.PerformLayout();

 

         }

 

@@ -108,7 +137,8 @@ namespace Handbrake
 

         private System.Windows.Forms.Label lblProgress;

         private System.Windows.Forms.ProgressBar progress_download;

-        internal System.Windows.Forms.PictureBox PictureBox1;

         internal System.Windows.Forms.Button btn_cancel;

+        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;

+        internal System.Windows.Forms.PictureBox PictureBox1;

     }

 }
\ No newline at end of file
diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index acd18f3b2..316885914 100644
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -40,7 +40,7 @@ namespace Handbrake
             this.components = new System.ComponentModel.Container();

             System.Windows.Forms.ContextMenuStrip notifyIconMenu;

             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain));

-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();

+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();

             this.btn_restore = new System.Windows.Forms.ToolStripMenuItem();

             this.DVD_Save = new System.Windows.Forms.SaveFileDialog();

             this.ToolTip = new System.Windows.Forms.ToolTip(this.components);

@@ -64,7 +64,6 @@ namespace Handbrake
             this.drop_chapterFinish = new System.Windows.Forms.ComboBox();

             this.drop_chapterStart = new System.Windows.Forms.ComboBox();

             this.drop_angle = new System.Windows.Forms.ComboBox();

-            this.drp_dvdtitle = new System.Windows.Forms.ComboBox();

             this.DVD_Open = new System.Windows.Forms.FolderBrowserDialog();

             this.File_Open = new System.Windows.Forms.OpenFileDialog();

             this.ISO_Open = new System.Windows.Forms.OpenFileDialog();

@@ -96,7 +95,6 @@ namespace Handbrake
             this.Label47 = new System.Windows.Forms.Label();

             this.Label3 = new System.Windows.Forms.Label();

             this.tab_audio = new System.Windows.Forms.TabPage();

-            this.AudioSettings = new Handbrake.Controls.AudioPanel();

             this.AudioMenuRowHeightHack = new System.Windows.Forms.ImageList(this.components);

             this.tab_video = new System.Windows.Forms.TabPage();

             this.radio_cq = new System.Windows.Forms.RadioButton();

@@ -108,17 +106,13 @@ namespace Handbrake
             this.SliderValue = new System.Windows.Forms.Label();

             this.Label46 = new System.Windows.Forms.Label();

             this.tab_picture = new System.Windows.Forms.TabPage();

-            this.PictureSettings = new Handbrake.Controls.PictureSettings();

             this.Check_ChapterMarkers = new System.Windows.Forms.CheckBox();

             this.tabs_panel = new System.Windows.Forms.TabControl();

             this.tab_filters = new System.Windows.Forms.TabPage();

-            this.Filters = new Handbrake.Controls.Filters();

             this.tab_subtitles = new System.Windows.Forms.TabPage();

-            this.Subtitles = new Handbrake.Controls.Subtitles();

             this.tab_chapters = new System.Windows.Forms.TabPage();

             this.label31 = new System.Windows.Forms.Label();

             this.tab_advanced = new System.Windows.Forms.TabPage();

-            this.x264Panel = new Handbrake.Controls.x264Panel();

             this.tab_query = new System.Windows.Forms.TabPage();

             this.btn_clear = new System.Windows.Forms.Button();

             this.label34 = new System.Windows.Forms.Label();

@@ -157,16 +151,23 @@ namespace Handbrake
             this.btn_destBrowse = new System.Windows.Forms.Button();

             this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel();

             this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();

-            this.Label10 = new System.Windows.Forms.Label();

             this.lbl_angle = new System.Windows.Forms.Label();

             this.Label9 = new System.Windows.Forms.Label();

             this.Label13 = new System.Windows.Forms.Label();

             this.label_duration = new System.Windows.Forms.Label();

             this.lbl_duration = new System.Windows.Forms.Label();

-            this.labelStaticSource = new System.Windows.Forms.Label();

-            this.labelSource = new System.Windows.Forms.Label();

             this.labelStaticDestination = new System.Windows.Forms.Label();

             this.labelPreset = new System.Windows.Forms.Label();

+            this.drp_dvdtitle = new System.Windows.Forms.ComboBox();

+            this.labelSource = new System.Windows.Forms.Label();

+            this.Label10 = new System.Windows.Forms.Label();

+            this.labelStaticSource = new System.Windows.Forms.Label();

+            this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();

+            this.PictureSettings = new Handbrake.Controls.PictureSettings();

+            this.Filters = new Handbrake.Controls.Filters();

+            this.AudioSettings = new Handbrake.Controls.AudioPanel();

+            this.Subtitles = new Handbrake.Controls.Subtitles();

+            this.x264Panel = new Handbrake.Controls.x264Panel();

             notifyIconMenu = new System.Windows.Forms.ContextMenuStrip(this.components);

             notifyIconMenu.SuspendLayout();

             ((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).BeginInit();

@@ -191,6 +192,7 @@ namespace Handbrake
             this.tableLayoutPanel2.SuspendLayout();

             this.tableLayoutPanel3.SuspendLayout();

             this.tableLayoutPanel1.SuspendLayout();

+            this.flowLayoutPanel1.SuspendLayout();

             this.SuspendLayout();

             // 

             // notifyIconMenu

@@ -199,12 +201,12 @@ namespace Handbrake
             this.btn_restore});

             notifyIconMenu.Name = "notifyIconMenu";

             notifyIconMenu.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional;

-            notifyIconMenu.Size = new System.Drawing.Size(124, 26);

+            notifyIconMenu.Size = new System.Drawing.Size(114, 26);

             // 

             // btn_restore

             // 

             this.btn_restore.Name = "btn_restore";

-            this.btn_restore.Size = new System.Drawing.Size(123, 22);

+            this.btn_restore.Size = new System.Drawing.Size(113, 22);

             this.btn_restore.Text = "Restore";

             this.btn_restore.Click += new System.EventHandler(this.btn_restore_Click);

             // 

@@ -251,7 +253,7 @@ namespace Handbrake
             this.check_largeFile.Anchor = System.Windows.Forms.AnchorStyles.Left;

             this.check_largeFile.AutoSize = true;

             this.check_largeFile.BackColor = System.Drawing.Color.Transparent;

-            this.check_largeFile.Location = new System.Drawing.Point(166, 5);

+            this.check_largeFile.Location = new System.Drawing.Point(179, 5);

             this.check_largeFile.Name = "check_largeFile";

             this.check_largeFile.Size = new System.Drawing.Size(91, 17);

             this.check_largeFile.TabIndex = 4;

@@ -275,6 +277,7 @@ namespace Handbrake
             // 

             // drp_videoFramerate

             // 

+            this.drp_videoFramerate.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;

             this.drp_videoFramerate.FormattingEnabled = true;

             this.drp_videoFramerate.Items.AddRange(new object[] {

             "Same as source",

@@ -290,7 +293,6 @@ namespace Handbrake
             this.drp_videoFramerate.Name = "drp_videoFramerate";

             this.drp_videoFramerate.Size = new System.Drawing.Size(126, 21);

             this.drp_videoFramerate.TabIndex = 2;

-            this.drp_videoFramerate.Text = "Same as source";

             this.ToolTip.SetToolTip(this.drp_videoFramerate, "Can be left to \"Same as source\" in most cases.");

             // 

             // slider_videoQuality

@@ -345,7 +347,7 @@ namespace Handbrake
             this.check_optimiseMP4.Anchor = System.Windows.Forms.AnchorStyles.Left;

             this.check_optimiseMP4.AutoSize = true;

             this.check_optimiseMP4.BackColor = System.Drawing.Color.Transparent;

-            this.check_optimiseMP4.Location = new System.Drawing.Point(263, 5);

+            this.check_optimiseMP4.Location = new System.Drawing.Point(276, 5);

             this.check_optimiseMP4.Name = "check_optimiseMP4";

             this.check_optimiseMP4.Size = new System.Drawing.Size(96, 17);

             this.check_optimiseMP4.TabIndex = 25;

@@ -360,7 +362,7 @@ namespace Handbrake
             this.check_iPodAtom.Anchor = System.Windows.Forms.AnchorStyles.Left;

             this.check_iPodAtom.AutoSize = true;

             this.check_iPodAtom.BackColor = System.Drawing.Color.Transparent;

-            this.check_iPodAtom.Location = new System.Drawing.Point(365, 5);

+            this.check_iPodAtom.Location = new System.Drawing.Point(378, 5);

             this.check_iPodAtom.Name = "check_iPodAtom";

             this.check_iPodAtom.Size = new System.Drawing.Size(102, 17);

             this.check_iPodAtom.TabIndex = 26;

@@ -388,9 +390,9 @@ namespace Handbrake
             // 

             // number

             // 

-            dataGridViewCellStyle2.Format = "N0";

-            dataGridViewCellStyle2.NullValue = null;

-            this.number.DefaultCellStyle = dataGridViewCellStyle2;

+            dataGridViewCellStyle1.Format = "N0";

+            dataGridViewCellStyle1.NullValue = null;

+            this.number.DefaultCellStyle = dataGridViewCellStyle1;

             this.number.Frozen = true;

             this.number.HeaderText = "Chapter Number";

             this.number.MaxInputLength = 3;

@@ -441,7 +443,7 @@ namespace Handbrake
             this.drop_format.Items.AddRange(new object[] {

             "MP4 File",

             "MKV File"});

-            this.drop_format.Location = new System.Drawing.Point(54, 3);

+            this.drop_format.Location = new System.Drawing.Point(67, 3);

             this.drop_format.Name = "drop_format";

             this.drop_format.Size = new System.Drawing.Size(106, 21);

             this.drop_format.TabIndex = 28;

@@ -450,23 +452,23 @@ namespace Handbrake
             // 

             // drop_chapterFinish

             // 

+            this.drop_chapterFinish.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;

             this.drop_chapterFinish.FormattingEnabled = true;

             this.drop_chapterFinish.Location = new System.Drawing.Point(447, 3);

             this.drop_chapterFinish.Name = "drop_chapterFinish";

             this.drop_chapterFinish.Size = new System.Drawing.Size(69, 21);

             this.drop_chapterFinish.TabIndex = 10;

-            this.drop_chapterFinish.Text = "Auto";

             this.ToolTip.SetToolTip(this.drop_chapterFinish, "Select the chapter range you would like to enocde. (default: All Chapters)");

             this.drop_chapterFinish.SelectedIndexChanged += new System.EventHandler(this.drop_chapterFinish_SelectedIndexChanged);

             // 

             // drop_chapterStart

             // 

+            this.drop_chapterStart.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;

             this.drop_chapterStart.FormattingEnabled = true;

             this.drop_chapterStart.Location = new System.Drawing.Point(321, 3);

             this.drop_chapterStart.Name = "drop_chapterStart";

             this.drop_chapterStart.Size = new System.Drawing.Size(69, 21);

             this.drop_chapterStart.TabIndex = 9;

-            this.drop_chapterStart.Text = "Auto";

             this.ToolTip.SetToolTip(this.drop_chapterStart, "Select the chapter range you would like to enocde. (default: All Chapters)");

             this.drop_chapterStart.SelectedIndexChanged += new System.EventHandler(this.drop_chapterStart_SelectedIndexChanged);

             // 

@@ -480,21 +482,6 @@ namespace Handbrake
             this.drop_angle.TabIndex = 45;

             this.ToolTip.SetToolTip(this.drop_angle, "Select the chapter range you would like to enocde. (default: All Chapters)");

             // 

-            // drp_dvdtitle

-            // 

-            this.drp_dvdtitle.FormattingEnabled = true;

-            this.drp_dvdtitle.Items.AddRange(new object[] {

-            "Automatic"});

-            this.drp_dvdtitle.Location = new System.Drawing.Point(40, 3);

-            this.drp_dvdtitle.Name = "drp_dvdtitle";

-            this.drp_dvdtitle.Size = new System.Drawing.Size(119, 21);

-            this.drp_dvdtitle.TabIndex = 7;

-            this.drp_dvdtitle.Text = "Automatic";

-            this.ToolTip.SetToolTip(this.drp_dvdtitle, "Select the title you wish to encode.\r\nThe longest title is selected by default af" +

-                    "ter you have scanned a source.");

-            this.drp_dvdtitle.SelectedIndexChanged += new System.EventHandler(this.drp_dvdtitle_SelectedIndexChanged);

-            this.drp_dvdtitle.Click += new System.EventHandler(this.drp_dvdtitle_Click);

-            // 

             // DVD_Open

             // 

             this.DVD_Open.Description = "Select the \"VIDEO_TS\" folder from your DVD Drive.";

@@ -517,13 +504,13 @@ namespace Handbrake
             this.mnu_killCLI,

             this.mnu_exit});

             this.FileToolStripMenuItem.Name = "FileToolStripMenuItem";

-            this.FileToolStripMenuItem.Size = new System.Drawing.Size(35, 20);

+            this.FileToolStripMenuItem.Size = new System.Drawing.Size(37, 20);

             this.FileToolStripMenuItem.Text = "&File";

             // 

             // mnu_killCLI

             // 

             this.mnu_killCLI.Name = "mnu_killCLI";

-            this.mnu_killCLI.Size = new System.Drawing.Size(143, 22);

+            this.mnu_killCLI.Size = new System.Drawing.Size(138, 22);

             this.mnu_killCLI.Text = "Cancel Scan";

             this.mnu_killCLI.Visible = false;

             this.mnu_killCLI.Click += new System.EventHandler(this.mnu_killCLI_Click);

@@ -531,7 +518,7 @@ namespace Handbrake
             // mnu_exit

             // 

             this.mnu_exit.Name = "mnu_exit";

-            this.mnu_exit.Size = new System.Drawing.Size(143, 22);

+            this.mnu_exit.Size = new System.Drawing.Size(138, 22);

             this.mnu_exit.Text = "E&xit";

             this.mnu_exit.Click += new System.EventHandler(this.mnu_exit_Click);

             // 

@@ -548,7 +535,7 @@ namespace Handbrake
             this.ToolStripSeparator5,

             this.mnu_options});

             this.ToolsToolStripMenuItem.Name = "ToolsToolStripMenuItem";

-            this.ToolsToolStripMenuItem.Size = new System.Drawing.Size(44, 20);

+            this.ToolsToolStripMenuItem.Size = new System.Drawing.Size(48, 20);

             this.ToolsToolStripMenuItem.Text = "&Tools";

             // 

             // mnu_encode

@@ -556,7 +543,7 @@ namespace Handbrake
             this.mnu_encode.Image = global::Handbrake.Properties.Resources.Queue_Small;

             this.mnu_encode.Name = "mnu_encode";

             this.mnu_encode.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Q)));

-            this.mnu_encode.Size = new System.Drawing.Size(186, 22);

+            this.mnu_encode.Size = new System.Drawing.Size(184, 22);

             this.mnu_encode.Text = "Show Queue";

             this.mnu_encode.Click += new System.EventHandler(this.mnu_encode_Click);

             // 

@@ -564,20 +551,20 @@ namespace Handbrake
             // 

             this.mnu_encodeLog.Image = global::Handbrake.Properties.Resources.ActivityWindow_small;

             this.mnu_encodeLog.Name = "mnu_encodeLog";

-            this.mnu_encodeLog.Size = new System.Drawing.Size(186, 22);

+            this.mnu_encodeLog.Size = new System.Drawing.Size(184, 22);

             this.mnu_encodeLog.Text = "Activity Window";

             this.mnu_encodeLog.Click += new System.EventHandler(this.mnu_encodeLog_Click);

             // 

             // ToolStripSeparator5

             // 

             this.ToolStripSeparator5.Name = "ToolStripSeparator5";

-            this.ToolStripSeparator5.Size = new System.Drawing.Size(183, 6);

+            this.ToolStripSeparator5.Size = new System.Drawing.Size(181, 6);

             // 

             // mnu_options

             // 

             this.mnu_options.Image = global::Handbrake.Properties.Resources.Pref_Small;

             this.mnu_options.Name = "mnu_options";

-            this.mnu_options.Size = new System.Drawing.Size(186, 22);

+            this.mnu_options.Size = new System.Drawing.Size(184, 22);

             this.mnu_options.Text = "Options";

             this.mnu_options.Click += new System.EventHandler(this.mnu_options_Click);

             // 

@@ -590,7 +577,7 @@ namespace Handbrake
             this.btn_new_preset,

             this.mnu_SelectDefault});

             this.PresetsToolStripMenuItem.Name = "PresetsToolStripMenuItem";

-            this.PresetsToolStripMenuItem.Size = new System.Drawing.Size(55, 20);

+            this.PresetsToolStripMenuItem.Size = new System.Drawing.Size(56, 20);

             this.PresetsToolStripMenuItem.Text = "&Presets";

             // 

             // mnu_presetReset

@@ -639,14 +626,14 @@ namespace Handbrake
             this.toolStripSeparator6,

             this.mnu_about});

             this.HelpToolStripMenuItem.Name = "HelpToolStripMenuItem";

-            this.HelpToolStripMenuItem.Size = new System.Drawing.Size(40, 20);

+            this.HelpToolStripMenuItem.Size = new System.Drawing.Size(44, 20);

             this.HelpToolStripMenuItem.Text = "&Help";

             // 

             // mnu_user_guide

             // 

             this.mnu_user_guide.Image = global::Handbrake.Properties.Resources.Help16;

             this.mnu_user_guide.Name = "mnu_user_guide";

-            this.mnu_user_guide.Size = new System.Drawing.Size(192, 22);

+            this.mnu_user_guide.Size = new System.Drawing.Size(194, 22);

             this.mnu_user_guide.Text = "HandBrake User Guide";

             this.mnu_user_guide.Click += new System.EventHandler(this.mnu_user_guide_Click);

             // 

@@ -654,39 +641,39 @@ namespace Handbrake
             // 

             this.mnu_handbrake_home.Image = global::Handbrake.Properties.Resources.info16;

             this.mnu_handbrake_home.Name = "mnu_handbrake_home";

-            this.mnu_handbrake_home.Size = new System.Drawing.Size(192, 22);

+            this.mnu_handbrake_home.Size = new System.Drawing.Size(194, 22);

             this.mnu_handbrake_home.Text = "HandBrake Homepage";

             this.mnu_handbrake_home.Click += new System.EventHandler(this.mnu_handbrake_home_Click);

             // 

             // mnu_handbrake_forums

             // 

             this.mnu_handbrake_forums.Name = "mnu_handbrake_forums";

-            this.mnu_handbrake_forums.Size = new System.Drawing.Size(192, 22);

+            this.mnu_handbrake_forums.Size = new System.Drawing.Size(194, 22);

             this.mnu_handbrake_forums.Text = "HandBrake Forums";

             this.mnu_handbrake_forums.Click += new System.EventHandler(this.mnu_handbrake_forums_Click);

             // 

             // ToolStripSeparator3

             // 

             this.ToolStripSeparator3.Name = "ToolStripSeparator3";

-            this.ToolStripSeparator3.Size = new System.Drawing.Size(189, 6);

+            this.ToolStripSeparator3.Size = new System.Drawing.Size(191, 6);

             // 

             // mnu_UpdateCheck

             // 

             this.mnu_UpdateCheck.Name = "mnu_UpdateCheck";

-            this.mnu_UpdateCheck.Size = new System.Drawing.Size(192, 22);

+            this.mnu_UpdateCheck.Size = new System.Drawing.Size(194, 22);

             this.mnu_UpdateCheck.Text = "Check for Updates";

             this.mnu_UpdateCheck.Click += new System.EventHandler(this.mnu_UpdateCheck_Click);

             // 

             // toolStripSeparator6

             // 

             this.toolStripSeparator6.Name = "toolStripSeparator6";

-            this.toolStripSeparator6.Size = new System.Drawing.Size(189, 6);

+            this.toolStripSeparator6.Size = new System.Drawing.Size(191, 6);

             // 

             // mnu_about

             // 

             this.mnu_about.Image = global::Handbrake.Properties.Resources.hb16;

             this.mnu_about.Name = "mnu_about";

-            this.mnu_about.Size = new System.Drawing.Size(192, 22);

+            this.mnu_about.Size = new System.Drawing.Size(194, 22);

             this.mnu_about.Text = "About...";

             this.mnu_about.Click += new System.EventHandler(this.mnu_about_Click);

             // 

@@ -711,9 +698,9 @@ namespace Handbrake
             this.label5.ForeColor = System.Drawing.Color.Black;

             this.label5.Location = new System.Drawing.Point(3, 7);

             this.label5.Name = "label5";

-            this.label5.Size = new System.Drawing.Size(45, 13);

+            this.label5.Size = new System.Drawing.Size(58, 13);

             this.label5.TabIndex = 27;

-            this.label5.Text = "Format:";

+            this.label5.Text = "Container:";

             // 

             // Label47

             // 

@@ -749,15 +736,6 @@ namespace Handbrake
             this.tab_audio.Text = "Audio";

             this.tab_audio.UseVisualStyleBackColor = true;

             // 

-            // AudioSettings

-            // 

-            this.AudioSettings.BackColor = System.Drawing.Color.Transparent;

-            this.AudioSettings.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.AudioSettings.Location = new System.Drawing.Point(0, 0);

-            this.AudioSettings.Name = "AudioSettings";

-            this.AudioSettings.Size = new System.Drawing.Size(715, 310);

-            this.AudioSettings.TabIndex = 0;

-            // 

             // AudioMenuRowHeightHack

             // 

             this.AudioMenuRowHeightHack.ColorDepth = System.Windows.Forms.ColorDepth.Depth8Bit;

@@ -891,16 +869,9 @@ namespace Handbrake
             this.tab_picture.Padding = new System.Windows.Forms.Padding(3);

             this.tab_picture.Size = new System.Drawing.Size(724, 308);

             this.tab_picture.TabIndex = 0;

-            this.tab_picture.Text = "Picture Settings";

+            this.tab_picture.Text = "Picture";

             this.tab_picture.UseVisualStyleBackColor = true;

             // 

-            // PictureSettings

-            // 

-            this.PictureSettings.Enabled = false;

-            this.PictureSettings.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.PictureSettings.Name = "PictureSettings";

-            this.PictureSettings.Size = new System.Drawing.Size(666, 279);

-            this.PictureSettings.TabIndex = 0;

             // 

             // Check_ChapterMarkers

             // 

@@ -941,15 +912,6 @@ namespace Handbrake
             this.tab_filters.Text = "Video Filters";

             this.tab_filters.UseVisualStyleBackColor = true;

             // 

-            // Filters

-            // 

-            this.Filters.BackColor = System.Drawing.Color.Transparent;

-            this.Filters.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.Filters.Location = new System.Drawing.Point(0, 0);

-            this.Filters.Name = "Filters";

-            this.Filters.Size = new System.Drawing.Size(713, 310);

-            this.Filters.TabIndex = 0;

-            // 

             // tab_subtitles

             // 

             this.tab_subtitles.Controls.Add(this.Subtitles);

@@ -961,15 +923,6 @@ namespace Handbrake
             this.tab_subtitles.Text = "Subtitles";

             this.tab_subtitles.UseVisualStyleBackColor = true;

             // 

-            // Subtitles

-            // 

-            this.Subtitles.BackColor = System.Drawing.Color.Transparent;

-            this.Subtitles.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.Subtitles.Location = new System.Drawing.Point(0, 0);

-            this.Subtitles.Name = "Subtitles";

-            this.Subtitles.Size = new System.Drawing.Size(722, 310);

-            this.Subtitles.TabIndex = 0;

-            // 

             // tab_chapters

             // 

             this.tab_chapters.BackColor = System.Drawing.Color.Transparent;

@@ -1006,16 +959,6 @@ namespace Handbrake
             this.tab_advanced.Text = "Advanced";

             this.tab_advanced.UseVisualStyleBackColor = true;

             // 

-            // x264Panel

-            // 

-            this.x264Panel.BackColor = System.Drawing.Color.Transparent;

-            this.x264Panel.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.x264Panel.Location = new System.Drawing.Point(0, 0);

-            this.x264Panel.Name = "x264Panel";

-            this.x264Panel.Size = new System.Drawing.Size(720, 306);

-            this.x264Panel.TabIndex = 0;

-            this.x264Panel.x264Query = "";

-            // 

             // tab_query

             // 

             this.tab_query.Controls.Add(this.btn_clear);

@@ -1144,40 +1087,40 @@ namespace Handbrake
             this.pmnu_saveChanges,

             this.pmnu_delete});

             this.presets_menu.Name = "presets_menu";

-            this.presets_menu.Size = new System.Drawing.Size(155, 98);

+            this.presets_menu.Size = new System.Drawing.Size(148, 98);

             this.presets_menu.Text = ";";

             this.presets_menu.Opening += new System.ComponentModel.CancelEventHandler(this.presets_menu_Opening);

             // 

             // pmnu_expandAll

             // 

             this.pmnu_expandAll.Name = "pmnu_expandAll";

-            this.pmnu_expandAll.Size = new System.Drawing.Size(154, 22);

+            this.pmnu_expandAll.Size = new System.Drawing.Size(147, 22);

             this.pmnu_expandAll.Text = "Expand All";

             this.pmnu_expandAll.Click += new System.EventHandler(this.pmnu_expandAll_Click);

             // 

             // pmnu_collapse

             // 

             this.pmnu_collapse.Name = "pmnu_collapse";

-            this.pmnu_collapse.Size = new System.Drawing.Size(154, 22);

+            this.pmnu_collapse.Size = new System.Drawing.Size(147, 22);

             this.pmnu_collapse.Text = "Collapse All";

             this.pmnu_collapse.Click += new System.EventHandler(this.pmnu_collapse_Click);

             // 

             // sep1

             // 

             this.sep1.Name = "sep1";

-            this.sep1.Size = new System.Drawing.Size(151, 6);

+            this.sep1.Size = new System.Drawing.Size(144, 6);

             // 

             // pmnu_saveChanges

             // 

             this.pmnu_saveChanges.Name = "pmnu_saveChanges";

-            this.pmnu_saveChanges.Size = new System.Drawing.Size(154, 22);

+            this.pmnu_saveChanges.Size = new System.Drawing.Size(147, 22);

             this.pmnu_saveChanges.Text = "Save Changes";

             this.pmnu_saveChanges.Click += new System.EventHandler(this.pmnu_saveChanges_Click);

             // 

             // pmnu_delete

             // 

             this.pmnu_delete.Name = "pmnu_delete";

-            this.pmnu_delete.Size = new System.Drawing.Size(154, 22);

+            this.pmnu_delete.Size = new System.Drawing.Size(147, 22);

             this.pmnu_delete.Text = "Delete";

             this.pmnu_delete.Click += new System.EventHandler(this.pmnu_delete_click);

             // 

@@ -1211,7 +1154,7 @@ namespace Handbrake
             this.btn_source.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;

             this.btn_source.ImageTransparentColor = System.Drawing.Color.Magenta;

             this.btn_source.Name = "btn_source";

-            this.btn_source.Size = new System.Drawing.Size(85, 36);

+            this.btn_source.Size = new System.Drawing.Size(88, 36);

             this.btn_source.Text = "Source";

             this.btn_source.ToolTipText = "Open a new source file or folder.";

             this.btn_source.Click += new System.EventHandler(this.btn_source_Click);

@@ -1220,7 +1163,7 @@ namespace Handbrake
             // 

             this.btn_file_source.Image = global::Handbrake.Properties.Resources.Movies_Small;

             this.btn_file_source.Name = "btn_file_source";

-            this.btn_file_source.Size = new System.Drawing.Size(194, 22);

+            this.btn_file_source.Size = new System.Drawing.Size(192, 22);

             this.btn_file_source.Text = "Video File";

             this.btn_file_source.Click += new System.EventHandler(this.btn_file_source_Click);

             // 

@@ -1229,20 +1172,20 @@ namespace Handbrake
             this.btn_dvd_source.Image = ((System.Drawing.Image)(resources.GetObject("btn_dvd_source.Image")));

             this.btn_dvd_source.ImageTransparentColor = System.Drawing.Color.Magenta;

             this.btn_dvd_source.Name = "btn_dvd_source";

-            this.btn_dvd_source.Size = new System.Drawing.Size(194, 22);

+            this.btn_dvd_source.Size = new System.Drawing.Size(192, 22);

             this.btn_dvd_source.Text = "DVD/ VIDEO_TS Folder";

             this.btn_dvd_source.Click += new System.EventHandler(this.btn_dvd_source_Click);

             // 

             // toolStripSeparator1

             // 

             this.toolStripSeparator1.Name = "toolStripSeparator1";

-            this.toolStripSeparator1.Size = new System.Drawing.Size(191, 6);

+            this.toolStripSeparator1.Size = new System.Drawing.Size(189, 6);

             // 

             // mnu_dvd_drive

             // 

             this.mnu_dvd_drive.Image = global::Handbrake.Properties.Resources.disc_small;

             this.mnu_dvd_drive.Name = "mnu_dvd_drive";

-            this.mnu_dvd_drive.Size = new System.Drawing.Size(194, 22);

+            this.mnu_dvd_drive.Size = new System.Drawing.Size(192, 22);

             this.mnu_dvd_drive.Text = "[No DVD Drive Ready]";

             this.mnu_dvd_drive.Visible = false;

             this.mnu_dvd_drive.Click += new System.EventHandler(this.mnu_dvd_drive_Click);

@@ -1269,7 +1212,7 @@ namespace Handbrake
             this.btn_add2Queue.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;

             this.btn_add2Queue.ImageTransparentColor = System.Drawing.Color.Magenta;

             this.btn_add2Queue.Name = "btn_add2Queue";

-            this.btn_add2Queue.Size = new System.Drawing.Size(110, 36);

+            this.btn_add2Queue.Size = new System.Drawing.Size(117, 36);

             this.btn_add2Queue.Text = "Add to Queue";

             this.btn_add2Queue.ToolTipText = "Add a new item to the Queue";

             this.btn_add2Queue.Click += new System.EventHandler(this.btn_add2Queue_Click);

@@ -1280,7 +1223,7 @@ namespace Handbrake
             this.btn_showQueue.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;

             this.btn_showQueue.ImageTransparentColor = System.Drawing.Color.Magenta;

             this.btn_showQueue.Name = "btn_showQueue";

-            this.btn_showQueue.Size = new System.Drawing.Size(104, 36);

+            this.btn_showQueue.Size = new System.Drawing.Size(110, 36);

             this.btn_showQueue.Tag = "";

             this.btn_showQueue.Text = "Show Queue";

             this.btn_showQueue.Click += new System.EventHandler(this.btn_showQueue_Click);

@@ -1296,7 +1239,7 @@ namespace Handbrake
             this.tb_preview.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;

             this.tb_preview.ImageTransparentColor = System.Drawing.Color.Magenta;

             this.tb_preview.Name = "tb_preview";

-            this.tb_preview.Size = new System.Drawing.Size(81, 36);

+            this.tb_preview.Size = new System.Drawing.Size(84, 36);

             this.tb_preview.Text = "Preview";

             this.tb_preview.Click += new System.EventHandler(this.tb_preview_Click);

             // 

@@ -1306,7 +1249,7 @@ namespace Handbrake
             this.btn_ActivityWindow.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;

             this.btn_ActivityWindow.ImageTransparentColor = System.Drawing.Color.Magenta;

             this.btn_ActivityWindow.Name = "btn_ActivityWindow";

-            this.btn_ActivityWindow.Size = new System.Drawing.Size(120, 36);

+            this.btn_ActivityWindow.Size = new System.Drawing.Size(130, 36);

             this.btn_ActivityWindow.Text = "Activity Window";

             this.btn_ActivityWindow.ToolTipText = "Displays the activity window which displays the log of the last completed or curr" +

                 "ently running encode.";

@@ -1448,17 +1391,6 @@ namespace Handbrake
             this.tableLayoutPanel1.Size = new System.Drawing.Size(723, 27);

             this.tableLayoutPanel1.TabIndex = 49;

             // 

-            // Label10

-            // 

-            this.Label10.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));

-            this.Label10.AutoSize = true;

-            this.Label10.ForeColor = System.Drawing.Color.Black;

-            this.Label10.Location = new System.Drawing.Point(3, 7);

-            this.Label10.Name = "Label10";

-            this.Label10.Size = new System.Drawing.Size(31, 13);

-            this.Label10.TabIndex = 6;

-            this.Label10.Text = "Title:";

-            // 

             // lbl_angle

             // 

             this.lbl_angle.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));

@@ -1513,30 +1445,11 @@ namespace Handbrake
             this.lbl_duration.TabIndex = 43;

             this.lbl_duration.Text = "--:--:--";

             // 

-            // labelStaticSource

-            // 

-            this.labelStaticSource.AutoSize = true;

-            this.labelStaticSource.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.labelStaticSource.Location = new System.Drawing.Point(12, 70);

-            this.labelStaticSource.Name = "labelStaticSource";

-            this.labelStaticSource.Size = new System.Drawing.Size(49, 13);

-            this.labelStaticSource.TabIndex = 51;

-            this.labelStaticSource.Text = "Source:";

-            // 

-            // labelSource

-            // 

-            this.labelSource.AutoSize = true;

-            this.labelSource.Location = new System.Drawing.Point(67, 70);

-            this.labelSource.Name = "labelSource";

-            this.labelSource.Size = new System.Drawing.Size(137, 13);

-            this.labelSource.TabIndex = 52;

-            this.labelSource.Text = "Select \"Source\" to continue";

-            // 

             // labelStaticDestination

             // 

             this.labelStaticDestination.AutoSize = true;

             this.labelStaticDestination.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.labelStaticDestination.Location = new System.Drawing.Point(12, 116);

+            this.labelStaticDestination.Location = new System.Drawing.Point(9, 116);

             this.labelStaticDestination.Name = "labelStaticDestination";

             this.labelStaticDestination.Size = new System.Drawing.Size(75, 13);

             this.labelStaticDestination.TabIndex = 53;

@@ -1546,29 +1459,133 @@ namespace Handbrake
             // 

             this.labelPreset.AutoSize = true;

             this.labelPreset.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.labelPreset.Location = new System.Drawing.Point(13, 164);

+            this.labelPreset.Location = new System.Drawing.Point(9, 164);

             this.labelPreset.Name = "labelPreset";

             this.labelPreset.Size = new System.Drawing.Size(180, 13);

             this.labelPreset.TabIndex = 54;

             this.labelPreset.Text = "Output Settings (Preset: None)";

             // 

+            // drp_dvdtitle

+            // 

+            this.drp_dvdtitle.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;

+            this.drp_dvdtitle.FormattingEnabled = true;

+            this.drp_dvdtitle.Items.AddRange(new object[] {

+            "Automatic"});

+            this.drp_dvdtitle.Location = new System.Drawing.Point(40, 3);

+            this.drp_dvdtitle.Name = "drp_dvdtitle";

+            this.drp_dvdtitle.Size = new System.Drawing.Size(119, 21);

+            this.drp_dvdtitle.TabIndex = 7;

+            this.ToolTip.SetToolTip(this.drp_dvdtitle, "Select the title you wish to encode.\r\nThe longest title is selected by default af" +

+                    "ter you have scanned a source.");

+            this.drp_dvdtitle.SelectedIndexChanged += new System.EventHandler(this.drp_dvdtitle_SelectedIndexChanged);

+            this.drp_dvdtitle.Click += new System.EventHandler(this.drp_dvdtitle_Click);

+            // 

+            // labelSource

+            // 

+            this.labelSource.AutoSize = true;

+            this.labelSource.Location = new System.Drawing.Point(55, 0);

+            this.labelSource.Name = "labelSource";

+            this.labelSource.Size = new System.Drawing.Size(137, 13);

+            this.labelSource.TabIndex = 52;

+            this.labelSource.Text = "Select \"Source\" to continue";

+            // 

+            // Label10

+            // 

+            this.Label10.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));

+            this.Label10.AutoSize = true;

+            this.Label10.ForeColor = System.Drawing.Color.Black;

+            this.Label10.Location = new System.Drawing.Point(3, 7);

+            this.Label10.Name = "Label10";

+            this.Label10.Size = new System.Drawing.Size(31, 13);

+            this.Label10.TabIndex = 6;

+            this.Label10.Text = "Title:";

+            // 

+            // labelStaticSource

+            // 

+            this.labelStaticSource.AutoSize = true;

+            this.labelStaticSource.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.labelStaticSource.Location = new System.Drawing.Point(0, 0);

+            this.labelStaticSource.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);

+            this.labelStaticSource.Name = "labelStaticSource";

+            this.labelStaticSource.Size = new System.Drawing.Size(49, 13);

+            this.labelStaticSource.TabIndex = 51;

+            this.labelStaticSource.Text = "Source:";

+            // 

+            // flowLayoutPanel1

+            // 

+            this.flowLayoutPanel1.AutoSize = true;

+            this.flowLayoutPanel1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;

+            this.flowLayoutPanel1.Controls.Add(this.labelStaticSource);

+            this.flowLayoutPanel1.Controls.Add(this.labelSource);

+            this.flowLayoutPanel1.Location = new System.Drawing.Point(9, 70);

+            this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(0);

+            this.flowLayoutPanel1.Name = "flowLayoutPanel1";

+            this.flowLayoutPanel1.Size = new System.Drawing.Size(195, 13);

+            this.flowLayoutPanel1.TabIndex = 55;

+            // 

+            // PictureSettings

+            // 

+            this.PictureSettings.BackColor = System.Drawing.Color.Transparent;

+            this.PictureSettings.Enabled = false;

+            this.PictureSettings.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.PictureSettings.Location = new System.Drawing.Point(0, 0);

+            this.PictureSettings.Name = "PictureSettings";

+            this.PictureSettings.Size = new System.Drawing.Size(666, 279);

+            this.PictureSettings.TabIndex = 0;

+            // 

+            // Filters

+            // 

+            this.Filters.BackColor = System.Drawing.Color.Transparent;

+            this.Filters.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.Filters.Location = new System.Drawing.Point(0, 0);

+            this.Filters.Name = "Filters";

+            this.Filters.Size = new System.Drawing.Size(713, 310);

+            this.Filters.TabIndex = 0;

+            // 

+            // AudioSettings

+            // 

+            this.AudioSettings.BackColor = System.Drawing.Color.Transparent;

+            this.AudioSettings.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.AudioSettings.Location = new System.Drawing.Point(0, 0);

+            this.AudioSettings.Name = "AudioSettings";

+            this.AudioSettings.Size = new System.Drawing.Size(715, 310);

+            this.AudioSettings.TabIndex = 0;

+            // 

+            // Subtitles

+            // 

+            this.Subtitles.BackColor = System.Drawing.Color.Transparent;

+            this.Subtitles.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.Subtitles.Location = new System.Drawing.Point(0, 0);

+            this.Subtitles.Name = "Subtitles";

+            this.Subtitles.Size = new System.Drawing.Size(722, 310);

+            this.Subtitles.TabIndex = 0;

+            // 

+            // x264Panel

+            // 

+            this.x264Panel.BackColor = System.Drawing.Color.Transparent;

+            this.x264Panel.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.x264Panel.Location = new System.Drawing.Point(0, 0);

+            this.x264Panel.Name = "x264Panel";

+            this.x264Panel.Size = new System.Drawing.Size(720, 306);

+            this.x264Panel.TabIndex = 0;

+            this.x264Panel.x264Query = "";

+            // 

             // frmMain

             // 

             this.AllowDrop = true;

             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;

             this.ClientSize = new System.Drawing.Size(1000, 582);

-            this.Controls.Add(this.labelStaticSource);

-            this.Controls.Add(this.labelSource);

             this.Controls.Add(this.tableLayoutPanel3);

-            this.Controls.Add(this.labelStaticDestination);

             this.Controls.Add(this.toolStrip1);

-            this.Controls.Add(this.labelPreset);

+            this.Controls.Add(this.flowLayoutPanel1);

             this.Controls.Add(this.frmMainMenu);

             this.Controls.Add(this.tableLayoutPanel2);

-            this.Controls.Add(this.tableLayoutPanel1);

+            this.Controls.Add(this.labelPreset);

             this.Controls.Add(this.groupBox2);

             this.Controls.Add(this.StatusStrip);

+            this.Controls.Add(this.labelStaticDestination);

+            this.Controls.Add(this.tableLayoutPanel1);

             this.Controls.Add(this.tabs_panel);

             this.DoubleBuffered = true;

             this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

@@ -1608,6 +1625,8 @@ namespace Handbrake
             this.tableLayoutPanel3.PerformLayout();

             this.tableLayoutPanel1.ResumeLayout(false);

             this.tableLayoutPanel1.PerformLayout();

+            this.flowLayoutPanel1.ResumeLayout(false);

+            this.flowLayoutPanel1.PerformLayout();

             this.ResumeLayout(false);

             this.PerformLayout();

 

@@ -1726,8 +1745,6 @@ namespace Handbrake
         private Button btn_destBrowse;

         private TableLayoutPanel tableLayoutPanel3;

         private TableLayoutPanel tableLayoutPanel1;

-        internal Label Label10;

-        internal ComboBox drp_dvdtitle;

         internal Label lbl_angle;

         internal ComboBox drop_angle;

         internal Label Label9;

@@ -1737,11 +1754,12 @@ namespace Handbrake
         internal Label label_duration;

         internal Label lbl_duration;

         private Label labelStaticDestination;

-        private Label labelSource;

-        private Label labelStaticSource;

         internal Label labelPreset;

         internal Handbrake.Controls.PictureSettings PictureSettings;

-

- 

+        private Label labelSource;

+        internal ComboBox drp_dvdtitle;

+        internal Label Label10;

+        private Label labelStaticSource;

+        private FlowLayoutPanel flowLayoutPanel1;

     }

 }
\ No newline at end of file
diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 684bd97b1..aa489325f 100644
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -164,7 +164,7 @@ namespace Handbrake
                 DialogResult result = MessageBox.Show("HandBrake has detected unfinished items on the queue from the last time the application was launched. Would you like to recover these?", "Queue Recovery Possible", MessageBoxButtons.YesNo, MessageBoxIcon.Question);

 

                 if (result == DialogResult.Yes)

-                    encodeQueue.recoverQueue("hb_queue_recovery.xml"); // Start Recovery

+                    encodeQueue.LoadQueueFromFile("hb_queue_recovery.xml"); // Start Recovery

                 else

                 {

                     // Remove the Queue recovery file if the user doesn't want to recovery the last queue.

@@ -188,9 +188,9 @@ namespace Handbrake
                 this.Resize += new EventHandler(frmMain_Resize);

 

             // Handle Encode Start / Finish / Pause

-            encodeQueue.OnEncodeEnded += new EventHandler(encodeEnded);

-            encodeQueue.OnPaused += new EventHandler(encodePaused);

-            encodeQueue.OnEncodeStart += new EventHandler(encodeStarted);

+            encodeQueue.CurrentJobCompleted += new EventHandler(encodeEnded);

+            encodeQueue.QueuePauseRequested += new EventHandler(encodePaused);

+            encodeQueue.NewJobStarted += new EventHandler(encodeStarted);

 

             // Handle a file being draged onto the GUI.

             this.DragEnter += new DragEventHandler(frmMain_DragEnter);

@@ -617,7 +617,7 @@ namespace Handbrake
                 if (result == DialogResult.Yes)

                 {

                     // Pause The Queue

-                    encodeQueue.pauseEncodeQueue();

+                    encodeQueue.RequestPause();

 

                     // Allow the CLI to exit cleanly

                     Win32.SetForegroundWindow((int)encodeQueue.encodeHandler.processHandle);

@@ -629,9 +629,44 @@ namespace Handbrake
             }

             else

             {

-                if (encodeQueue.count() != 0 || (!string.IsNullOrEmpty(sourcePath) && !string.IsNullOrEmpty(text_destination.Text)))

+                if (encodeQueue.Count != 0 || (!string.IsNullOrEmpty(sourcePath) && !string.IsNullOrEmpty(text_destination.Text)))

                 {

-                    String query = rtf_query.Text != "" ? rtf_query.Text : queryGen.generateTheQuery(this);

+                    string generatedQuery = queryGen.generateTheQuery(this);

+                    string specifiedQuery = rtf_query.Text != "" ? rtf_query.Text : queryGen.generateTheQuery(this);

+                    string query = string.Empty;

+

+                    // Check to make sure the generated query matches the GUI settings

+                    if (Properties.Settings.Default.PromptOnUnmatchingQueries && !string.IsNullOrEmpty(specifiedQuery) && generatedQuery != specifiedQuery)

+                    {

+                        DialogResult result = MessageBox.Show("The query under the \"Query Editor\" tab " +

+                            "does not match the current GUI settings. Because the manual query takes " +

+                            "priority over the GUI, your recently updated settings will not be taken " +

+                            "into account when encoding this job." + Environment.NewLine + Environment.NewLine +

+                            "Do you want to replace the manual query with the GUI-generated query?",

+                            "Manual Query does not Match GUI",

+                            MessageBoxButtons.YesNoCancel, MessageBoxIcon.Asterisk,

+                            MessageBoxDefaultButton.Button3);

+

+                        switch (result)

+                        {

+                            case DialogResult.Yes:

+                                // Replace the manual query with the generated one

+                                query = generatedQuery;

+                                rtf_query.Text = generatedQuery;

+                                break;

+                            case DialogResult.No:

+                                // Use the manual query

+                                query = specifiedQuery;

+                                break;

+                            case DialogResult.Cancel:

+                                // Don't start the encode

+                                return;

+                        }

+                    }

+                    else

+                    {

+                        query = generatedQuery;

+                    }

 

                     DialogResult overwrite = DialogResult.Yes;

                     if (text_destination.Text != "")

@@ -640,15 +675,15 @@ namespace Handbrake
 

                     if (overwrite == DialogResult.Yes)

                     {

-                        if (encodeQueue.count() == 0)

-                            encodeQueue.add(query, sourcePath, text_destination.Text);

+                        if (encodeQueue.Count == 0)

+                            encodeQueue.AddJob(query, sourcePath, text_destination.Text);

 

                         queueWindow.setQueue();

-                        if (encodeQueue.count() > 1)

+                        if (encodeQueue.Count > 1)

                             queueWindow.Show(false);

 

                         setEncodeStarted(); // Encode is running, so setup the GUI appropriately

-                        encodeQueue.startEncode(); // Start The Queue Encoding Process

+                        encodeQueue.StartEncodeQueue(); // Start The Queue Encoding Process

                         lastAction = "encode";   // Set the last action to encode - Used for activity window.

                     }

                     this.Focus();

@@ -667,16 +702,16 @@ namespace Handbrake
                 if (rtf_query.Text != "")

                     query = rtf_query.Text;

 

-                if (encodeQueue.checkDestinationPath(text_destination.Text))

+                if (encodeQueue.CheckForDestinationDuplicate(text_destination.Text))

                 {

                     DialogResult result = MessageBox.Show("There is already a queue item for this destination path. \n\n If you continue, the encode will be overwritten. Do you wish to continue?",

                   "Warning", MessageBoxButtons.YesNo, MessageBoxIcon.Warning);

                     if (result == DialogResult.Yes)

-                        encodeQueue.add(query, sourcePath, text_destination.Text);

+                        encodeQueue.AddJob(query, sourcePath, text_destination.Text);

 

                 }

                 else

-                    encodeQueue.add(query, sourcePath, text_destination.Text);

+                    encodeQueue.AddJob(query, sourcePath, text_destination.Text);

 

                 queueWindow.Show();

             }

@@ -1630,7 +1665,7 @@ namespace Handbrake
         protected override void OnFormClosing(FormClosingEventArgs e)

         {

             // If currently encoding, the queue isn't paused, and there are queue items to process, prompt to confirm close.

-            if ((encodeQueue.isEncoding) && (!encodeQueue.isPaused) && (encodeQueue.count() > 0))

+            if ((encodeQueue.IsEncoding) && (!encodeQueue.PauseRequested) && (encodeQueue.Count > 0))

             {

                 DialogResult result = MessageBox.Show("HandBrake has queue items to process. Closing HandBrake will not stop the current encoding, but will stop processing the queue.\n\nDo you want to close HandBrake?",

                     "Close HandBrake?", MessageBoxButtons.YesNo, MessageBoxIcon.Question);

diff --git a/win/C#/frmMain.resx b/win/C#/frmMain.resx
index e34b5020e..57ce99c9f 100644
--- a/win/C#/frmMain.resx
+++ b/win/C#/frmMain.resx
@@ -166,18 +166,17 @@ Note: Do not change any of the chapter numbers!</value>
   <data name="btn_dvd_source.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

     <value>

         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8

-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAlpJREFUOE+tk21I

-        k1EYhif0oyA0sqIQCix/+GcQFFH9CCmiUBTLLEjShJofVBgL2fxoU9Pp5ubUlS5rU9f8rCyjsA+pUCRC

-        TR1ppmVFUSlmhq78unrnQF1KGHTg/nEOz30993PO+7qJFrmUeiv2n+Mij+XLRLLYULdF2pxlEVIDcw0p

-        AsyxD5fmI/rQ94pqi26eOlsfuZj+7BgSm01QdA4ih7m73Yx9qGpavwatjPebqCzOprPt8YKQgzFagqL0

-        BEjyEFWVaBkdLHMxT34uYNwWR9nVTEoL0zHlp2DMSeaSRk6eKt4VWm5WM/rVPNN5SjDTLQebZEHNA1wr

-        UvHjk3E6tsNcV62e1r3KLGqtKm6WplNpSsVqVFJsOM8VfSKFWjkGtcyZptSYzvC7XByx3zQoqCnTMvlG

-        CX1prnornPUmQJcUXsbSVhGK5bIOkcmQyveeTHiv4VZ5Nk33Nc6iuSO8CIfmECYa/bE/8ON1iRipJNh5

-        F0V6Bd86lfQ1JlFj1TDVq4COKCegLVIwHmGiKRB7/V6G7+5koHozymgfYRy5E1CgTWKgXcZ1i5qWp0KS

-        rjgBcAJawph6FszYk/2M1O1isGYLX8p9ab6wgqP+3rMvYciS01GfzA1LFvQkQ6sQ9/khxhoCGHnox1Dt

-        NvorxXw0b8Km8UQh2cip6GOzgNyMeKqKM7HdjqFZJ5pRk2YJ9aql3EnxoCJxNaZ4Ly6e3UDY3O6OEXRp

-        59ApTpIhiyDh9GHORAZyPHQPB/ZtZ/cOMVvFPvh6e7F+3SrWrHRnraf7Xz/xf/rJ/kvxb84I3U1y+9/W

-        AAAAAElFTkSuQmCC

+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJQSURBVDhPlZNdSNNRGMb/F110ZZEVhVBgeeHNICiiuggp

+        olAUyyxI0oSaH1QYC3N+tKnp5ubm1JUua5uuqdPKMgr7kApFItTUkWZqVhSVYmao5Nev/xyoQ4k88Nyc

+        8z6/93nP4QjCfy6lwc4ltZVso4P/tMyXRcmMHqZ0EeY6jZQVInzuf0e1Tb9Ina3P/tkpLD6XkNg8BJe5

+        u93C+HDVrP4M2ZkcMOOw5tLZ9nxJyJE4HSExBoKkBQhVpTrGhso9zNPfiph0JlB+U01ZcRbmwnRMeWlc

+        08opUCV6QissGsZ+WOY6z4hmuuXglC6pRYBbJSp+fzXNxnaZ66o1s3rkyKHWruJuWRYOcwZ2kxKr8TI3

+        DCkU6+QYNUnuNGWmLEY+5uOK3degoKZcx3SfEvozPfVB3OtNhi4ZvI2nrTIc23U9gtmYwa8eNXzScq8i

+        l6bHWnfRwhHeREJzGFONgYw/CeB9qQSZNNR9FyUGBT87lfQ3plJj1zLTq4COGDegLVo0HmeqKZjx+gOM

+        PNzDYPU2lLF+4jhyN6BIl8pgexK3bRpaXopJuhJEwGloiWDmVSgTLw4xWreXoZrtfK/wp/nKak4E+s6/

+        hDFHTkd9GndsOdCTBq1i3NdHmWgIYvRpAMO1OxlwSPhi2YpT641CuoWzsSfnAfnZiVRZ1Tjvx9GsF+bU

+        pF1BvWolD9JXUZmyDnOiD1cvbCZiYXfXCPrMi+gVZ8hOiiL53DHORwdzKnw/hw/uYt9uCTskfvj7+rBp

+        41rWr/Fig7fX8j/Tsn/fcgx/ARfG3ml6M3rzAAAAAElFTkSuQmCC

 </value>

   </data>

   <metadata name="notifyIcon.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

diff --git a/win/C#/frmOptions.Designer.cs b/win/C#/frmOptions.Designer.cs
index 6e6a51ccd..697ca2631 100644
--- a/win/C#/frmOptions.Designer.cs
+++ b/win/C#/frmOptions.Designer.cs
@@ -40,54 +40,60 @@ namespace Handbrake
             this.drp_completeOption = new System.Windows.Forms.ComboBox();

             this.tab_options = new System.Windows.Forms.TabControl();

             this.tab_general = new System.Windows.Forms.TabPage();

-            this.check_m4v = new System.Windows.Forms.CheckBox();

+            this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();

+            this.label1 = new System.Windows.Forms.Label();

+            this.drop_updateCheckDays = new System.Windows.Forms.ComboBox();

             this.label7 = new System.Windows.Forms.Label();

-            this.label5 = new System.Windows.Forms.Label();

+            this.check_updateCheck = new System.Windows.Forms.CheckBox();

             this.txt_autoNameFormat = new System.Windows.Forms.TextBox();

-            this.btn_browse = new System.Windows.Forms.Button();

-            this.label10 = new System.Windows.Forms.Label();

-            this.text_an_path = new System.Windows.Forms.TextBox();

-            this.check_autoNaming = new System.Windows.Forms.CheckBox();

+            this.label5 = new System.Windows.Forms.Label();

+            this.label2 = new System.Windows.Forms.Label();

             this.label13 = new System.Windows.Forms.Label();

+            this.btn_browse = new System.Windows.Forms.Button();

             this.check_tooltip = new System.Windows.Forms.CheckBox();

-            this.check_updateCheck = new System.Windows.Forms.CheckBox();

+            this.text_an_path = new System.Windows.Forms.TextBox();

+            this.label10 = new System.Windows.Forms.Label();

             this.check_userDefaultSettings = new System.Windows.Forms.CheckBox();

-            this.label1 = new System.Windows.Forms.Label();

-            this.label2 = new System.Windows.Forms.Label();

+            this.check_autoNaming = new System.Windows.Forms.CheckBox();

+            this.check_m4v = new System.Windows.Forms.CheckBox();

             this.tab_picture = new System.Windows.Forms.TabPage();

+            this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();

+            this.label29 = new System.Windows.Forms.Label();

             this.btn_vlcPath = new System.Windows.Forms.Button();

             this.txt_vlcPath = new System.Windows.Forms.TextBox();

-            this.label29 = new System.Windows.Forms.Label();

             this.tab_cli = new System.Windows.Forms.TabPage();

-            this.btn_viewLogs = new System.Windows.Forms.Button();

-            this.btn_clearLogs = new System.Windows.Forms.Button();

-            this.check_logsInSpecifiedLocation = new System.Windows.Forms.CheckBox();

-            this.cb_logVerboseLvl = new System.Windows.Forms.ComboBox();

-            this.label3 = new System.Windows.Forms.Label();

-            this.check_saveLogWithVideo = new System.Windows.Forms.CheckBox();

+            this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel();

+            this.label12 = new System.Windows.Forms.Label();

+            this.check_cli_minimized = new System.Windows.Forms.CheckBox();

+            this.label9 = new System.Windows.Forms.Label();

             this.btn_saveLog = new System.Windows.Forms.Button();

+            this.check_logsInSpecifiedLocation = new System.Windows.Forms.CheckBox();

             this.label14 = new System.Windows.Forms.Label();

+            this.Label11 = new System.Windows.Forms.Label();

+            this.check_saveLogWithVideo = new System.Windows.Forms.CheckBox();

+            this.Label4 = new System.Windows.Forms.Label();

+            this.label3 = new System.Windows.Forms.Label();

             this.text_logPath = new System.Windows.Forms.TextBox();

-            this.label9 = new System.Windows.Forms.Label();

-            this.check_cli_minimized = new System.Windows.Forms.CheckBox();

-            this.label12 = new System.Windows.Forms.Label();

+            this.cb_logVerboseLvl = new System.Windows.Forms.ComboBox();

             this.drp_Priority = new System.Windows.Forms.ComboBox();

-            this.Label11 = new System.Windows.Forms.Label();

             this.drp_processors = new System.Windows.Forms.ComboBox();

-            this.Label4 = new System.Windows.Forms.Label();

+            this.btn_viewLogs = new System.Windows.Forms.Button();

+            this.btn_clearLogs = new System.Windows.Forms.Button();

             this.tab_advanced = new System.Windows.Forms.TabPage();

-            this.check_trayStatusAlerts = new System.Windows.Forms.CheckBox();

-            this.check_inGuiStatus = new System.Windows.Forms.CheckBox();

-            this.check_disablePresetNotification = new System.Windows.Forms.CheckBox();

+            this.tableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel();

+            this.check_promptOnUnmatchingQueries = new System.Windows.Forms.CheckBox();

             this.check_dvdnav = new System.Windows.Forms.CheckBox();

+            this.check_trayStatusAlerts = new System.Windows.Forms.CheckBox();

             this.label32 = new System.Windows.Forms.Label();

-            this.label30 = new System.Windows.Forms.Label();

+            this.label6 = new System.Windows.Forms.Label();

             this.drop_x264step = new System.Windows.Forms.ComboBox();

+            this.label30 = new System.Windows.Forms.Label();

+            this.btn_drive_detect = new System.Windows.Forms.CheckBox();

+            this.check_mainMinimize = new System.Windows.Forms.CheckBox();

             this.label28 = new System.Windows.Forms.Label();

             this.check_queryEditorTab = new System.Windows.Forms.CheckBox();

-            this.check_mainMinimize = new System.Windows.Forms.CheckBox();

-            this.btn_drive_detect = new System.Windows.Forms.CheckBox();

-            this.label6 = new System.Windows.Forms.Label();

+            this.check_disablePresetNotification = new System.Windows.Forms.CheckBox();

+            this.check_inGuiStatus = new System.Windows.Forms.CheckBox();

             this.label8 = new System.Windows.Forms.Label();

             this.pictureBox2 = new System.Windows.Forms.PictureBox();

             this.pathFinder = new System.Windows.Forms.FolderBrowserDialog();

@@ -121,22 +127,28 @@ namespace Handbrake
             this.label26 = new System.Windows.Forms.Label();

             this.label27 = new System.Windows.Forms.Label();

             this.openFile_vlc = new System.Windows.Forms.OpenFileDialog();

-            this.drop_updateCheckDays = new System.Windows.Forms.ComboBox();

+            this.tableLayoutPanel5 = new System.Windows.Forms.TableLayoutPanel();

             this.tab_options.SuspendLayout();

             this.tab_general.SuspendLayout();

+            this.tableLayoutPanel1.SuspendLayout();

             this.tab_picture.SuspendLayout();

+            this.tableLayoutPanel2.SuspendLayout();

             this.tab_cli.SuspendLayout();

+            this.tableLayoutPanel3.SuspendLayout();

             this.tab_advanced.SuspendLayout();

+            this.tableLayoutPanel4.SuspendLayout();

             ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();

+            this.tableLayoutPanel5.SuspendLayout();

             this.SuspendLayout();

             // 

             // btn_close

             // 

+            this.btn_close.Anchor = System.Windows.Forms.AnchorStyles.Right;

             this.btn_close.BackColor = System.Drawing.SystemColors.ControlLight;

             this.btn_close.FlatAppearance.BorderColor = System.Drawing.Color.Black;

             this.btn_close.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

             this.btn_close.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));

-            this.btn_close.Location = new System.Drawing.Point(437, 389);

+            this.btn_close.Location = new System.Drawing.Point(519, 378);

             this.btn_close.Name = "btn_close";

             this.btn_close.Size = new System.Drawing.Size(72, 22);

             this.btn_close.TabIndex = 53;

@@ -146,18 +158,19 @@ namespace Handbrake
             // 

             // drp_completeOption

             // 

+            this.drp_completeOption.Anchor = System.Windows.Forms.AnchorStyles.Left;

+            this.tableLayoutPanel1.SetColumnSpan(this.drp_completeOption, 4);

             this.drp_completeOption.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;

-            this.drp_completeOption.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

             this.drp_completeOption.FormattingEnabled = true;

             this.drp_completeOption.Items.AddRange(new object[] {

-            "Do Nothing",

+            "Do nothing",

             "Shutdown",

             "Suspend",

             "Hibernate",

-            "Lock System",

-            "Log Off",

+            "Lock system",

+            "Log off",

             "Quit HandBrake"});

-            this.drp_completeOption.Location = new System.Drawing.Point(114, 126);

+            this.drp_completeOption.Location = new System.Drawing.Point(106, 119);

             this.drp_completeOption.Name = "drp_completeOption";

             this.drp_completeOption.Size = new System.Drawing.Size(166, 21);

             this.drp_completeOption.TabIndex = 43;

@@ -166,222 +179,331 @@ namespace Handbrake
             // 

             // tab_options

             // 

+            this.tableLayoutPanel5.SetColumnSpan(this.tab_options, 2);

             this.tab_options.Controls.Add(this.tab_general);

             this.tab_options.Controls.Add(this.tab_picture);

             this.tab_options.Controls.Add(this.tab_cli);

             this.tab_options.Controls.Add(this.tab_advanced);

-            this.tab_options.Location = new System.Drawing.Point(12, 55);

+            this.tab_options.Dock = System.Windows.Forms.DockStyle.Fill;

+            this.tab_options.Location = new System.Drawing.Point(3, 38);

             this.tab_options.Name = "tab_options";

             this.tab_options.SelectedIndex = 0;

-            this.tab_options.Size = new System.Drawing.Size(497, 328);

+            this.tab_options.Size = new System.Drawing.Size(588, 332);

             this.tab_options.TabIndex = 58;

             // 

             // tab_general

             // 

-            this.tab_general.Controls.Add(this.drop_updateCheckDays);

-            this.tab_general.Controls.Add(this.check_m4v);

-            this.tab_general.Controls.Add(this.label7);

-            this.tab_general.Controls.Add(this.label5);

-            this.tab_general.Controls.Add(this.txt_autoNameFormat);

-            this.tab_general.Controls.Add(this.btn_browse);

-            this.tab_general.Controls.Add(this.label10);

-            this.tab_general.Controls.Add(this.text_an_path);

-            this.tab_general.Controls.Add(this.check_autoNaming);

-            this.tab_general.Controls.Add(this.label13);

-            this.tab_general.Controls.Add(this.check_tooltip);

-            this.tab_general.Controls.Add(this.check_updateCheck);

-            this.tab_general.Controls.Add(this.check_userDefaultSettings);

-            this.tab_general.Controls.Add(this.label1);

-            this.tab_general.Controls.Add(this.label2);

-            this.tab_general.Controls.Add(this.drp_completeOption);

+            this.tab_general.Controls.Add(this.tableLayoutPanel1);

             this.tab_general.Location = new System.Drawing.Point(4, 22);

             this.tab_general.Name = "tab_general";

-            this.tab_general.Size = new System.Drawing.Size(489, 302);

+            this.tab_general.Padding = new System.Windows.Forms.Padding(10);

+            this.tab_general.Size = new System.Drawing.Size(580, 306);

             this.tab_general.TabIndex = 3;

             this.tab_general.Text = "General";

             this.tab_general.UseVisualStyleBackColor = true;

             // 

-            // check_m4v

+            // tableLayoutPanel1

+            // 

+            this.tableLayoutPanel1.AutoSize = true;

+            this.tableLayoutPanel1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;

+            this.tableLayoutPanel1.ColumnCount = 6;

+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());

+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));

+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));

+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());

+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));

+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());

+            this.tableLayoutPanel1.Controls.Add(this.label1, 0, 0);

+            this.tableLayoutPanel1.Controls.Add(this.drop_updateCheckDays, 3, 1);

+            this.tableLayoutPanel1.Controls.Add(this.label7, 4, 12);

+            this.tableLayoutPanel1.Controls.Add(this.check_updateCheck, 2, 0);

+            this.tableLayoutPanel1.Controls.Add(this.txt_autoNameFormat, 4, 11);

+            this.tableLayoutPanel1.Controls.Add(this.label5, 2, 11);

+            this.tableLayoutPanel1.Controls.Add(this.label2, 0, 6);

+            this.tableLayoutPanel1.Controls.Add(this.label13, 0, 9);

+            this.tableLayoutPanel1.Controls.Add(this.btn_browse, 5, 10);

+            this.tableLayoutPanel1.Controls.Add(this.check_tooltip, 2, 2);

+            this.tableLayoutPanel1.Controls.Add(this.text_an_path, 4, 10);

+            this.tableLayoutPanel1.Controls.Add(this.label10, 2, 10);

+            this.tableLayoutPanel1.Controls.Add(this.check_userDefaultSettings, 2, 3);

+            this.tableLayoutPanel1.Controls.Add(this.drp_completeOption, 2, 6);

+            this.tableLayoutPanel1.Controls.Add(this.check_autoNaming, 2, 9);

+            this.tableLayoutPanel1.Controls.Add(this.check_m4v, 2, 13);

+            this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;

+            this.tableLayoutPanel1.Location = new System.Drawing.Point(10, 10);

+            this.tableLayoutPanel1.Name = "tableLayoutPanel1";

+            this.tableLayoutPanel1.RowCount = 15;

+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());

+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());

+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());

+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());

+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());

+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));

+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());

+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));

+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());

+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());

+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());

+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());

+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());

+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());

+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());

+            this.tableLayoutPanel1.Size = new System.Drawing.Size(560, 286);

+            this.tableLayoutPanel1.TabIndex = 98;

             // 

-            this.check_m4v.AutoSize = true;

-            this.check_m4v.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.check_m4v.Location = new System.Drawing.Point(114, 273);

-            this.check_m4v.Name = "check_m4v";

-            this.check_m4v.Size = new System.Drawing.Size(334, 17);

-            this.check_m4v.TabIndex = 82;

-            this.check_m4v.Text = "Use iPod/iTunes friendly (.m4v) file extension for MP4";

-            this.ToolTip.SetToolTip(this.check_m4v, "Use .m4v instead of .mp4 for MP4 files");

-            this.check_m4v.UseVisualStyleBackColor = true;

-            this.check_m4v.CheckedChanged += new System.EventHandler(this.check_m4v_CheckedChanged);

+            // label1

+            // 

+            this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));

+            this.label1.AutoSize = true;

+            this.label1.BackColor = System.Drawing.Color.Transparent;

+            this.label1.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.label1.Location = new System.Drawing.Point(14, 5);

+            this.label1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 0);

+            this.label1.Name = "label1";

+            this.tableLayoutPanel1.SetRowSpan(this.label1, 2);

+            this.label1.Size = new System.Drawing.Size(66, 13);

+            this.label1.TabIndex = 67;

+            this.label1.Text = "At Launch:";

+            // 

+            // drop_updateCheckDays

+            // 

+            this.drop_updateCheckDays.Anchor = System.Windows.Forms.AnchorStyles.Left;

+            this.tableLayoutPanel1.SetColumnSpan(this.drop_updateCheckDays, 3);

+            this.drop_updateCheckDays.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;

+            this.drop_updateCheckDays.FormattingEnabled = true;

+            this.drop_updateCheckDays.Items.AddRange(new object[] {

+            "Daily",

+            "Weekly",

+            "Monthly"});

+            this.drop_updateCheckDays.Location = new System.Drawing.Point(126, 26);

+            this.drop_updateCheckDays.Name = "drop_updateCheckDays";

+            this.drop_updateCheckDays.Size = new System.Drawing.Size(97, 21);

+            this.drop_updateCheckDays.TabIndex = 97;

+            this.ToolTip.SetToolTip(this.drop_updateCheckDays, "The number of processor\'s / processor cores. Unless your having problems, leave o" +

+                    "n Automatic.");

+            this.drop_updateCheckDays.SelectedIndexChanged += new System.EventHandler(this.drop_updateCheckDays_SelectedIndexChanged);

             // 

             // label7

             // 

+            this.label7.Anchor = System.Windows.Forms.AnchorStyles.Left;

             this.label7.AutoSize = true;

-            this.label7.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.label7.Location = new System.Drawing.Point(197, 248);

+            this.tableLayoutPanel1.SetColumnSpan(this.label7, 2);

+            this.label7.Location = new System.Drawing.Point(183, 245);

+            this.label7.Margin = new System.Windows.Forms.Padding(3);

             this.label7.Name = "label7";

-            this.label7.Size = new System.Drawing.Size(242, 12);

+            this.label7.Size = new System.Drawing.Size(225, 13);

             this.label7.TabIndex = 81;

             this.label7.Text = "Available Options: {source} {title} {chapters}";

             // 

-            // label5

+            // check_updateCheck

             // 

-            this.label5.AutoSize = true;

-            this.label5.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.label5.Location = new System.Drawing.Point(111, 227);

-            this.label5.Name = "label5";

-            this.label5.Size = new System.Drawing.Size(52, 13);

-            this.label5.TabIndex = 80;

-            this.label5.Text = "Format:";

+            this.check_updateCheck.Anchor = System.Windows.Forms.AnchorStyles.Left;

+            this.check_updateCheck.AutoSize = true;

+            this.check_updateCheck.BackColor = System.Drawing.Color.Transparent;

+            this.tableLayoutPanel1.SetColumnSpan(this.check_updateCheck, 4);

+            this.check_updateCheck.Location = new System.Drawing.Point(106, 3);

+            this.check_updateCheck.Name = "check_updateCheck";

+            this.check_updateCheck.Size = new System.Drawing.Size(114, 17);

+            this.check_updateCheck.TabIndex = 68;

+            this.check_updateCheck.Text = "Check for updates";

+            this.ToolTip.SetToolTip(this.check_updateCheck, "Enables the built in update checker. This check is performed when the application" +

+                    " starts.");

+            this.check_updateCheck.UseVisualStyleBackColor = false;

+            this.check_updateCheck.CheckedChanged += new System.EventHandler(this.check_updateCheck_CheckedChanged);

             // 

             // txt_autoNameFormat

             // 

-            this.txt_autoNameFormat.Location = new System.Drawing.Point(199, 224);

+            this.txt_autoNameFormat.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));

+            this.tableLayoutPanel1.SetColumnSpan(this.txt_autoNameFormat, 2);

+            this.txt_autoNameFormat.Location = new System.Drawing.Point(183, 218);

             this.txt_autoNameFormat.Name = "txt_autoNameFormat";

-            this.txt_autoNameFormat.Size = new System.Drawing.Size(255, 21);

+            this.txt_autoNameFormat.Size = new System.Drawing.Size(374, 21);

             this.txt_autoNameFormat.TabIndex = 79;

             this.ToolTip.SetToolTip(this.txt_autoNameFormat, "Define the format of the automatically named file.\r\ne.g  {source}_{title}_some-te" +

                     "xt\r\n{source} {title} {chapters} will be automatically substituted for the input " +

                     "sources values.");

             this.txt_autoNameFormat.TextChanged += new System.EventHandler(this.txt_autoNameFormat_TextChanged);

             // 

-            // btn_browse

-            // 

-            this.btn_browse.FlatAppearance.BorderColor = System.Drawing.Color.Black;

-            this.btn_browse.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.btn_browse.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));

-            this.btn_browse.Location = new System.Drawing.Point(386, 197);

-            this.btn_browse.Name = "btn_browse";

-            this.btn_browse.Size = new System.Drawing.Size(68, 22);

-            this.btn_browse.TabIndex = 78;

-            this.btn_browse.Text = "Browse";

-            this.btn_browse.UseVisualStyleBackColor = true;

-            this.btn_browse.Click += new System.EventHandler(this.btn_browse_Click);

-            // 

-            // label10

-            // 

-            this.label10.AutoSize = true;

-            this.label10.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.label10.Location = new System.Drawing.Point(111, 200);

-            this.label10.Name = "label10";

-            this.label10.Size = new System.Drawing.Size(82, 13);

-            this.label10.TabIndex = 77;

-            this.label10.Text = "Default Path:";

-            // 

-            // text_an_path

+            // label5

             // 

-            this.text_an_path.Location = new System.Drawing.Point(199, 197);

-            this.text_an_path.Name = "text_an_path";

-            this.text_an_path.Size = new System.Drawing.Size(181, 21);

-            this.text_an_path.TabIndex = 76;

-            this.ToolTip.SetToolTip(this.text_an_path, "The default location where auto named files are stored.");

-            this.text_an_path.TextChanged += new System.EventHandler(this.text_an_path_TextChanged);

+            this.label5.Anchor = System.Windows.Forms.AnchorStyles.Left;

+            this.label5.AutoSize = true;

+            this.tableLayoutPanel1.SetColumnSpan(this.label5, 2);

+            this.label5.Location = new System.Drawing.Point(106, 222);

+            this.label5.Name = "label5";

+            this.label5.Size = new System.Drawing.Size(45, 13);

+            this.label5.TabIndex = 80;

+            this.label5.Text = "Format:";

             // 

-            // check_autoNaming

+            // label2

             // 

-            this.check_autoNaming.AutoSize = true;

-            this.check_autoNaming.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.check_autoNaming.Location = new System.Drawing.Point(114, 174);

-            this.check_autoNaming.Name = "check_autoNaming";

-            this.check_autoNaming.Size = new System.Drawing.Size(206, 17);

-            this.check_autoNaming.TabIndex = 72;

-            this.check_autoNaming.Text = "Automatically name output files";

-            this.ToolTip.SetToolTip(this.check_autoNaming, "Automatically name output files");

-            this.check_autoNaming.UseVisualStyleBackColor = true;

-            this.check_autoNaming.CheckedChanged += new System.EventHandler(this.check_autoNaming_CheckedChanged);

+            this.label2.Anchor = System.Windows.Forms.AnchorStyles.Right;

+            this.label2.AutoSize = true;

+            this.label2.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.label2.Location = new System.Drawing.Point(6, 123);

+            this.label2.Name = "label2";

+            this.label2.Size = new System.Drawing.Size(74, 13);

+            this.label2.TabIndex = 54;

+            this.label2.Text = "When Done:";

             // 

             // label13

             // 

+            this.label13.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));

             this.label13.AutoSize = true;

-            this.label13.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.label13.Location = new System.Drawing.Point(10, 175);

+            this.label13.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.label13.Location = new System.Drawing.Point(3, 168);

+            this.label13.Margin = new System.Windows.Forms.Padding(3, 5, 3, 0);

             this.label13.Name = "label13";

-            this.label13.Size = new System.Drawing.Size(86, 13);

+            this.tableLayoutPanel1.SetRowSpan(this.label13, 2);

+            this.label13.Size = new System.Drawing.Size(77, 13);

             this.label13.TabIndex = 71;

-            this.label13.Text = "Output files:";

+            this.label13.Text = "Output Files:";

+            // 

+            // btn_browse

+            // 

+            this.btn_browse.Anchor = System.Windows.Forms.AnchorStyles.Left;

+            this.btn_browse.FlatAppearance.BorderColor = System.Drawing.Color.Black;

+            this.btn_browse.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.btn_browse.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));

+            this.btn_browse.Location = new System.Drawing.Point(482, 189);

+            this.btn_browse.Name = "btn_browse";

+            this.btn_browse.Size = new System.Drawing.Size(75, 23);

+            this.btn_browse.TabIndex = 78;

+            this.btn_browse.Text = "Browse";

+            this.btn_browse.UseVisualStyleBackColor = true;

+            this.btn_browse.Click += new System.EventHandler(this.btn_browse_Click);

             // 

             // check_tooltip

             // 

+            this.check_tooltip.Anchor = System.Windows.Forms.AnchorStyles.Left;

             this.check_tooltip.AutoSize = true;

             this.check_tooltip.BackColor = System.Drawing.Color.Transparent;

-            this.check_tooltip.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.check_tooltip.Location = new System.Drawing.Point(114, 67);

+            this.tableLayoutPanel1.SetColumnSpan(this.check_tooltip, 4);

+            this.check_tooltip.Location = new System.Drawing.Point(106, 53);

             this.check_tooltip.Name = "check_tooltip";

-            this.check_tooltip.Size = new System.Drawing.Size(135, 17);

+            this.check_tooltip.Size = new System.Drawing.Size(117, 17);

             this.check_tooltip.TabIndex = 70;

             this.check_tooltip.Text = "Enable GUI tooltips";

             this.ToolTip.SetToolTip(this.check_tooltip, "Enable the built in tooltips for gui controls. (Requires Restart)");

             this.check_tooltip.UseVisualStyleBackColor = false;

             this.check_tooltip.CheckedChanged += new System.EventHandler(this.check_tooltip_CheckedChanged);

             // 

-            // check_updateCheck

+            // text_an_path

             // 

-            this.check_updateCheck.AutoSize = true;

-            this.check_updateCheck.BackColor = System.Drawing.Color.Transparent;

-            this.check_updateCheck.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.check_updateCheck.Location = new System.Drawing.Point(114, 18);

-            this.check_updateCheck.Name = "check_updateCheck";

-            this.check_updateCheck.Size = new System.Drawing.Size(131, 17);

-            this.check_updateCheck.TabIndex = 68;

-            this.check_updateCheck.Text = "Check for updates";

-            this.ToolTip.SetToolTip(this.check_updateCheck, "Enables the built in update checker. This check is performed when the application" +

-                    " starts.");

-            this.check_updateCheck.UseVisualStyleBackColor = false;

-            this.check_updateCheck.CheckedChanged += new System.EventHandler(this.check_updateCheck_CheckedChanged);

+            this.text_an_path.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));

+            this.text_an_path.Location = new System.Drawing.Point(183, 190);

+            this.text_an_path.Name = "text_an_path";

+            this.text_an_path.Size = new System.Drawing.Size(293, 21);

+            this.text_an_path.TabIndex = 76;

+            this.ToolTip.SetToolTip(this.text_an_path, "The default location where auto named files are stored.");

+            this.text_an_path.TextChanged += new System.EventHandler(this.text_an_path_TextChanged);

+            // 

+            // label10

+            // 

+            this.label10.Anchor = System.Windows.Forms.AnchorStyles.Left;

+            this.label10.AutoSize = true;

+            this.tableLayoutPanel1.SetColumnSpan(this.label10, 2);

+            this.label10.Location = new System.Drawing.Point(106, 194);

+            this.label10.Name = "label10";

+            this.label10.Size = new System.Drawing.Size(71, 13);

+            this.label10.TabIndex = 77;

+            this.label10.Text = "Default Path:";

             // 

             // check_userDefaultSettings

             // 

+            this.check_userDefaultSettings.Anchor = System.Windows.Forms.AnchorStyles.Left;

             this.check_userDefaultSettings.AutoSize = true;

             this.check_userDefaultSettings.BackColor = System.Drawing.Color.Transparent;

-            this.check_userDefaultSettings.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.check_userDefaultSettings.Location = new System.Drawing.Point(114, 90);

+            this.tableLayoutPanel1.SetColumnSpan(this.check_userDefaultSettings, 4);

+            this.check_userDefaultSettings.Location = new System.Drawing.Point(106, 76);

             this.check_userDefaultSettings.Name = "check_userDefaultSettings";

-            this.check_userDefaultSettings.Size = new System.Drawing.Size(158, 17);

+            this.check_userDefaultSettings.Size = new System.Drawing.Size(137, 17);

             this.check_userDefaultSettings.TabIndex = 69;

             this.check_userDefaultSettings.Text = "Load my default preset";

             this.ToolTip.SetToolTip(this.check_userDefaultSettings, "Loads the users default settings rather than the Normal preset.");

             this.check_userDefaultSettings.UseVisualStyleBackColor = false;

             this.check_userDefaultSettings.CheckedChanged += new System.EventHandler(this.check_userDefaultSettings_CheckedChanged);

             // 

-            // label1

+            // check_autoNaming

             // 

-            this.label1.AutoSize = true;

-            this.label1.BackColor = System.Drawing.Color.Transparent;

-            this.label1.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.label1.Location = new System.Drawing.Point(21, 19);

-            this.label1.Name = "label1";

-            this.label1.Size = new System.Drawing.Size(75, 13);

-            this.label1.TabIndex = 67;

-            this.label1.Text = "At Launch:";

+            this.check_autoNaming.Anchor = System.Windows.Forms.AnchorStyles.Left;

+            this.check_autoNaming.AutoSize = true;

+            this.tableLayoutPanel1.SetColumnSpan(this.check_autoNaming, 4);

+            this.check_autoNaming.Location = new System.Drawing.Point(106, 166);

+            this.check_autoNaming.Name = "check_autoNaming";

+            this.check_autoNaming.Size = new System.Drawing.Size(176, 17);

+            this.check_autoNaming.TabIndex = 72;

+            this.check_autoNaming.Text = "Automatically name output files";

+            this.ToolTip.SetToolTip(this.check_autoNaming, "Automatically name output files");

+            this.check_autoNaming.UseVisualStyleBackColor = true;

+            this.check_autoNaming.CheckedChanged += new System.EventHandler(this.check_autoNaming_CheckedChanged);

             // 

-            // label2

+            // check_m4v

             // 

-            this.label2.AutoSize = true;

-            this.label2.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.label2.Location = new System.Drawing.Point(12, 129);

-            this.label2.Name = "label2";

-            this.label2.Size = new System.Drawing.Size(84, 13);

-            this.label2.TabIndex = 54;

-            this.label2.Text = "When Done:";

+            this.check_m4v.Anchor = System.Windows.Forms.AnchorStyles.Left;

+            this.check_m4v.AutoSize = true;

+            this.tableLayoutPanel1.SetColumnSpan(this.check_m4v, 4);

+            this.check_m4v.Location = new System.Drawing.Point(106, 264);

+            this.check_m4v.Name = "check_m4v";

+            this.check_m4v.Size = new System.Drawing.Size(283, 17);

+            this.check_m4v.TabIndex = 82;

+            this.check_m4v.Text = "Use iPod/iTunes friendly file extension (.m4v) for MP4";

+            this.ToolTip.SetToolTip(this.check_m4v, "Use .m4v instead of .mp4 for MP4 files");

+            this.check_m4v.UseVisualStyleBackColor = true;

+            this.check_m4v.CheckedChanged += new System.EventHandler(this.check_m4v_CheckedChanged);

             // 

             // tab_picture

             // 

-            this.tab_picture.Controls.Add(this.btn_vlcPath);

-            this.tab_picture.Controls.Add(this.txt_vlcPath);

-            this.tab_picture.Controls.Add(this.label29);

+            this.tab_picture.Controls.Add(this.tableLayoutPanel2);

             this.tab_picture.Location = new System.Drawing.Point(4, 22);

             this.tab_picture.Name = "tab_picture";

-            this.tab_picture.Size = new System.Drawing.Size(489, 302);

+            this.tab_picture.Padding = new System.Windows.Forms.Padding(10);

+            this.tab_picture.Size = new System.Drawing.Size(580, 306);

             this.tab_picture.TabIndex = 5;

             this.tab_picture.Text = "Picture";

             this.tab_picture.UseVisualStyleBackColor = true;

             // 

+            // tableLayoutPanel2

+            // 

+            this.tableLayoutPanel2.AutoSize = true;

+            this.tableLayoutPanel2.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;

+            this.tableLayoutPanel2.ColumnCount = 4;

+            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());

+            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));

+            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));

+            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());

+            this.tableLayoutPanel2.Controls.Add(this.label29, 0, 0);

+            this.tableLayoutPanel2.Controls.Add(this.btn_vlcPath, 3, 0);

+            this.tableLayoutPanel2.Controls.Add(this.txt_vlcPath, 2, 0);

+            this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill;

+            this.tableLayoutPanel2.Location = new System.Drawing.Point(10, 10);

+            this.tableLayoutPanel2.Name = "tableLayoutPanel2";

+            this.tableLayoutPanel2.RowCount = 2;

+            this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle());

+            this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));

+            this.tableLayoutPanel2.Size = new System.Drawing.Size(560, 286);

+            this.tableLayoutPanel2.TabIndex = 84;

+            // 

+            // label29

+            // 

+            this.label29.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));

+            this.label29.AutoSize = true;

+            this.label29.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.label29.Location = new System.Drawing.Point(3, 5);

+            this.label29.Margin = new System.Windows.Forms.Padding(3, 5, 3, 0);

+            this.label29.Name = "label29";

+            this.tableLayoutPanel2.SetRowSpan(this.label29, 2);

+            this.label29.Size = new System.Drawing.Size(59, 13);

+            this.label29.TabIndex = 79;

+            this.label29.Text = "VLC Path:";

+            // 

             // btn_vlcPath

             // 

+            this.btn_vlcPath.Anchor = System.Windows.Forms.AnchorStyles.Left;

             this.btn_vlcPath.FlatAppearance.BorderColor = System.Drawing.Color.Black;

-            this.btn_vlcPath.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.btn_vlcPath.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

             this.btn_vlcPath.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));

-            this.btn_vlcPath.Location = new System.Drawing.Point(398, 15);

+            this.btn_vlcPath.Location = new System.Drawing.Point(489, 3);

             this.btn_vlcPath.Name = "btn_vlcPath";

             this.btn_vlcPath.Size = new System.Drawing.Size(68, 22);

             this.btn_vlcPath.TabIndex = 83;

@@ -391,195 +513,229 @@ namespace Handbrake
             // 

             // txt_vlcPath

             // 

-            this.txt_vlcPath.Location = new System.Drawing.Point(98, 15);

+            this.txt_vlcPath.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));

+            this.txt_vlcPath.Location = new System.Drawing.Point(88, 3);

             this.txt_vlcPath.Name = "txt_vlcPath";

-            this.txt_vlcPath.Size = new System.Drawing.Size(294, 21);

+            this.txt_vlcPath.Size = new System.Drawing.Size(395, 21);

             this.txt_vlcPath.TabIndex = 81;

             this.ToolTip.SetToolTip(this.txt_vlcPath, "The path where VLC is installed on this system.\r\nThis is used for the video previ" +

                     "ew feature.");

             this.txt_vlcPath.TextChanged += new System.EventHandler(this.txt_vlcPath_TextChanged);

             // 

-            // label29

-            // 

-            this.label29.AutoSize = true;

-            this.label29.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.label29.Location = new System.Drawing.Point(17, 20);

-            this.label29.Name = "label29";

-            this.label29.Size = new System.Drawing.Size(67, 13);

-            this.label29.TabIndex = 79;

-            this.label29.Text = "VLC Path:";

-            // 

             // tab_cli

             // 

-            this.tab_cli.Controls.Add(this.btn_viewLogs);

-            this.tab_cli.Controls.Add(this.btn_clearLogs);

-            this.tab_cli.Controls.Add(this.check_logsInSpecifiedLocation);

-            this.tab_cli.Controls.Add(this.cb_logVerboseLvl);

-            this.tab_cli.Controls.Add(this.label3);

-            this.tab_cli.Controls.Add(this.check_saveLogWithVideo);

-            this.tab_cli.Controls.Add(this.btn_saveLog);

-            this.tab_cli.Controls.Add(this.label14);

-            this.tab_cli.Controls.Add(this.text_logPath);

-            this.tab_cli.Controls.Add(this.label9);

-            this.tab_cli.Controls.Add(this.check_cli_minimized);

-            this.tab_cli.Controls.Add(this.label12);

-            this.tab_cli.Controls.Add(this.drp_Priority);

-            this.tab_cli.Controls.Add(this.Label11);

-            this.tab_cli.Controls.Add(this.drp_processors);

-            this.tab_cli.Controls.Add(this.Label4);

+            this.tab_cli.Controls.Add(this.tableLayoutPanel3);

             this.tab_cli.Location = new System.Drawing.Point(4, 22);

             this.tab_cli.Name = "tab_cli";

-            this.tab_cli.Size = new System.Drawing.Size(489, 302);

+            this.tab_cli.Padding = new System.Windows.Forms.Padding(10);

+            this.tab_cli.Size = new System.Drawing.Size(580, 306);

             this.tab_cli.TabIndex = 2;

             this.tab_cli.Text = "CLI";

             this.tab_cli.UseVisualStyleBackColor = true;

             // 

-            // btn_viewLogs

+            // tableLayoutPanel3

+            // 

+            this.tableLayoutPanel3.AutoSize = true;

+            this.tableLayoutPanel3.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;

+            this.tableLayoutPanel3.ColumnCount = 7;

+            this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());

+            this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));

+            this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());

+            this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());

+            this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());

+            this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));

+            this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());

+            this.tableLayoutPanel3.Controls.Add(this.label12, 0, 0);

+            this.tableLayoutPanel3.Controls.Add(this.check_cli_minimized, 2, 0);

+            this.tableLayoutPanel3.Controls.Add(this.label9, 0, 4);

+            this.tableLayoutPanel3.Controls.Add(this.btn_saveLog, 6, 7);

+            this.tableLayoutPanel3.Controls.Add(this.check_logsInSpecifiedLocation, 2, 6);

+            this.tableLayoutPanel3.Controls.Add(this.label14, 2, 7);

+            this.tableLayoutPanel3.Controls.Add(this.Label11, 2, 1);

+            this.tableLayoutPanel3.Controls.Add(this.check_saveLogWithVideo, 2, 5);

+            this.tableLayoutPanel3.Controls.Add(this.Label4, 2, 2);

+            this.tableLayoutPanel3.Controls.Add(this.label3, 2, 4);

+            this.tableLayoutPanel3.Controls.Add(this.text_logPath, 3, 7);

+            this.tableLayoutPanel3.Controls.Add(this.cb_logVerboseLvl, 3, 4);

+            this.tableLayoutPanel3.Controls.Add(this.drp_Priority, 3, 2);

+            this.tableLayoutPanel3.Controls.Add(this.drp_processors, 3, 1);

+            this.tableLayoutPanel3.Controls.Add(this.btn_viewLogs, 2, 8);

+            this.tableLayoutPanel3.Controls.Add(this.btn_clearLogs, 4, 8);

+            this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill;

+            this.tableLayoutPanel3.Location = new System.Drawing.Point(10, 10);

+            this.tableLayoutPanel3.Name = "tableLayoutPanel3";

+            this.tableLayoutPanel3.RowCount = 10;

+            this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle());

+            this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle());

+            this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle());

+            this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));

+            this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle());

+            this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle());

+            this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle());

+            this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle());

+            this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle());

+            this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle());

+            this.tableLayoutPanel3.Size = new System.Drawing.Size(560, 286);

+            this.tableLayoutPanel3.TabIndex = 62;

             // 

-            this.btn_viewLogs.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.btn_viewLogs.ForeColor = System.Drawing.Color.DarkOrange;

-            this.btn_viewLogs.Location = new System.Drawing.Point(71, 238);

-            this.btn_viewLogs.Name = "btn_viewLogs";

-            this.btn_viewLogs.Size = new System.Drawing.Size(139, 23);

-            this.btn_viewLogs.TabIndex = 89;

-            this.btn_viewLogs.Text = "View Log Directory";

-            this.btn_viewLogs.UseVisualStyleBackColor = true;

-            this.btn_viewLogs.Click += new System.EventHandler(this.btn_viewLogs_Click);

+            // label12

             // 

-            // btn_clearLogs

+            this.label12.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));

+            this.label12.AutoSize = true;

+            this.label12.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.label12.Location = new System.Drawing.Point(11, 5);

+            this.label12.Margin = new System.Windows.Forms.Padding(3, 5, 3, 0);

+            this.label12.Name = "label12";

+            this.tableLayoutPanel3.SetRowSpan(this.label12, 2);

+            this.label12.Size = new System.Drawing.Size(28, 13);

+            this.label12.TabIndex = 75;

+            this.label12.Text = "CLI:";

             // 

-            this.btn_clearLogs.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.btn_clearLogs.ForeColor = System.Drawing.Color.DarkOrange;

-            this.btn_clearLogs.Location = new System.Drawing.Point(216, 238);

-            this.btn_clearLogs.Name = "btn_clearLogs";

-            this.btn_clearLogs.Size = new System.Drawing.Size(135, 23);

-            this.btn_clearLogs.TabIndex = 88;

-            this.btn_clearLogs.Text = "Clear Log History";

-            this.btn_clearLogs.UseVisualStyleBackColor = true;

-            this.btn_clearLogs.Click += new System.EventHandler(this.btn_clearLogs_Click);

+            // check_cli_minimized

+            // 

+            this.check_cli_minimized.Anchor = System.Windows.Forms.AnchorStyles.Left;

+            this.check_cli_minimized.AutoSize = true;

+            this.tableLayoutPanel3.SetColumnSpan(this.check_cli_minimized, 5);

+            this.check_cli_minimized.Location = new System.Drawing.Point(65, 3);

+            this.check_cli_minimized.Name = "check_cli_minimized";

+            this.check_cli_minimized.Size = new System.Drawing.Size(137, 17);

+            this.check_cli_minimized.TabIndex = 76;

+            this.check_cli_minimized.Text = "Start window minimized";

+            this.ToolTip.SetToolTip(this.check_cli_minimized, "Starts a CLI window minimized.");

+            this.check_cli_minimized.UseVisualStyleBackColor = true;

+            this.check_cli_minimized.CheckedChanged += new System.EventHandler(this.check_cli_minimized_CheckedChanged);

+            // 

+            // label9

+            // 

+            this.label9.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));

+            this.label9.AutoSize = true;

+            this.label9.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.label9.Location = new System.Drawing.Point(3, 102);

+            this.label9.Margin = new System.Windows.Forms.Padding(3, 5, 3, 0);

+            this.label9.Name = "label9";

+            this.tableLayoutPanel3.SetRowSpan(this.label9, 2);

+            this.label9.Size = new System.Drawing.Size(36, 13);

+            this.label9.TabIndex = 77;

+            this.label9.Text = "Logs:";

+            // 

+            // btn_saveLog

+            // 

+            this.btn_saveLog.Anchor = System.Windows.Forms.AnchorStyles.Left;

+            this.btn_saveLog.FlatAppearance.BorderColor = System.Drawing.Color.Black;

+            this.btn_saveLog.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.btn_saveLog.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));

+            this.btn_saveLog.Location = new System.Drawing.Point(480, 173);

+            this.btn_saveLog.Name = "btn_saveLog";

+            this.btn_saveLog.Size = new System.Drawing.Size(77, 22);

+            this.btn_saveLog.TabIndex = 82;

+            this.btn_saveLog.Text = "Browse";

+            this.btn_saveLog.UseVisualStyleBackColor = true;

+            this.btn_saveLog.Click += new System.EventHandler(this.btn_saveLog_Click);

             // 

             // check_logsInSpecifiedLocation

             // 

+            this.check_logsInSpecifiedLocation.Anchor = System.Windows.Forms.AnchorStyles.Left;

             this.check_logsInSpecifiedLocation.AutoSize = true;

-            this.check_logsInSpecifiedLocation.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.check_logsInSpecifiedLocation.Location = new System.Drawing.Point(71, 187);

+            this.tableLayoutPanel3.SetColumnSpan(this.check_logsInSpecifiedLocation, 5);

+            this.check_logsInSpecifiedLocation.Location = new System.Drawing.Point(65, 150);

             this.check_logsInSpecifiedLocation.Name = "check_logsInSpecifiedLocation";

-            this.check_logsInSpecifiedLocation.Size = new System.Drawing.Size(363, 17);

+            this.check_logsInSpecifiedLocation.Size = new System.Drawing.Size(306, 17);

             this.check_logsInSpecifiedLocation.TabIndex = 87;

             this.check_logsInSpecifiedLocation.Text = "Put a copy of individual encode logs in a specified location:";

             this.ToolTip.SetToolTip(this.check_logsInSpecifiedLocation, "Place a copy of the encode log in the same folder as the encoded movie.");

             this.check_logsInSpecifiedLocation.UseVisualStyleBackColor = true;

             this.check_logsInSpecifiedLocation.CheckedChanged += new System.EventHandler(this.check_logsInSpecifiedLocation_CheckedChanged);

             // 

-            // cb_logVerboseLvl

+            // label14

             // 

-            this.cb_logVerboseLvl.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;

-            this.cb_logVerboseLvl.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.cb_logVerboseLvl.FormattingEnabled = true;

-            this.cb_logVerboseLvl.Items.AddRange(new object[] {

-            "0",

-            "1",

-            "2"});

-            this.cb_logVerboseLvl.Location = new System.Drawing.Point(198, 119);

-            this.cb_logVerboseLvl.Name = "cb_logVerboseLvl";

-            this.cb_logVerboseLvl.Size = new System.Drawing.Size(111, 21);

-            this.cb_logVerboseLvl.TabIndex = 86;

-            this.ToolTip.SetToolTip(this.cb_logVerboseLvl, "Activity Log Verbosity Level");

-            this.cb_logVerboseLvl.SelectedIndexChanged += new System.EventHandler(this.cb_logVerboseLvl_SelectedIndexChanged);

+            this.label14.Anchor = System.Windows.Forms.AnchorStyles.Left;

+            this.label14.AutoSize = true;

+            this.label14.Location = new System.Drawing.Point(65, 177);

+            this.label14.Name = "label14";

+            this.label14.Size = new System.Drawing.Size(53, 13);

+            this.label14.TabIndex = 81;

+            this.label14.Text = "Log Path:";

             // 

-            // label3

+            // Label11

             // 

-            this.label3.AutoSize = true;

-            this.label3.BackColor = System.Drawing.Color.Transparent;

-            this.label3.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.label3.Location = new System.Drawing.Point(68, 122);

-            this.label3.Name = "label3";

-            this.label3.Size = new System.Drawing.Size(124, 13);

-            this.label3.TabIndex = 85;

-            this.label3.Text = "Log Verbosity Level:";

+            this.Label11.Anchor = System.Windows.Forms.AnchorStyles.Left;

+            this.Label11.AutoSize = true;

+            this.Label11.BackColor = System.Drawing.Color.Transparent;

+            this.Label11.Location = new System.Drawing.Point(65, 30);

+            this.Label11.Name = "Label11";

+            this.Label11.Size = new System.Drawing.Size(87, 13);

+            this.Label11.TabIndex = 40;

+            this.Label11.Text = "Processor cores:";

             // 

             // check_saveLogWithVideo

             // 

+            this.check_saveLogWithVideo.Anchor = System.Windows.Forms.AnchorStyles.Left;

             this.check_saveLogWithVideo.AutoSize = true;

-            this.check_saveLogWithVideo.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.check_saveLogWithVideo.Location = new System.Drawing.Point(71, 164);

+            this.tableLayoutPanel3.SetColumnSpan(this.check_saveLogWithVideo, 5);

+            this.check_saveLogWithVideo.Location = new System.Drawing.Point(65, 127);

             this.check_saveLogWithVideo.Name = "check_saveLogWithVideo";

-            this.check_saveLogWithVideo.Size = new System.Drawing.Size(406, 17);

+            this.check_saveLogWithVideo.Size = new System.Drawing.Size(382, 17);

             this.check_saveLogWithVideo.TabIndex = 83;

-            this.check_saveLogWithVideo.Text = "Put a copy of individual encode logs in the same location as movie";

+            this.check_saveLogWithVideo.Text = "Put a copy of individual encode logs in the same location as encoded video";

             this.ToolTip.SetToolTip(this.check_saveLogWithVideo, "Place a copy of the encode log in the same folder as the encoded movie.");

             this.check_saveLogWithVideo.UseVisualStyleBackColor = true;

             this.check_saveLogWithVideo.CheckedChanged += new System.EventHandler(this.check_saveLogWithVideo_CheckedChanged);

             // 

-            // btn_saveLog

+            // Label4

             // 

-            this.btn_saveLog.FlatAppearance.BorderColor = System.Drawing.Color.Black;

-            this.btn_saveLog.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.btn_saveLog.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));

-            this.btn_saveLog.Location = new System.Drawing.Point(343, 211);

-            this.btn_saveLog.Name = "btn_saveLog";

-            this.btn_saveLog.Size = new System.Drawing.Size(68, 22);

-            this.btn_saveLog.TabIndex = 82;

-            this.btn_saveLog.Text = "Browse";

-            this.btn_saveLog.UseVisualStyleBackColor = true;

-            this.btn_saveLog.Click += new System.EventHandler(this.btn_saveLog_Click);

+            this.Label4.Anchor = System.Windows.Forms.AnchorStyles.Left;

+            this.Label4.AutoSize = true;

+            this.Label4.BackColor = System.Drawing.Color.Transparent;

+            this.Label4.Location = new System.Drawing.Point(65, 57);

+            this.Label4.Name = "Label4";

+            this.Label4.Size = new System.Drawing.Size(70, 13);

+            this.Label4.TabIndex = 42;

+            this.Label4.Text = "Priority level:";

             // 

-            // label14

+            // label3

             // 

-            this.label14.AutoSize = true;

-            this.label14.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.label14.Location = new System.Drawing.Point(68, 214);

-            this.label14.Name = "label14";

-            this.label14.Size = new System.Drawing.Size(61, 13);

-            this.label14.TabIndex = 81;

-            this.label14.Text = "Log Path:";

+            this.label3.Anchor = System.Windows.Forms.AnchorStyles.Left;

+            this.label3.AutoSize = true;

+            this.label3.BackColor = System.Drawing.Color.Transparent;

+            this.label3.Location = new System.Drawing.Point(65, 104);

+            this.label3.Name = "label3";

+            this.label3.Size = new System.Drawing.Size(101, 13);

+            this.label3.TabIndex = 85;

+            this.label3.Text = "Log verbosity level:";

             // 

             // text_logPath

             // 

-            this.text_logPath.Location = new System.Drawing.Point(135, 211);

+            this.text_logPath.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));

+            this.tableLayoutPanel3.SetColumnSpan(this.text_logPath, 3);

+            this.text_logPath.Location = new System.Drawing.Point(172, 173);

             this.text_logPath.Name = "text_logPath";

-            this.text_logPath.Size = new System.Drawing.Size(202, 21);

+            this.text_logPath.Size = new System.Drawing.Size(302, 21);

             this.text_logPath.TabIndex = 80;

             this.ToolTip.SetToolTip(this.text_logPath, "The default location where auto named files are stored.");

             this.text_logPath.TextChanged += new System.EventHandler(this.text_logPath_TextChanged);

             // 

-            // label9

-            // 

-            this.label9.AutoSize = true;

-            this.label9.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.label9.Location = new System.Drawing.Point(12, 122);

-            this.label9.Name = "label9";

-            this.label9.Size = new System.Drawing.Size(41, 13);

-            this.label9.TabIndex = 77;

-            this.label9.Text = "Logs:";

-            // 

-            // check_cli_minimized

-            // 

-            this.check_cli_minimized.AutoSize = true;

-            this.check_cli_minimized.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.check_cli_minimized.Location = new System.Drawing.Point(71, 18);

-            this.check_cli_minimized.Name = "check_cli_minimized";

-            this.check_cli_minimized.Size = new System.Drawing.Size(162, 17);

-            this.check_cli_minimized.TabIndex = 76;

-            this.check_cli_minimized.Text = "Start window minimized";

-            this.ToolTip.SetToolTip(this.check_cli_minimized, "Starts a CLI window minimized.");

-            this.check_cli_minimized.UseVisualStyleBackColor = true;

-            this.check_cli_minimized.CheckedChanged += new System.EventHandler(this.check_cli_minimized_CheckedChanged);

-            // 

-            // label12

+            // cb_logVerboseLvl

             // 

-            this.label12.AutoSize = true;

-            this.label12.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.label12.Location = new System.Drawing.Point(21, 19);

-            this.label12.Name = "label12";

-            this.label12.Size = new System.Drawing.Size(32, 13);

-            this.label12.TabIndex = 75;

-            this.label12.Text = "CLI:";

+            this.cb_logVerboseLvl.Anchor = System.Windows.Forms.AnchorStyles.Left;

+            this.tableLayoutPanel3.SetColumnSpan(this.cb_logVerboseLvl, 4);

+            this.cb_logVerboseLvl.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;

+            this.cb_logVerboseLvl.FormattingEnabled = true;

+            this.cb_logVerboseLvl.Items.AddRange(new object[] {

+            "0",

+            "1",

+            "2"});

+            this.cb_logVerboseLvl.Location = new System.Drawing.Point(172, 100);

+            this.cb_logVerboseLvl.Name = "cb_logVerboseLvl";

+            this.cb_logVerboseLvl.Size = new System.Drawing.Size(111, 21);

+            this.cb_logVerboseLvl.TabIndex = 86;

+            this.ToolTip.SetToolTip(this.cb_logVerboseLvl, "Activity Log Verbosity Level");

+            this.cb_logVerboseLvl.SelectedIndexChanged += new System.EventHandler(this.cb_logVerboseLvl_SelectedIndexChanged);

             // 

             // drp_Priority

             // 

+            this.drp_Priority.Anchor = System.Windows.Forms.AnchorStyles.Left;

+            this.tableLayoutPanel3.SetColumnSpan(this.drp_Priority, 4);

             this.drp_Priority.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;

-            this.drp_Priority.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

             this.drp_Priority.FormattingEnabled = true;

             this.drp_Priority.Items.AddRange(new object[] {

             "Realtime",

@@ -588,7 +744,7 @@ namespace Handbrake
             "Normal",

             "Below Normal",

             "Low"});

-            this.drp_Priority.Location = new System.Drawing.Point(198, 75);

+            this.drp_Priority.Location = new System.Drawing.Point(172, 53);

             this.drp_Priority.Name = "drp_Priority";

             this.drp_Priority.Size = new System.Drawing.Size(111, 21);

             this.drp_Priority.TabIndex = 43;

@@ -596,21 +752,11 @@ namespace Handbrake
                     "w Normal if you wish to use your system whilst encoding with HandBrake.\r\n");

             this.drp_Priority.SelectedIndexChanged += new System.EventHandler(this.drp_Priority_SelectedIndexChanged);

             // 

-            // Label11

-            // 

-            this.Label11.AutoSize = true;

-            this.Label11.BackColor = System.Drawing.Color.Transparent;

-            this.Label11.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.Label11.Location = new System.Drawing.Point(68, 48);

-            this.Label11.Name = "Label11";

-            this.Label11.Size = new System.Drawing.Size(103, 13);

-            this.Label11.TabIndex = 40;

-            this.Label11.Text = "Processor cores:";

-            // 

             // drp_processors

             // 

+            this.drp_processors.Anchor = System.Windows.Forms.AnchorStyles.Left;

+            this.tableLayoutPanel3.SetColumnSpan(this.drp_processors, 4);

             this.drp_processors.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;

-            this.drp_processors.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

             this.drp_processors.FormattingEnabled = true;

             this.drp_processors.Items.AddRange(new object[] {

             "Automatic",

@@ -622,7 +768,7 @@ namespace Handbrake
             "6",

             "7",

             "8"});

-            this.drp_processors.Location = new System.Drawing.Point(198, 48);

+            this.drp_processors.Location = new System.Drawing.Point(172, 26);

             this.drp_processors.Name = "drp_processors";

             this.drp_processors.Size = new System.Drawing.Size(111, 21);

             this.drp_processors.TabIndex = 41;

@@ -630,47 +776,122 @@ namespace Handbrake
                     "n Automatic.");

             this.drp_processors.SelectedIndexChanged += new System.EventHandler(this.drp_processors_SelectedIndexChanged);

             // 

-            // Label4

+            // btn_viewLogs

             // 

-            this.Label4.AutoSize = true;

-            this.Label4.BackColor = System.Drawing.Color.Transparent;

-            this.Label4.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.Label4.Location = new System.Drawing.Point(68, 75);

-            this.Label4.Name = "Label4";

-            this.Label4.Size = new System.Drawing.Size(84, 13);

-            this.Label4.TabIndex = 42;

-            this.Label4.Text = "Priority level:";

+            this.btn_viewLogs.Anchor = System.Windows.Forms.AnchorStyles.Left;

+            this.tableLayoutPanel3.SetColumnSpan(this.btn_viewLogs, 2);

+            this.btn_viewLogs.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.btn_viewLogs.ForeColor = System.Drawing.Color.DarkOrange;

+            this.btn_viewLogs.Location = new System.Drawing.Point(65, 201);

+            this.btn_viewLogs.Name = "btn_viewLogs";

+            this.btn_viewLogs.Size = new System.Drawing.Size(139, 23);

+            this.btn_viewLogs.TabIndex = 89;

+            this.btn_viewLogs.Text = "View Log Directory";

+            this.btn_viewLogs.UseVisualStyleBackColor = true;

+            this.btn_viewLogs.Click += new System.EventHandler(this.btn_viewLogs_Click);

+            // 

+            // btn_clearLogs

+            // 

+            this.btn_clearLogs.Anchor = System.Windows.Forms.AnchorStyles.Left;

+            this.btn_clearLogs.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.btn_clearLogs.ForeColor = System.Drawing.Color.DarkOrange;

+            this.btn_clearLogs.Location = new System.Drawing.Point(210, 201);

+            this.btn_clearLogs.Name = "btn_clearLogs";

+            this.btn_clearLogs.Size = new System.Drawing.Size(135, 23);

+            this.btn_clearLogs.TabIndex = 88;

+            this.btn_clearLogs.Text = "Clear Log History";

+            this.btn_clearLogs.UseVisualStyleBackColor = true;

+            this.btn_clearLogs.Click += new System.EventHandler(this.btn_clearLogs_Click);

             // 

             // tab_advanced

             // 

-            this.tab_advanced.Controls.Add(this.check_trayStatusAlerts);

-            this.tab_advanced.Controls.Add(this.check_inGuiStatus);

-            this.tab_advanced.Controls.Add(this.check_disablePresetNotification);

-            this.tab_advanced.Controls.Add(this.check_dvdnav);

-            this.tab_advanced.Controls.Add(this.label32);

-            this.tab_advanced.Controls.Add(this.label30);

-            this.tab_advanced.Controls.Add(this.drop_x264step);

-            this.tab_advanced.Controls.Add(this.label28);

-            this.tab_advanced.Controls.Add(this.check_queryEditorTab);

-            this.tab_advanced.Controls.Add(this.check_mainMinimize);

-            this.tab_advanced.Controls.Add(this.btn_drive_detect);

-            this.tab_advanced.Controls.Add(this.label6);

+            this.tab_advanced.Controls.Add(this.tableLayoutPanel4);

             this.tab_advanced.Location = new System.Drawing.Point(4, 22);

             this.tab_advanced.Name = "tab_advanced";

-            this.tab_advanced.Padding = new System.Windows.Forms.Padding(3);

-            this.tab_advanced.Size = new System.Drawing.Size(489, 302);

+            this.tab_advanced.Padding = new System.Windows.Forms.Padding(10);

+            this.tab_advanced.Size = new System.Drawing.Size(580, 306);

             this.tab_advanced.TabIndex = 4;

             this.tab_advanced.Text = "Advanced / Other";

             this.tab_advanced.UseVisualStyleBackColor = true;

             // 

+            // tableLayoutPanel4

+            // 

+            this.tableLayoutPanel4.AutoSize = true;

+            this.tableLayoutPanel4.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;

+            this.tableLayoutPanel4.ColumnCount = 6;

+            this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());

+            this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));

+            this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));

+            this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());

+            this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());

+            this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());

+            this.tableLayoutPanel4.Controls.Add(this.check_promptOnUnmatchingQueries, 3, 4);

+            this.tableLayoutPanel4.Controls.Add(this.check_dvdnav, 2, 10);

+            this.tableLayoutPanel4.Controls.Add(this.check_trayStatusAlerts, 3, 2);

+            this.tableLayoutPanel4.Controls.Add(this.label32, 0, 10);

+            this.tableLayoutPanel4.Controls.Add(this.label6, 0, 0);

+            this.tableLayoutPanel4.Controls.Add(this.drop_x264step, 4, 8);

+            this.tableLayoutPanel4.Controls.Add(this.label30, 2, 8);

+            this.tableLayoutPanel4.Controls.Add(this.btn_drive_detect, 2, 0);

+            this.tableLayoutPanel4.Controls.Add(this.check_mainMinimize, 2, 1);

+            this.tableLayoutPanel4.Controls.Add(this.label28, 0, 8);

+            this.tableLayoutPanel4.Controls.Add(this.check_queryEditorTab, 2, 3);

+            this.tableLayoutPanel4.Controls.Add(this.check_disablePresetNotification, 2, 5);

+            this.tableLayoutPanel4.Controls.Add(this.check_inGuiStatus, 2, 6);

+            this.tableLayoutPanel4.Dock = System.Windows.Forms.DockStyle.Fill;

+            this.tableLayoutPanel4.Location = new System.Drawing.Point(10, 10);

+            this.tableLayoutPanel4.Name = "tableLayoutPanel4";

+            this.tableLayoutPanel4.RowCount = 12;

+            this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle());

+            this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle());

+            this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle());

+            this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle());

+            this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle());

+            this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle());

+            this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle());

+            this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));

+            this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle());

+            this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));

+            this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle());

+            this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle());

+            this.tableLayoutPanel4.Size = new System.Drawing.Size(560, 286);

+            this.tableLayoutPanel4.TabIndex = 62;

+            // 

+            // check_promptOnUnmatchingQueries

+            // 

+            this.check_promptOnUnmatchingQueries.AutoSize = true;

+            this.tableLayoutPanel4.SetColumnSpan(this.check_promptOnUnmatchingQueries, 3);

+            this.check_promptOnUnmatchingQueries.Location = new System.Drawing.Point(87, 95);

+            this.check_promptOnUnmatchingQueries.Name = "check_promptOnUnmatchingQueries";

+            this.check_promptOnUnmatchingQueries.Size = new System.Drawing.Size(305, 17);

+            this.check_promptOnUnmatchingQueries.TabIndex = 63;

+            this.check_promptOnUnmatchingQueries.Text = "Prompt when a manual query does not match GUI settings";

+            this.check_promptOnUnmatchingQueries.UseVisualStyleBackColor = true;

+            this.check_promptOnUnmatchingQueries.CheckedChanged += new System.EventHandler(this.check_promptOnUnmatchingQueries_CheckedChanged);

+            // 

+            // check_dvdnav

+            // 

+            this.check_dvdnav.Anchor = System.Windows.Forms.AnchorStyles.Left;

+            this.check_dvdnav.AutoSize = true;

+            this.check_dvdnav.BackColor = System.Drawing.Color.Transparent;

+            this.tableLayoutPanel4.SetColumnSpan(this.check_dvdnav, 4);

+            this.check_dvdnav.Location = new System.Drawing.Point(67, 231);

+            this.check_dvdnav.Name = "check_dvdnav";

+            this.check_dvdnav.Size = new System.Drawing.Size(250, 17);

+            this.check_dvdnav.TabIndex = 90;

+            this.check_dvdnav.Text = "Use libdvdnav (instead of libdvdread) for DVDs";

+            this.check_dvdnav.UseVisualStyleBackColor = false;

+            this.check_dvdnav.CheckedChanged += new System.EventHandler(this.check_dvdnav_CheckedChanged);

+            // 

             // check_trayStatusAlerts

             // 

+            this.check_trayStatusAlerts.Anchor = System.Windows.Forms.AnchorStyles.Left;

             this.check_trayStatusAlerts.AutoSize = true;

             this.check_trayStatusAlerts.BackColor = System.Drawing.Color.Transparent;

-            this.check_trayStatusAlerts.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.check_trayStatusAlerts.Location = new System.Drawing.Point(97, 64);

+            this.tableLayoutPanel4.SetColumnSpan(this.check_trayStatusAlerts, 3);

+            this.check_trayStatusAlerts.Location = new System.Drawing.Point(87, 49);

             this.check_trayStatusAlerts.Name = "check_trayStatusAlerts";

-            this.check_trayStatusAlerts.Size = new System.Drawing.Size(352, 17);

+            this.check_trayStatusAlerts.Size = new System.Drawing.Size(296, 17);

             this.check_trayStatusAlerts.TabIndex = 93;

             this.check_trayStatusAlerts.Text = "Display status messages from tray icon (balloon popups)";

             this.ToolTip.SetToolTip(this.check_trayStatusAlerts, "Minimize the window to the system tray rather than the task bar.\r\nThe system tray" +

@@ -679,78 +900,41 @@ namespace Handbrake
             this.check_trayStatusAlerts.UseVisualStyleBackColor = false;

             this.check_trayStatusAlerts.CheckedChanged += new System.EventHandler(this.check_trayStatusAlerts_CheckedChanged);

             // 

-            // check_inGuiStatus

-            // 

-            this.check_inGuiStatus.AutoSize = true;

-            this.check_inGuiStatus.BackColor = System.Drawing.Color.Transparent;

-            this.check_inGuiStatus.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.check_inGuiStatus.Location = new System.Drawing.Point(76, 133);

-            this.check_inGuiStatus.Name = "check_inGuiStatus";

-            this.check_inGuiStatus.Size = new System.Drawing.Size(281, 17);

-            this.check_inGuiStatus.TabIndex = 92;

-            this.check_inGuiStatus.Text = "Enable in-GUI Encode status. (Experimental)";

-            this.ToolTip.SetToolTip(this.check_inGuiStatus, "Displays the CLI status in the GUI windows instead of the CLI window.");

-            this.check_inGuiStatus.UseVisualStyleBackColor = false;

-            this.check_inGuiStatus.CheckedChanged += new System.EventHandler(this.check_inGuiStatus_CheckedChanged);

-            // 

-            // check_disablePresetNotification

-            // 

-            this.check_disablePresetNotification.AutoSize = true;

-            this.check_disablePresetNotification.BackColor = System.Drawing.Color.Transparent;

-            this.check_disablePresetNotification.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.check_disablePresetNotification.Location = new System.Drawing.Point(76, 110);

-            this.check_disablePresetNotification.Name = "check_disablePresetNotification";

-            this.check_disablePresetNotification.Size = new System.Drawing.Size(261, 17);

-            this.check_disablePresetNotification.TabIndex = 91;

-            this.check_disablePresetNotification.Text = "Disable Built-in preset update notification";

-            this.ToolTip.SetToolTip(this.check_disablePresetNotification, "Disables the notification you recieve when presets are updated when a new version" +

-                    " of HandBrake is installed.");

-            this.check_disablePresetNotification.UseVisualStyleBackColor = false;

-            this.check_disablePresetNotification.CheckedChanged += new System.EventHandler(this.check_disablePresetNotification_CheckedChanged);

-            // 

-            // check_dvdnav

-            // 

-            this.check_dvdnav.AutoSize = true;

-            this.check_dvdnav.BackColor = System.Drawing.Color.Transparent;

-            this.check_dvdnav.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.check_dvdnav.Location = new System.Drawing.Point(76, 212);

-            this.check_dvdnav.Name = "check_dvdnav";

-            this.check_dvdnav.Size = new System.Drawing.Size(297, 17);

-            this.check_dvdnav.TabIndex = 90;

-            this.check_dvdnav.Text = "Use Libdvdnav (instead of libdvdread) for dvd\'s";

-            this.check_dvdnav.UseVisualStyleBackColor = false;

-            this.check_dvdnav.CheckedChanged += new System.EventHandler(this.check_dvdnav_CheckedChanged);

-            // 

             // label32

             // 

+            this.label32.Anchor = System.Windows.Forms.AnchorStyles.Right;

             this.label32.AutoSize = true;

-            this.label32.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.label32.Location = new System.Drawing.Point(34, 213);

+            this.label32.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.label32.Location = new System.Drawing.Point(8, 233);

             this.label32.Name = "label32";

-            this.label32.Size = new System.Drawing.Size(36, 13);

+            this.label32.Size = new System.Drawing.Size(33, 13);

             this.label32.TabIndex = 89;

-            this.label32.Text = "Dvd:";

+            this.label32.Text = "DVD:";

             // 

-            // label30

+            // label6

             // 

-            this.label30.AutoSize = true;

-            this.label30.Location = new System.Drawing.Point(73, 170);

-            this.label30.Name = "label30";

-            this.label30.Size = new System.Drawing.Size(230, 13);

-            this.label30.TabIndex = 87;

-            this.label30.Text = "Constant Quality fractional granularity:\r\n";

+            this.label6.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));

+            this.label6.AutoSize = true;

+            this.label6.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.label6.Location = new System.Drawing.Point(10, 5);

+            this.label6.Margin = new System.Windows.Forms.Padding(3, 5, 3, 0);

+            this.label6.Name = "label6";

+            this.tableLayoutPanel4.SetRowSpan(this.label6, 2);

+            this.label6.Size = new System.Drawing.Size(31, 13);

+            this.label6.TabIndex = 71;

+            this.label6.Text = "GUI:";

             // 

             // drop_x264step

             // 

+            this.tableLayoutPanel4.SetColumnSpan(this.drop_x264step, 2);

             this.drop_x264step.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;

-            this.drop_x264step.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

             this.drop_x264step.FormattingEnabled = true;

             this.drop_x264step.Items.AddRange(new object[] {

             "1.0",

             "0.50",

             "0.25",

             "0.20"});

-            this.drop_x264step.Location = new System.Drawing.Point(323, 167);

+            this.drop_x264step.Location = new System.Drawing.Point(266, 184);

             this.drop_x264step.Name = "drop_x264step";

             this.drop_x264step.Size = new System.Drawing.Size(85, 21);

             this.drop_x264step.TabIndex = 86;

@@ -758,85 +942,123 @@ namespace Handbrake
                     "n Automatic.");

             this.drop_x264step.SelectedIndexChanged += new System.EventHandler(this.x264step_SelectedIndexChanged);

             // 

+            // label30

+            // 

+            this.label30.Anchor = System.Windows.Forms.AnchorStyles.Left;

+            this.label30.AutoSize = true;

+            this.tableLayoutPanel4.SetColumnSpan(this.label30, 2);

+            this.label30.Location = new System.Drawing.Point(67, 188);

+            this.label30.Name = "label30";

+            this.label30.Size = new System.Drawing.Size(193, 13);

+            this.label30.TabIndex = 87;

+            this.label30.Text = "Constant quality fractional granularity:\r\n";

+            // 

+            // btn_drive_detect

+            // 

+            this.btn_drive_detect.Anchor = System.Windows.Forms.AnchorStyles.Left;

+            this.btn_drive_detect.AutoSize = true;

+            this.tableLayoutPanel4.SetColumnSpan(this.btn_drive_detect, 4);

+            this.btn_drive_detect.Location = new System.Drawing.Point(67, 3);

+            this.btn_drive_detect.Name = "btn_drive_detect";

+            this.btn_drive_detect.Size = new System.Drawing.Size(326, 17);

+            this.btn_drive_detect.TabIndex = 72;

+            this.btn_drive_detect.Text = "Enable DVD drive detection in \"Source\" button dropdown menu";

+            this.ToolTip.SetToolTip(this.btn_drive_detect, "Enables the Source button\'s ability to detect DVD\'s.\r\nIf this option is enabled, " +

+                    "DVD\'s will be listed in the source menu.");

+            this.btn_drive_detect.UseVisualStyleBackColor = true;

+            this.btn_drive_detect.CheckedChanged += new System.EventHandler(this.btn_drive_detect_CheckedChanged);

+            // 

+            // check_mainMinimize

+            // 

+            this.check_mainMinimize.Anchor = System.Windows.Forms.AnchorStyles.Left;

+            this.check_mainMinimize.AutoSize = true;

+            this.check_mainMinimize.BackColor = System.Drawing.Color.Transparent;

+            this.tableLayoutPanel4.SetColumnSpan(this.check_mainMinimize, 4);

+            this.check_mainMinimize.Location = new System.Drawing.Point(67, 26);

+            this.check_mainMinimize.Name = "check_mainMinimize";

+            this.check_mainMinimize.Size = new System.Drawing.Size(138, 17);

+            this.check_mainMinimize.TabIndex = 82;

+            this.check_mainMinimize.Text = "Minimize to system tray";

+            this.ToolTip.SetToolTip(this.check_mainMinimize, "Minimize the window to the system tray rather than the task bar.\r\nThe system tray" +

+                    " icon has encode status notifications.\r\nNote: requires restart to take effect!\r\n" +

+                    "");

+            this.check_mainMinimize.UseVisualStyleBackColor = false;

+            this.check_mainMinimize.CheckedChanged += new System.EventHandler(this.check_mainMinimize_CheckedChanged);

+            // 

             // label28

             // 

+            this.label28.Anchor = System.Windows.Forms.AnchorStyles.Right;

             this.label28.AutoSize = true;

-            this.label28.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.label28.Location = new System.Drawing.Point(27, 170);

+            this.label28.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.label28.Location = new System.Drawing.Point(3, 188);

             this.label28.Name = "label28";

-            this.label28.Size = new System.Drawing.Size(43, 13);

+            this.label28.Size = new System.Drawing.Size(38, 13);

             this.label28.TabIndex = 85;

             this.label28.Text = "x264:";

             // 

             // check_queryEditorTab

             // 

+            this.check_queryEditorTab.Anchor = System.Windows.Forms.AnchorStyles.Left;

             this.check_queryEditorTab.AutoSize = true;

             this.check_queryEditorTab.BackColor = System.Drawing.Color.Transparent;

-            this.check_queryEditorTab.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.check_queryEditorTab.Location = new System.Drawing.Point(76, 87);

+            this.tableLayoutPanel4.SetColumnSpan(this.check_queryEditorTab, 4);

+            this.check_queryEditorTab.Location = new System.Drawing.Point(67, 72);

             this.check_queryEditorTab.Name = "check_queryEditorTab";

-            this.check_queryEditorTab.Size = new System.Drawing.Size(175, 17);

+            this.check_queryEditorTab.Size = new System.Drawing.Size(149, 17);

             this.check_queryEditorTab.TabIndex = 84;

-            this.check_queryEditorTab.Text = "Enable \"Query Editor\" Tab";

+            this.check_queryEditorTab.Text = "Enable \"Query Editor\" tab";

             this.ToolTip.SetToolTip(this.check_queryEditorTab, "Enables the Query Editor tab on the main window. Requires program restart to take" +

                     " effect.");

             this.check_queryEditorTab.UseVisualStyleBackColor = false;

             this.check_queryEditorTab.CheckedChanged += new System.EventHandler(this.check_queryEditorTab_CheckedChanged);

             // 

-            // check_mainMinimize

-            // 

-            this.check_mainMinimize.AutoSize = true;

-            this.check_mainMinimize.BackColor = System.Drawing.Color.Transparent;

-            this.check_mainMinimize.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.check_mainMinimize.Location = new System.Drawing.Point(76, 41);

-            this.check_mainMinimize.Name = "check_mainMinimize";

-            this.check_mainMinimize.Size = new System.Drawing.Size(286, 17);

-            this.check_mainMinimize.TabIndex = 82;

-            this.check_mainMinimize.Text = "Minimize to System Tray rather than task bar";

-            this.ToolTip.SetToolTip(this.check_mainMinimize, "Minimize the window to the system tray rather than the task bar.\r\nThe system tray" +

-                    " icon has encode status notifications.\r\nNote: requires restart to take effect!\r\n" +

-                    "");

-            this.check_mainMinimize.UseVisualStyleBackColor = false;

-            this.check_mainMinimize.CheckedChanged += new System.EventHandler(this.check_mainMinimize_CheckedChanged);

-            // 

-            // btn_drive_detect

+            // check_disablePresetNotification

             // 

-            this.btn_drive_detect.AutoSize = true;

-            this.btn_drive_detect.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.btn_drive_detect.Location = new System.Drawing.Point(76, 18);

-            this.btn_drive_detect.Name = "btn_drive_detect";

-            this.btn_drive_detect.Size = new System.Drawing.Size(383, 17);

-            this.btn_drive_detect.TabIndex = 72;

-            this.btn_drive_detect.Text = "Enable Drive Detection in the \"Source\" button dropdown menu";

-            this.ToolTip.SetToolTip(this.btn_drive_detect, "Enables the Source button\'s ability to detect DVD\'s.\r\nIf this option is enabled, " +

-                    "DVD\'s will be listed in the source menu.");

-            this.btn_drive_detect.UseVisualStyleBackColor = true;

-            this.btn_drive_detect.CheckedChanged += new System.EventHandler(this.btn_drive_detect_CheckedChanged);

+            this.check_disablePresetNotification.Anchor = System.Windows.Forms.AnchorStyles.Left;

+            this.check_disablePresetNotification.AutoSize = true;

+            this.check_disablePresetNotification.BackColor = System.Drawing.Color.Transparent;

+            this.tableLayoutPanel4.SetColumnSpan(this.check_disablePresetNotification, 4);

+            this.check_disablePresetNotification.Location = new System.Drawing.Point(67, 118);

+            this.check_disablePresetNotification.Name = "check_disablePresetNotification";

+            this.check_disablePresetNotification.Size = new System.Drawing.Size(222, 17);

+            this.check_disablePresetNotification.TabIndex = 91;

+            this.check_disablePresetNotification.Text = "Disable built-in preset update notification";

+            this.ToolTip.SetToolTip(this.check_disablePresetNotification, "Disables the notification you recieve when presets are updated when a new version" +

+                    " of HandBrake is installed.");

+            this.check_disablePresetNotification.UseVisualStyleBackColor = false;

+            this.check_disablePresetNotification.CheckedChanged += new System.EventHandler(this.check_disablePresetNotification_CheckedChanged);

             // 

-            // label6

+            // check_inGuiStatus

             // 

-            this.label6.AutoSize = true;

-            this.label6.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.label6.Location = new System.Drawing.Point(35, 19);

-            this.label6.Name = "label6";

-            this.label6.Size = new System.Drawing.Size(35, 13);

-            this.label6.TabIndex = 71;

-            this.label6.Text = "GUI:";

+            this.check_inGuiStatus.Anchor = System.Windows.Forms.AnchorStyles.Left;

+            this.check_inGuiStatus.AutoSize = true;

+            this.check_inGuiStatus.BackColor = System.Drawing.Color.Transparent;

+            this.tableLayoutPanel4.SetColumnSpan(this.check_inGuiStatus, 4);

+            this.check_inGuiStatus.Location = new System.Drawing.Point(67, 141);

+            this.check_inGuiStatus.Name = "check_inGuiStatus";

+            this.check_inGuiStatus.Size = new System.Drawing.Size(235, 17);

+            this.check_inGuiStatus.TabIndex = 92;

+            this.check_inGuiStatus.Text = "Enable in-GUI encode status (experimental)";

+            this.ToolTip.SetToolTip(this.check_inGuiStatus, "Displays the CLI status in the GUI windows instead of the CLI window.");

+            this.check_inGuiStatus.UseVisualStyleBackColor = false;

+            this.check_inGuiStatus.CheckedChanged += new System.EventHandler(this.check_inGuiStatus_CheckedChanged);

             // 

             // label8

             // 

+            this.label8.Anchor = System.Windows.Forms.AnchorStyles.Left;

             this.label8.AutoSize = true;

-            this.label8.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.label8.Location = new System.Drawing.Point(50, 24);

+            this.label8.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.label8.Location = new System.Drawing.Point(41, 11);

             this.label8.Name = "label8";

-            this.label8.Size = new System.Drawing.Size(131, 13);

+            this.label8.Size = new System.Drawing.Size(115, 13);

             this.label8.TabIndex = 61;

             this.label8.Text = "HandBrake Options";

             // 

             // pictureBox2

             // 

             this.pictureBox2.Image = global::Handbrake.Properties.Resources.General_Preferences;

-            this.pictureBox2.Location = new System.Drawing.Point(12, 12);

+            this.pictureBox2.Location = new System.Drawing.Point(3, 0);

+            this.pictureBox2.Margin = new System.Windows.Forms.Padding(3, 0, 3, 3);

             this.pictureBox2.Name = "pictureBox2";

             this.pictureBox2.Size = new System.Drawing.Size(32, 32);

             this.pictureBox2.TabIndex = 60;

@@ -1178,48 +1400,66 @@ namespace Handbrake
             this.openFile_vlc.DefaultExt = "exe";

             this.openFile_vlc.Filter = "exe|*.exe";

             // 

-            // drop_updateCheckDays

-            // 

-            this.drop_updateCheckDays.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;

-            this.drop_updateCheckDays.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.drop_updateCheckDays.FormattingEnabled = true;

-            this.drop_updateCheckDays.Items.AddRange(new object[] {

-            "Daily",

-            "Weekly",

-            "Monthly"});

-            this.drop_updateCheckDays.Location = new System.Drawing.Point(134, 40);

-            this.drop_updateCheckDays.Name = "drop_updateCheckDays";

-            this.drop_updateCheckDays.Size = new System.Drawing.Size(85, 21);

-            this.drop_updateCheckDays.TabIndex = 97;

-            this.ToolTip.SetToolTip(this.drop_updateCheckDays, "The number of processor\'s / processor cores. Unless your having problems, leave o" +

-                    "n Automatic.");

-            this.drop_updateCheckDays.SelectedIndexChanged += new System.EventHandler(this.drop_updateCheckDays_SelectedIndexChanged);

+            // tableLayoutPanel5

+            // 

+            this.tableLayoutPanel5.AutoSize = true;

+            this.tableLayoutPanel5.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;

+            this.tableLayoutPanel5.ColumnCount = 2;

+            this.tableLayoutPanel5.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());

+            this.tableLayoutPanel5.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());

+            this.tableLayoutPanel5.Controls.Add(this.pictureBox2, 0, 0);

+            this.tableLayoutPanel5.Controls.Add(this.btn_close, 1, 2);

+            this.tableLayoutPanel5.Controls.Add(this.label8, 1, 0);

+            this.tableLayoutPanel5.Controls.Add(this.tab_options, 0, 1);

+            this.tableLayoutPanel5.Dock = System.Windows.Forms.DockStyle.Fill;

+            this.tableLayoutPanel5.Location = new System.Drawing.Point(12, 12);

+            this.tableLayoutPanel5.Name = "tableLayoutPanel5";

+            this.tableLayoutPanel5.RowCount = 3;

+            this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle());

+            this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle());

+            this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle());

+            this.tableLayoutPanel5.Size = new System.Drawing.Size(594, 405);

+            this.tableLayoutPanel5.TabIndex = 62;

             // 

             // frmOptions

             // 

-            this.ClientSize = new System.Drawing.Size(521, 418);

-            this.Controls.Add(this.label8);

-            this.Controls.Add(this.pictureBox2);

-            this.Controls.Add(this.tab_options);

-            this.Controls.Add(this.btn_close);

-            this.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);

+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;

+            this.AutoSize = true;

+            this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;

+            this.ClientSize = new System.Drawing.Size(618, 429);

+            this.Controls.Add(this.tableLayoutPanel5);

+            this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;

             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));

             this.MaximizeBox = false;

             this.MinimizeBox = false;

             this.Name = "frmOptions";

+            this.Padding = new System.Windows.Forms.Padding(12);

+            this.ShowIcon = false;

+            this.ShowInTaskbar = false;

             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;

-            this.Text = "Options";

+            this.Text = "HandBrake Options";

             this.tab_options.ResumeLayout(false);

             this.tab_general.ResumeLayout(false);

             this.tab_general.PerformLayout();

+            this.tableLayoutPanel1.ResumeLayout(false);

+            this.tableLayoutPanel1.PerformLayout();

             this.tab_picture.ResumeLayout(false);

             this.tab_picture.PerformLayout();

+            this.tableLayoutPanel2.ResumeLayout(false);

+            this.tableLayoutPanel2.PerformLayout();

             this.tab_cli.ResumeLayout(false);

             this.tab_cli.PerformLayout();

+            this.tableLayoutPanel3.ResumeLayout(false);

+            this.tableLayoutPanel3.PerformLayout();

             this.tab_advanced.ResumeLayout(false);

             this.tab_advanced.PerformLayout();

+            this.tableLayoutPanel4.ResumeLayout(false);

+            this.tableLayoutPanel4.PerformLayout();

             ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();

+            this.tableLayoutPanel5.ResumeLayout(false);

+            this.tableLayoutPanel5.PerformLayout();

             this.ResumeLayout(false);

             this.PerformLayout();

 

@@ -1236,10 +1476,8 @@ namespace Handbrake
         private System.Windows.Forms.PictureBox pictureBox2;

         private System.Windows.Forms.TabPage tab_general;

         private System.Windows.Forms.FolderBrowserDialog pathFinder;

-        internal System.Windows.Forms.ComboBox drp_Priority;

         internal System.Windows.Forms.Label Label11;

         internal System.Windows.Forms.Label Label4;

-        internal System.Windows.Forms.ComboBox drp_processors;

         internal System.Windows.Forms.CheckBox check_tooltip;

         internal System.Windows.Forms.CheckBox check_updateCheck;

         internal System.Windows.Forms.CheckBox check_userDefaultSettings;

@@ -1313,5 +1551,13 @@ namespace Handbrake
         private System.Windows.Forms.Button btn_clearLogs;

         internal System.Windows.Forms.CheckBox check_m4v;

         internal System.Windows.Forms.ComboBox drop_updateCheckDays;

+        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;

+        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2;

+        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel3;

+        internal System.Windows.Forms.ComboBox drp_processors;

+        internal System.Windows.Forms.ComboBox drp_Priority;

+        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel4;

+        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel5;

+        private System.Windows.Forms.CheckBox check_promptOnUnmatchingQueries;

     }

 }
\ No newline at end of file
diff --git a/win/C#/frmOptions.cs b/win/C#/frmOptions.cs
index 606d9d773..174b8601c 100644
--- a/win/C#/frmOptions.cs
+++ b/win/C#/frmOptions.cs
@@ -112,6 +112,9 @@ namespace Handbrake
             if (Properties.Settings.Default.QueryEditorTab)

                 check_queryEditorTab.CheckState = CheckState.Checked;

 

+            // Prompt on inconsistant queries

+            check_promptOnUnmatchingQueries.Checked = Properties.Settings.Default.PromptOnUnmatchingQueries;

+

             // Preset update notification

             if (Properties.Settings.Default.presetNotification)

                 check_disablePresetNotification.CheckState = CheckState.Checked;

@@ -284,6 +287,7 @@ namespace Handbrake
         private void check_mainMinimize_CheckedChanged(object sender, EventArgs e)

         {

             Properties.Settings.Default.MainWindowMinimize = check_mainMinimize.Checked;

+            check_trayStatusAlerts.Enabled = check_mainMinimize.Checked;

         }

 

         private void check_trayStatusAlerts_CheckedChanged(object sender, EventArgs e)

@@ -294,6 +298,12 @@ namespace Handbrake
         private void check_queryEditorTab_CheckedChanged(object sender, EventArgs e)

         {

             Properties.Settings.Default.QueryEditorTab = check_queryEditorTab.Checked;

+            check_promptOnUnmatchingQueries.Enabled = check_queryEditorTab.Checked;

+        }

+

+        private void check_promptOnUnmatchingQueries_CheckedChanged(object sender, EventArgs e)

+        {

+            Properties.Settings.Default.PromptOnUnmatchingQueries = check_promptOnUnmatchingQueries.Checked;

         }

 

         private void check_disablePresetNotification_CheckedChanged(object sender, EventArgs e)

@@ -352,8 +362,5 @@ namespace Handbrake
             Properties.Settings.Default.Save(); // Small hack for Vista. Seems to work fine on XP without this

             this.Close();

         }

-

-        

-

     }

 }
\ No newline at end of file
diff --git a/win/C#/frmPreview.Designer.cs b/win/C#/frmPreview.Designer.cs
index bd3f7201b..cbbf5e539 100644
--- a/win/C#/frmPreview.Designer.cs
+++ b/win/C#/frmPreview.Designer.cs
@@ -68,7 +68,7 @@
             // 

             this.lbl_preview.BackColor = System.Drawing.Color.Transparent;

             this.lbl_preview.Name = "lbl_preview";

-            this.lbl_preview.Size = new System.Drawing.Size(89, 22);

+            this.lbl_preview.Size = new System.Drawing.Size(91, 22);

             this.lbl_preview.Text = "Start at Preview:";

             // 

             // cb_preview

@@ -95,7 +95,7 @@
             // 

             this.toolStripLabel2.BackColor = System.Drawing.Color.Transparent;

             this.toolStripLabel2.Name = "toolStripLabel2";

-            this.toolStripLabel2.Size = new System.Drawing.Size(98, 22);

+            this.toolStripLabel2.Size = new System.Drawing.Size(107, 22);

             this.toolStripLabel2.Text = "Duration (seconds)";

             // 

             // cb_duration

@@ -127,7 +127,7 @@
             this.btn_playQT.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;

             this.btn_playQT.ImageTransparentColor = System.Drawing.Color.Magenta;

             this.btn_playQT.Name = "btn_playQT";

-            this.btn_playQT.Size = new System.Drawing.Size(89, 22);

+            this.btn_playQT.Size = new System.Drawing.Size(96, 22);

             this.btn_playQT.Text = "Play with QT";

             this.btn_playQT.Click += new System.EventHandler(this.btn_playQT_Click);

             // 

@@ -137,7 +137,7 @@
             this.btn_playVLC.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;

             this.btn_playVLC.ImageTransparentColor = System.Drawing.Color.Magenta;

             this.btn_playVLC.Name = "btn_playVLC";

-            this.btn_playVLC.Size = new System.Drawing.Size(93, 22);

+            this.btn_playVLC.Size = new System.Drawing.Size(101, 22);

             this.btn_playVLC.Text = "Play with VLC";

             this.btn_playVLC.Click += new System.EventHandler(this.btn_playVLC_Click);

             // 

@@ -183,6 +183,7 @@
             this.ClientSize = new System.Drawing.Size(772, 506);

             this.Controls.Add(this.panel1);

             this.Controls.Add(this.toolBar);

+            this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));

             this.Name = "frmPreview";

             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;

diff --git a/win/C#/frmQueue.Designer.cs b/win/C#/frmQueue.Designer.cs
index 98d04d012..f5b379cac 100644
--- a/win/C#/frmQueue.Designer.cs
+++ b/win/C#/frmQueue.Designer.cs
@@ -79,23 +79,27 @@ namespace Handbrake
             this.panel3 = new System.Windows.Forms.Panel();

             this.panel2 = new System.Windows.Forms.Panel();

             this.panel1 = new System.Windows.Forms.Panel();

+            this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();

             this.toolStrip1.SuspendLayout();

             this.mnu_queue.SuspendLayout();

             this.statusStrip1.SuspendLayout();

             this.splitContainer1.Panel1.SuspendLayout();

             this.splitContainer1.Panel2.SuspendLayout();

             this.splitContainer1.SuspendLayout();

+            this.tableLayoutPanel1.SuspendLayout();

             this.SuspendLayout();

             // 

             // btn_down

             // 

+            this.btn_down.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));

             this.btn_down.BackColor = System.Drawing.SystemColors.ControlLight;

             this.btn_down.FlatAppearance.BorderColor = System.Drawing.Color.Black;

             this.btn_down.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

             this.btn_down.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));

-            this.btn_down.Location = new System.Drawing.Point(607, 66);

+            this.btn_down.Location = new System.Drawing.Point(625, 52);

             this.btn_down.Name = "btn_down";

-            this.btn_down.Size = new System.Drawing.Size(75, 22);

+            this.tableLayoutPanel1.SetRowSpan(this.btn_down, 2);

+            this.btn_down.Size = new System.Drawing.Size(64, 22);

             this.btn_down.TabIndex = 33;

             this.btn_down.TabStop = false;

             this.btn_down.Text = "Down";

@@ -105,13 +109,15 @@ namespace Handbrake
             // 

             // btn_up

             // 

+            this.btn_up.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));

             this.btn_up.BackColor = System.Drawing.SystemColors.ControlLight;

             this.btn_up.FlatAppearance.BorderColor = System.Drawing.Color.Black;

             this.btn_up.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

             this.btn_up.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));

-            this.btn_up.Location = new System.Drawing.Point(537, 66);

+            this.btn_up.Location = new System.Drawing.Point(564, 52);

             this.btn_up.Name = "btn_up";

-            this.btn_up.Size = new System.Drawing.Size(64, 22);

+            this.tableLayoutPanel1.SetRowSpan(this.btn_up, 2);

+            this.btn_up.Size = new System.Drawing.Size(55, 22);

             this.btn_up.TabIndex = 32;

             this.btn_up.TabStop = false;

             this.btn_up.Text = "Up";

@@ -121,13 +127,15 @@ namespace Handbrake
             // 

             // btn_delete

             // 

+            this.btn_delete.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));

             this.btn_delete.BackColor = System.Drawing.SystemColors.ControlLight;

             this.btn_delete.FlatAppearance.BorderColor = System.Drawing.Color.Black;

             this.btn_delete.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

             this.btn_delete.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));

-            this.btn_delete.Location = new System.Drawing.Point(689, 66);

+            this.btn_delete.Location = new System.Drawing.Point(695, 52);

             this.btn_delete.Name = "btn_delete";

-            this.btn_delete.Size = new System.Drawing.Size(75, 22);

+            this.tableLayoutPanel1.SetRowSpan(this.btn_delete, 2);

+            this.btn_delete.Size = new System.Drawing.Size(64, 22);

             this.btn_delete.TabIndex = 31;

             this.btn_delete.TabStop = false;

             this.btn_delete.Text = "Delete";

@@ -139,8 +147,9 @@ namespace Handbrake
             // 

             this.label4.AutoSize = true;

             this.label4.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.label4.Location = new System.Drawing.Point(225, 57);

+            this.label4.Location = new System.Drawing.Point(125, 49);

             this.label4.Name = "label4";

+            this.tableLayoutPanel1.SetRowSpan(this.label4, 2);

             this.label4.Size = new System.Drawing.Size(48, 26);

             this.label4.TabIndex = 70;

             this.label4.Text = "Video:\r\nAudio:";

@@ -148,9 +157,9 @@ namespace Handbrake
             // lbl_chapt

             // 

             this.lbl_chapt.AutoSize = true;

-            this.lbl_chapt.Location = new System.Drawing.Point(158, 69);

+            this.lbl_chapt.Location = new System.Drawing.Point(108, 62);

             this.lbl_chapt.Name = "lbl_chapt";

-            this.lbl_chapt.Size = new System.Drawing.Size(12, 13);

+            this.lbl_chapt.Size = new System.Drawing.Size(11, 13);

             this.lbl_chapt.TabIndex = 69;

             this.lbl_chapt.Text = "-";

             // 

@@ -158,36 +167,36 @@ namespace Handbrake
             // 

             this.lbl_title.AccessibleRole = System.Windows.Forms.AccessibleRole.None;

             this.lbl_title.AutoSize = true;

-            this.lbl_title.Location = new System.Drawing.Point(158, 56);

+            this.lbl_title.Location = new System.Drawing.Point(108, 49);

             this.lbl_title.Name = "lbl_title";

-            this.lbl_title.Size = new System.Drawing.Size(12, 13);

+            this.lbl_title.Size = new System.Drawing.Size(11, 13);

             this.lbl_title.TabIndex = 68;

             this.lbl_title.Text = "-";

             // 

             // lbl_aEnc

             // 

             this.lbl_aEnc.AutoSize = true;

-            this.lbl_aEnc.Location = new System.Drawing.Point(286, 70);

+            this.lbl_aEnc.Location = new System.Drawing.Point(179, 62);

             this.lbl_aEnc.Name = "lbl_aEnc";

-            this.lbl_aEnc.Size = new System.Drawing.Size(12, 13);

+            this.lbl_aEnc.Size = new System.Drawing.Size(11, 13);

             this.lbl_aEnc.TabIndex = 67;

             this.lbl_aEnc.Text = "-";

             // 

             // lbl_vEnc

             // 

             this.lbl_vEnc.AutoSize = true;

-            this.lbl_vEnc.Location = new System.Drawing.Point(286, 57);

+            this.lbl_vEnc.Location = new System.Drawing.Point(179, 49);

             this.lbl_vEnc.Name = "lbl_vEnc";

-            this.lbl_vEnc.Size = new System.Drawing.Size(12, 13);

+            this.lbl_vEnc.Size = new System.Drawing.Size(11, 13);

             this.lbl_vEnc.TabIndex = 66;

             this.lbl_vEnc.Text = "-";

             // 

             // lbl_dest

             // 

             this.lbl_dest.AutoSize = true;

-            this.lbl_dest.Location = new System.Drawing.Point(158, 44);

+            this.lbl_dest.Location = new System.Drawing.Point(108, 36);

             this.lbl_dest.Name = "lbl_dest";

-            this.lbl_dest.Size = new System.Drawing.Size(12, 13);

+            this.lbl_dest.Size = new System.Drawing.Size(11, 13);

             this.lbl_dest.TabIndex = 65;

             this.lbl_dest.Text = "-";

             this.lbl_dest.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;

@@ -195,9 +204,9 @@ namespace Handbrake
             // lbl_source

             // 

             this.lbl_source.AutoSize = true;

-            this.lbl_source.Location = new System.Drawing.Point(158, 31);

+            this.lbl_source.Location = new System.Drawing.Point(108, 23);

             this.lbl_source.Name = "lbl_source";

-            this.lbl_source.Size = new System.Drawing.Size(12, 13);

+            this.lbl_source.Size = new System.Drawing.Size(11, 13);

             this.lbl_source.TabIndex = 64;

             this.lbl_source.Text = "-";

             // 

@@ -205,8 +214,9 @@ namespace Handbrake
             // 

             this.label1.AutoSize = true;

             this.label1.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.label1.Location = new System.Drawing.Point(12, 31);

+            this.label1.Location = new System.Drawing.Point(3, 23);

             this.label1.Name = "label1";

+            this.tableLayoutPanel1.SetRowSpan(this.label1, 4);

             this.label1.Size = new System.Drawing.Size(99, 52);

             this.label1.TabIndex = 63;

             this.label1.Text = "Source:\r\nDestination:\r\nDVD Title:\r\nDVD Chapters:";

@@ -215,7 +225,7 @@ namespace Handbrake
             // 

             this.label3.AutoSize = true;

             this.label3.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.label3.Location = new System.Drawing.Point(12, 9);

+            this.label3.Location = new System.Drawing.Point(3, 0);

             this.label3.Name = "label3";

             this.label3.Size = new System.Drawing.Size(82, 13);

             this.label3.TabIndex = 62;

@@ -232,7 +242,7 @@ namespace Handbrake
             this.toolStrip1.Location = new System.Drawing.Point(0, 0);

             this.toolStrip1.Name = "toolStrip1";

             this.toolStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional;

-            this.toolStrip1.Size = new System.Drawing.Size(779, 39);

+            this.toolStrip1.Size = new System.Drawing.Size(787, 39);

             this.toolStrip1.TabIndex = 71;

             this.toolStrip1.Text = "toolStrip1";

             // 

@@ -242,7 +252,7 @@ namespace Handbrake
             this.btn_encode.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;

             this.btn_encode.ImageTransparentColor = System.Drawing.Color.Magenta;

             this.btn_encode.Name = "btn_encode";

-            this.btn_encode.Size = new System.Drawing.Size(78, 36);

+            this.btn_encode.Size = new System.Drawing.Size(82, 36);

             this.btn_encode.Text = "Encode";

             this.btn_encode.Click += new System.EventHandler(this.btn_encode_Click);

             // 

@@ -253,7 +263,7 @@ namespace Handbrake
             this.btn_pause.ImageTransparentColor = System.Drawing.Color.Magenta;

             this.btn_pause.Name = "btn_pause";

             this.btn_pause.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never;

-            this.btn_pause.Size = new System.Drawing.Size(72, 36);

+            this.btn_pause.Size = new System.Drawing.Size(74, 36);

             this.btn_pause.Text = "Pause";

             this.btn_pause.Visible = false;

             this.btn_pause.Click += new System.EventHandler(this.btn_pause_Click);

@@ -275,14 +285,14 @@ namespace Handbrake
             this.drop_button_queue.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;

             this.drop_button_queue.ImageTransparentColor = System.Drawing.Color.Magenta;

             this.drop_button_queue.Name = "drop_button_queue";

-            this.drop_button_queue.Size = new System.Drawing.Size(84, 36);

+            this.drop_button_queue.Size = new System.Drawing.Size(87, 36);

             this.drop_button_queue.Text = "Queue";

             // 

             // mnu_batch

             // 

             this.mnu_batch.Image = global::Handbrake.Properties.Resources.Output_Small;

             this.mnu_batch.Name = "mnu_batch";

-            this.mnu_batch.Size = new System.Drawing.Size(190, 22);

+            this.mnu_batch.Size = new System.Drawing.Size(187, 22);

             this.mnu_batch.Text = "Generate Batch Script";

             this.mnu_batch.Click += new System.EventHandler(this.mnu_batch_Click);

             // 

@@ -290,7 +300,7 @@ namespace Handbrake
             // 

             this.mnu_import.Image = global::Handbrake.Properties.Resources.folder;

             this.mnu_import.Name = "mnu_import";

-            this.mnu_import.Size = new System.Drawing.Size(190, 22);

+            this.mnu_import.Size = new System.Drawing.Size(187, 22);

             this.mnu_import.Text = "Import Queue";

             this.mnu_import.Click += new System.EventHandler(this.mnu_import_Click);

             // 

@@ -298,21 +308,21 @@ namespace Handbrake
             // 

             this.mnu_export.Image = global::Handbrake.Properties.Resources.save;

             this.mnu_export.Name = "mnu_export";

-            this.mnu_export.Size = new System.Drawing.Size(190, 22);

+            this.mnu_export.Size = new System.Drawing.Size(187, 22);

             this.mnu_export.Text = "Export Queue";

             this.mnu_export.Click += new System.EventHandler(this.mnu_export_Click);

             // 

             // toolStripSeparator2

             // 

             this.toolStripSeparator2.Name = "toolStripSeparator2";

-            this.toolStripSeparator2.Size = new System.Drawing.Size(187, 6);

+            this.toolStripSeparator2.Size = new System.Drawing.Size(184, 6);

             // 

             // mnu_readd

             // 

             this.mnu_readd.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;

             this.mnu_readd.Image = global::Handbrake.Properties.Resources.AddToQueue_small;

             this.mnu_readd.Name = "mnu_readd";

-            this.mnu_readd.Size = new System.Drawing.Size(190, 22);

+            this.mnu_readd.Size = new System.Drawing.Size(187, 22);

             this.mnu_readd.Text = "Re-Add Current Job";

             this.mnu_readd.Click += new System.EventHandler(this.mnu_readd_Click);

             // 

@@ -335,9 +345,9 @@ namespace Handbrake
             this.list_queue.FullRowSelect = true;

             this.list_queue.GridLines = true;

             this.list_queue.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;

-            this.list_queue.Location = new System.Drawing.Point(15, 0);

+            this.list_queue.Location = new System.Drawing.Point(13, 0);

             this.list_queue.Name = "list_queue";

-            this.list_queue.Size = new System.Drawing.Size(749, 219);

+            this.list_queue.Size = new System.Drawing.Size(761, 219);

             this.list_queue.TabIndex = 72;

             this.list_queue.UseCompatibleStateImageBehavior = false;

             this.list_queue.View = System.Windows.Forms.View.Details;

@@ -381,31 +391,31 @@ namespace Handbrake
             this.toolStripSeparator3,

             this.mnu_delete});

             this.mnu_queue.Name = "mnu_queue";

-            this.mnu_queue.Size = new System.Drawing.Size(142, 76);

+            this.mnu_queue.Size = new System.Drawing.Size(139, 76);

             // 

             // mnu_up

             // 

             this.mnu_up.Name = "mnu_up";

-            this.mnu_up.Size = new System.Drawing.Size(141, 22);

+            this.mnu_up.Size = new System.Drawing.Size(138, 22);

             this.mnu_up.Text = "Move Up";

             this.mnu_up.Click += new System.EventHandler(this.mnu_up_Click);

             // 

             // mnu_Down

             // 

             this.mnu_Down.Name = "mnu_Down";

-            this.mnu_Down.Size = new System.Drawing.Size(141, 22);

+            this.mnu_Down.Size = new System.Drawing.Size(138, 22);

             this.mnu_Down.Text = "Move Down";

             this.mnu_Down.Click += new System.EventHandler(this.mnu_Down_Click);

             // 

             // toolStripSeparator3

             // 

             this.toolStripSeparator3.Name = "toolStripSeparator3";

-            this.toolStripSeparator3.Size = new System.Drawing.Size(138, 6);

+            this.toolStripSeparator3.Size = new System.Drawing.Size(135, 6);

             // 

             // mnu_delete

             // 

             this.mnu_delete.Name = "mnu_delete";

-            this.mnu_delete.Size = new System.Drawing.Size(141, 22);

+            this.mnu_delete.Size = new System.Drawing.Size(138, 22);

             this.mnu_delete.Text = "Delete";

             this.mnu_delete.Click += new System.EventHandler(this.mnu_delete_Click);

             // 

@@ -415,7 +425,8 @@ namespace Handbrake
             this.lbl_encodesPending});

             this.statusStrip1.Location = new System.Drawing.Point(0, 368);

             this.statusStrip1.Name = "statusStrip1";

-            this.statusStrip1.Size = new System.Drawing.Size(779, 22);

+            this.statusStrip1.Padding = new System.Windows.Forms.Padding(1, 0, 12, 0);

+            this.statusStrip1.Size = new System.Drawing.Size(787, 22);

             this.statusStrip1.TabIndex = 73;

             this.statusStrip1.Text = "statusStrip1";

             // 

@@ -424,7 +435,7 @@ namespace Handbrake
             this.lbl_encodesPending.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;

             this.lbl_encodesPending.Margin = new System.Windows.Forms.Padding(0, 3, 10, 2);

             this.lbl_encodesPending.Name = "lbl_encodesPending";

-            this.lbl_encodesPending.Size = new System.Drawing.Size(105, 17);

+            this.lbl_encodesPending.Size = new System.Drawing.Size(115, 17);

             this.lbl_encodesPending.Text = "0 encode(s) pending";

             // 

             // OpenFile

@@ -442,18 +453,7 @@ namespace Handbrake
             // 

             // splitContainer1.Panel1

             // 

-            this.splitContainer1.Panel1.Controls.Add(this.label3);

-            this.splitContainer1.Panel1.Controls.Add(this.label1);

-            this.splitContainer1.Panel1.Controls.Add(this.btn_down);

-            this.splitContainer1.Panel1.Controls.Add(this.lbl_title);

-            this.splitContainer1.Panel1.Controls.Add(this.btn_up);

-            this.splitContainer1.Panel1.Controls.Add(this.lbl_aEnc);

-            this.splitContainer1.Panel1.Controls.Add(this.lbl_source);

-            this.splitContainer1.Panel1.Controls.Add(this.label4);

-            this.splitContainer1.Panel1.Controls.Add(this.lbl_chapt);

-            this.splitContainer1.Panel1.Controls.Add(this.lbl_dest);

-            this.splitContainer1.Panel1.Controls.Add(this.lbl_vEnc);

-            this.splitContainer1.Panel1.Controls.Add(this.btn_delete);

+            this.splitContainer1.Panel1.Controls.Add(this.tableLayoutPanel1);

             // 

             // splitContainer1.Panel2

             // 

@@ -461,7 +461,7 @@ namespace Handbrake
             this.splitContainer1.Panel2.Controls.Add(this.panel3);

             this.splitContainer1.Panel2.Controls.Add(this.panel2);

             this.splitContainer1.Panel2.Controls.Add(this.panel1);

-            this.splitContainer1.Size = new System.Drawing.Size(779, 329);

+            this.splitContainer1.Size = new System.Drawing.Size(787, 329);

             this.splitContainer1.SplitterDistance = 94;

             this.splitContainer1.SplitterWidth = 1;

             this.splitContainer1.TabIndex = 74;

@@ -469,17 +469,17 @@ namespace Handbrake
             // panel3

             // 

             this.panel3.Dock = System.Windows.Forms.DockStyle.Bottom;

-            this.panel3.Location = new System.Drawing.Point(15, 219);

+            this.panel3.Location = new System.Drawing.Point(13, 219);

             this.panel3.Name = "panel3";

-            this.panel3.Size = new System.Drawing.Size(749, 15);

+            this.panel3.Size = new System.Drawing.Size(761, 15);

             this.panel3.TabIndex = 77;

             // 

             // panel2

             // 

             this.panel2.Dock = System.Windows.Forms.DockStyle.Right;

-            this.panel2.Location = new System.Drawing.Point(764, 0);

+            this.panel2.Location = new System.Drawing.Point(774, 0);

             this.panel2.Name = "panel2";

-            this.panel2.Size = new System.Drawing.Size(15, 234);

+            this.panel2.Size = new System.Drawing.Size(13, 234);

             this.panel2.TabIndex = 76;

             // 

             // panel1

@@ -487,20 +487,55 @@ namespace Handbrake
             this.panel1.Dock = System.Windows.Forms.DockStyle.Left;

             this.panel1.Location = new System.Drawing.Point(0, 0);

             this.panel1.Name = "panel1";

-            this.panel1.Size = new System.Drawing.Size(15, 234);

+            this.panel1.Size = new System.Drawing.Size(13, 234);

             this.panel1.TabIndex = 75;

             // 

+            // tableLayoutPanel1

+            // 

+            this.tableLayoutPanel1.AutoSize = true;

+            this.tableLayoutPanel1.ColumnCount = 7;

+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());

+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());

+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());

+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));

+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());

+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());

+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());

+            this.tableLayoutPanel1.Controls.Add(this.label1, 0, 2);

+            this.tableLayoutPanel1.Controls.Add(this.btn_delete, 6, 4);

+            this.tableLayoutPanel1.Controls.Add(this.btn_down, 5, 4);

+            this.tableLayoutPanel1.Controls.Add(this.lbl_aEnc, 3, 5);

+            this.tableLayoutPanel1.Controls.Add(this.btn_up, 4, 4);

+            this.tableLayoutPanel1.Controls.Add(this.lbl_source, 1, 2);

+            this.tableLayoutPanel1.Controls.Add(this.lbl_vEnc, 3, 4);

+            this.tableLayoutPanel1.Controls.Add(this.label4, 2, 4);

+            this.tableLayoutPanel1.Controls.Add(this.lbl_dest, 1, 3);

+            this.tableLayoutPanel1.Controls.Add(this.lbl_title, 1, 4);

+            this.tableLayoutPanel1.Controls.Add(this.lbl_chapt, 1, 5);

+            this.tableLayoutPanel1.Controls.Add(this.label3, 0, 0);

+            this.tableLayoutPanel1.Location = new System.Drawing.Point(13, 13);

+            this.tableLayoutPanel1.Name = "tableLayoutPanel1";

+            this.tableLayoutPanel1.RowCount = 6;

+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());

+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 10F));

+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());

+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());

+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());

+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());

+            this.tableLayoutPanel1.Size = new System.Drawing.Size(762, 77);

+            this.tableLayoutPanel1.TabIndex = 71;

+            // 

             // frmQueue

             // 

-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 13F);

+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;

-            this.ClientSize = new System.Drawing.Size(779, 390);

+            this.ClientSize = new System.Drawing.Size(787, 390);

             this.Controls.Add(this.splitContainer1);

             this.Controls.Add(this.statusStrip1);

             this.Controls.Add(this.toolStrip1);

-            this.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));

-            this.MinimumSize = new System.Drawing.Size(787, 417);

+            this.MinimumSize = new System.Drawing.Size(677, 417);

             this.Name = "frmQueue";

             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;

             this.Text = "Encode Queue";

@@ -513,6 +548,8 @@ namespace Handbrake
             this.splitContainer1.Panel1.PerformLayout();

             this.splitContainer1.Panel2.ResumeLayout(false);

             this.splitContainer1.ResumeLayout(false);

+            this.tableLayoutPanel1.ResumeLayout(false);

+            this.tableLayoutPanel1.PerformLayout();

             this.ResumeLayout(false);

             this.PerformLayout();

 

@@ -563,5 +600,6 @@ namespace Handbrake
         private System.Windows.Forms.ToolStripMenuItem mnu_Down;

         private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;

         private System.Windows.Forms.ToolStripMenuItem mnu_delete;

+        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;

     }

 }

diff --git a/win/C#/frmQueue.cs b/win/C#/frmQueue.cs
index c7b280ef3..d52545b0b 100644
--- a/win/C#/frmQueue.cs
+++ b/win/C#/frmQueue.cs
@@ -9,22 +9,23 @@ using System.Collections.Generic;
 using System.ComponentModel;

 using System.Windows.Forms;

 using Handbrake.EncodeQueue;

+using System.Collections.ObjectModel;

 

 namespace Handbrake

 {

     public partial class frmQueue : Form

     {

         private delegate void UpdateHandler();

-        QueueHandler queue;

+        private QueueHandler queue;

 

         public frmQueue(QueueHandler q)

         {

             InitializeComponent();

 

             this.queue = q;

-            queue.OnEncodeStart += new EventHandler(queueOnEncodeStart);

-            queue.OnQueueFinished += new EventHandler(queueOnQueueFinished);

-            queue.OnPaused += new EventHandler(queueOnPaused);

+            queue.NewJobStarted += new EventHandler(queueOnEncodeStart);

+            queue.QueueCompleted += new EventHandler(queueOnQueueFinished);

+            queue.QueuePauseRequested += new EventHandler(queueOnPaused);

         }

         void queueOnPaused(object sender, EventArgs e)

         {

@@ -74,19 +75,19 @@ namespace Handbrake
         // Start and Stop Controls

         private void btn_encode_Click(object sender, EventArgs e)

         {

-            if (queue.isPaused)

+            if (queue.PauseRequested)

             {

                 setUIEncodeStarted();

                 MessageBox.Show("Encoding restarted", "Information", MessageBoxButtons.OK, MessageBoxIcon.Information);

             }

 

-            if (!queue.isEncodeStarted)

-                queue.startEncode();

+            if (!queue.IsEncoding)

+                queue.StartEncodeQueue();

 

         }

         private void btn_pause_Click(object sender, EventArgs e)

         {

-            queue.pauseEncodeQueue();

+            queue.RequestPause();

             setUIEncodeFinished();

             resetQueue();

             MessageBox.Show("No further items on the queue will start. The current encode process will continue until it is finished. \nClick 'Encode' when you wish to continue encoding the queue.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);

@@ -141,7 +142,7 @@ namespace Handbrake
             }

 

             list_queue.Items.Clear();

-            List<Job> theQueue = queue.getQueue();

+            ReadOnlyCollection<Job> theQueue = queue.CurrentQueue;

             foreach (Job queue_item in theQueue)

             {

                 string q_item = queue_item.Query;

@@ -203,9 +204,9 @@ namespace Handbrake
                 }

 

                 // found query is a global varible

-                Functions.QueryParser parsed = Functions.QueryParser.Parse(queue.lastQueueItem.Query);

-                lbl_source.Text = queue.lastQueueItem.Source;

-                lbl_dest.Text = queue.lastQueueItem.Destination;

+                Functions.QueryParser parsed = Functions.QueryParser.Parse(queue.LastEncode.Query);

+                lbl_source.Text = queue.LastEncode.Source;

+                lbl_dest.Text = queue.LastEncode.Destination;

 

                 lbl_title.Text = parsed.DVDTitle == 0 ? "Auto" : parsed.DVDTitle.ToString();

 

@@ -254,7 +255,7 @@ namespace Handbrake
 

                 // Remove each selected item

                 foreach (int selectedIndex in selectedIndices)

-                    queue.remove(selectedIndex);

+                    queue.RemoveJob(selectedIndex);

 

                 updateUIElements();

 

@@ -308,7 +309,7 @@ namespace Handbrake
 

                 // Move up each selected item

                 foreach (int selectedIndex in selectedIndices)

-                    queue.moveUp(selectedIndex);

+                    queue.MoveUp(selectedIndex);

 

                 updateUIElements();

 

@@ -336,7 +337,7 @@ namespace Handbrake
 

                 // Move down each selected item

                 foreach (int selectedIndex in selectedIndices)

-                    queue.moveDown(selectedIndex);

+                    queue.MoveDown(selectedIndex);

 

                 updateUIElements();

 

@@ -356,7 +357,7 @@ namespace Handbrake
             SaveFile.Filter = "Batch|.bat";

             SaveFile.ShowDialog();

             if (SaveFile.FileName != String.Empty)

-                queue.writeBatchScript(SaveFile.FileName);

+                queue.WriteBatchScriptToFile(SaveFile.FileName);

         }

         private void mnu_export_Click(object sender, EventArgs e)

         {

@@ -364,21 +365,21 @@ namespace Handbrake
             SaveFile.Filter = "HandBrake Queue|*.queue";

             SaveFile.ShowDialog();

             if (SaveFile.FileName != String.Empty)

-                queue.updateQueueRecoveryFile(SaveFile.FileName);

+                queue.WriteQueueStateToFile(SaveFile.FileName);

         }

         private void mnu_import_Click(object sender, EventArgs e)

         {

             OpenFile.FileName = "";

             OpenFile.ShowDialog();

             if (OpenFile.FileName != String.Empty)

-                queue.recoverQueue(OpenFile.FileName);

+                queue.LoadQueueFromFile(OpenFile.FileName);

             updateUIElements();

         }

         private void mnu_readd_Click(object sender, EventArgs e)

         {

-            if (queue.lastQueueItem != null)

+            if (!queue.LastEncode.IsEmpty)

             {

-                queue.add(queue.lastQueueItem.Query, queue.lastQueueItem.Source, queue.lastQueueItem.Destination);

+                queue.AddJob(queue.LastEncode.Query, queue.LastEncode.Source, queue.LastEncode.Destination);

                 updateUIElements();

             }

         }

diff --git a/win/C#/frmUpdater.Designer.cs b/win/C#/frmUpdater.Designer.cs
index f5c903a95..26b57695e 100644
--- a/win/C#/frmUpdater.Designer.cs
+++ b/win/C#/frmUpdater.Designer.cs
@@ -63,20 +63,19 @@ namespace Handbrake
             // label1

             // 

             this.label1.AutoSize = true;

-            this.label1.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.label1.Location = new System.Drawing.Point(82, 12);

+            this.label1.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.label1.Location = new System.Drawing.Point(84, 12);

             this.label1.Name = "label1";

-            this.label1.Size = new System.Drawing.Size(305, 16);

+            this.label1.Size = new System.Drawing.Size(273, 16);

             this.label1.TabIndex = 25;

             this.label1.Text = "A New Version of Handbrake is available!";

             // 

             // label6

             // 

             this.label6.AutoSize = true;

-            this.label6.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

             this.label6.Location = new System.Drawing.Point(82, 49);

             this.label6.Name = "label6";

-            this.label6.Size = new System.Drawing.Size(208, 13);

+            this.label6.Size = new System.Drawing.Size(175, 13);

             this.label6.TabIndex = 30;

             this.label6.Text = "Would you like to download it now?";

             // 

@@ -131,10 +130,10 @@ namespace Handbrake
             // label3

             // 

             this.label3.AutoSize = true;

-            this.label3.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.label3.Location = new System.Drawing.Point(82, 84);

+            this.label3.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.label3.Location = new System.Drawing.Point(84, 87);

             this.label3.Name = "label3";

-            this.label3.Size = new System.Drawing.Size(103, 13);

+            this.label3.Size = new System.Drawing.Size(90, 13);

             this.label3.TabIndex = 57;

             this.label3.Text = "Release Notes:";

             // 

@@ -151,10 +150,9 @@ namespace Handbrake
             // lbl_update_text

             // 

             this.lbl_update_text.AutoSize = true;

-            this.lbl_update_text.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.lbl_update_text.Location = new System.Drawing.Point(82, 34);

+            this.lbl_update_text.Location = new System.Drawing.Point(84, 36);

             this.lbl_update_text.Name = "lbl_update_text";

-            this.lbl_update_text.Size = new System.Drawing.Size(489, 13);

+            this.lbl_update_text.Size = new System.Drawing.Size(409, 13);

             this.lbl_update_text.TabIndex = 58;

             this.lbl_update_text.Text = "HandBrake {0.0.0} (000000000) is now available. (You have: {0.0.0} (000000000))";

             //