WinGui:

- Updated Advanced Panel to match new defaults and new animate options.

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

diff --git a/win/C#/Changelog.html b/win/C#/Changelog.html
index bf5df358221d0519f7b093fe159517742d9db942..266c068116acf3f05b9f08f4176f8bf90f2c3039 100644 (file)
--- a/win/C#/Changelog.html
+++ b/win/C#/Changelog.html
@@ -22,13 +22,11 @@ Windows Platform Specific Changlog.<br />
     \r
     \r
     <h4>Fixed</h4>\r
-    - Re-written the Picture Settings Panel code so it should now work alot better.<br />\r
-    - Issue where the GUI would error if the encode was stoped too quickly.<br />\r
+    - Re-written the Picture Settings Panel code so it should now work a lot better.<br />\r
+    - Issue where the GUI would error if the encode was stopped  too quickly.<br />\r
     - Numerous other fixes including: Quality slider resetting to 0 and other settings lost when a title change occurs.<br />\r
     - Fixes some scaling / quality issues with QuickTime preview. Also added a possible fix for QT not working on 64bit systems.<br />\r
     \r
-    \r
-    \r
     <h2>Changes since 0.9.3</h2>\r
     <h4>Major Changes</h4>\r
 \r

diff --git a/win/C#/Controls/x264Panel.Designer.cs b/win/C#/Controls/x264Panel.Designer.cs
index e43bd809a874cd2dde21f7335a0c62502985dc32..76a156c618990db1fe20a36e6e6d0748c28aa3cc 100644 (file)
--- a/win/C#/Controls/x264Panel.Designer.cs
+++ b/win/C#/Controls/x264Panel.Designer.cs
@@ -237,7 +237,7 @@ namespace Handbrake.Controls
             this.drop_trellis.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
             this.drop_trellis.FormattingEnabled = true;\r
             this.drop_trellis.Items.AddRange(new object[] {\r
-            "Default (0)",\r
+            "Default (1)",\r
             "0",\r
             "1",\r
             "2"});\r
