WinGui:

- Fix a few issues with the weightp x264 option.

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

diff --git a/win/C#/Controls/x264Panel.Designer.cs b/win/C#/Controls/x264Panel.Designer.cs
index 37fa372..b9849e7 100644 (file)
--- 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();\r
             this.lbl_adaptiveQuantStrength = new System.Windows.Forms.Label();\r
             this.label1 = new System.Windows.Forms.Label();\r
-            this.label2 = new System.Windows.Forms.Label();\r
+            this.lbl_prymidalBframes = new System.Windows.Forms.Label();\r
             this.label3 = new System.Windows.Forms.Label();\r
             ((System.ComponentModel.ISupportInitialize)(this.slider_psytrellis)).BeginInit();\r
             ((System.ComponentModel.ISupportInitialize)(this.slider_psyrd)).BeginInit();\r
@@ -654,14 +654,14 @@ namespace Handbrake.Controls
             this.label1.TabIndex = 90;\r
             this.label1.Text = "Psychovisual:";\r
             // \r
-            // label2\r
+            // lbl_prymidalBframes\r
             // \r
-            this.label2.AutoSize = true;\r
-            this.label2.Location = new System.Drawing.Point(20, 160);\r
-            this.label2.Name = "label2";\r
-            this.label2.Size = new System.Drawing.Size(105, 13);\r
-            this.label2.TabIndex = 91;\r
-            this.label2.Text = "Pyramidal B-Frames:";\r
+            this.lbl_prymidalBframes.AutoSize = true;\r
+            this.lbl_prymidalBframes.Location = new System.Drawing.Point(20, 160);\r
+            this.lbl_prymidalBframes.Name = "lbl_prymidalBframes";\r
+            this.lbl_prymidalBframes.Size = new System.Drawing.Size(105, 13);\r
+            this.lbl_prymidalBframes.TabIndex = 91;\r
+            this.lbl_prymidalBframes.Text = "Pyramidal B-Frames:";\r
             // \r
             // label3\r
             // \r
@@ -680,7 +680,7 @@ namespace Handbrake.Controls
             this.BackColor = System.Drawing.Color.Transparent;\r
             this.Controls.Add(this.label3);\r
             this.Controls.Add(this.rtf_x264Query);\r
-            this.Controls.Add(this.label2);\r
+            this.Controls.Add(this.lbl_prymidalBframes);\r
             this.Controls.Add(this.combo_pyrmidalBFrames);\r
             this.Controls.Add(this.label1);\r
             this.Controls.Add(this.slider_psytrellis);\r
@@ -765,7 +765,7 @@ namespace Handbrake.Controls
         internal System.Windows.Forms.Label lbl_adaptiveQuantStrength;\r
         internal System.Windows.Forms.TrackBar slider_adaptiveQuantStrength;\r
         internal System.Windows.Forms.Label label1;\r
-        internal System.Windows.Forms.Label label2;\r
+        internal System.Windows.Forms.Label lbl_prymidalBframes;\r
         internal System.Windows.Forms.ComboBox combo_pyrmidalBFrames;\r
         internal System.Windows.Forms.Label label3;\r
     }\r

diff --git a/win/C#/Controls/x264Panel.cs b/win/C#/Controls/x264Panel.cs
index bc4926a..53d420b 100644 (file)
--- a/win/C#/Controls/x264Panel.cs
+++ b/win/C#/Controls/x264Panel.cs
@@ -499,7 +499,7 @@ namespace Handbrake.Controls
                         else if (optNameToChange.Equals("cabac"))\r
                             thisOpt = check_Cabac.CheckState == CheckState.Checked ? string.Empty : "cabac=0";\r
                         else if (optNameToChange.Equals("weightp"))\r
-                            thisOpt = check_Cabac.CheckState == CheckState.Checked ? string.Empty : "weightp=0";\r
+                            thisOpt = check_weightp.CheckState == CheckState.Checked ? string.Empty : "weightp=0";\r
                         else if (optNameToChange.Equals("me"))\r
                         {\r
                             switch (drop_MotionEstimationMethod.SelectedIndex)\r
@@ -811,7 +811,7 @@ namespace Handbrake.Controls
             }\r
             else if (optNameToChange.Equals("weightp"))\r
             {\r
-                if (check_weightp.CheckState != CheckState.Unchecked)\r
+                if (check_weightp.CheckState == CheckState.Unchecked)\r
                     query = query + colon + "weightp=0";\r
             }\r
             else if (optNameToChange.Equals("ref"))\r
@@ -877,6 +877,7 @@ namespace Handbrake.Controls
                            not to use b-frames at all. So disable the options\r
                            that can only be used when b-frames are enabled.        */\r
                         combo_pyrmidalBFrames.Visible = false;\r
+                        lbl_prymidalBframes.Visible = false;\r
                         drop_directPrediction.Visible = false;\r
                         lbl_direct_prediction.Visible = false;\r
 \r
@@ -891,6 +892,7 @@ namespace Handbrake.Controls
                     {\r
                         /* Only 1 b-frame? Disable b-pyramid. */\r
                         combo_pyrmidalBFrames.Visible = false;\r
+                        lbl_prymidalBframes.Visible = false;\r
                         combo_pyrmidalBFrames.SelectedIndex = 0;\r
 \r
                         drop_directPrediction.Visible = true;\r
@@ -902,6 +904,7 @@ namespace Handbrake.Controls
                     else\r
                     {\r
                         combo_pyrmidalBFrames.Visible = true;\r
+                        lbl_prymidalBframes.Visible = true;\r
                         drop_directPrediction.Visible = true;\r
                         lbl_direct_prediction.Visible = true;\r
 \r