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

3 files changed, 22 insertions, 16 deletions

diff --git a/win/C#/Controls/x264Panel.Designer.cs b/win/C#/Controls/x264Panel.Designer.cs
index e43bd809a..76a156c61 100644
--- 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;

             this.drop_trellis.FormattingEnabled = true;

             this.drop_trellis.Items.AddRange(new object[] {

-            "Default (0)",

+            "Default (1)",

             "0",

             "1",

             "2"});

@@ -389,7 +389,7 @@ namespace Handbrake.Controls
             this.drop_subpixelMotionEstimation.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;

             this.drop_subpixelMotionEstimation.FormattingEnabled = true;

             this.drop_subpixelMotionEstimation.Items.AddRange(new object[] {

-            "Default (6)",

+            "Default (7)",

             "0",

             "1",

             "2",

@@ -586,7 +586,7 @@ namespace Handbrake.Controls
             this.drop_bFrames.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;

             this.drop_bFrames.FormattingEnabled = true;

             this.drop_bFrames.Items.AddRange(new object[] {

-            "Default (0)",

+            "Default (3)",

             "0",

             "1",

             "2",

@@ -608,9 +608,9 @@ namespace Handbrake.Controls
             this.drop_bFrames.Name = "drop_bFrames";

             this.drop_bFrames.Size = new System.Drawing.Size(121, 21);

             this.drop_bFrames.TabIndex = 56;

-            this.ToolTip.SetToolTip(this.drop_bFrames, "Sane values are 1-6. B-Frames are smaller than other frames, so they let you pack" +

-                    " in more quality at the same bitrate.\r\nUse more of them with animated material: " +

-                    "9-16.");

+            this.ToolTip.SetToolTip(this.drop_bFrames, "Sane values are 1-6. \r\nB-Frames are smaller than other frames, so they let you pa" +

+                    "ck in more quality at the same bitrate. \r\nUse more of them with animated materia" +

+                    "l.");

             this.drop_bFrames.SelectedIndexChanged += new System.EventHandler(this.drop_bFrames_SelectedIndexChanged);

             // 

             // label64

@@ -627,7 +627,7 @@ namespace Handbrake.Controls
             this.drop_refFrames.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;

             this.drop_refFrames.FormattingEnabled = true;

             this.drop_refFrames.Items.AddRange(new object[] {

-            "Default (1)",

+            "Default (3)",

             "0",

             "1",

             "2",

diff --git a/win/C#/Controls/x264Panel.cs b/win/C#/Controls/x264Panel.cs
index 503fcc253..7313dc361 100644
--- a/win/C#/Controls/x264Panel.cs
+++ b/win/C#/Controls/x264Panel.cs
@@ -138,13 +138,13 @@ namespace Handbrake.Controls
         /// </summary>

         public void reset2Defaults()

         {

-            check_8x8DCT.CheckState = CheckState.Unchecked;

+            check_8x8DCT.CheckState = CheckState.Checked;

             check_Cabac.CheckState = CheckState.Checked;

-            check_mixedReferences.CheckState = CheckState.Unchecked;

+            check_mixedReferences.CheckState = CheckState.Checked;

             check_noDCTDecimate.CheckState = CheckState.Unchecked;

             check_noFastPSkip.CheckState = CheckState.Unchecked;

             check_pyrmidalBFrames.CheckState = CheckState.Unchecked;

-            check_weightedBFrames.CheckState = CheckState.Unchecked;

+            check_weightedBFrames.CheckState = CheckState.Checked;

             drop_analysis.SelectedIndex = 0;

             drop_bFrames.SelectedIndex = 0;

             drop_deblockAlpha.SelectedIndex = 0;

@@ -877,7 +877,7 @@ namespace Handbrake.Controls
             switch(sender)

             {

                 case "bframes":

-                    if (drop_bFrames.SelectedIndex < 2)

+                    if (drop_bFrames.SelectedIndex >0 && drop_bFrames.SelectedIndex < 2  )

                     {

                         /* If the b-frame widget is at 0 or 1, the user has chosen

                            not to use b-frames at all. So disable the options

@@ -945,7 +945,7 @@ namespace Handbrake.Controls
                         check_8x8DCT.Visible = true;

                 break;

                 case "ref":

-                    if (drop_refFrames.SelectedIndex < 3)

+                    if (drop_refFrames.SelectedIndex > 0 && drop_refFrames.SelectedIndex < 3)

                     {

                         check_mixedReferences.Visible = false;

                         if (sender != "mixed-refs")

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

                 break;

                 case "trellis":        // subme

-                    if (drop_trellis.SelectedIndex < 2)

+                    if (drop_trellis.SelectedIndex > 0 && drop_trellis.SelectedIndex < 2 )

                     {

                         slider_psytrellis.Visible = false;

                         slider_psytrellis.Value = 0;

diff --git a/win/C#/Controls/x264Panel.resx b/win/C#/Controls/x264Panel.resx
index dbd32d12a..064df4a55 100644
--- 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">

     <value>17, 17</value>

   </metadata>

+  <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

+    <value>17, 17</value>

+  </metadata>

   <data name="slider_psyrd.ToolTip" xml:space="preserve">

     <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, 

 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>

@@ -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). 

 Higher levels increase quality by further refining the motion prediction for these quarter pixels, but take longer to encode.

 

-The default, 6, turns on a feature called rate distortion optimization, including psychovisual enhancements. 

-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>

+Level 6, turns on a feature called rate distortion optimization, including psychovisual enhancements. 

+7, the default, 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>

   </data>

   <data name="drop_MotionEstimationRange.ToolTip" xml:space="preserve">

     <value>This range is the radius, in pixels, x264 should use for motion estimation searches. 

@@ -232,7 +236,9 @@ Logically, to reference an earlier B-frame, you must tell x264 to use at least 2
   </data>

   <data name="check_weightedBFrames.ToolTip" xml:space="preserve">

     <value>Sometimes x264 will base a B-frame's motion compensation on frames both before and after. 

-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>

+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. 

+The AppleTV can have issues with this.</value>

   </data>

   <data name="drop_directPrediction.ToolTip" xml:space="preserve">

     <value>Direct prediction tells x264 what method to use when guessing motion for certain parts of a B-frame.