WinGui:

- Moved the x264 panel onto it's own panel. This cleans up frmMain significantly and makes it a tad easier to maintain. Started to clean up the code a bit.
- Reworded the b-adapt pop up menu items: "Off", "Fast", "Optimal" as per 2162

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

diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj
index 88b0e3a..1137a89 100644 (file)
--- a/win/C#/HandBrakeCS.csproj
+++ b/win/C#/HandBrakeCS.csproj
@@ -124,6 +124,12 @@
     <Compile Include="Controls\Deinterlace.Designer.cs">\r
       <DependentUpon>Deinterlace.cs</DependentUpon>\r
     </Compile>\r
+    <Compile Include="Controls\x264Panel.cs">\r
+      <SubType>UserControl</SubType>\r
+    </Compile>\r
+    <Compile Include="Controls\x264Panel.Designer.cs">\r
+      <DependentUpon>x264Panel.cs</DependentUpon>\r
+    </Compile>\r
     <Compile Include="frmPreview.cs">\r
       <SubType>Form</SubType>\r
     </Compile>\r
@@ -199,7 +205,6 @@
     <Compile Include="Functions\AppcastReader.cs" />\r
     <Compile Include="Functions\Encode.cs" />\r
     <Compile Include="Functions\QueryParser.cs" />\r
-    <Compile Include="frmMain\x264Panel.cs" />\r
     <Compile Include="Parsing\AudioTrack.cs" />\r
     <Compile Include="Parsing\Chapter.cs" />\r
     <Compile Include="Parsing\DVD.cs" />\r
@@ -224,6 +229,10 @@
       <DependentUpon>Deinterlace.cs</DependentUpon>\r
       <SubType>Designer</SubType>\r
     </EmbeddedResource>\r
+    <EmbeddedResource Include="Controls\x264Panel.resx">\r
+      <DependentUpon>x264Panel.cs</DependentUpon>\r
+      <SubType>Designer</SubType>\r
+    </EmbeddedResource>\r
     <EmbeddedResource Include="frmPreview.resx">\r
       <DependentUpon>frmPreview.cs</DependentUpon>\r
       <SubType>Designer</SubType>\r

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index 6e92aa2..75dc6f8 100644 (file)
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -37,7 +37,7 @@ namespace Handbrake
             this.components = new System.ComponentModel.Container();\r
             System.Windows.Forms.ContextMenuStrip notifyIconMenu;\r
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain));\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();\r
             this.btn_restore = new System.Windows.Forms.ToolStripMenuItem();\r
             this.DVD_Save = new System.Windows.Forms.SaveFileDialog();\r
             this.File_Save = new System.Windows.Forms.SaveFileDialog();\r
@@ -72,24 +72,6 @@ namespace Handbrake
             this.drop_format = new System.Windows.Forms.ComboBox();\r
             this.check_customCrop = new System.Windows.Forms.RadioButton();\r
             this.check_autoCrop = new System.Windows.Forms.RadioButton();\r
-            this.check_Cabac = new System.Windows.Forms.CheckBox();\r
-            this.check_noDCTDecimate = new System.Windows.Forms.CheckBox();\r
-            this.check_noFastPSkip = new System.Windows.Forms.CheckBox();\r
-            this.drop_trellis = new System.Windows.Forms.ComboBox();\r
-            this.drop_deblockBeta = new System.Windows.Forms.ComboBox();\r
-            this.drop_deblockAlpha = new System.Windows.Forms.ComboBox();\r
-            this.check_8x8DCT = new System.Windows.Forms.CheckBox();\r
-            this.drop_analysis = new System.Windows.Forms.ComboBox();\r
-            this.drop_subpixelMotionEstimation = new System.Windows.Forms.ComboBox();\r
-            this.drop_MotionEstimationRange = new System.Windows.Forms.ComboBox();\r
-            this.drop_MotionEstimationMethod = new System.Windows.Forms.ComboBox();\r
-            this.check_pyrmidalBFrames = new System.Windows.Forms.CheckBox();\r
-            this.check_weightedBFrames = new System.Windows.Forms.CheckBox();\r
-            this.drop_directPrediction = new System.Windows.Forms.ComboBox();\r
-            this.drop_bFrames = new System.Windows.Forms.ComboBox();\r
-            this.drop_refFrames = new System.Windows.Forms.ComboBox();\r
-            this.check_mixedReferences = new System.Windows.Forms.CheckBox();\r
-            this.drop_adaptBFrames = new System.Windows.Forms.ComboBox();\r
             this.lbl_src_res = new System.Windows.Forms.Label();\r
             this.lbl_duration = new System.Windows.Forms.Label();\r
             this.label_duration = new System.Windows.Forms.Label();\r
@@ -197,29 +179,14 @@ namespace Handbrake
             this.Check_ChapterMarkers = new System.Windows.Forms.CheckBox();\r
             this.tabs_panel = new System.Windows.Forms.TabControl();\r
             this.tab_Filters = new System.Windows.Forms.TabPage();\r
+            this.ctl_deinterlace = new Handbrake.Deinterlace();\r
+            this.ctl_denoise = new Handbrake.Denoise();\r
+            this.ctl_decomb = new Handbrake.Decomb();\r
+            this.ctl_detelecine = new Handbrake.Detelecine();\r
             this.tab_chapters = new System.Windows.Forms.TabPage();\r
             this.label31 = new System.Windows.Forms.Label();\r
             this.h264Tab = new System.Windows.Forms.TabPage();\r
-            this.slider_psytrellis = new System.Windows.Forms.TrackBar();\r
-            this.lbl_psytrellis = new System.Windows.Forms.Label();\r
-            this.lbl_psyrd = new System.Windows.Forms.Label();\r
-            this.slider_psyrd = new System.Windows.Forms.TrackBar();\r
-            this.lbl_adaptBFrames = new System.Windows.Forms.Label();\r
-            this.label43 = new System.Windows.Forms.Label();\r
-            this.btn_reset = new System.Windows.Forms.Button();\r
-            this.rtf_x264Query = new System.Windows.Forms.RichTextBox();\r
-            this.lbl_trellis = new System.Windows.Forms.Label();\r
-            this.label41 = new System.Windows.Forms.Label();\r
-            this.panel3 = new System.Windows.Forms.Panel();\r
-            this.panel1 = new System.Windows.Forms.Panel();\r
-            this.panel2 = new System.Windows.Forms.Panel();\r
-            this.label45 = new System.Windows.Forms.Label();\r
-            this.label48 = new System.Windows.Forms.Label();\r
-            this.lbl_merange = new System.Windows.Forms.Label();\r
-            this.label54 = new System.Windows.Forms.Label();\r
-            this.lbl_direct_prediction = new System.Windows.Forms.Label();\r
-            this.label62 = new System.Windows.Forms.Label();\r
-            this.label64 = new System.Windows.Forms.Label();\r
+            this.x264Panel = new Handbrake.Controls.x264Panel();\r
             this.tab_query = new System.Windows.Forms.TabPage();\r
             this.btn_clear = new System.Windows.Forms.Button();\r
             this.label34 = new System.Windows.Forms.Label();\r
@@ -255,10 +222,6 @@ namespace Handbrake
             this.notifyIcon = new System.Windows.Forms.NotifyIcon(this.components);\r
             this.StatusStrip = new System.Windows.Forms.StatusStrip();\r
             this.lbl_encode = new System.Windows.Forms.ToolStripStatusLabel();\r
