WinGui:

New layout for the tab bar. (Similar to the MacGUI)

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

diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj
index 97918ad..4c257c5 100644 (file)
--- a/win/C#/HandBrakeCS.csproj
+++ b/win/C#/HandBrakeCS.csproj
@@ -102,6 +102,12 @@
     <Compile Include="Parsing\Parser.cs" />\r
     <Compile Include="Parsing\Subtitle.cs" />\r
     <Compile Include="Parsing\Title.cs" />\r
+    <Compile Include="PictureController.cs">\r
+      <SubType>Form</SubType>\r
+    </Compile>\r
+    <Compile Include="PictureController.Designer.cs">\r
+      <DependentUpon>PictureController.cs</DependentUpon>\r
+    </Compile>\r
     <Compile Include="Program.cs" />\r
     <Compile Include="Properties\AssemblyInfo.cs" />\r
     <EmbeddedResource Include="frmAbout.resx">\r
@@ -124,6 +130,10 @@
       <SubType>Designer</SubType>\r
       <DependentUpon>frmQuickStart.cs</DependentUpon>\r
     </EmbeddedResource>\r
+    <EmbeddedResource Include="PictureController.resx">\r
+      <SubType>Designer</SubType>\r
+      <DependentUpon>PictureController.cs</DependentUpon>\r
+    </EmbeddedResource>\r
     <EmbeddedResource Include="Properties\Resources.resx">\r
       <Generator>ResXFileCodeGenerator</Generator>\r
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>\r

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index 2c736f3..d74482e 100644 (file)
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -47,7 +47,6 @@ namespace Handbrake
             this.drp_videoEncoder = new System.Windows.Forms.ComboBox();\r
             this.drp_audioCodec = new System.Windows.Forms.ComboBox();\r
             this.CheckCRF = new System.Windows.Forms.CheckBox();\r
-            this.drp_subtitle = new System.Windows.Forms.ComboBox();\r
             this.QueryEditorText = new System.Windows.Forms.RichTextBox();\r
             this.rtf_h264advanced = new System.Windows.Forms.RichTextBox();\r
             this.drp_audioBitrate = new System.Windows.Forms.ComboBox();\r
@@ -58,8 +57,7 @@ namespace Handbrake
             this.slider_videoQuality = new System.Windows.Forms.TrackBar();\r
             this.text_filesize = new System.Windows.Forms.TextBox();\r
             this.text_bitrate = new System.Windows.Forms.TextBox();\r
-            this.drp_deInterlace_option = new System.Windows.Forms.ComboBox();\r
-            this.drp_deNoise = new System.Windows.Forms.ComboBox();\r
+            this.drp_subtitle = new System.Windows.Forms.ComboBox();\r
             this.DVD_Open = new System.Windows.Forms.FolderBrowserDialog();\r
             this.File_Open = new System.Windows.Forms.OpenFileDialog();\r
             this.ISO_Open = new System.Windows.Forms.OpenFileDialog();\r
@@ -140,6 +138,9 @@ namespace Handbrake
             this.Label90 = new System.Windows.Forms.Label();\r
             this.Label92 = new System.Windows.Forms.Label();\r
             this.TabPage2 = new System.Windows.Forms.TabPage();\r
+            this.Label19 = new System.Windows.Forms.Label();\r
+            this.Label21 = new System.Windows.Forms.Label();\r
+            this.Label20 = new System.Windows.Forms.Label();\r
             this.Label29 = new System.Windows.Forms.Label();\r
             this.drp_audioMixDown = new System.Windows.Forms.ComboBox();\r
             this.drp_audioChannels = new System.Windows.Forms.ComboBox();\r
@@ -150,32 +151,30 @@ namespace Handbrake
             this.Label32 = new System.Windows.Forms.Label();\r
             this.Label18 = new System.Windows.Forms.Label();\r
             this.TabPage3 = new System.Windows.Forms.TabPage();\r
-            this.label24 = new System.Windows.Forms.Label();\r
-            this.label11 = new System.Windows.Forms.Label();\r
-            this.check_deblock = new System.Windows.Forms.CheckBox();\r
-            this.check_detelecine = new System.Windows.Forms.CheckBox();\r
-            this.label4 = new System.Windows.Forms.Label();\r
+            this.check_grayscale = new System.Windows.Forms.CheckBox();\r
             this.Label37 = new System.Windows.Forms.Label();\r
-            this.Label23 = new System.Windows.Forms.Label();\r
             this.Label22 = new System.Windows.Forms.Label();\r
+            this.check_2PassEncode = new System.Windows.Forms.CheckBox();\r
             this.Label2 = new System.Windows.Forms.Label();\r
+            this.Label42 = new System.Windows.Forms.Label();\r
             this.SliderValue = new System.Windows.Forms.Label();\r
-            this.check_2PassEncode = new System.Windows.Forms.CheckBox();\r
             this.Label46 = new System.Windows.Forms.Label();\r
             this.Label40 = new System.Windows.Forms.Label();\r
-            this.Label42 = new System.Windows.Forms.Label();\r
             this.TabPage1 = new System.Windows.Forms.TabPage();\r
+            this.label24 = new System.Windows.Forms.Label();\r
+            this.drp_deNoise = new System.Windows.Forms.ComboBox();\r
+            this.label11 = new System.Windows.Forms.Label();\r
+            this.check_deblock = new System.Windows.Forms.CheckBox();\r
+            this.check_detelecine = new System.Windows.Forms.CheckBox();\r
+            this.label4 = new System.Windows.Forms.Label();\r
+            this.drp_deInterlace_option = new System.Windows.Forms.ComboBox();\r
             this.Check_ChapterMarkers = new System.Windows.Forms.CheckBox();\r
             this.CheckPixelRatio = new System.Windows.Forms.CheckBox();\r
-            this.check_grayscale = new System.Windows.Forms.CheckBox();\r
             this.label6 = new System.Windows.Forms.Label();\r
-            this.Label19 = new System.Windows.Forms.Label();\r
             this.lbl_RecomendedCrop = new System.Windows.Forms.Label();\r
             this.Label8 = new System.Windows.Forms.Label();\r
             this.Label1 = new System.Windows.Forms.Label();\r
             this.Label53 = new System.Windows.Forms.Label();\r
-            this.Label21 = new System.Windows.Forms.Label();\r
-            this.Label20 = new System.Windows.Forms.Label();\r
             this.Label52 = new System.Windows.Forms.Label();\r
             this.Label51 = new System.Windows.Forms.Label();\r
             this.Label50 = new System.Windows.Forms.Label();\r
