WinGui: Bug Fixes:

- Picture Settings tab now refreshes visible controls after preset load, rather than source load.
- Preset Picture Settings behaviour now fixed to match the MacGui
- Video Tab: Fix 2Pass/Turbo First pass not reloading correctly from a preset.

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

4 files changed, 22 insertions, 12 deletions

diff --git a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
index 272f7da50..33dd772c7 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
@@ -61,7 +61,7 @@ namespace HandBrakeWPF.Properties {
         }

         

         /// <summary>

-        ///   Looks up a localized string similar to Copyright (C) 2003-2013 The HandBrake Team

+        ///   Looks up a localized string similar to Copyright (C) 2003-2014 The HandBrake Team

         ///

         ///This program is free software; you can redistribute it and/or

         ///modify it under the terms of the GNU General Public License

@@ -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 picture settings with this preset. There are 3 modes:

         ///

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

+        ///None:  Picture settings are not stored in the preset. When loading a source, they will remain as-is within the bounds of the source resolution. This also affects Anamorphic, modulus, cropping etc.

         ///

         ///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 [rest of string was truncated]&quot;;.

+        ///Source Maximum:  Always encode at the sources [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 d958987ad..05317d800 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.resx
+++ b/win/CS/HandBrakeWPF/Properties/Resources.resx
@@ -288,13 +288,13 @@ x264 and x265's scale is logarithmic and lower values correspond to higher quali
 So small increases in value will result in progressively larger increases in the resulting file size.</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 picture settings with this preset. There are 3 modes:

 

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

+None:  Picture settings are not stored in the preset. When loading a source, they will remain as-is within the bounds of the source resolution. This also affects Anamorphic, modulus, cropping etc.

 

 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. Keep Aspect Ratio will be automatically turned on.</value>

+Source Maximum:  Always encode at the sources resolution where possible.</value>

   </data>

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

     <value>The options passed to the x264 encoder. 

@@ -302,7 +302,7 @@ The above controls are only a subset of useful x264 parameters.
 This box allows you to add or modify additional or current parameters as desired. </value>

   </data>

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

-    <value>Copyright (C) 2003-2013 The HandBrake Team

+    <value>Copyright (C) 2003-2014 The HandBrake Team

 

 This program is free software; you can redistribute it and/or

 modify it under the terms of the GNU General Public License

diff --git a/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
index e2684047e..d569b7824 100644
--- a/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
@@ -634,8 +634,16 @@ namespace HandBrakeWPF.ViewModels
                     this.MaintainAspectRatio = preset.Task.KeepDisplayAspect;

 

                     // Set the Maximum so libhb can correctly manage the size.

-                    this.MaxWidth = preset.Task.MaxWidth ?? this.sourceResolution.Width;

-                    this.MaxHeight = preset.Task.MaxHeight ?? this.sourceResolution.Height;

+                    if (preset.PictureSettingsMode == PresetPictureSettingsMode.SourceMaximum)

+                    {

+                        this.MaxWidth = this.sourceResolution.Width;

+                        this.MaxHeight = this.sourceResolution.Height;

+                    }

+                    else

+                    {

+                        this.MaxWidth = preset.Task.MaxWidth ?? this.sourceResolution.Width;

+                        this.MaxHeight = preset.Task.MaxHeight ?? this.sourceResolution.Height;                        

+                    }             

 

                     // Set the width, then check the height doesn't breach the max height and correct if necessary.

                     int width = this.GetModulusValue(this.GetRes((this.sourceResolution.Width - this.CropLeft - this.CropRight), preset.Task.MaxWidth)); 

@@ -679,6 +687,8 @@ namespace HandBrakeWPF.ViewModels
             }

 

             this.NotifyOfPropertyChange(() => this.Task);

+

+            this.UpdateVisibileControls();

         }

 

         /// <summary>

diff --git a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
index d358988c5..aff9d6101 100644
--- a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
@@ -1157,8 +1157,8 @@ namespace HandBrakeWPF.ViewModels
                     break;

             }

 

-            this.Task.TwoPass = preset.Task.TwoPass;

-            this.Task.TurboFirstPass = preset.Task.TurboFirstPass;

+            this.TwoPass = preset.Task.TwoPass;

+            this.TurboFirstPass = preset.Task.TurboFirstPass;

             this.Task.VideoBitrate = preset.Task.VideoBitrate;

 

             this.NotifyOfPropertyChange(() => this.Task);