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

2 files changed, 14 insertions, 4 deletions

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