@@ -187,6 +186,7 @@ namespace Handbrake
             this.text_left = new System.Windows.Forms.TextBox();\r
             this.advancedOptions = new System.Windows.Forms.TabControl();\r
             this.groupBox_dest = new System.Windows.Forms.GroupBox();\r
+            this.label23 = new System.Windows.Forms.Label();\r
             Label38 = new System.Windows.Forms.Label();\r
             ((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).BeginInit();\r
             this.frmMainMenu.SuspendLayout();\r
@@ -205,7 +205,7 @@ namespace Handbrake
             // \r
             Label38.AutoSize = true;\r
             Label38.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            Label38.Location = new System.Drawing.Point(13, 67);\r
+            Label38.Location = new System.Drawing.Point(304, 67);\r
             Label38.Name = "Label38";\r
             Label38.Size = new System.Drawing.Size(103, 13);\r
             Label38.TabIndex = 30;\r
@@ -273,7 +273,7 @@ namespace Handbrake
             // \r
             this.RadioISO.AutoSize = true;\r
             this.RadioISO.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.RadioISO.Location = new System.Drawing.Point(487, 33);\r
+            this.RadioISO.Location = new System.Drawing.Point(549, 25);\r
             this.RadioISO.Name = "RadioISO";\r
             this.RadioISO.Size = new System.Drawing.Size(44, 17);\r
             this.RadioISO.TabIndex = 19;\r
@@ -397,7 +397,7 @@ namespace Handbrake
             this.CheckCRF.AutoSize = true;\r
             this.CheckCRF.Enabled = false;\r
             this.CheckCRF.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.CheckCRF.Location = new System.Drawing.Point(155, 133);\r
+            this.CheckCRF.Location = new System.Drawing.Point(446, 133);\r
             this.CheckCRF.Name = "CheckCRF";\r
             this.CheckCRF.Size = new System.Drawing.Size(146, 17);\r
             this.CheckCRF.TabIndex = 44;\r
@@ -405,31 +405,19 @@ namespace Handbrake
             this.ToolTip.SetToolTip(this.CheckCRF, "Constant Rate Factor");\r
             this.CheckCRF.UseVisualStyleBackColor = true;\r
             // \r
-            // drp_subtitle\r
-            // \r
-            this.drp_subtitle.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.drp_subtitle.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.drp_subtitle.FormattingEnabled = true;\r
-            this.drp_subtitle.Location = new System.Drawing.Point(381, 36);\r
-            this.drp_subtitle.Name = "drp_subtitle";\r
-            this.drp_subtitle.Size = new System.Drawing.Size(213, 21);\r
-            this.drp_subtitle.TabIndex = 42;\r
-            this.drp_subtitle.Text = "None";\r
-            this.ToolTip.SetToolTip(this.drp_subtitle, "Select the subtitle language you require from this dropdown.");\r
-            // \r
             // QueryEditorText\r
             // \r
-            this.QueryEditorText.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
-            this.QueryEditorText.Location = new System.Drawing.Point(16, 114);\r
+            this.QueryEditorText.BorderStyle = System.Windows.Forms.BorderStyle.None;\r
+            this.QueryEditorText.Location = new System.Drawing.Point(16, 88);\r
             this.QueryEditorText.Name = "QueryEditorText";\r
-            this.QueryEditorText.Size = new System.Drawing.Size(605, 104);\r
+            this.QueryEditorText.Size = new System.Drawing.Size(605, 122);\r
             this.QueryEditorText.TabIndex = 41;\r
             this.QueryEditorText.Text = "";\r
             this.ToolTip.SetToolTip(this.QueryEditorText, "Manually add or edit a query generated by the GUI.");\r
             // \r
             // rtf_h264advanced\r
             // \r
-            this.rtf_h264advanced.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
+            this.rtf_h264advanced.BorderStyle = System.Windows.Forms.BorderStyle.None;\r
             this.rtf_h264advanced.Location = new System.Drawing.Point(16, 79);\r
             this.rtf_h264advanced.Name = "rtf_h264advanced";\r
             this.rtf_h264advanced.Size = new System.Drawing.Size(605, 96);\r
@@ -453,7 +441,7 @@ namespace Handbrake
             "112",\r
             "128",\r
             "160"});\r
-            this.drp_audioBitrate.Location = new System.Drawing.Point(157, 37);\r
+            this.drp_audioBitrate.Location = new System.Drawing.Point(137, 37);\r
             this.drp_audioBitrate.Name = "drp_audioBitrate";\r
             this.drp_audioBitrate.Size = new System.Drawing.Size(101, 21);\r
             this.drp_audioBitrate.TabIndex = 40;\r
@@ -471,7 +459,7 @@ namespace Handbrake
             "32",\r
             "24",\r
             "22.05"});\r
-            this.drp_audioSampleRate.Location = new System.Drawing.Point(157, 67);\r
+            this.drp_audioSampleRate.Location = new System.Drawing.Point(137, 67);\r
             this.drp_audioSampleRate.Name = "drp_audioSampleRate";\r
             this.drp_audioSampleRate.Size = new System.Drawing.Size(101, 21);\r
             this.drp_audioSampleRate.TabIndex = 23;\r
@@ -482,7 +470,7 @@ namespace Handbrake
             // \r
             this.check_largeFile.AutoSize = true;\r
             this.check_largeFile.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.check_largeFile.Location = new System.Drawing.Point(363, 84);\r
+            this.check_largeFile.Location = new System.Drawing.Point(16, 107);\r
             this.check_largeFile.Name = "check_largeFile";\r
             this.check_largeFile.Size = new System.Drawing.Size(172, 17);\r
             this.check_largeFile.TabIndex = 51;\r
@@ -495,7 +483,7 @@ namespace Handbrake
             // \r
             this.check_turbo.AutoSize = true;\r
             this.check_turbo.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.check_turbo.Location = new System.Drawing.Point(363, 61);\r
+            this.check_turbo.Location = new System.Drawing.Point(37, 84);\r
             this.check_turbo.Name = "check_turbo";\r
             this.check_turbo.Size = new System.Drawing.Size(110, 17);\r
             this.check_turbo.TabIndex = 50;\r
@@ -518,7 +506,7 @@ namespace Handbrake
             "24",\r
             "25",\r
             "29.97"});\r
-            this.drp_videoFramerate.Location = new System.Drawing.Point(155, 179);\r
+            this.drp_videoFramerate.Location = new System.Drawing.Point(126, 149);\r
             this.drp_videoFramerate.Name = "drp_videoFramerate";\r
             this.drp_videoFramerate.Size = new System.Drawing.Size(112, 21);\r
             this.drp_videoFramerate.TabIndex = 21;\r
