WinGui:

- Advanced options panel for ffmpeg mpeg-4 encoder options.
- Bug fixes in the new preset service and handling code.

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

1 files changed, 19 insertions, 6 deletions

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index 525da334c..1171afa78 100644
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -117,6 +117,7 @@ namespace Handbrake
             this.tab_chapters = new System.Windows.Forms.TabPage();

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

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

+            this.advancedEncoderOpts = new Handbrake.Controls.AdvancedEncoderOpts();

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

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

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

@@ -285,7 +286,7 @@ namespace Handbrake
             this.check_turbo.Enabled = false;

             this.check_turbo.Location = new System.Drawing.Point(495, 134);

             this.check_turbo.Name = "check_turbo";

-            this.check_turbo.Size = new System.Drawing.Size(101, 17);

+            this.check_turbo.Size = new System.Drawing.Size(99, 17);

             this.check_turbo.TabIndex = 9;

             this.check_turbo.Text = "Turbo first Pass";

             this.ToolTip.SetToolTip(this.check_turbo, "Makes the first pass of a 2 pass encode faster.");

@@ -555,7 +556,7 @@ namespace Handbrake
             this.radio_cq.BackColor = System.Drawing.Color.Transparent;

             this.radio_cq.Location = new System.Drawing.Point(366, 37);

             this.radio_cq.Name = "radio_cq";

-            this.radio_cq.Size = new System.Drawing.Size(110, 17);

+            this.radio_cq.Size = new System.Drawing.Size(105, 17);

             this.radio_cq.TabIndex = 3;

             this.radio_cq.Text = "Constant Quality:";

             this.ToolTip.SetToolTip(this.radio_cq, resources.GetString("radio_cq.ToolTip"));

@@ -569,7 +570,7 @@ namespace Handbrake
             this.radio_avgBitrate.Checked = true;

             this.radio_avgBitrate.Location = new System.Drawing.Point(367, 108);

             this.radio_avgBitrate.Name = "radio_avgBitrate";

-            this.radio_avgBitrate.Size = new System.Drawing.Size(116, 17);

+            this.radio_avgBitrate.Size = new System.Drawing.Size(112, 17);

             this.radio_avgBitrate.TabIndex = 4;

             this.radio_avgBitrate.TabStop = true;

             this.radio_avgBitrate.Text = "Avg Bitrate (kbps):";

@@ -583,7 +584,7 @@ namespace Handbrake
             this.check_2PassEncode.BackColor = System.Drawing.Color.Transparent;

             this.check_2PassEncode.Location = new System.Drawing.Point(385, 134);

             this.check_2PassEncode.Name = "check_2PassEncode";

-            this.check_2PassEncode.Size = new System.Drawing.Size(104, 17);

+            this.check_2PassEncode.Size = new System.Drawing.Size(106, 17);

             this.check_2PassEncode.TabIndex = 10;

             this.check_2PassEncode.Text = "2-Pass Encoding";

             this.ToolTip.SetToolTip(this.check_2PassEncode, resources.GetString("check_2PassEncode.ToolTip"));

@@ -871,7 +872,7 @@ namespace Handbrake
             this.radio_constantFramerate.Checked = true;

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

             this.radio_constantFramerate.Name = "radio_constantFramerate";

-            this.radio_constantFramerate.Size = new System.Drawing.Size(122, 17);

+            this.radio_constantFramerate.Size = new System.Drawing.Size(117, 17);

             this.radio_constantFramerate.TabIndex = 17;

             this.radio_constantFramerate.TabStop = true;

             this.radio_constantFramerate.Text = "Constant Framerate";

@@ -883,7 +884,7 @@ namespace Handbrake
             this.radio_peakAndVariable.BackColor = System.Drawing.Color.Transparent;

             this.radio_peakAndVariable.Location = new System.Drawing.Point(0, 23);

             this.radio_peakAndVariable.Name = "radio_peakAndVariable";

-            this.radio_peakAndVariable.Size = new System.Drawing.Size(116, 17);

+            this.radio_peakAndVariable.Size = new System.Drawing.Size(113, 17);

             this.radio_peakAndVariable.TabIndex = 19;

             this.radio_peakAndVariable.Text = "Variable Framerate";

             this.radio_peakAndVariable.UseVisualStyleBackColor = false;

@@ -1051,6 +1052,7 @@ namespace Handbrake
             // tab_advanced

             // 

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

+            this.tab_advanced.Controls.Add(this.advancedEncoderOpts);

             this.tab_advanced.Controls.Add(this.x264Panel);

             this.tab_advanced.Location = new System.Drawing.Point(4, 22);

             this.tab_advanced.Name = "tab_advanced";

@@ -1060,6 +1062,16 @@ namespace Handbrake
             this.tab_advanced.Text = "Advanced";

             this.tab_advanced.UseVisualStyleBackColor = true;

             // 

+            // advancedEncoderOpts

+            // 

+            this.advancedEncoderOpts.AdavancedQuery = "";

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

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

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

+            this.advancedEncoderOpts.Name = "advancedEncoderOpts";

+            this.advancedEncoderOpts.Size = new System.Drawing.Size(720, 209);

+            this.advancedEncoderOpts.TabIndex = 1;

+            // 

             // x264Panel

             // 

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

@@ -1935,5 +1947,6 @@ namespace Handbrake
         internal RadioButton radio_peakAndVariable;

         internal RadioButton radio_constantFramerate;

         private Panel panel1;

+        internal Controls.AdvancedEncoderOpts advancedEncoderOpts;

     }

 }
\ No newline at end of file