-            this.ctl_deinterlace = new Handbrake.Deinterlace();\r
-            this.ctl_denoise = new Handbrake.Denoise();\r
-            this.ctl_decomb = new Handbrake.Decomb();\r
-            this.ctl_detelecine = new Handbrake.Detelecine();\r
             notifyIconMenu = new System.Windows.Forms.ContextMenuStrip(this.components);\r
             notifyIconMenu.SuspendLayout();\r
             ((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).BeginInit();\r
@@ -280,8 +243,6 @@ namespace Handbrake
             this.tab_Filters.SuspendLayout();\r
             this.tab_chapters.SuspendLayout();\r
             this.h264Tab.SuspendLayout();\r
-            ((System.ComponentModel.ISupportInitialize)(this.slider_psytrellis)).BeginInit();\r
-            ((System.ComponentModel.ISupportInitialize)(this.slider_psyrd)).BeginInit();\r
             this.tab_query.SuspendLayout();\r
             this.groupBox_dest.SuspendLayout();\r
             this.groupBox2.SuspendLayout();\r
@@ -645,9 +606,9 @@ namespace Handbrake
             // \r
             // number\r
             // \r
-            dataGridViewCellStyle1.Format = "N0";\r
-            dataGridViewCellStyle1.NullValue = null;\r
-            this.number.DefaultCellStyle = dataGridViewCellStyle1;\r
+            dataGridViewCellStyle3.Format = "N0";\r
+            dataGridViewCellStyle3.NullValue = null;\r
+            this.number.DefaultCellStyle = dataGridViewCellStyle3;\r
             this.number.HeaderText = "Chapter Number";\r
             this.number.MaxInputLength = 3;\r
             this.number.Name = "number";\r
@@ -750,429 +711,6 @@ namespace Handbrake
             this.check_autoCrop.UseVisualStyleBackColor = true;\r
             this.check_autoCrop.CheckedChanged += new System.EventHandler(this.check_autoCrop_CheckedChanged);\r
             // \r
-            // check_Cabac\r
-            // \r
-            this.check_Cabac.AutoSize = true;\r
-            this.check_Cabac.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;\r
-            this.check_Cabac.Checked = true;\r
-            this.check_Cabac.CheckState = System.Windows.Forms.CheckState.Checked;\r
-            this.check_Cabac.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.check_Cabac.Location = new System.Drawing.Point(273, 123);\r
-            this.check_Cabac.Name = "check_Cabac";\r
-            this.check_Cabac.RightToLeft = System.Windows.Forms.RightToLeft.No;\r
-            this.check_Cabac.Size = new System.Drawing.Size(144, 16);\r
-            this.check_Cabac.TabIndex = 40;\r
-            this.check_Cabac.Text = "CABAC Entropy Coding:";\r
-            this.check_Cabac.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
-            this.ToolTip.SetToolTip(this.check_Cabac, resources.GetString("check_Cabac.ToolTip"));\r
-            this.check_Cabac.UseVisualStyleBackColor = true;\r
-            this.check_Cabac.CheckStateChanged += new System.EventHandler(this.check_Cabac_CheckedChanged);\r
-            // \r
-            // check_noDCTDecimate\r
-            // \r
-            this.check_noDCTDecimate.AutoSize = true;\r
-            this.check_noDCTDecimate.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;\r
-            this.check_noDCTDecimate.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.check_noDCTDecimate.Location = new System.Drawing.Point(593, 35);\r
-            this.check_noDCTDecimate.Name = "check_noDCTDecimate";\r
-            this.check_noDCTDecimate.RightToLeft = System.Windows.Forms.RightToLeft.No;\r
-            this.check_noDCTDecimate.Size = new System.Drawing.Size(118, 16);\r
-            this.check_noDCTDecimate.TabIndex = 39;\r
-            this.check_noDCTDecimate.Text = "No DCT-Decimate:";\r
-            this.check_noDCTDecimate.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
-            this.ToolTip.SetToolTip(this.check_noDCTDecimate, "Only use this with constant quality encoding. \r\nIt increases quality but also bit" +\r
-                    "rate/file size.");\r
-            this.check_noDCTDecimate.UseVisualStyleBackColor = true;\r
-            this.check_noDCTDecimate.CheckStateChanged += new System.EventHandler(this.check_noDCTDecimate_CheckedChanged);\r
-            // \r
-            // check_noFastPSkip\r
-            // \r
-            this.check_noFastPSkip.AutoSize = true;\r
-            this.check_noFastPSkip.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;\r
-            this.check_noFastPSkip.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.check_noFastPSkip.Location = new System.Drawing.Point(608, 14);\r
-            this.check_noFastPSkip.Name = "check_noFastPSkip";\r
-            this.check_noFastPSkip.RightToLeft = System.Windows.Forms.RightToLeft.No;\r
-            this.check_noFastPSkip.Size = new System.Drawing.Size(103, 16);\r
-            this.check_noFastPSkip.TabIndex = 38;\r
-            this.check_noFastPSkip.Text = "No Fast-P-Skip:";\r
-            this.check_noFastPSkip.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
-            this.ToolTip.SetToolTip(this.check_noFastPSkip, "This can help with blocking on solid colors like blue skies, \r\nbut it also slows " +\r
-                    "down the encode.");\r
-            this.check_noFastPSkip.UseVisualStyleBackColor = true;\r
-            this.check_noFastPSkip.CheckStateChanged += new System.EventHandler(this.check_noFastPSkip_CheckedChanged);\r
-            // \r
-            // drop_trellis\r
-            // \r
-            this.drop_trellis.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
-            this.drop_trellis.FlatStyle = System.Windows.Forms.FlatStyle.Popup;\r
-            this.drop_trellis.FormattingEnabled = true;\r
-            this.drop_trellis.Items.AddRange(new object[] {\r
-            "Default (0)",\r
-            "0",\r
-            "1",\r
-            "2"});\r
-            this.drop_trellis.Location = new System.Drawing.Point(468, 122);\r
-            this.drop_trellis.Name = "drop_trellis";\r
-            this.drop_trellis.Size = new System.Drawing.Size(94, 20);\r
-            this.drop_trellis.TabIndex = 37;\r
-            this.ToolTip.SetToolTip(this.drop_trellis, "Trellis fine-tunes how bitrate is doled out, so it can reduce file size/bitrate o" +\r
-                    "r increase quality. \r\nA value of 2 forces it to be used more often than a value " +\r
-                    "of 1.");\r
-            this.drop_trellis.SelectedIndexChanged += new System.EventHandler(this.drop_trellis_SelectedIndexChanged);\r
-            // \r
-            // drop_deblockBeta\r
-            // \r
-            this.drop_deblockBeta.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
-            this.drop_deblockBeta.FlatStyle = System.Windows.Forms.FlatStyle.Popup;\r
-            this.drop_deblockBeta.FormattingEnabled = true;\r
-            this.drop_deblockBeta.Items.AddRange(new object[] {\r
-            "Default (0)",\r
-            "-6",\r
-            "-5",\r
-            "-4",\r
-            "-3",\r
-            "-2",\r
-            "-1",\r
-            "0",\r
-            "1",\r
-            "2",\r
-            "3",\r
-            "4",\r
-            "5",\r
-            "6"});\r
-            this.drop_deblockBeta.Location = new System.Drawing.Point(642, 90);\r
-            this.drop_deblockBeta.Name = "drop_deblockBeta";\r
-            this.drop_deblockBeta.Size = new System.Drawing.Size(69, 20);\r
-            this.drop_deblockBeta.TabIndex = 36;\r
-            this.ToolTip.SetToolTip(this.drop_deblockBeta, resources.GetString("drop_deblockBeta.ToolTip"));\r
-            this.drop_deblockBeta.SelectedIndexChanged += new System.EventHandler(this.drop_deblockBeta_SelectedIndexChanged);\r
-            // \r
-            // drop_deblockAlpha\r
-            // \r
-            this.drop_deblockAlpha.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
-            this.drop_deblockAlpha.FlatStyle = System.Windows.Forms.FlatStyle.Popup;\r
-            this.drop_deblockAlpha.FormattingEnabled = true;\r
-            this.drop_deblockAlpha.Items.AddRange(new object[] {\r
-            "Default (0)",\r
-            "-6",\r
-            "-5",\r
-            "-4",\r
-            "-3",\r
-            "-2",\r
-            "-1",\r
-            "0",\r
-            "1",\r
-            "2",\r
-            "3",\r
-            "4",\r
-            "5",\r
-            "6"});\r
-            this.drop_deblockAlpha.Location = new System.Drawing.Point(643, 64);\r
-            this.drop_deblockAlpha.Name = "drop_deblockAlpha";\r
-            this.drop_deblockAlpha.Size = new System.Drawing.Size(68, 20);\r
-            this.drop_deblockAlpha.TabIndex = 35;\r
-            this.ToolTip.SetToolTip(this.drop_deblockAlpha, resources.GetString("drop_deblockAlpha.ToolTip"));\r
-            this.drop_deblockAlpha.SelectedIndexChanged += new System.EventHandler(this.drop_deblockAlpha_SelectedIndexChanged);\r
-            // \r
-            // check_8x8DCT\r
-            // \r
-            this.check_8x8DCT.AutoSize = true;\r
-            this.check_8x8DCT.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;\r
-            this.check_8x8DCT.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.check_8x8DCT.Location = new System.Drawing.Point(492, 95);\r
-            this.check_8x8DCT.Name = "check_8x8DCT";\r
-            this.check_8x8DCT.RightToLeft = System.Windows.Forms.RightToLeft.No;\r
-            this.check_8x8DCT.Size = new System.Drawing.Size(71, 16);\r
-            this.check_8x8DCT.TabIndex = 34;\r
-            this.check_8x8DCT.Text = "8x8 DCT:";\r
-            this.check_8x8DCT.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
-            this.ToolTip.SetToolTip(this.check_8x8DCT, resources.GetString("check_8x8DCT.ToolTip"));\r
-            this.check_8x8DCT.UseVisualStyleBackColor = true;\r
-            this.check_8x8DCT.CheckStateChanged += new System.EventHandler(this.check_8x8DCT_CheckedChanged);\r
-            // \r
-            // drop_analysis\r
-            // \r
-            this.drop_analysis.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
-            this.drop_analysis.FlatStyle = System.Windows.Forms.FlatStyle.Popup;\r
-            this.drop_analysis.FormattingEnabled = true;\r
-            this.drop_analysis.Items.AddRange(new object[] {\r
-            "Default (some)",\r
-            "None",\r
-            "All"});\r
-            this.drop_analysis.Location = new System.Drawing.Point(423, 94);\r
-            this.drop_analysis.Name = "drop_analysis";\r
-            this.drop_analysis.Size = new System.Drawing.Size(63, 20);\r
-            this.drop_analysis.TabIndex = 33;\r
-            this.ToolTip.SetToolTip(this.drop_analysis, resources.GetString("drop_analysis.ToolTip"));\r
-            this.drop_analysis.SelectedIndexChanged += new System.EventHandler(this.drop_analysis_SelectedIndexChanged);\r
-            // \r
-            // drop_subpixelMotionEstimation\r
-            // \r
-            this.drop_subpixelMotionEstimation.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
-            this.drop_subpixelMotionEstimation.FlatStyle = System.Windows.Forms.FlatStyle.Popup;\r
-            this.drop_subpixelMotionEstimation.FormattingEnabled = true;\r
-            this.drop_subpixelMotionEstimation.Items.AddRange(new object[] {\r
-            "Default (6)",\r
-            "0",\r
-            "1",\r
-            "2",\r
-            "3",\r
-            "4",\r
-            "5",\r
-            "6",\r
-            "7",\r
-            "8",\r
-            "9"});\r
-            this.drop_subpixelMotionEstimation.Location = new System.Drawing.Point(423, 37);\r
-            this.drop_subpixelMotionEstimation.Name = "drop_subpixelMotionEstimation";\r
-            this.drop_subpixelMotionEstimation.Size = new System.Drawing.Size(139, 20);\r
-            this.drop_subpixelMotionEstimation.TabIndex = 32;\r
-            this.ToolTip.SetToolTip(this.drop_subpixelMotionEstimation, resources.GetString("drop_subpixelMotionEstimation.ToolTip"));\r
-            this.drop_subpixelMotionEstimation.SelectedIndexChanged += new System.EventHandler(this.drop_subpixelMotionEstimation_SelectedIndexChanged);\r
-            // \r
-            // drop_MotionEstimationRange\r
-            // \r
-            this.drop_MotionEstimationRange.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
-            this.drop_MotionEstimationRange.FlatStyle = System.Windows.Forms.FlatStyle.Popup;\r
-            this.drop_MotionEstimationRange.FormattingEnabled = true;\r
-            this.drop_MotionEstimationRange.Items.AddRange(new object[] {\r
-            "Default (16)",\r
-            "4",\r
-            "5",\r
-            "6",\r
-            "7",\r
-            "8",\r
-            "9",\r
-            "10",\r
-            "11",\r
-            "12",\r
-            "13",\r
-            "14",\r
-            "15",\r
-            "16",\r
-            "17",\r
-            "18",\r
-            "19",\r
-            "20",\r
-            "21",\r
-            "22",\r
-            "23",\r
-            "24",\r
-            "25",\r
-            "26",\r
-            "27",\r
-            "28",\r
-            "29",\r
-            "30",\r
-            "31",\r
-            "32",\r
-            "33",\r
-            "34",\r
-            "35",\r
-            "36",\r
-            "37",\r
-            "38",\r
-            "39",\r
-            "40",\r
-            "41",\r
-            "42",\r
-            "43",\r
-            "44",\r
-            "45",\r
-            "46",\r
-            "47",\r
-            "48",\r
-            "49",\r
-            "50",\r
-            "51",\r
-            "52",\r
-            "53",\r
-            "54",\r
-            "55",\r
-            "56",\r
-            "57",\r
-            "58",\r
-            "59",\r
-            "60",\r
-            "61",\r
-            "62",\r
-            "63",\r
-            "64"});\r
-            this.drop_MotionEstimationRange.Location = new System.Drawing.Point(423, 63);\r
-            this.drop_MotionEstimationRange.Name = "drop_MotionEstimationRange";\r
-            this.drop_MotionEstimationRange.Size = new System.Drawing.Size(139, 20);\r
-            this.drop_MotionEstimationRange.TabIndex = 31;\r
-            this.ToolTip.SetToolTip(this.drop_MotionEstimationRange, resources.GetString("drop_MotionEstimationRange.ToolTip"));\r
-            this.drop_MotionEstimationRange.SelectedIndexChanged += new System.EventHandler(this.drop_MotionEstimationRange_SelectedIndexChanged);\r
-            // \r
-            // drop_MotionEstimationMethod\r
-            // \r
-            this.drop_MotionEstimationMethod.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
-            this.drop_MotionEstimationMethod.FlatStyle = System.Windows.Forms.FlatStyle.Popup;\r
-            this.drop_MotionEstimationMethod.FormattingEnabled = true;\r
-            this.drop_MotionEstimationMethod.ItemHeight = 12;\r
-            this.drop_MotionEstimationMethod.Items.AddRange(new object[] {\r
-            "Default (Hexagon)",\r
-            "Diamond",\r
-            "Hexagon",\r
-            "Uneven Multi-Hexagon",\r
-            "Exhaustive",\r
-            "Transformed Exhaustive"});\r
-            this.drop_MotionEstimationMethod.Location = new System.Drawing.Point(423, 11);\r
-            this.drop_MotionEstimationMethod.Name = "drop_MotionEstimationMethod";\r
-            this.drop_MotionEstimationMethod.Size = new System.Drawing.Size(139, 20);\r
-            this.drop_MotionEstimationMethod.TabIndex = 30;\r
-            this.ToolTip.SetToolTip(this.drop_MotionEstimationMethod, resources.GetString("drop_MotionEstimationMethod.ToolTip"));\r
-            this.drop_MotionEstimationMethod.SelectedIndexChanged += new System.EventHandler(this.drop_MotionEstimationMethod_SelectedIndexChanged);\r
-            // \r
-            // check_pyrmidalBFrames\r
-            // \r
-            this.check_pyrmidalBFrames.AutoSize = true;\r
-            this.check_pyrmidalBFrames.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;\r
-            this.check_pyrmidalBFrames.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.check_pyrmidalBFrames.Location = new System.Drawing.Point(18, 189);\r
-            this.check_pyrmidalBFrames.Name = "check_pyrmidalBFrames";\r
-            this.check_pyrmidalBFrames.RightToLeft = System.Windows.Forms.RightToLeft.No;\r
-            this.check_pyrmidalBFrames.Size = new System.Drawing.Size(121, 16);\r
-            this.check_pyrmidalBFrames.TabIndex = 17;\r
-            this.check_pyrmidalBFrames.Text = "Pyrmidal B-Frames:";\r
-            this.check_pyrmidalBFrames.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
-            this.ToolTip.SetToolTip(this.check_pyrmidalBFrames, resources.GetString("check_pyrmidalBFrames.ToolTip"));\r
-            this.check_pyrmidalBFrames.UseVisualStyleBackColor = true;\r
-            this.check_pyrmidalBFrames.CheckStateChanged += new System.EventHandler(this.check_pyrmidalBFrames_CheckedChanged);\r
-            // \r
-            // check_weightedBFrames\r
-            // \r
-            this.check_weightedBFrames.AutoSize = true;\r
-            this.check_weightedBFrames.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;\r
-            this.check_weightedBFrames.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.check_weightedBFrames.Location = new System.Drawing.Point(16, 168);\r
-            this.check_weightedBFrames.Name = "check_weightedBFrames";\r
-            this.check_weightedBFrames.RightToLeft = System.Windows.Forms.RightToLeft.No;\r
-            this.check_weightedBFrames.Size = new System.Drawing.Size(123, 16);\r
-            this.check_weightedBFrames.TabIndex = 14;\r
-            this.check_weightedBFrames.Text = "Weighted B-Frames:";\r
-            this.ToolTip.SetToolTip(this.check_weightedBFrames, resources.GetString("check_weightedBFrames.ToolTip"));\r
-            this.check_weightedBFrames.UseVisualStyleBackColor = true;\r
-            this.check_weightedBFrames.CheckStateChanged += new System.EventHandler(this.check_weightedBFrames_CheckedChanged);\r
-            // \r
-            // drop_directPrediction\r
-            // \r
-            this.drop_directPrediction.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
-            this.drop_directPrediction.FlatStyle = System.Windows.Forms.FlatStyle.Popup;\r
-            this.drop_directPrediction.FormattingEnabled = true;\r
-            this.drop_directPrediction.Items.AddRange(new object[] {\r
-            "Default (Spatial)",\r
-            "None",\r
-            "Spatial",\r
-            "Temporal",\r
-            "Automatic"});\r
-            this.drop_directPrediction.Location = new System.Drawing.Point(129, 142);\r
-            this.drop_directPrediction.Name = "drop_directPrediction";\r
-            this.drop_directPrediction.Size = new System.Drawing.Size(121, 20);\r
-            this.drop_directPrediction.TabIndex = 13;\r
-            this.ToolTip.SetToolTip(this.drop_directPrediction, resources.GetString("drop_directPrediction.ToolTip"));\r
-            this.drop_directPrediction.SelectedIndexChanged += new System.EventHandler(this.drop_directPrediction_SelectedIndexChanged);\r
-            // \r
-            // drop_bFrames\r
-            // \r
-            this.drop_bFrames.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
-            this.drop_bFrames.FlatStyle = System.Windows.Forms.FlatStyle.Popup;\r
-            this.drop_bFrames.FormattingEnabled = true;\r
-            this.drop_bFrames.Items.AddRange(new object[] {\r
-            "Default (0)",\r
-            "0",\r
-            "1",\r
-            "2",\r
-            "3",\r
-            "4",\r
-            "5",\r
-            "6",\r
-            "7",\r
-            "8",\r
-            "9",\r
-            "10",\r
-            "11",\r
-            "12",\r
-            "13",\r
-            "14",\r
-            "15",\r
-            "16"});\r
-            this.drop_bFrames.Location = new System.Drawing.Point(129, 90);\r
-            this.drop_bFrames.Name = "drop_bFrames";\r
-            this.drop_bFrames.Size = new System.Drawing.Size(121, 20);\r
-            this.drop_bFrames.TabIndex = 12;\r
-            this.ToolTip.SetToolTip(this.drop_bFrames, "Sane values are 1-6. \r\nB-Frames are smaller than other frames, so they let you pa" +\r
-                    "ck in more quality at the same bitrate. \r\nUse more of them with animated materia" +\r
-                    "l: 9-16. ");\r
-            this.drop_bFrames.SelectedIndexChanged += new System.EventHandler(this.drop_bFrames_SelectedIndexChanged);\r
-            // \r
-            // drop_refFrames\r
-            // \r
-            this.drop_refFrames.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
-            this.drop_refFrames.FlatStyle = System.Windows.Forms.FlatStyle.Popup;\r
-            this.drop_refFrames.FormattingEnabled = true;\r
-            this.drop_refFrames.Items.AddRange(new object[] {\r
-            "Default (1)",\r
-            "0",\r
-            "1",\r
-            "2",\r
-            "3",\r
-            "4",\r
-            "5",\r
-            "6",\r
-            "7",\r
-            "8",\r
-            "9",\r
-            "10",\r
-            "11",\r
-            "12",\r
-            "13",\r
-            "14",\r
-            "15",\r
-            "16"});\r
-            this.drop_refFrames.Location = new System.Drawing.Point(129, 37);\r
-            this.drop_refFrames.Name = "drop_refFrames";\r
-            this.drop_refFrames.Size = new System.Drawing.Size(121, 20);\r
-            this.drop_refFrames.TabIndex = 10;\r
-            this.ToolTip.SetToolTip(this.drop_refFrames, "Sane values are 1-6. The more you add, the higher the quality \97 but the slower th" +\r
-                    "e encode. ");\r
-            this.drop_refFrames.SelectedIndexChanged += new System.EventHandler(this.drop_refFrames_SelectedIndexChanged);\r
-            // \r
-            // check_mixedReferences\r
-            // \r
-            this.check_mixedReferences.AutoSize = true;\r
-            this.check_mixedReferences.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;\r
-            this.check_mixedReferences.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.check_mixedReferences.Location = new System.Drawing.Point(25, 63);\r
-            this.check_mixedReferences.Name = "check_mixedReferences";\r
-            this.check_mixedReferences.RightToLeft = System.Windows.Forms.RightToLeft.No;\r
-            this.check_mixedReferences.Size = new System.Drawing.Size(114, 16);\r
-            this.check_mixedReferences.TabIndex = 11;\r
-            this.check_mixedReferences.Text = "Mixed References:";\r
-            this.check_mixedReferences.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
-            this.ToolTip.SetToolTip(this.check_mixedReferences, "With this on, different parts of a frame will refer back to different prior frame" +\r
-                    "s, \r\ndepending on what\'s best for that part of the image. ");\r
-            this.check_mixedReferences.UseVisualStyleBackColor = true;\r
-            this.check_mixedReferences.CheckStateChanged += new System.EventHandler(this.check_mixedReferences_CheckedChanged);\r
-            // \r
-            // drop_adaptBFrames\r
-            // \r
-            this.drop_adaptBFrames.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
-            this.drop_adaptBFrames.FlatStyle = System.Windows.Forms.FlatStyle.Popup;\r
-            this.drop_adaptBFrames.FormattingEnabled = true;\r
-            this.drop_adaptBFrames.Items.AddRange(new object[] {\r
-            "Default (1)",\r
-            "0",\r
-            "1",\r
-            "2"});\r
-            this.drop_adaptBFrames.Location = new System.Drawing.Point(129, 116);\r
-            this.drop_adaptBFrames.Name = "drop_adaptBFrames";\r
-            this.drop_adaptBFrames.Size = new System.Drawing.Size(121, 20);\r
-            this.drop_adaptBFrames.TabIndex = 44;\r
-            this.drop_adaptBFrames.SelectedIndexChanged += new System.EventHandler(this.drop_adaptBFrames_SelectedIndexChanged);\r
-            // \r
             // lbl_src_res\r
             // \r
             this.lbl_src_res.AutoSize = true;\r
@@ -2320,6 +1858,48 @@ namespace Handbrake
             this.tab_Filters.Text = "Video Filters";\r
             this.tab_Filters.UseVisualStyleBackColor = true;\r
             // \r
+            // ctl_deinterlace\r
+            // \r
+            this.ctl_deinterlace.AutoSize = true;\r
+            this.ctl_deinterlace.Location = new System.Drawing.Point(19, 95);\r
+            this.ctl_deinterlace.Margin = new System.Windows.Forms.Padding(0);\r
+            this.ctl_deinterlace.MaximumSize = new System.Drawing.Size(400, 30);\r
+            this.ctl_deinterlace.Name = "ctl_deinterlace";\r
+            this.ctl_deinterlace.Size = new System.Drawing.Size(275, 28);\r
+            this.ctl_deinterlace.TabIndex = 41;\r
+            this.ctl_deinterlace.onChange += new System.EventHandler(this.ctl_deinterlace_changed);\r
+            // \r
+            // ctl_denoise\r
+            // \r
+            this.ctl_denoise.AutoSize = true;\r
+            this.ctl_denoise.Location = new System.Drawing.Point(19, 123);\r
+            this.ctl_denoise.Margin = new System.Windows.Forms.Padding(0);\r
+            this.ctl_denoise.MaximumSize = new System.Drawing.Size(400, 30);\r
+            this.ctl_denoise.Name = "ctl_denoise";\r
+            this.ctl_denoise.Size = new System.Drawing.Size(275, 28);\r
+            this.ctl_denoise.TabIndex = 40;\r
+            // \r
+            // ctl_decomb\r
+            // \r
+            this.ctl_decomb.AutoSize = true;\r
+            this.ctl_decomb.Location = new System.Drawing.Point(19, 66);\r
+            this.ctl_decomb.Margin = new System.Windows.Forms.Padding(0);\r
+            this.ctl_decomb.MaximumSize = new System.Drawing.Size(400, 30);\r
+            this.ctl_decomb.Name = "ctl_decomb";\r
+            this.ctl_decomb.Size = new System.Drawing.Size(275, 28);\r
+            this.ctl_decomb.TabIndex = 39;\r
+            this.ctl_decomb.onChange += new System.EventHandler(this.ctl_decomb_changed);\r
+            // \r
+            // ctl_detelecine\r
+            // \r
+            this.ctl_detelecine.AutoSize = true;\r
+            this.ctl_detelecine.Location = new System.Drawing.Point(19, 38);\r
+            this.ctl_detelecine.Margin = new System.Windows.Forms.Padding(0);\r
+            this.ctl_detelecine.MaximumSize = new System.Drawing.Size(400, 30);\r
+            this.ctl_detelecine.Name = "ctl_detelecine";\r
+            this.ctl_detelecine.Size = new System.Drawing.Size(275, 28);\r
+            this.ctl_detelecine.TabIndex = 38;\r
+            // \r
             // tab_chapters\r
             // \r
             this.tab_chapters.BackColor = System.Drawing.Color.Transparent;\r
@@ -2347,44 +1927,7 @@ namespace Handbrake
             // h264Tab\r
             // \r
             this.h264Tab.BackColor = System.Drawing.Color.Transparent;\r
-            this.h264Tab.Controls.Add(this.slider_psytrellis);\r
-            this.h264Tab.Controls.Add(this.lbl_psytrellis);\r
-            this.h264Tab.Controls.Add(this.lbl_psyrd);\r
-            this.h264Tab.Controls.Add(this.slider_psyrd);\r
-            this.h264Tab.Controls.Add(this.lbl_adaptBFrames);\r
-            this.h264Tab.Controls.Add(this.drop_adaptBFrames);\r
-            this.h264Tab.Controls.Add(this.label43);\r
-            this.h264Tab.Controls.Add(this.btn_reset);\r
-            this.h264Tab.Controls.Add(this.rtf_x264Query);\r
-            this.h264Tab.Controls.Add(this.check_Cabac);\r
-            this.h264Tab.Controls.Add(this.check_noDCTDecimate);\r
-            this.h264Tab.Controls.Add(this.check_noFastPSkip);\r
-            this.h264Tab.Controls.Add(this.lbl_trellis);\r
-            this.h264Tab.Controls.Add(this.drop_trellis);\r
-            this.h264Tab.Controls.Add(this.drop_deblockBeta);\r
-            this.h264Tab.Controls.Add(this.label41);\r
-            this.h264Tab.Controls.Add(this.drop_deblockAlpha);\r
-            this.h264Tab.Controls.Add(this.panel3);\r
-            this.h264Tab.Controls.Add(this.panel1);\r
-            this.h264Tab.Controls.Add(this.panel2);\r
-            this.h264Tab.Controls.Add(this.check_8x8DCT);\r
-            this.h264Tab.Controls.Add(this.label45);\r
-            this.h264Tab.Controls.Add(this.drop_analysis);\r
-            this.h264Tab.Controls.Add(this.label48);\r
-            this.h264Tab.Controls.Add(this.drop_subpixelMotionEstimation);\r
-            this.h264Tab.Controls.Add(this.lbl_merange);\r
-            this.h264Tab.Controls.Add(this.drop_MotionEstimationRange);\r
-            this.h264Tab.Controls.Add(this.label54);\r
-            this.h264Tab.Controls.Add(this.drop_MotionEstimationMethod);\r
-            this.h264Tab.Controls.Add(this.check_pyrmidalBFrames);\r
-            this.h264Tab.Controls.Add(this.check_weightedBFrames);\r
-            this.h264Tab.Controls.Add(this.lbl_direct_prediction);\r
-            this.h264Tab.Controls.Add(this.drop_directPrediction);\r
-            this.h264Tab.Controls.Add(this.label62);\r
-            this.h264Tab.Controls.Add(this.drop_bFrames);\r
-            this.h264Tab.Controls.Add(this.label64);\r
-            this.h264Tab.Controls.Add(this.drop_refFrames);\r
-            this.h264Tab.Controls.Add(this.check_mixedReferences);\r
+            this.h264Tab.Controls.Add(this.x264Panel);\r
             this.h264Tab.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.h264Tab.Location = new System.Drawing.Point(4, 22);\r
             this.h264Tab.Name = "h264Tab";\r
@@ -2394,200 +1937,13 @@ namespace Handbrake
             this.h264Tab.Text = "Advanced";\r
             this.h264Tab.UseVisualStyleBackColor = true;\r
             // \r
-            // slider_psytrellis\r
-            // \r
-            this.slider_psytrellis.Location = new System.Drawing.Point(436, 189);\r
-            this.slider_psytrellis.Name = "slider_psytrellis";\r
-            this.slider_psytrellis.Size = new System.Drawing.Size(131, 42);\r
-            this.slider_psytrellis.TabIndex = 48;\r
-            this.slider_psytrellis.ValueChanged += new System.EventHandler(this.slider_psytrellis_Scroll);\r
-            // \r
-            // lbl_psytrellis\r
-            // \r
-            this.lbl_psytrellis.AutoSize = true;\r
-            this.lbl_psytrellis.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.lbl_psytrellis.Location = new System.Drawing.Point(319, 193);\r
-            this.lbl_psytrellis.Name = "lbl_psytrellis";\r
-            this.lbl_psytrellis.Size = new System.Drawing.Size(111, 12);\r
-            this.lbl_psytrellis.TabIndex = 47;\r
-            this.lbl_psytrellis.Text = "Psychovisual Trellis:";\r
-            // \r
-            // lbl_psyrd\r
-            // \r
-            this.lbl_psyrd.AutoSize = true;\r
-            this.lbl_psyrd.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.lbl_psyrd.Location = new System.Drawing.Point(275, 159);\r
-            this.lbl_psyrd.Name = "lbl_psyrd";\r
-            this.lbl_psyrd.Size = new System.Drawing.Size(155, 12);\r
-            this.lbl_psyrd.TabIndex = 46;\r
-            this.lbl_psyrd.Text = "Psychovisual Rate Distortion:";\r
-            // \r
-            // slider_psyrd\r
-            // \r
-            this.slider_psyrd.Location = new System.Drawing.Point(436, 148);\r
-            this.slider_psyrd.Name = "slider_psyrd";\r
-            this.slider_psyrd.Size = new System.Drawing.Size(131, 42);\r
-            this.slider_psyrd.TabIndex = 45;\r
-            this.slider_psyrd.ValueChanged += new System.EventHandler(this.slider_psyrd_Scroll);\r
-            // \r
-            // lbl_adaptBFrames\r
-            // \r
-            this.lbl_adaptBFrames.AutoSize = true;\r
-            this.lbl_adaptBFrames.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.lbl_adaptBFrames.Location = new System.Drawing.Point(17, 119);\r
-            this.lbl_adaptBFrames.Name = "lbl_adaptBFrames";\r
-            this.lbl_adaptBFrames.Size = new System.Drawing.Size(106, 12);\r
-            this.lbl_adaptBFrames.TabIndex = 43;\r
-            this.lbl_adaptBFrames.Text = "Adaptive B-Frames:";\r
-            // \r
-            // label43\r
-            // \r
-            this.label43.AutoSize = true;\r
-            this.label43.BackColor = System.Drawing.Color.Transparent;\r
-            this.label43.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label43.Location = new System.Drawing.Point(13, 13);\r
-            this.label43.Name = "label43";\r
-            this.label43.Size = new System.Drawing.Size(165, 13);\r
-            this.label43.TabIndex = 0;\r
-            this.label43.Text = "Advanced H.264 Options";\r
-            // \r
-            // btn_reset\r
-            // \r
-            this.btn_reset.Location = new System.Drawing.Point(13, 224);\r
-            this.btn_reset.Name = "btn_reset";\r
-            this.btn_reset.Size = new System.Drawing.Size(75, 23);\r
-            this.btn_reset.TabIndex = 41;\r
-            this.btn_reset.Text = "Reset All";\r
-            this.btn_reset.UseVisualStyleBackColor = true;\r
-            this.btn_reset.Click += new System.EventHandler(this.btn_reset_Click);\r
-            // \r
-            // rtf_x264Query\r
-            // \r
-            this.rtf_x264Query.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
-            this.rtf_x264Query.Location = new System.Drawing.Point(13, 253);\r
-            this.rtf_x264Query.Name = "rtf_x264Query";\r
-            this.rtf_x264Query.Size = new System.Drawing.Size(698, 43);\r
-            this.rtf_x264Query.TabIndex = 42;\r
-            this.rtf_x264Query.Text = "";\r
-            this.rtf_x264Query.LostFocus += new System.EventHandler(this.rtf_x264Query_TextChanged);\r
-            this.rtf_x264Query.TextChanged += new System.EventHandler(this.rtf_x264Query_TextChanged);\r
-            // \r
-            // lbl_trellis\r
-            // \r
-            this.lbl_trellis.AutoSize = true;\r
-            this.lbl_trellis.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.lbl_trellis.Location = new System.Drawing.Point(421, 125);\r
-            this.lbl_trellis.Name = "lbl_trellis";\r
-            this.lbl_trellis.Size = new System.Drawing.Size(41, 12);\r
-            this.lbl_trellis.TabIndex = 26;\r
-            this.lbl_trellis.Text = "Trellis:";\r
-            // \r
-            // label41\r
-            // \r
-            this.label41.AutoSize = true;\r
-            this.label41.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label41.Location = new System.Drawing.Point(575, 67);\r
-            this.label41.Name = "label41";\r
-            this.label41.Size = new System.Drawing.Size(65, 12);\r
-            this.label41.TabIndex = 25;\r
-            this.label41.Text = "Deblocking:";\r
-            // \r
-            // panel3\r
-            // \r
-            this.panel3.BackColor = System.Drawing.Color.Black;\r
-            this.panel3.Location = new System.Drawing.Point(277, 118);\r
-            this.panel3.Margin = new System.Windows.Forms.Padding(0);\r
-            this.panel3.Name = "panel3";\r
-            this.panel3.Size = new System.Drawing.Size(290, 1);\r
-            this.panel3.TabIndex = 24;\r
-            // \r
-            // panel1\r
-            // \r
-            this.panel1.BackColor = System.Drawing.Color.Black;\r
-            this.panel1.Location = new System.Drawing.Point(13, 84);\r
-            this.panel1.Margin = new System.Windows.Forms.Padding(0);\r
-            this.panel1.Name = "panel1";\r
-            this.panel1.Size = new System.Drawing.Size(247, 1);\r
-            this.panel1.TabIndex = 3;\r
-            // \r
-            // panel2\r
-            // \r
-            this.panel2.BackColor = System.Drawing.Color.Black;\r
-            this.panel2.Location = new System.Drawing.Point(277, 90);\r
-            this.panel2.Margin = new System.Windows.Forms.Padding(0);\r
-            this.panel2.Name = "panel2";\r
-            this.panel2.Size = new System.Drawing.Size(290, 1);\r
-            this.panel2.TabIndex = 21;\r
-            // \r
-            // label45\r
-            // \r
-            this.label45.AutoSize = true;\r
-            this.label45.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label45.Location = new System.Drawing.Point(364, 97);\r
-            this.label45.Name = "label45";\r
-            this.label45.Size = new System.Drawing.Size(53, 12);\r
-            this.label45.TabIndex = 22;\r
-            this.label45.Text = "Analysis:";\r
-            // \r
-            // label48\r
-            // \r
-            this.label48.AutoSize = true;\r
-            this.label48.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label48.Location = new System.Drawing.Point(271, 40);\r
-            this.label48.Name = "label48";\r
-            this.label48.Size = new System.Drawing.Size(146, 12);\r
-            this.label48.TabIndex = 20;\r
-            this.label48.Text = "Subpixel Motion Estimation:";\r
-            // \r
-            // lbl_merange\r
-            // \r
-            this.lbl_merange.AutoSize = true;\r
-            this.lbl_merange.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.lbl_merange.Location = new System.Drawing.Point(283, 66);\r
-            this.lbl_merange.Name = "lbl_merange";\r
-            this.lbl_merange.Size = new System.Drawing.Size(134, 12);\r
-            this.lbl_merange.TabIndex = 19;\r
-            this.lbl_merange.Text = "Motion Estimation Range:";\r
-            // \r
-            // label54\r
-            // \r
-            this.label54.AutoSize = true;\r
-            this.label54.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label54.Location = new System.Drawing.Point(277, 14);\r
-            this.label54.Name = "label54";\r
-            this.label54.Size = new System.Drawing.Size(140, 12);\r
-            this.label54.TabIndex = 18;\r
-            this.label54.Text = "Motion Estimation Method:";\r
-            // \r
-            // lbl_direct_prediction\r
-            // \r
-            this.lbl_direct_prediction.AutoSize = true;\r
-            this.lbl_direct_prediction.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.lbl_direct_prediction.Location = new System.Drawing.Point(29, 145);\r
-            this.lbl_direct_prediction.Name = "lbl_direct_prediction";\r
-            this.lbl_direct_prediction.Size = new System.Drawing.Size(94, 12);\r
-            this.lbl_direct_prediction.TabIndex = 5;\r
-            this.lbl_direct_prediction.Text = "Direct Prediction:";\r
-            // \r
-            // label62\r
-            // \r
-            this.label62.AutoSize = true;\r
-            this.label62.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label62.Location = new System.Drawing.Point(65, 93);\r
-            this.label62.Name = "label62";\r
-            this.label62.Size = new System.Drawing.Size(58, 12);\r
-            this.label62.TabIndex = 4;\r
-            this.label62.Text = "B-Frames:";\r
-            // \r
-            // label64\r
-            // \r
-            this.label64.AutoSize = true;\r
-            this.label64.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label64.Location = new System.Drawing.Point(24, 40);\r
-            this.label64.Name = "label64";\r
-            this.label64.Size = new System.Drawing.Size(99, 12);\r
-            this.label64.TabIndex = 1;\r
-            this.label64.Text = "Reference Frames:";\r
+            // x264Panel\r
+            // \r
+            this.x264Panel.Location = new System.Drawing.Point(0, 0);\r
+            this.x264Panel.Name = "x264Panel";\r
+            this.x264Panel.Size = new System.Drawing.Size(720, 306);\r
+            this.x264Panel.TabIndex = 0;\r
+            this.x264Panel.x264Query = "";\r
             // \r
             // tab_query\r
             // \r
@@ -2953,48 +2309,6 @@ namespace Handbrake
             this.lbl_encode.Size = new System.Drawing.Size(31, 17);\r
             this.lbl_encode.Text = "{0}";\r
             // \r
-            // ctl_deinterlace\r
-            // \r
-            this.ctl_deinterlace.AutoSize = true;\r
-            this.ctl_deinterlace.Location = new System.Drawing.Point(19, 95);\r
-            this.ctl_deinterlace.Margin = new System.Windows.Forms.Padding(0);\r
-            this.ctl_deinterlace.MaximumSize = new System.Drawing.Size(400, 30);\r
-            this.ctl_deinterlace.Name = "ctl_deinterlace";\r
-            this.ctl_deinterlace.Size = new System.Drawing.Size(275, 28);\r
-            this.ctl_deinterlace.TabIndex = 41;\r
-            this.ctl_deinterlace.onChange += new System.EventHandler(this.ctl_deinterlace_changed);\r
-            // \r
-            // ctl_denoise\r
-            // \r
-            this.ctl_denoise.AutoSize = true;\r
-            this.ctl_denoise.Location = new System.Drawing.Point(19, 123);\r
-            this.ctl_denoise.Margin = new System.Windows.Forms.Padding(0);\r
-            this.ctl_denoise.MaximumSize = new System.Drawing.Size(400, 30);\r
-            this.ctl_denoise.Name = "ctl_denoise";\r
-            this.ctl_denoise.Size = new System.Drawing.Size(275, 28);\r
-            this.ctl_denoise.TabIndex = 40;\r
-            // \r
-            // ctl_decomb\r
-            // \r
-            this.ctl_decomb.AutoSize = true;\r
-            this.ctl_decomb.Location = new System.Drawing.Point(19, 66);\r
-            this.ctl_decomb.Margin = new System.Windows.Forms.Padding(0);\r
-            this.ctl_decomb.MaximumSize = new System.Drawing.Size(400, 30);\r
-            this.ctl_decomb.Name = "ctl_decomb";\r
-            this.ctl_decomb.Size = new System.Drawing.Size(275, 28);\r
-            this.ctl_decomb.TabIndex = 39;\r
-            this.ctl_decomb.onChange += new System.EventHandler(this.ctl_decomb_changed);\r
-            // \r
-            // ctl_detelecine\r
-            // \r
-            this.ctl_detelecine.AutoSize = true;\r
-            this.ctl_detelecine.Location = new System.Drawing.Point(19, 38);\r
-            this.ctl_detelecine.Margin = new System.Windows.Forms.Padding(0);\r
-            this.ctl_detelecine.MaximumSize = new System.Drawing.Size(400, 30);\r
-            this.ctl_detelecine.Name = "ctl_detelecine";\r
-            this.ctl_detelecine.Size = new System.Drawing.Size(275, 28);\r
-            this.ctl_detelecine.TabIndex = 38;\r
-            // \r
             // frmMain\r
             // \r
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);\r
@@ -3042,9 +2356,6 @@ namespace Handbrake
             this.tab_chapters.ResumeLayout(false);\r
             this.tab_chapters.PerformLayout();\r
             this.h264Tab.ResumeLayout(false);\r
