WinGui: Refactor the Presets Picture Size handling to make it a bit clearer what's actually happening.

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

2 files changed, 10 insertions, 8 deletions

diff --git a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
index 1b2f1531a..bef7d7030 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
@@ -80,13 +80,13 @@ namespace HandBrakeWPF.Properties {
         }

         

         /// <summary>

-        ///   Looks up a localized string similar to You can optionally store a maximum resolution for encodes that use this preset. There are 3 modes:

+        ///   Looks up a localized string similar to You can optionally store a maximum resolution for encodes that use this preset. There are 4 modes:

         ///

-        ///None:  There is no maximum resolution for encodes using this preset. They will always use the source resolution minus any cropping that may be applied.

+        ///None:  There is no maximum resolution for encodes using this preset. When the preset is loaded, the current width, height and aspect ratio that you currently have set will be reloaded.

         ///

-        ///Custom: You can optionally set a Maximum width and height. When doing this an encode will be less than or equal to these values.

+        ///Custom: You can optionally set a Maximum width and Height. When doing this an encode will be less than or equal to these values. Keep Aspect Ratio will be automatically turned on.

         ///

-        ///Source Maximum:  Similar to custom, but the resolution of your current source is used as the Max width and Height values in [rest of string was truncated]&quot;;.

+        ///Source Maximum:  Similar to custom, but [rest of string was truncated]&quot;;.

         /// </summary>

         public static string AddPreset_PictureSizeMode {

             get {

diff --git a/win/CS/HandBrakeWPF/Properties/Resources.resx b/win/CS/HandBrakeWPF/Properties/Resources.resx
index a1796ff59..180d0abc5 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.resx
+++ b/win/CS/HandBrakeWPF/Properties/Resources.resx
@@ -292,13 +292,15 @@ So small increases in value will result in progressively larger increases in the
 Suggested values are: 18 to 20 for Standard Definition and 20 to 23 for High Definition.</value>

   </data>

   <data name="AddPreset_PictureSizeMode" xml:space="preserve">

-    <value>You can optionally store a maximum resolution for encodes that use this preset. There are 3 modes:

+    <value>You can optionally store a maximum resolution for encodes that use this preset. There are 4 modes:

 

-None:  There is no maximum resolution for encodes using this preset. They will always use the source resolution minus any cropping that may be applied.

+None:  There is no maximum resolution for encodes using this preset. When the preset is loaded, the current width, height and aspect ratio that you currently have set will be reloaded.

 

-Custom: You can optionally set a Maximum width and height. When doing this an encode will be less than or equal to these values.

+Custom: You can optionally set a Maximum width and Height. When doing this an encode will be less than or equal to these values. Keep Aspect Ratio will be automatically turned on.

 

-Source Maximum:  Similar to custom, but the resolution of your current source is used as the Max width and Height values instead.</value>

+Source Maximum:  Similar to custom, but the resolution of your current source is used as the Max width and Height values instead. Keep Aspect Ratio will be automatically turned on.

+

+No Limit: Always use the full source resolution for all sources keeping aspect ratio. This is the default behaviour.</value>

   </data>

   <data name="Advanced_EncoderOptions" xml:space="preserve">

     <value>The options passed to the x264 encoder.