@@ -527,7 +515,7 @@ namespace Handbrake
             // \r
             // slider_videoQuality\r
             // \r
-            this.slider_videoQuality.Location = new System.Drawing.Point(144, 90);\r
+            this.slider_videoQuality.Location = new System.Drawing.Point(435, 90);\r
             this.slider_videoQuality.Maximum = 100;\r
             this.slider_videoQuality.Name = "slider_videoQuality";\r
             this.slider_videoQuality.Size = new System.Drawing.Size(167, 42);\r
@@ -540,7 +528,7 @@ namespace Handbrake
             // \r
             this.text_filesize.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
             this.text_filesize.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.text_filesize.Location = new System.Drawing.Point(155, 63);\r
+            this.text_filesize.Location = new System.Drawing.Point(446, 63);\r
             this.text_filesize.Name = "text_filesize";\r
             this.text_filesize.Size = new System.Drawing.Size(156, 21);\r
             this.text_filesize.TabIndex = 16;\r
@@ -551,45 +539,24 @@ namespace Handbrake
             // \r
             this.text_bitrate.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
             this.text_bitrate.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.text_bitrate.Location = new System.Drawing.Point(155, 36);\r
+            this.text_bitrate.Location = new System.Drawing.Point(446, 36);\r
             this.text_bitrate.Name = "text_bitrate";\r
             this.text_bitrate.Size = new System.Drawing.Size(156, 21);\r
             this.text_bitrate.TabIndex = 15;\r
             this.ToolTip.SetToolTip(this.text_bitrate, "Set the bitrate of the video");\r
             this.text_bitrate.TextChanged += new System.EventHandler(this.text_bitrate_TextChanged);\r
             // \r
-            // drp_deInterlace_option\r
-            // \r
-            this.drp_deInterlace_option.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.drp_deInterlace_option.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.drp_deInterlace_option.FormattingEnabled = true;\r
-            this.drp_deInterlace_option.Items.AddRange(new object[] {\r
-            "None",\r
-            "Origional (Fast)",\r
-            "yadif (Slow)",\r
-            "yadif + mcdeint (Slower)",\r
-            "yadif + mcdeint  (Slowest)"});\r
-            this.drp_deInterlace_option.Location = new System.Drawing.Point(462, 154);\r
-            this.drp_deInterlace_option.Name = "drp_deInterlace_option";\r
-            this.drp_deInterlace_option.Size = new System.Drawing.Size(161, 21);\r
-            this.drp_deInterlace_option.TabIndex = 67;\r
-            this.drp_deInterlace_option.Text = "None";\r
-            // \r
-            // drp_deNoise\r
+            // drp_subtitle\r
             // \r
-            this.drp_deNoise.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.drp_deNoise.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.drp_deNoise.FormattingEnabled = true;\r
-            this.drp_deNoise.Items.AddRange(new object[] {\r
-            "None",\r
-            "Weak",\r
-            "Medium",\r
-            "Strong"});\r
-            this.drp_deNoise.Location = new System.Drawing.Point(462, 211);\r
-            this.drp_deNoise.Name = "drp_deNoise";\r
-            this.drp_deNoise.Size = new System.Drawing.Size(161, 21);\r
-            this.drp_deNoise.TabIndex = 72;\r
-            this.drp_deNoise.Text = "None";\r
+            this.drp_subtitle.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
+            this.drp_subtitle.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.drp_subtitle.FormattingEnabled = true;\r
+            this.drp_subtitle.Location = new System.Drawing.Point(406, 36);\r
+            this.drp_subtitle.Name = "drp_subtitle";\r
+            this.drp_subtitle.Size = new System.Drawing.Size(213, 21);\r
+            this.drp_subtitle.TabIndex = 54;\r
+            this.drp_subtitle.Text = "None";\r
+            this.ToolTip.SetToolTip(this.drp_subtitle, "Select the subtitle language you require from this dropdown.");\r
             // \r
             // DVD_Open\r
             // \r
@@ -974,7 +941,7 @@ namespace Handbrake
             this.HelpToolStripMenuItem});\r
             this.frmMainMenu.Location = new System.Drawing.Point(0, 0);\r
             this.frmMainMenu.Name = "frmMainMenu";\r
-            this.frmMainMenu.Size = new System.Drawing.Size(676, 24);\r
+            this.frmMainMenu.Size = new System.Drawing.Size(675, 24);\r
             this.frmMainMenu.TabIndex = 1;\r
             this.frmMainMenu.Text = "MenuStrip1";\r
             // \r
@@ -1016,7 +983,7 @@ namespace Handbrake
             this.RadioDVD.AutoSize = true;\r
             this.RadioDVD.Checked = true;\r
             this.RadioDVD.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.RadioDVD.Location = new System.Drawing.Point(487, 17);\r
+            this.RadioDVD.Location = new System.Drawing.Point(483, 25);\r
             this.RadioDVD.Name = "RadioDVD";\r
             this.RadioDVD.Size = new System.Drawing.Size(60, 17);\r
             this.RadioDVD.TabIndex = 20;\r
@@ -1240,6 +1207,7 @@ namespace Handbrake
             // TabPage6\r
             // \r
             this.TabPage6.BackColor = System.Drawing.SystemColors.ControlLight;\r
+            this.TabPage6.Controls.Add(this.label23);\r
             this.TabPage6.Controls.Add(this.Label7);\r
             this.TabPage6.Controls.Add(this.Label39);\r
             this.TabPage6.Controls.Add(this.btn_ClearQuery);\r
@@ -1267,11 +1235,9 @@ namespace Handbrake
             this.Label39.AutoSize = true;\r
             this.Label39.Location = new System.Drawing.Point(13, 34);\r
             this.Label39.Name = "Label39";\r
-            this.Label39.Size = new System.Drawing.Size(403, 39);\r
+            this.Label39.Size = new System.Drawing.Size(331, 13);\r
             this.Label39.TabIndex = 40;\r
-            this.Label39.Text = "Here you can alter the query generated by the program.\r\nClick the \"Generate Query" +\r
-                " Now\" button to continue.\r\nRemember to re-generate the query each time you chang" +\r
-                "e a setting!";\r
+            this.Label39.Text = "Here you can alter the query generated by the program.";\r
             // \r
             // btn_ClearQuery\r
             // \r
@@ -1279,7 +1245,7 @@ namespace Handbrake
             this.btn_ClearQuery.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.btn_ClearQuery.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_ClearQuery.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_ClearQuery.Location = new System.Drawing.Point(542, 84);\r