-            this.h264Tab.PerformLayout();\r
-            ((System.ComponentModel.ISupportInitialize)(this.slider_psytrellis)).EndInit();\r
-            ((System.ComponentModel.ISupportInitialize)(this.slider_psyrd)).EndInit();\r
             this.tab_query.ResumeLayout(false);\r
             this.tab_query.PerformLayout();\r
             this.groupBox_dest.ResumeLayout(false);\r
@@ -3168,38 +2479,6 @@ namespace Handbrake
         internal System.Windows.Forms.Label label6;\r
         internal System.Windows.Forms.ComboBox drp_anamorphic;\r
         internal System.Windows.Forms.TabPage h264Tab;\r
-        internal System.Windows.Forms.RichTextBox rtf_x264Query;\r
-        internal System.Windows.Forms.Label label43;\r
-        internal System.Windows.Forms.Button btn_reset;\r
-        internal System.Windows.Forms.CheckBox check_Cabac;\r
-        internal System.Windows.Forms.CheckBox check_noDCTDecimate;\r
-        internal System.Windows.Forms.CheckBox check_noFastPSkip;\r
-        internal System.Windows.Forms.Label lbl_trellis;\r
-        internal System.Windows.Forms.ComboBox drop_trellis;\r
-        internal System.Windows.Forms.ComboBox drop_deblockBeta;\r
-        internal System.Windows.Forms.Label label41;\r
-        internal System.Windows.Forms.ComboBox drop_deblockAlpha;\r
-        internal System.Windows.Forms.Panel panel3;\r
-        internal System.Windows.Forms.Panel panel1;\r
-        internal System.Windows.Forms.Panel panel2;\r
-        internal System.Windows.Forms.CheckBox check_8x8DCT;\r
-        internal System.Windows.Forms.Label label45;\r
-        internal System.Windows.Forms.ComboBox drop_analysis;\r
-        internal System.Windows.Forms.Label label48;\r
-        internal System.Windows.Forms.ComboBox drop_subpixelMotionEstimation;\r
-        internal System.Windows.Forms.Label lbl_merange;\r
-        internal System.Windows.Forms.ComboBox drop_MotionEstimationRange;\r
-        internal System.Windows.Forms.Label label54;\r
-        internal System.Windows.Forms.ComboBox drop_MotionEstimationMethod;\r
-        internal System.Windows.Forms.CheckBox check_pyrmidalBFrames;\r
-        internal System.Windows.Forms.CheckBox check_weightedBFrames;\r
-        internal System.Windows.Forms.Label lbl_direct_prediction;\r
-        internal System.Windows.Forms.ComboBox drop_directPrediction;\r
-        internal System.Windows.Forms.Label label62;\r
-        internal System.Windows.Forms.ComboBox drop_bFrames;\r
-        internal System.Windows.Forms.Label label64;\r
-        internal System.Windows.Forms.ComboBox drop_refFrames;\r
-        internal System.Windows.Forms.CheckBox check_mixedReferences;\r
         internal System.Windows.Forms.Label label65;\r
         internal System.Windows.Forms.Label label14;\r
         internal System.Windows.Forms.ComboBox drp_audenc_1;\r