@@ -389,7 +389,7 @@ namespace Handbrake.Controls
             this.drop_subpixelMotionEstimation.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
             this.drop_subpixelMotionEstimation.FormattingEnabled = true;\r
             this.drop_subpixelMotionEstimation.Items.AddRange(new object[] {\r
-            "Default (6)",\r
+            "Default (7)",\r
             "0",\r
             "1",\r
             "2",\r
@@ -586,7 +586,7 @@ namespace Handbrake.Controls
             this.drop_bFrames.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
             this.drop_bFrames.FormattingEnabled = true;\r
             this.drop_bFrames.Items.AddRange(new object[] {\r
-            "Default (0)",\r
+            "Default (3)",\r
             "0",\r
             "1",\r
             "2",\r
@@ -608,9 +608,9 @@ namespace Handbrake.Controls
             this.drop_bFrames.Name = "drop_bFrames";\r
             this.drop_bFrames.Size = new System.Drawing.Size(121, 21);\r
             this.drop_bFrames.TabIndex = 56;\r
-            this.ToolTip.SetToolTip(this.drop_bFrames, "Sane values are 1-6. B-Frames are smaller than other frames, so they let you pack" +\r
-                    " in more quality at the same bitrate.\r\nUse more of them with animated material: " +\r
-                    "9-16.");\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.");\r
             this.drop_bFrames.SelectedIndexChanged += new System.EventHandler(this.drop_bFrames_SelectedIndexChanged);\r
             // \r
             // label64\r
@@ -627,7 +627,7 @@ namespace Handbrake.Controls
             this.drop_refFrames.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
             this.drop_refFrames.FormattingEnabled = true;\r
             this.drop_refFrames.Items.AddRange(new object[] {\r
-            "Default (1)",\r
+            "Default (3)",\r
             "0",\r
             "1",\r
             "2",\r

diff --git a/win/C#/Controls/x264Panel.cs b/win/C#/Controls/x264Panel.cs
index 503fcc253d5b9c7349fe3fee23928bd22e0fac7f..7313dc36178f2cce78b9638b5d568ab2b37c1e74 100644 (file)
--- a/win/C#/Controls/x264Panel.cs
+++ b/win/C#/Controls/x264Panel.cs
@@ -138,13 +138,13 @@ namespace Handbrake.Controls
         /// </summary>\r
         public void reset2Defaults()\r
         {\r
-            check_8x8DCT.CheckState = CheckState.Unchecked;\r
+            check_8x8DCT.CheckState = CheckState.Checked;\r
             check_Cabac.CheckState = CheckState.Checked;\r
-            check_mixedReferences.CheckState = CheckState.Unchecked;\r
+            check_mixedReferences.CheckState = CheckState.Checked;\r
             check_noDCTDecimate.CheckState = CheckState.Unchecked;\r
             check_noFastPSkip.CheckState = CheckState.Unchecked;\r
             check_pyrmidalBFrames.CheckState = CheckState.Unchecked;\r
-            check_weightedBFrames.CheckState = CheckState.Unchecked;\r
+            check_weightedBFrames.CheckState = CheckState.Checked;\r
             drop_analysis.SelectedIndex = 0;\r
             drop_bFrames.SelectedIndex = 0;\r
             drop_deblockAlpha.SelectedIndex = 0;\r
@@ -877,7 +877,7 @@ namespace Handbrake.Controls
             switch(sender)\r
             {\r
                 case "bframes":\r
-                    if (drop_bFrames.SelectedIndex < 2)\r
+                    if (drop_bFrames.SelectedIndex >0 && drop_bFrames.SelectedIndex < 2  )\r
                     {\r
                         /* If the b-frame widget is at 0 or 1, the user has chosen\r
                            not to use b-frames at all. So disable the options\r
@@ -945,7 +945,7 @@ namespace Handbrake.Controls
                         check_8x8DCT.Visible = true;\r
                 break;\r
                 case "ref":\r
-                    if (drop_refFrames.SelectedIndex < 3)\r
+                    if (drop_refFrames.SelectedIndex > 0 && drop_refFrames.SelectedIndex < 3)\r
                     {\r
                         check_mixedReferences.Visible = false;\r
                         if (sender != "mixed-refs")\r
@@ -992,7 +992,7 @@ namespace Handbrake.Controls
                     }\r
                 break;\r
                 case "trellis":        // subme\r
-                    if (drop_trellis.SelectedIndex < 2)\r
+                    if (drop_trellis.SelectedIndex > 0 && drop_trellis.SelectedIndex < 2 )\r
                     {\r
                         slider_psytrellis.Visible = false;\r
                         slider_psytrellis.Value = 0;\r

diff --git a/win/C#/Controls/x264Panel.resx b/win/C#/Controls/x264Panel.resx
index dbd32d12aaa35990530179c1ddb09c771707cd00..064df4a5562ae49e3c2d6bd452ca1d89b3fbf9ae 100644 (file)
--- a/win/C#/Controls/x264Panel.resx
+++ b/win/C#/Controls/x264Panel.resx
@@ -120,6 +120,9 @@
   <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>17, 17</value>\r
   </metadata>\r
+  <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+    <value>17, 17</value>\r
+  </metadata>\r
   <data name="slider_psyrd.ToolTip" xml:space="preserve">\r
     <value>Psychovisual Rate Distortion Optimization sure is a mouthful, isn't it? Basically, it means x264 tries to retain detail, for better quality to the human eye, \r
 as opposed to trying to maximize quality the way a computer understands it, through signal-to-noise ratios that have trouble telling apart fine detail and noise.</value>\r
@@ -202,8 +205,9 @@ If you want to create a high profile H.264 video (which is less compatible with
     <value>This setting is finer-grained than the motion estimation settings above. Instead of dealing with whole pixels, it deals with 4 fractional pixels, or quarter pixels (qpel). \r
 Higher levels increase quality by further refining the motion prediction for these quarter pixels, but take longer to encode.\r
 \r
-The default, 6, turns on a feature called rate distortion optimization, including psychovisual enhancements. \r
-7 enables that rate distortion for B-frames. 8 refines those decisions for I and P frames, and 9 adds on refinement for B-frames as well.</value>\r
+Level 6, turns on a feature called rate distortion optimization, including psychovisual enhancements. \r
+7, the default, enables that rate distortion for B-frames.\r
+8 refines those decisions for I and P frames, and 9 adds on refinement for B-frames as well.</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
@@ -232,7 +236,9 @@ Logically, to reference an earlier B-frame, you must tell x264 to use at least 2
   </data>\r
   <data name="check_weightedBFrames.ToolTip" xml:space="preserve">\r
     <value>Sometimes x264 will base a B-frame's motion compensation on frames both before and after. \r
-With weighted B-frames, the amount of influence each frame has is related to its distance from the frame being encoded, instead of both having equal influence.</value>\r
+With weighted B-frames, the amount of influence each frame has is related to its distance from the frame being encoded, \r
+instead of both having equal influence. \r
+The AppleTV can have issues with this.</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