+            this.btn_ClearQuery.Location = new System.Drawing.Point(542, 59);\r
             this.btn_ClearQuery.Name = "btn_ClearQuery";\r
             this.btn_ClearQuery.Size = new System.Drawing.Size(79, 23);\r
             this.btn_ClearQuery.TabIndex = 39;\r
@@ -1293,7 +1259,7 @@ namespace Handbrake
             this.GenerateQuery.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.GenerateQuery.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.GenerateQuery.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.GenerateQuery.Location = new System.Drawing.Point(16, 84);\r
+            this.GenerateQuery.Location = new System.Drawing.Point(16, 59);\r
             this.GenerateQuery.Name = "GenerateQuery";\r
             this.GenerateQuery.Size = new System.Drawing.Size(176, 23);\r
             this.GenerateQuery.TabIndex = 38;\r
@@ -1384,6 +1350,10 @@ namespace Handbrake
             // TabPage2\r
             // \r
             this.TabPage2.BackColor = System.Drawing.SystemColors.ControlLight;\r
+            this.TabPage2.Controls.Add(this.drp_subtitle);\r
+            this.TabPage2.Controls.Add(this.Label19);\r
+            this.TabPage2.Controls.Add(this.Label21);\r
+            this.TabPage2.Controls.Add(this.Label20);\r
             this.TabPage2.Controls.Add(this.Label29);\r
             this.TabPage2.Controls.Add(this.drp_audioMixDown);\r
             this.TabPage2.Controls.Add(this.drp_audioChannels);\r
@@ -1400,13 +1370,43 @@ namespace Handbrake
             this.TabPage2.Padding = new System.Windows.Forms.Padding(3);\r
             this.TabPage2.Size = new System.Drawing.Size(639, 242);\r
             this.TabPage2.TabIndex = 3;\r
-            this.TabPage2.Text = "Audio Settings";\r
+            this.TabPage2.Text = "Audio && Subtitles";\r
+            // \r
+            // Label19\r
+            // \r
+            this.Label19.AutoSize = true;\r
+            this.Label19.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.Label19.Location = new System.Drawing.Point(339, 13);\r
+            this.Label19.Name = "Label19";\r
+            this.Label19.Size = new System.Drawing.Size(64, 13);\r
+            this.Label19.TabIndex = 53;\r
+            this.Label19.Text = "Subtitles";\r
+            // \r
+            // Label21\r
+            // \r
+            this.Label21.AutoSize = true;\r
+            this.Label21.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.Label21.Location = new System.Drawing.Point(403, 63);\r
+            this.Label21.Name = "Label21";\r
+            this.Label21.Size = new System.Drawing.Size(224, 26);\r
+            this.Label21.TabIndex = 52;\r
+            this.Label21.Text = "Please note that subtitles will be hard \r\ncoded into the video.\r\n";\r
+            // \r
+            // Label20\r
+            // \r
+            this.Label20.AutoSize = true;\r
+            this.Label20.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.Label20.Location = new System.Drawing.Point(339, 39);\r
+            this.Label20.Name = "Label20";\r
+            this.Label20.Size = new System.Drawing.Size(61, 13);\r
+            this.Label20.TabIndex = 51;\r
+            this.Label20.Text = "Subtitles:";\r
             // \r
             // Label29\r
             // \r
             this.Label29.AutoSize = true;\r
             this.Label29.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label29.Location = new System.Drawing.Point(155, 151);\r
+            this.Label29.Location = new System.Drawing.Point(135, 151);\r
             this.Label29.Name = "Label29";\r
             this.Label29.Size = new System.Drawing.Size(189, 24);\r
             this.Label29.TabIndex = 42;\r
@@ -1423,7 +1423,7 @@ namespace Handbrake
             "Dolby Surround",\r
             "Dolby Pro Logic II",\r
             "6 Channel Discrete"});\r
-            this.drp_audioMixDown.Location = new System.Drawing.Point(157, 127);\r
+            this.drp_audioMixDown.Location = new System.Drawing.Point(137, 127);\r
             this.drp_audioMixDown.Name = "drp_audioMixDown";\r
             this.drp_audioMixDown.Size = new System.Drawing.Size(173, 21);\r
             this.drp_audioMixDown.TabIndex = 50;\r
@@ -1435,7 +1435,7 @@ namespace Handbrake
             this.drp_audioChannels.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.drp_audioChannels.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.drp_audioChannels.FormattingEnabled = true;\r
-            this.drp_audioChannels.Location = new System.Drawing.Point(157, 97);\r
+            this.drp_audioChannels.Location = new System.Drawing.Point(137, 97);\r
             this.drp_audioChannels.Name = "drp_audioChannels";\r
             this.drp_audioChannels.Size = new System.Drawing.Size(173, 21);\r
             this.drp_audioChannels.TabIndex = 49;\r
@@ -1447,9 +1447,9 @@ namespace Handbrake
             this.Label14.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.Label14.Location = new System.Drawing.Point(13, 130);\r
             this.Label14.Name = "Label14";\r
-            this.Label14.Size = new System.Drawing.Size(99, 13);\r
+            this.Label14.Size = new System.Drawing.Size(78, 13);\r
             this.Label14.TabIndex = 39;\r
-            this.Label14.Text = "Audio MixDown:";\r
+            this.Label14.Text = "Track 1 Mix:";\r
             // \r
             // Label5\r
             // \r
@@ -1464,7 +1464,7 @@ namespace Handbrake
             // Label35\r
             // \r
             this.Label35.AutoSize = true;\r
-            this.Label35.Location = new System.Drawing.Point(239, 103);\r
+            this.Label35.Location = new System.Drawing.Point(219, 103);\r
             this.Label35.Name = "Label35";\r
             this.Label35.Size = new System.Drawing.Size(0, 13);\r
             this.Label35.TabIndex = 30;\r
@@ -1485,9 +1485,9 @@ namespace Handbrake
             this.Label32.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.Label32.Location = new System.Drawing.Point(13, 100);\r
             this.Label32.Name = "Label32";\r
-            this.Label32.Size = new System.Drawing.Size(80, 13);\r
+            this.Label32.Size = new System.Drawing.Size(55, 13);\r
             this.Label32.TabIndex = 29;\r
-            this.Label32.Text = "Audio Track:";\r
+            this.Label32.Text = "Track 1:";\r
             // \r
             // Label18\r
             // \r
@@ -1502,30 +1502,23 @@ namespace Handbrake
             // TabPage3\r
             // \r
             this.TabPage3.BackColor = System.Drawing.SystemColors.ControlLight;\r