@@ -3280,12 +2559,7 @@ namespace Handbrake
         internal System.Windows.Forms.RadioButton radio_cq;\r
         internal System.Windows.Forms.RadioButton radio_avgBitrate;\r
         internal System.Windows.Forms.RadioButton radio_targetFilesize;\r
-        internal System.Windows.Forms.Label lbl_adaptBFrames;\r
-        internal System.Windows.Forms.ComboBox drop_adaptBFrames;\r
-        internal System.Windows.Forms.TrackBar slider_psyrd;\r
-        internal System.Windows.Forms.TrackBar slider_psytrellis;\r
-        internal System.Windows.Forms.Label lbl_psytrellis;\r
-        internal System.Windows.Forms.Label lbl_psyrd;\r
+        internal Handbrake.Controls.x264Panel x264Panel;\r
 \r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 7e7c1c6..2629456 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -29,7 +29,6 @@ namespace Handbrake
 \r
         // Objects belonging to this window only\r
         PresetLoader presetLoader = new PresetLoader();\r
-        x264Panel x264PanelFunctions = new x264Panel();\r
         QueryGenerator queryGen = new QueryGenerator();\r
 \r
         // Globals: Mainly used for tracking.\r
@@ -82,7 +81,7 @@ namespace Handbrake
             // Setup the GUI components\r
             lblStatus.Text = "Setting up the GUI ...";\r
             Application.DoEvents();\r
