WinGui: Output settings were not loading with the presets.

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

2 files changed, 9 insertions, 0 deletions

diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index c68cf1d6b..9a2fc5a00 100644
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -361,6 +361,13 @@ namespace HandBrakeWPF.ViewModels
 

                 if (this.SelectedPreset != null)

                 {

+                    // Main Window Settings

+                    this.CurrentTask.LargeFile = selectedPreset.Task.LargeFile;

+                    this.CurrentTask.OptimizeMP4 = selectedPreset.Task.OptimizeMP4;

+                    this.CurrentTask.IPod5GSupport = selectedPreset.Task.IPod5GSupport;

+                    this.SelectedOutputFormat = selectedPreset.Task.OutputFormat;

+

+                    // Tab Settings

                     this.PictureSettingsViewModel.SetPreset(this.SelectedPreset, this.CurrentTask);

                     this.VideoViewModel.SetPreset(this.SelectedPreset, this.CurrentTask);

                     this.FiltersViewModel.SetPreset(this.SelectedPreset, this.CurrentTask);

diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml
index 3c2963378..a4bce1863 100644
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml
@@ -156,6 +156,8 @@
                      HorizontalAlignment="Stretch"

                      VerticalAlignment="Stretch"

                      SnapsToDevicePixels="False"

+                     ToolBar.OverflowMode="Never"

+                     ToolBarTray.IsLocked="True"

                      >

                 <Menu Background="Transparent">

                     <MenuItem ItemsSource="{Binding SourceToolbarMenu}">