WinGui:

- Fix issue with weightb option on the x264 panel.

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

diff --git a/win/C#/Controls/x264Panel.cs b/win/C#/Controls/x264Panel.cs
index 6df49e7440b3af8057684ebc853e729079db55ff..4229c8298a135e41769fa567f3d8fb6f82cca2b0 100644 (file)
--- a/win/C#/Controls/x264Panel.cs
+++ b/win/C#/Controls/x264Panel.cs
@@ -349,7 +349,10 @@ namespace Handbrake.Controls
                                 drop_adaptBFrames.SelectedIndex = (badapt + 1);\r
                                 continue;\r
                             case "weightb":\r
-                                check_weightedBFrames.CheckState = CheckState.Checked;\r
+                                if (optValue != "0")\r
+                                    check_weightedBFrames.CheckState = CheckState.Checked;\r
+                                else\r
+                                    check_weightedBFrames.CheckState = CheckState.Unchecked;\r
                                 continue;\r
                             case "b-pyramid":\r
                                 check_pyrmidalBFrames.CheckState = CheckState.Checked;\r
@@ -521,7 +524,7 @@ namespace Handbrake.Controls
                         else if (optNameToChange.Equals("mixed-refs"))\r
                             thisOpt = check_mixedReferences.CheckState == CheckState.Checked ? "mixed-refs=1" : "mixed-refs=0";\r
                         else if (optNameToChange.Equals("weightb"))\r
-                            thisOpt = check_weightedBFrames.CheckState == CheckState.Checked ? "weightb=1" : "";\r
+                            thisOpt = check_weightedBFrames.CheckState == CheckState.Checked ? "" : "weightb=0";\r
                         else if (optNameToChange.Equals("b-pyramid"))\r
                             thisOpt = check_pyrmidalBFrames.CheckState == CheckState.Checked ? "b-pyramid=1" : "";\r
                         else if (optNameToChange.Equals("no-fast-pskip"))\r
@@ -791,8 +794,8 @@ namespace Handbrake.Controls
             }\r
             else if (optNameToChange.Equals("weightb"))\r
             {\r
-                if (check_weightedBFrames.CheckState == CheckState.Checked)\r
-                    query = query + colon + "weightb=1";\r
+                if (check_weightedBFrames.CheckState != CheckState.Checked)\r
+                    query = query + colon + "weightb=0";\r
             }\r
             else if (optNameToChange.Equals("b-pyramid"))\r
             {\r

diff --git a/win/C#/frmOptions.Designer.cs b/win/C#/frmOptions.Designer.cs
index 5e9e23faa9810a34c45df0cf9c3154aa9341add5..85c5e1d0ea7146f99a8651a9f01586f2a56193fd 100644 (file)
--- a/win/C#/frmOptions.Designer.cs
+++ b/win/C#/frmOptions.Designer.cs
@@ -263,10 +263,9 @@ namespace Handbrake
             this.check_m4v.AutoSize = true;\r
             this.check_m4v.Location = new System.Drawing.Point(108, 279);\r
             this.check_m4v.Name = "check_m4v";\r
-            this.check_m4v.Size = new System.Drawing.Size(423, 17);\r
+            this.check_m4v.Size = new System.Drawing.Size(319, 17);\r
             this.check_m4v.TabIndex = 82;\r
-            this.check_m4v.Text = "Use iPod/iTunes friendly file extension (.m4v) for MP4 (See tooltip for more deta" +\r
-                "ils)";\r
+            this.check_m4v.Text = "Always use iPod/iTunes friendly file extension (.m4v) for MP4";\r
             this.ToolTip.SetToolTip(this.check_m4v, resources.GetString("check_m4v.ToolTip"));\r
             this.check_m4v.UseVisualStyleBackColor = true;\r
             this.check_m4v.CheckedChanged += new System.EventHandler(this.check_m4v_CheckedChanged);\r