-            x264PanelFunctions.reset2Defaults(this); // Initialize all the x264 widgets to their default values\r
+            x264Panel.reset2Defaults(); // Initialize all the x264 widgets to their default values\r
             loadPresetPanel();                       // Load the Preset Panel\r
             treeView_presets.ExpandAll();\r
             lbl_encode.Text = "";\r
@@ -102,15 +101,15 @@ namespace Handbrake
                     if (query != null)\r
                     {\r
                         //Ok, Reset all the H264 widgets before changing the preset\r
-                        x264PanelFunctions.reset2Defaults(this);\r
+                        x264Panel.reset2Defaults();\r
 \r
                         // Send the query from the file to the Query Parser class, then load the preset\r
                         Functions.QueryParser presetQuery = Functions.QueryParser.Parse(query);\r
                         presetLoader.presetLoader(this, presetQuery, Properties.Settings.Default.defaultPreset, loadPictureSettings);\r
 \r
                         // The x264 widgets will need updated, so do this now:\r
-                        x264PanelFunctions.X264_StandardizeOptString(this);\r
-                        x264PanelFunctions.X264_SetCurrentSettingsInPanel(this);\r
+                        x264Panel.X264_StandardizeOptString();\r
+                        x264Panel.X264_SetCurrentSettingsInPanel();\r
                     }\r
                 }\r
                 else\r
