WinGui:

- Fix a few issues with the weightp x264 option.

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

2 files changed, 15 insertions, 12 deletions

diff --git a/win/C#/Controls/x264Panel.Designer.cs b/win/C#/Controls/x264Panel.Designer.cs
index 37fa3725e..b9849e71f 100644
--- a/win/C#/Controls/x264Panel.Designer.cs
+++ b/win/C#/Controls/x264Panel.Designer.cs
@@ -73,7 +73,7 @@ namespace Handbrake.Controls
             this.combo_pyrmidalBFrames = new System.Windows.Forms.ComboBox();

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

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

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

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

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

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

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

@@ -654,14 +654,14 @@ namespace Handbrake.Controls
             this.label1.TabIndex = 90;

             this.label1.Text = "Psychovisual:";

             // 

-            // label2

+            // lbl_prymidalBframes

             // 

-            this.label2.AutoSize = true;

-            this.label2.Location = new System.Drawing.Point(20, 160);

-            this.label2.Name = "label2";

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

-            this.label2.TabIndex = 91;

-            this.label2.Text = "Pyramidal B-Frames:";

+            this.lbl_prymidalBframes.AutoSize = true;

+            this.lbl_prymidalBframes.Location = new System.Drawing.Point(20, 160);

+            this.lbl_prymidalBframes.Name = "lbl_prymidalBframes";

+            this.lbl_prymidalBframes.Size = new System.Drawing.Size(105, 13);

+            this.lbl_prymidalBframes.TabIndex = 91;

+            this.lbl_prymidalBframes.Text = "Pyramidal B-Frames:";

             // 

             // label3

             // 

@@ -680,7 +680,7 @@ namespace Handbrake.Controls
             this.BackColor = System.Drawing.Color.Transparent;

             this.Controls.Add(this.label3);

             this.Controls.Add(this.rtf_x264Query);

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

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

             this.Controls.Add(this.combo_pyrmidalBFrames);

             this.Controls.Add(this.label1);

             this.Controls.Add(this.slider_psytrellis);

@@ -765,7 +765,7 @@ namespace Handbrake.Controls
         internal System.Windows.Forms.Label lbl_adaptiveQuantStrength;

         internal System.Windows.Forms.TrackBar slider_adaptiveQuantStrength;

         internal System.Windows.Forms.Label label1;

-        internal System.Windows.Forms.Label label2;

+        internal System.Windows.Forms.Label lbl_prymidalBframes;

         internal System.Windows.Forms.ComboBox combo_pyrmidalBFrames;

         internal System.Windows.Forms.Label label3;

     }

diff --git a/win/C#/Controls/x264Panel.cs b/win/C#/Controls/x264Panel.cs
index bc4926aa0..53d420ba6 100644
--- a/win/C#/Controls/x264Panel.cs
+++ b/win/C#/Controls/x264Panel.cs
@@ -499,7 +499,7 @@ namespace Handbrake.Controls
                         else if (optNameToChange.Equals("cabac"))

                             thisOpt = check_Cabac.CheckState == CheckState.Checked ? string.Empty : "cabac=0";

                         else if (optNameToChange.Equals("weightp"))

-                            thisOpt = check_Cabac.CheckState == CheckState.Checked ? string.Empty : "weightp=0";

+                            thisOpt = check_weightp.CheckState == CheckState.Checked ? string.Empty : "weightp=0";

                         else if (optNameToChange.Equals("me"))

                         {

                             switch (drop_MotionEstimationMethod.SelectedIndex)

@@ -811,7 +811,7 @@ namespace Handbrake.Controls
             }

             else if (optNameToChange.Equals("weightp"))

             {

-                if (check_weightp.CheckState != CheckState.Unchecked)

+                if (check_weightp.CheckState == CheckState.Unchecked)

                     query = query + colon + "weightp=0";

             }

             else if (optNameToChange.Equals("ref"))

@@ -877,6 +877,7 @@ namespace Handbrake.Controls
                            not to use b-frames at all. So disable the options

                            that can only be used when b-frames are enabled.        */

                         combo_pyrmidalBFrames.Visible = false;

+                        lbl_prymidalBframes.Visible = false;

                         drop_directPrediction.Visible = false;

                         lbl_direct_prediction.Visible = false;

 

@@ -891,6 +892,7 @@ namespace Handbrake.Controls
                     {

                         /* Only 1 b-frame? Disable b-pyramid. */

                         combo_pyrmidalBFrames.Visible = false;

+                        lbl_prymidalBframes.Visible = false;

                         combo_pyrmidalBFrames.SelectedIndex = 0;

 

                         drop_directPrediction.Visible = true;

@@ -902,6 +904,7 @@ namespace Handbrake.Controls
                     else

                     {

                         combo_pyrmidalBFrames.Visible = true;

+                        lbl_prymidalBframes.Visible = true;

                         drop_directPrediction.Visible = true;

                         lbl_direct_prediction.Visible = true;