-            this.TabPage3.Controls.Add(this.label24);\r
-            this.TabPage3.Controls.Add(this.drp_deNoise);\r
-            this.TabPage3.Controls.Add(this.label11);\r
-            this.TabPage3.Controls.Add(this.check_deblock);\r
-            this.TabPage3.Controls.Add(this.check_detelecine);\r
-            this.TabPage3.Controls.Add(this.label4);\r
-            this.TabPage3.Controls.Add(this.drp_deInterlace_option);\r
+            this.TabPage3.Controls.Add(this.check_grayscale);\r
             this.TabPage3.Controls.Add(this.Label37);\r
             this.TabPage3.Controls.Add(this.check_largeFile);\r
             this.TabPage3.Controls.Add(this.check_turbo);\r
             this.TabPage3.Controls.Add(this.CheckCRF);\r
-            this.TabPage3.Controls.Add(this.Label23);\r
             this.TabPage3.Controls.Add(this.Label22);\r
-            this.TabPage3.Controls.Add(this.Label2);\r
-            this.TabPage3.Controls.Add(this.SliderValue);\r
-            this.TabPage3.Controls.Add(this.drp_videoFramerate);\r
             this.TabPage3.Controls.Add(this.check_2PassEncode);\r
-            this.TabPage3.Controls.Add(this.slider_videoQuality);\r
+            this.TabPage3.Controls.Add(this.Label2);\r
             this.TabPage3.Controls.Add(this.text_filesize);\r
+            this.TabPage3.Controls.Add(this.Label42);\r
+            this.TabPage3.Controls.Add(this.slider_videoQuality);\r
+            this.TabPage3.Controls.Add(this.text_bitrate);\r
             this.TabPage3.Controls.Add(Label38);\r
+            this.TabPage3.Controls.Add(this.SliderValue);\r
             this.TabPage3.Controls.Add(this.Label46);\r
             this.TabPage3.Controls.Add(this.Label40);\r
-            this.TabPage3.Controls.Add(this.text_bitrate);\r
-            this.TabPage3.Controls.Add(this.Label42);\r
+            this.TabPage3.Controls.Add(this.drp_videoFramerate);\r
             this.TabPage3.Location = new System.Drawing.Point(4, 22);\r
             this.TabPage3.Name = "TabPage3";\r
             this.TabPage3.Padding = new System.Windows.Forms.Padding(3);\r
@@ -1533,124 +1526,83 @@ namespace Handbrake
             this.TabPage3.TabIndex = 2;\r
             this.TabPage3.Text = "Video Settings";\r
             // \r
-            // label24\r
-            // \r
-            this.label24.AutoSize = true;\r
-            this.label24.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label24.Location = new System.Drawing.Point(360, 133);\r
-            this.label24.Name = "label24";\r
-            this.label24.Size = new System.Drawing.Size(109, 13);\r
-            this.label24.TabIndex = 73;\r
-            this.label24.Text = "Picture Cleanup";\r
-            // \r
-            // label11\r
-            // \r
-            this.label11.AutoSize = true;\r
-            this.label11.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label11.Location = new System.Drawing.Point(360, 214);\r
-            this.label11.Name = "label11";\r
-            this.label11.Size = new System.Drawing.Size(58, 13);\r
-            this.label11.TabIndex = 71;\r
-            this.label11.Text = "Denoise:";\r
-            // \r
-            // check_deblock\r
-            // \r
-            this.check_deblock.AutoSize = true;\r
-            this.check_deblock.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.check_deblock.Location = new System.Drawing.Point(462, 186);\r
-            this.check_deblock.Name = "check_deblock";\r
-            this.check_deblock.Size = new System.Drawing.Size(72, 17);\r
-            this.check_deblock.TabIndex = 70;\r
-            this.check_deblock.Text = "Deblock";\r
-            this.check_deblock.UseVisualStyleBackColor = true;\r
-            // \r
-            // check_detelecine\r
-            // \r
-            this.check_detelecine.AutoSize = true;\r
-            this.check_detelecine.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.check_detelecine.Location = new System.Drawing.Point(363, 185);\r
-            this.check_detelecine.Name = "check_detelecine";\r
-            this.check_detelecine.Size = new System.Drawing.Size(86, 17);\r
-            this.check_detelecine.TabIndex = 69;\r
-            this.check_detelecine.Text = "Detelecine";\r
-            this.check_detelecine.UseVisualStyleBackColor = true;\r
-            // \r
-            // label4\r
+            // check_grayscale\r
             // \r
-            this.label4.AutoSize = true;\r
-            this.label4.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label4.Location = new System.Drawing.Point(360, 157);\r
-            this.label4.Name = "label4";\r
-            this.label4.Size = new System.Drawing.Size(77, 13);\r
-            this.label4.TabIndex = 68;\r
-            this.label4.Text = "Deinterlace:";\r
+            this.check_grayscale.AutoSize = true;\r
+            this.check_grayscale.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.check_grayscale.Location = new System.Drawing.Point(16, 38);\r
+            this.check_grayscale.Name = "check_grayscale";\r
+            this.check_grayscale.Size = new System.Drawing.Size(138, 17);\r
+            this.check_grayscale.TabIndex = 74;\r
+            this.check_grayscale.Text = "Grayscale Encoding";\r
+            this.check_grayscale.UseVisualStyleBackColor = true;\r
             // \r
             // Label37\r
             // \r
             this.Label37.AutoSize = true;\r
             this.Label37.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label37.Location = new System.Drawing.Point(382, 104);\r
+            this.Label37.Location = new System.Drawing.Point(35, 127);\r
             this.Label37.Name = "Label37";\r
             this.Label37.Size = new System.Drawing.Size(241, 12);\r
             this.Label37.TabIndex = 52;\r
             this.Label37.Text = "Warning: Breaks iPod, @TV, PS3 compatibility.";\r
             // \r
-            // Label23\r
-            // \r
-            this.Label23.AutoSize = true;\r
-            this.Label23.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label23.Location = new System.Drawing.Point(13, 162);\r
-            this.Label23.Name = "Label23";\r
-            this.Label23.Size = new System.Drawing.Size(100, 13);\r
-            this.Label23.TabIndex = 39;\r
-            this.Label23.Text = "Video Settings";\r
-            // \r
             // Label22\r
             // \r
             this.Label22.AutoSize = true;\r
             this.Label22.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label22.Location = new System.Drawing.Point(360, 13);\r
+            this.Label22.Location = new System.Drawing.Point(13, 13);\r
             this.Label22.Name = "Label22";\r