@@ -460,7 +459,7 @@ namespace Handbrake
                     if (query != null)\r
                     {\r
                         //Ok, Reset all the H264 widgets before changing the preset\r
-                        x264PanelFunctions.reset2Defaults(this);\r
+                        x264Panel.reset2Defaults();\r
 \r
                         // Send the query from the file to the Query Parser class\r
                         Functions.QueryParser presetQuery = Functions.QueryParser.Parse(query);\r
@@ -469,8 +468,8 @@ namespace Handbrake
                         presetLoader.presetLoader(this, presetQuery, presetName, loadPictureSettings);\r
 \r
                         // The x264 widgets will need updated, so do this now:\r
-                        x264PanelFunctions.X264_StandardizeOptString(this);\r
-                        x264PanelFunctions.X264_SetCurrentSettingsInPanel(this);\r
+                        x264Panel.X264_StandardizeOptString();\r
+                        x264Panel.X264_SetCurrentSettingsInPanel();\r
                     }\r
                 }\r
             }\r
@@ -1048,7 +1047,7 @@ namespace Handbrake
                 check_turbo.CheckState = CheckState.Unchecked;\r
                 check_turbo.Enabled = false;\r
                 h264Tab.Enabled = false;\r
-                rtf_x264Query.Text = "";\r
+                x264Panel.x264Query = "";\r
                 check_iPodAtom.Enabled = false;\r
                 check_iPodAtom.Checked = false;\r
             }\r