-            this.Label22.Size = new System.Drawing.Size(175, 13);\r
+            this.Label22.Size = new System.Drawing.Size(191, 13);\r
             this.Label22.TabIndex = 38;\r
-            this.Label22.Text = "Advanced Output Settings";\r
+            this.Label22.Text = "Advanced Encoding Settings";\r
+            // \r
+            // check_2PassEncode\r
+            // \r
+            this.check_2PassEncode.AutoSize = true;\r
+            this.check_2PassEncode.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.check_2PassEncode.Location = new System.Drawing.Point(16, 61);\r
+            this.check_2PassEncode.Name = "check_2PassEncode";\r
+            this.check_2PassEncode.Size = new System.Drawing.Size(119, 17);\r
+            this.check_2PassEncode.TabIndex = 18;\r
+            this.check_2PassEncode.Text = "2-Pass Encoding";\r
+            this.check_2PassEncode.UseVisualStyleBackColor = true;\r
             // \r
             // Label2\r
             // \r
             this.Label2.AutoSize = true;\r
             this.Label2.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label2.Location = new System.Drawing.Point(13, 13);\r
+            this.Label2.Location = new System.Drawing.Point(304, 13);\r
             this.Label2.Name = "Label2";\r
             this.Label2.Size = new System.Drawing.Size(110, 13);\r
             this.Label2.TabIndex = 37;\r
             this.Label2.Text = "Quality Settings";\r
             // \r
+            // Label42\r
+            // \r
+            this.Label42.AutoSize = true;\r
+            this.Label42.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.Label42.Location = new System.Drawing.Point(304, 38);\r
+            this.Label42.Name = "Label42";\r
+            this.Label42.Size = new System.Drawing.Size(117, 13);\r
+            this.Label42.TabIndex = 18;\r
+            this.Label42.Text = "Avg Bitrate (kbps):";\r
+            // \r
             // SliderValue\r
             // \r
             this.SliderValue.AutoSize = true;\r
             this.SliderValue.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.SliderValue.Location = new System.Drawing.Point(308, 96);\r
+            this.SliderValue.Location = new System.Drawing.Point(599, 96);\r
             this.SliderValue.Name = "SliderValue";\r
             this.SliderValue.Size = new System.Drawing.Size(23, 12);\r
             this.SliderValue.TabIndex = 32;\r
             this.SliderValue.Text = "0%";\r
             // \r
-            // check_2PassEncode\r
-            // \r
-            this.check_2PassEncode.AutoSize = true;\r
-            this.check_2PassEncode.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.check_2PassEncode.Location = new System.Drawing.Point(363, 38);\r
-            this.check_2PassEncode.Name = "check_2PassEncode";\r
-            this.check_2PassEncode.Size = new System.Drawing.Size(119, 17);\r
-            this.check_2PassEncode.TabIndex = 18;\r
-            this.check_2PassEncode.Text = "2-Pass Encoding";\r
-            this.check_2PassEncode.UseVisualStyleBackColor = true;\r
-            // \r
             // Label46\r
             // \r
             this.Label46.AutoSize = true;\r
             this.Label46.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label46.Location = new System.Drawing.Point(13, 186);\r
+            this.Label46.Location = new System.Drawing.Point(13, 152);\r
             this.Label46.Name = "Label46";\r
             this.Label46.Size = new System.Drawing.Size(107, 13);\r
             this.Label46.TabIndex = 21;\r
@@ -1660,37 +1612,29 @@ namespace Handbrake
             // \r
             this.Label40.AutoSize = true;\r
             this.Label40.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label40.Location = new System.Drawing.Point(13, 96);\r
+            this.Label40.Location = new System.Drawing.Point(304, 96);\r
             this.Label40.Name = "Label40";\r
             this.Label40.Size = new System.Drawing.Size(107, 13);\r
             this.Label40.TabIndex = 27;\r
             this.Label40.Text = "Constant Quality:";\r
             // \r
-            // Label42\r
-            // \r
-            this.Label42.AutoSize = true;\r
-            this.Label42.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label42.Location = new System.Drawing.Point(13, 38);\r
-            this.Label42.Name = "Label42";\r
-            this.Label42.Size = new System.Drawing.Size(117, 13);\r
-            this.Label42.TabIndex = 18;\r
-            this.Label42.Text = "Avg Bitrate (kbps):";\r
-            // \r
             // TabPage1\r
             // \r
             this.TabPage1.BackColor = System.Drawing.SystemColors.ControlLight;\r
+            this.TabPage1.Controls.Add(this.label24);\r
+            this.TabPage1.Controls.Add(this.drp_deNoise);\r
+            this.TabPage1.Controls.Add(this.label11);\r
+            this.TabPage1.Controls.Add(this.check_deblock);\r
+            this.TabPage1.Controls.Add(this.check_detelecine);\r
+            this.TabPage1.Controls.Add(this.label4);\r
+            this.TabPage1.Controls.Add(this.drp_deInterlace_option);\r
             this.TabPage1.Controls.Add(this.Check_ChapterMarkers);\r
             this.TabPage1.Controls.Add(this.CheckPixelRatio);\r
-            this.TabPage1.Controls.Add(this.check_grayscale);\r
             this.TabPage1.Controls.Add(this.label6);\r
-            this.TabPage1.Controls.Add(this.drp_subtitle);\r
-            this.TabPage1.Controls.Add(this.Label19);\r
             this.TabPage1.Controls.Add(this.lbl_RecomendedCrop);\r
             this.TabPage1.Controls.Add(this.Label8);\r
             this.TabPage1.Controls.Add(this.Label1);\r
             this.TabPage1.Controls.Add(this.Label53);\r
-            this.TabPage1.Controls.Add(this.Label21);\r
-            this.TabPage1.Controls.Add(this.Label20);\r
             this.TabPage1.Controls.Add(this.Label52);\r
             this.TabPage1.Controls.Add(this.Label51);\r
             this.TabPage1.Controls.Add(this.Label50);\r
@@ -1707,6 +1651,91 @@ namespace Handbrake
             this.TabPage1.TabIndex = 0;\r
             this.TabPage1.Text = "Picture Settings";\r
             // \r
+            // label24\r
+            // \r
+            this.label24.AutoSize = true;\r
+            this.label24.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.label24.Location = new System.Drawing.Point(314, 13);\r
+            this.label24.Name = "label24";\r
+            this.label24.Size = new System.Drawing.Size(109, 13);\r
+            this.label24.TabIndex = 80;\r
+            this.label24.Text = "Picture Cleanup";\r
+            // \r
+            // drp_deNoise\r
+            // \r
+            this.drp_deNoise.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
+            this.drp_deNoise.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.drp_deNoise.FormattingEnabled = true;\r
+            this.drp_deNoise.Items.AddRange(new object[] {\r
+            "None",\r
+            "Weak",\r
+            "Medium",\r
+            "Strong"});\r
+            this.drp_deNoise.Location = new System.Drawing.Point(416, 91);\r
+            this.drp_deNoise.Name = "drp_deNoise";\r
+            this.drp_deNoise.Size = new System.Drawing.Size(161, 21);\r
+            this.drp_deNoise.TabIndex = 79;\r
+            this.drp_deNoise.Text = "None";\r
+            // \r
+            // label11\r
+            // \r
+            this.label11.AutoSize = true;\r
+            this.label11.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.label11.Location = new System.Drawing.Point(314, 94);\r
+            this.label11.Name = "label11";\r
+            this.label11.Size = new System.Drawing.Size(58, 13);\r
+            this.label11.TabIndex = 78;\r
+            this.label11.Text = "Denoise:";\r
+            // \r
+            // check_deblock\r
+            // \r
+            this.check_deblock.AutoSize = true;\r
+            this.check_deblock.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.check_deblock.Location = new System.Drawing.Point(416, 37);\r
+            this.check_deblock.Name = "check_deblock";\r
+            this.check_deblock.Size = new System.Drawing.Size(72, 17);\r
+            this.check_deblock.TabIndex = 77;\r
+            this.check_deblock.Text = "Deblock";\r
+            this.check_deblock.UseVisualStyleBackColor = true;\r
+            // \r
+            // check_detelecine\r
+            // \r
+            this.check_detelecine.AutoSize = true;\r
+            this.check_detelecine.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.check_detelecine.Location = new System.Drawing.Point(317, 36);\r
+            this.check_detelecine.Name = "check_detelecine";\r
+            this.check_detelecine.Size = new System.Drawing.Size(86, 17);\r
+            this.check_detelecine.TabIndex = 76;\r
+            this.check_detelecine.Text = "Detelecine";\r
+            this.check_detelecine.UseVisualStyleBackColor = true;\r
+            // \r
+            // label4\r
+            // \r
+            this.label4.AutoSize = true;\r
+            this.label4.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.label4.Location = new System.Drawing.Point(314, 66);\r
+            this.label4.Name = "label4";\r
+            this.label4.Size = new System.Drawing.Size(77, 13);\r
+            this.label4.TabIndex = 75;\r
+            this.label4.Text = "Deinterlace:";\r
+            // \r
+            // drp_deInterlace_option\r
+            // \r
+            this.drp_deInterlace_option.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
+            this.drp_deInterlace_option.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.drp_deInterlace_option.FormattingEnabled = true;\r
+            this.drp_deInterlace_option.Items.AddRange(new object[] {\r
+            "None",\r
+            "Origional (Fast)",\r
+            "yadif (Slow)",\r
+            "yadif + mcdeint (Slower)",\r
+            "yadif + mcdeint  (Slowest)"});\r
+            this.drp_deInterlace_option.Location = new System.Drawing.Point(416, 63);\r
+            this.drp_deInterlace_option.Name = "drp_deInterlace_option";\r
+            this.drp_deInterlace_option.Size = new System.Drawing.Size(161, 21);\r
+            this.drp_deInterlace_option.TabIndex = 74;\r
+            this.drp_deInterlace_option.Text = "None";\r
+            // \r
             // Check_ChapterMarkers\r
             // \r
             this.Check_ChapterMarkers.AutoSize = true;\r
@@ -1731,36 +1760,15 @@ namespace Handbrake
             this.CheckPixelRatio.UseVisualStyleBackColor = true;\r
             this.CheckPixelRatio.CheckedChanged += new System.EventHandler(this.CheckPixelRatio_CheckedChanged);\r
             // \r
-            // check_grayscale\r
-            // \r
-            this.check_grayscale.AutoSize = true;\r
-            this.check_grayscale.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.check_grayscale.Location = new System.Drawing.Point(317, 127);\r
-            this.check_grayscale.Name = "check_grayscale";\r
-            this.check_grayscale.Size = new System.Drawing.Size(138, 17);\r
-            this.check_grayscale.TabIndex = 46;\r
-            this.check_grayscale.Text = "Grayscale Encoding";\r
-            this.check_grayscale.UseVisualStyleBackColor = true;\r
-            // \r
             // label6\r
             // \r
             this.label6.AutoSize = true;\r
             this.label6.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label6.Location = new System.Drawing.Point(314, 105);\r
+            this.label6.Location = new System.Drawing.Point(314, 128);\r
             this.label6.Name = "label6";\r
-            this.label6.Size = new System.Drawing.Size(110, 13);\r
+            this.label6.Size = new System.Drawing.Size(173, 13);\r
             this.label6.TabIndex = 45;\r
-            this.label6.Text = "Picture Settings";\r
-            // \r
-            // Label19\r
-            // \r
-            this.Label19.AutoSize = true;\r
-            this.Label19.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label19.Location = new System.Drawing.Point(311, 13);\r
-            this.Label19.Name = "Label19";\r
-            this.Label19.Size = new System.Drawing.Size(64, 13);\r
-            this.Label19.TabIndex = 39;\r
-            this.Label19.Text = "Subtitles";\r
+            this.label6.Text = "Additional Output Options";\r
             // \r
             // lbl_RecomendedCrop\r
             // \r
@@ -1801,26 +1809,6 @@ namespace Handbrake
             this.Label53.TabIndex = 32;\r
             this.Label53.Text = "Bottom";\r
             // \r
-            // Label21\r
-            // \r
-            this.Label21.AutoSize = true;\r
-            this.Label21.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label21.Location = new System.Drawing.Point(378, 63);\r
-            this.Label21.Name = "Label21";\r
-            this.Label21.Size = new System.Drawing.Size(224, 26);\r
-            this.Label21.TabIndex = 34;\r
-            this.Label21.Text = "Please note that subtitles will be hard \r\ncoded into the video.\r\n";\r
-            // \r
-            // Label20\r
-            // \r
-            this.Label20.AutoSize = true;\r
-            this.Label20.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label20.Location = new System.Drawing.Point(314, 39);\r
-            this.Label20.Name = "Label20";\r
-            this.Label20.Size = new System.Drawing.Size(61, 13);\r
-            this.Label20.TabIndex = 33;\r
-            this.Label20.Text = "Subtitles:";\r
-            // \r
             // Label52\r
             // \r
             this.Label52.AutoSize = true;\r
@@ -1945,12 +1933,21 @@ namespace Handbrake
             this.groupBox_dest.TabStop = false;\r
             this.groupBox_dest.Text = "Destination";\r
             // \r