@@ -1526,109 +1525,6 @@ namespace Handbrake
             }\r
         }\r
 \r
-        // Advanced Tab\r
-        private void drop_refFrames_SelectedIndexChanged(object sender, EventArgs e)\r
-        {\r
-            x264PanelFunctions.on_x264_WidgetChange("ref", this);\r
-        }\r
-        private void check_mixedReferences_CheckedChanged(object sender, EventArgs e)\r
-        {\r
-            x264PanelFunctions.on_x264_WidgetChange("mixed-refs", this);\r
-        }\r
-        private void drop_bFrames_SelectedIndexChanged(object sender, EventArgs e)\r
-        {\r
-            x264PanelFunctions.on_x264_WidgetChange("bframes", this);\r
-        }\r
-        private void drop_directPrediction_SelectedIndexChanged(object sender, EventArgs e)\r
-        {\r
-            x264PanelFunctions.on_x264_WidgetChange("direct", this);\r
-        }\r
-        private void check_weightedBFrames_CheckedChanged(object sender, EventArgs e)\r
-        {\r
-            x264PanelFunctions.on_x264_WidgetChange("weightb", this);\r
-        }\r
-        private void check_pyrmidalBFrames_CheckedChanged(object sender, EventArgs e)\r
-        {\r
-            x264PanelFunctions.on_x264_WidgetChange("b-pyramid", this);\r
-        }\r
-        private void drop_MotionEstimationMethod_SelectedIndexChanged(object sender, EventArgs e)\r
-        {\r
-            x264PanelFunctions.on_x264_WidgetChange("me", this);\r
-        }\r
-        private void drop_MotionEstimationRange_SelectedIndexChanged(object sender, EventArgs e)\r
-        {\r
-            x264PanelFunctions.on_x264_WidgetChange("merange", this);\r
-        }\r
-        private void drop_subpixelMotionEstimation_SelectedIndexChanged(object sender, EventArgs e)\r
-        {\r
-            x264PanelFunctions.on_x264_WidgetChange("subq", this);\r
-        }\r
-        private void drop_analysis_SelectedIndexChanged(object sender, EventArgs e)\r
-        {\r
-            x264PanelFunctions.on_x264_WidgetChange("analyse", this);\r
-        }\r
-        private void check_8x8DCT_CheckedChanged(object sender, EventArgs e)\r
-        {\r
-            x264PanelFunctions.on_x264_WidgetChange("8x8dct", this);\r
-        }\r
-        private void drop_deblockAlpha_SelectedIndexChanged(object sender, EventArgs e)\r
-        {\r
-            x264PanelFunctions.on_x264_WidgetChange("deblock", this);\r
-\r
-        }\r
-        private void drop_deblockBeta_SelectedIndexChanged(object sender, EventArgs e)\r
-        {\r
-            x264PanelFunctions.on_x264_WidgetChange("deblock", this);\r
-\r
-        }\r
-        private void drop_trellis_SelectedIndexChanged(object sender, EventArgs e)\r
-        {\r
-            x264PanelFunctions.on_x264_WidgetChange("trellis", this);\r
-        }\r
-        private void check_noFastPSkip_CheckedChanged(object sender, EventArgs e)\r
-        {\r
-            x264PanelFunctions.on_x264_WidgetChange("no-fast-pskip", this);\r
-        }\r
-        private void check_noDCTDecimate_CheckedChanged(object sender, EventArgs e)\r
-        {\r
-            x264PanelFunctions.on_x264_WidgetChange("no-dct-decimate", this);\r
-\r
-        }\r
-        private void check_Cabac_CheckedChanged(object sender, EventArgs e)\r
-        {\r
-            x264PanelFunctions.on_x264_WidgetChange("cabac", this);\r
-        }\r
-        private void slider_psyrd_Scroll(object sender, EventArgs e)\r
-        {\r
-            x264PanelFunctions.on_x264_WidgetChange("psy-rd", this);\r
-        }\r
-        private void slider_psytrellis_Scroll(object sender, EventArgs e)\r
-        {\r
-            x264PanelFunctions.on_x264_WidgetChange("psy-rd", this);\r
-        }\r
-        private void drop_adaptBFrames_SelectedIndexChanged(object sender, EventArgs e)\r
-        {\r
-            x264PanelFunctions.on_x264_WidgetChange("b-adapt", this);\r
-        }\r
-\r
-        private void rtf_x264Query_TextChanged(object sender, EventArgs e)\r
-        {\r
-            if (rtf_x264Query.Text.EndsWith("\n"))\r
-            {\r
-                rtf_x264Query.Text = rtf_x264Query.Text.Replace("\n", "");\r
-                x264PanelFunctions.X264_StandardizeOptString(this);\r
-                x264PanelFunctions.X264_SetCurrentSettingsInPanel(this);\r
-\r
-                if (rtf_x264Query.Text == string.Empty)\r
-                    x264PanelFunctions.reset2Defaults(this);\r
-            }\r
-        }\r
-        private void btn_reset_Click(object sender, EventArgs e)\r
-        {\r
-            rtf_x264Query.Text = "";\r
-            x264PanelFunctions.reset2Defaults(this);\r
-        }\r
-\r
         // Query Editor Tab\r
         private void btn_generate_Query_Click(object sender, EventArgs e)\r
         {\r
@@ -2203,7 +2099,6 @@ namespace Handbrake
 \r
         #endregion\r
 \r
-\r
         // This is the END of the road ------------------------------------------------------------------------------\r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/frmMain.resx b/win/C#/frmMain.resx
index 00fd530..9b96457 100644 (file)
--- a/win/C#/frmMain.resx
+++ b/win/C#/frmMain.resx
@@ -152,93 +152,12 @@ Make sure you have selected a "Title" from the "Source" box above otherwise
 the list will not be populated with the correct amount of chapters.\r
 Note: Do not change any of the chapter numbers!</value>\r
   </data>\r
-  <data name="check_Cabac.ToolTip" xml:space="preserve">\r
-    <value>CABAC, or context adaptive binary arithmetic coding, is used by x264 to reduce the bitrate needed for a given quality by 15%. \r
-This makes it very cool and very useful, and it should be left on whenever possible. However, it is incompatible with the iPod 5.5G, and makes the AppleTV struggle. \r
-So turn it off for those. CABAC is a kind of entropy coding, which means that it compresses data by making shorthand symbols to represent long streams of data. \r
-The "entropy" part means that the symbols it uses the most often are the smallest. \r
-When you disable CABAC, another entropy coding scheme gets enabled, called CAVLC (context adaptive variable-length coding). \r
-CAVLC is a lot less efficient, which is why it needs 15% more bitrate to achieve the same quality as CABAC.</value>\r
-  </data>\r
-  <data name="drop_deblockBeta.ToolTip" xml:space="preserve">\r
-    <value>x264 includes an in-loop deblocking filter. \r
-What this means is that blocky compression artifacts are smoothed away when you play back the video. \r
-It has two settings: strength and threshold, just like a simple filter in Photoshop. \r
-Strength controls the amount of deblocking applied to the whole frame. \r
-If you drop down below 0, you reduce the amount of blurring.\r
-Go too negative, and you'll get an effect somewhat like oversharpening an image. \r
-Go into positive values, and the image may become too soft. \r
-Threshold controls how sensitive the filter is to whether something in a block is detail that needs to be preserved: lower numbers blur details less. \r
-The default deblocking values are 0 and 0. This does not mean zero deblocking. \r
-It means x264 will apply the regular deblocking strength and thresholds the codec authors have selected as working the best in most cases. \r
-While many, many people stick with the default deblocking values of 0,0, other people disagree. \r
-Some prefer a slightly less blurred image for live action material, and use values like -2,-1 or -2,-2. Others will raise it to 1,1 or even 3,3 for animation. \r
-While the values for each setting extend from -6 to 6, the consensus is that going below -3 or above 3 is worthless.\r
-</value>\r
-  </data>\r
-  <data name="drop_deblockAlpha.ToolTip" xml:space="preserve">\r
-    <value>x264 includes an in-loop deblocking filter. \r
-What this means is that blocky compression artifacts are smoothed away when you play back the video. \r
-It has two settings: strength and threshold, just like a simple filter in Photoshop. \r
-Strength controls the amount of deblocking applied to the whole frame. \r
-If you drop down below 0, you reduce the amount of blurring.\r
-Go too negative, and you'll get an effect somewhat like oversharpening an image. \r
-Go into positive values, and the image may become too soft. \r
-Threshold controls how sensitive the filter is to whether something in a block is detail that needs to be preserved: lower numbers blur details less. \r
-The default deblocking values are 0 and 0. This does not mean zero deblocking. \r
-It means x264 will apply the regular deblocking strength and thresholds the codec authors have selected as working the best in most cases. \r
-While many, many people stick with the default deblocking values of 0,0, other people disagree. \r
-Some prefer a slightly less blurred image for live action material, and use values like -2,-1 or -2,-2. Others will raise it to 1,1 or even 3,3 for animation. \r
-While the values for each setting extend from -6 to 6, the consensus is that going below -3 or above 3 is worthless.</value>\r
-  </data>\r
-  <data name="check_8x8DCT.ToolTip" xml:space="preserve">\r
-    <value>When Analysis is set to "all," checking this box lets x264 break key frames down into 8x8 blocks of pixels for analysis. \r
-This is a high profile feature of H.264, which makes it less compatible. It should slightly decrease bitrate or improve quality.</value>\r
-  </data>\r
-  <data name="drop_analysis.ToolTip" xml:space="preserve">\r
-    <value>Analysis controls how finely x264 divides up a frame to capture detail. \r
-Full macroblocks are 16x16 pixels, but x264 can go down all the way to 4x4 blocks if it judges it necessary. \r
-By default it only breaks up key frames that much. \r
-To give x264 the freedom to make the best decisions for all frames, use "all" analysis. \r
-If you want to create a high profile H.264 video (which is less compatible with the world at large than main profile), \r
-also check the "8x8 DCT blocks" box to add yet another block size for analysis.</value>\r
-  </data>\r
-  <data name="drop_subpixelMotionEstimation.ToolTip" xml:space="preserve">\r
-    <value>This setting is finer-grained than the motion estimation settings above. \r
-Instead of dealing with whole pixels, it deals with fractional pixels. 4, HandBrake's default, means looking at quarter pixels (qpel). \r
-Higher levels increase quality by dividing the pixel more, but take longer to encode. \r
-Using 6 or 7 turns unlocks the ability to turn on more advanced features like B-Frame rate distortion.</value>\r
-  </data>\r
-  <data name="drop_MotionEstimationRange.ToolTip" xml:space="preserve">\r
-    <value>This range is the radius, in pixels, x264 should use for motion estimation searches. \r
-It only has an effect when you use Uneven Multi-Hexagonal or Exhaustive searching. \r
-24, 32, and 64 are good values.</value>\r
-  </data>\r
-  <data name="drop_MotionEstimationMethod.ToolTip" xml:space="preserve">\r
-    <value>This sets the shape of the area x264 searches when estimating motion. \r
-Your choices are a diamond, a hexagon, a more complex hexagonal shape, or searching the entire frame. \r
-You are best off using Uneven Multi-Hexagonal searching.</value>\r
-  </data>\r
-  <data name="check_pyrmidalBFrames.ToolTip" xml:space="preserve">\r
-    <value>B-frame pyramids are a High Profile feature. \r
-This means that if you enable it, YOUR VIDEO WILL NOT PLAY IN QUICKTIME. \r
-Pyramidal B-frames mean that B-frames don't just reference surrounding reference frames — \r
- instead, it also treats a previous B-frame as a reference, improving quality/lowering bitrate at the expense of complexity. \r
-Logically, to reference an earlier B-frame, you must tell x264 to use at least 2 B-frames.</value>\r
-  </data>\r
-  <data name="check_weightedBFrames.ToolTip" xml:space="preserve">\r
-    <value>With weighted B-frame prediction enabled, x264 will consider how far away the previous and next P-frames are, \r
-before deciding to make a frame a B-frame. \r
-The effect is that x264 will use fewer B-frames when they'd look bad — when it can't accurately predict motion. \r
-Obviously, this only works when you tell x264 to use more than 1 B-frame.  </value>\r
-  </data>\r
-  <data name="drop_directPrediction.ToolTip" xml:space="preserve">\r
-    <value>Direct prediction tells x264 what method to use when guessing motion for certain parts of a B-frame. \r
-It can either look at other parts of the current frame (spatial) or compare against the preceding frame (temporal). \r
-You're best off setting this to automatic, so x264 decides which method is best on its own. \r
-Don't select none assuming it will be faster; instead it will take longer and look worse. \r
-If you're going to choose between spatial and temporal, spatial is usually better. </value>\r
-  </data>\r
+  <metadata name="number.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
+    <value>True</value>\r
+  </metadata>\r
+  <metadata name="name.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
+    <value>True</value>\r
+  </metadata>\r
   <metadata name="DVD_Open.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>232, 15</value>\r
   </metadata>\r

diff --git a/win/C#/frmMain/PresetLoader.cs b/win/C#/frmMain/PresetLoader.cs
index ed5dccd..dd6ee48 100644 (file)
--- a/win/C#/frmMain/PresetLoader.cs
+++ b/win/C#/frmMain/PresetLoader.cs
@@ -316,7 +316,7 @@ namespace Handbrake
 \r
             // H264 Tab & Preset Name\r
             #region other\r
-            mainWindow.rtf_x264Query.Text = presetQuery.H264Query;\r
+            mainWindow.x264Panel.x264Query = presetQuery.H264Query;\r
 \r
             // Set the preset name\r
             mainWindow.groupBox_output.Text = "Output Settings (Preset: " + name + ")";\r

diff --git a/win/C#/frmMain/QueryGenerator.cs b/win/C#/frmMain/QueryGenerator.cs
index 31ba53e..a14e3e8 100644 (file)
--- a/win/C#/frmMain/QueryGenerator.cs
+++ b/win/C#/frmMain/QueryGenerator.cs
@@ -424,8 +424,8 @@ namespace Handbrake
             #endregion\r
 \r
             #region  H264 Tab\r
-            if (mainWindow.rtf_x264Query.Text != "")\r
-                query += " -x " + mainWindow.rtf_x264Query.Text;\r
+            if (mainWindow.x264Panel.x264Query != "")\r
+                query += " -x " + mainWindow.x264Panel.x264Query;\r
             #endregion\r
 \r
             #region Processors / Other\r