+            // label23\r
+            // \r
+            this.label23.AutoSize = true;\r
+            this.label23.Location = new System.Drawing.Point(13, 221);\r
+            this.label23.Name = "label23";\r
+            this.label23.Size = new System.Drawing.Size(403, 13);\r
+            this.label23.TabIndex = 43;\r
+            this.label23.Text = "Remember to re-generate the query each time you change a setting!";\r
+            // \r
             // frmMain\r
             // \r
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);\r
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\r
             this.BackColor = System.Drawing.SystemColors.ControlLight;\r
-            this.ClientSize = new System.Drawing.Size(676, 621);\r
+            this.ClientSize = new System.Drawing.Size(675, 621);\r
             this.Controls.Add(this.groupBox_dest);\r
             this.Controls.Add(this.btn_eCancel);\r
             this.Controls.Add(this.lbl_encode);\r
@@ -1963,7 +1960,6 @@ namespace Handbrake
             this.Controls.Add(this.GroupBox1);\r
             this.Controls.Add(this.frmMainMenu);\r
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));\r
-            this.MaximumSize = new System.Drawing.Size(878, 750);\r
             this.MinimumSize = new System.Drawing.Size(683, 648);\r
             this.Name = "frmMain";\r
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;\r
@@ -2091,7 +2087,6 @@ namespace Handbrake
         internal System.Windows.Forms.CheckBox check_largeFile;\r
         internal System.Windows.Forms.CheckBox check_turbo;\r
         internal System.Windows.Forms.CheckBox CheckCRF;\r
-        internal System.Windows.Forms.Label Label23;\r
         internal System.Windows.Forms.Label Label22;\r
         internal System.Windows.Forms.Label Label2;\r
         internal System.Windows.Forms.Label SliderValue;\r
@@ -2105,16 +2100,11 @@ namespace Handbrake
         internal System.Windows.Forms.TabPage TabPage1;\r
         internal System.Windows.Forms.CheckBox Check_ChapterMarkers;\r
         internal System.Windows.Forms.CheckBox CheckPixelRatio;\r
-        internal System.Windows.Forms.CheckBox check_grayscale;\r
         internal System.Windows.Forms.Label label6;\r
-        internal System.Windows.Forms.ComboBox drp_subtitle;\r
-        internal System.Windows.Forms.Label Label19;\r
         internal System.Windows.Forms.Label lbl_RecomendedCrop;\r
         internal System.Windows.Forms.Label Label8;\r
         internal System.Windows.Forms.Label Label1;\r
         internal System.Windows.Forms.Label Label53;\r
-        internal System.Windows.Forms.Label Label21;\r
-        internal System.Windows.Forms.Label Label20;\r
         internal System.Windows.Forms.Label Label52;\r
         internal System.Windows.Forms.Label Label51;\r
         internal System.Windows.Forms.Label Label50;\r
@@ -2125,14 +2115,7 @@ namespace Handbrake
         internal System.Windows.Forms.TextBox text_right;\r
         internal System.Windows.Forms.TextBox text_left;\r
         internal System.Windows.Forms.TabControl advancedOptions;\r
-        internal System.Windows.Forms.ComboBox drp_deInterlace_option;\r
-        internal System.Windows.Forms.Label label4;\r
         internal System.Windows.Forms.Label Label46;\r
-        internal System.Windows.Forms.CheckBox check_deblock;\r
-        internal System.Windows.Forms.CheckBox check_detelecine;\r
-        internal System.Windows.Forms.Label label24;\r
-        internal System.Windows.Forms.ComboBox drp_deNoise;\r
-        internal System.Windows.Forms.Label label11;\r
         private System.Windows.Forms.ToolStripMenuItem mnu_iphone;\r
         private System.Windows.Forms.ToolStripMenuItem mnu_psp;\r
         private System.Windows.Forms.ToolStripMenuItem mnu_qt;\r
@@ -2151,6 +2134,19 @@ namespace Handbrake
         private System.Windows.Forms.ToolStripMenuItem mnu_ipodLow;\r
         private System.Windows.Forms.ToolStripMenuItem mnu_ps3;\r
         private System.Windows.Forms.GroupBox groupBox_dest;\r
+        internal System.Windows.Forms.ComboBox drp_subtitle;\r
+        internal System.Windows.Forms.Label Label19;\r
+        internal System.Windows.Forms.Label Label21;\r
+        internal System.Windows.Forms.Label Label20;\r
+        internal System.Windows.Forms.CheckBox check_grayscale;\r
+        internal System.Windows.Forms.Label label24;\r
+        internal System.Windows.Forms.ComboBox drp_deNoise;\r
+        internal System.Windows.Forms.Label label11;\r
+        internal System.Windows.Forms.CheckBox check_deblock;\r
+        internal System.Windows.Forms.CheckBox check_detelecine;\r
+        internal System.Windows.Forms.Label label4;\r
+        internal System.Windows.Forms.ComboBox drp_deInterlace_option;\r
+        private System.Windows.Forms.Label label23;\r
 \r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 7833bcc..2f94115 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -1984,8 +1984,6 @@ namespace Handbrake
 \r
         #endregion\r
 \r
-\r
-\r
         // This is the END of the road ------------------------------------------------------------------------------\r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/frmOptions.Designer.cs b/win/C#/frmOptions.Designer.cs
index 6429a41..dc44870 100644 (file)
--- a/win/C#/frmOptions.Designer.cs
+++ b/win/C#/frmOptions.Designer.cs
@@ -277,7 +277,7 @@ namespace Handbrake
             // frmOptions\r
             // \r
             this.BackColor = System.Drawing.SystemColors.ControlLight;\r
-            this.ClientSize = new System.Drawing.Size(411, 405);\r
+            this.ClientSize = new System.Drawing.Size(413, 403);\r
             this.Controls.Add(this.groupBox4);\r
             this.Controls.Add(this.GroupBox2);\r
             this.Controls.Add(this.GroupBox3);\r

diff --git a/win/C#/frmOptions.cs b/win/C#/frmOptions.cs
index bc511f2..cb5c73e 100644 (file)
--- a/win/C#/frmOptions.cs
+++ b/win/C#/frmOptions.cs
@@ -89,9 +89,7 @@ namespace Handbrake
         private void drp_completeOption_SelectedIndexChanged(object sender, EventArgs e)\r
         {\r
             Properties.Settings.Default.CompletionOption = drp_completeOption.Text;\r
-        }\r
-\r
-    \r
+        }  \r
  \r
 \r
     }\r