WinGui: Output settings were not loading with the presets.

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

diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index c68cf1d6b2e3f91b485e681ffac9d8c770f7c3ed..9a2fc5a00174e63ae727eba8a38f8b39377c3c18 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -361,6 +361,13 @@ namespace HandBrakeWPF.ViewModels
 \r
                 if (this.SelectedPreset != null)\r
                 {\r
+                    // Main Window Settings\r
+                    this.CurrentTask.LargeFile = selectedPreset.Task.LargeFile;\r
+                    this.CurrentTask.OptimizeMP4 = selectedPreset.Task.OptimizeMP4;\r
+                    this.CurrentTask.IPod5GSupport = selectedPreset.Task.IPod5GSupport;\r
+                    this.SelectedOutputFormat = selectedPreset.Task.OutputFormat;\r
+\r
+                    // Tab Settings\r
                     this.PictureSettingsViewModel.SetPreset(this.SelectedPreset, this.CurrentTask);\r
                     this.VideoViewModel.SetPreset(this.SelectedPreset, this.CurrentTask);\r
                     this.FiltersViewModel.SetPreset(this.SelectedPreset, this.CurrentTask);\r

diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml
index 3c29633786b6c39c68893337b31ee9f05b7596a7..a4bce18636298d9ceec185d006cd8f75f9c61c13 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml
@@ -156,6 +156,8 @@
                      HorizontalAlignment="Stretch"\r
                      VerticalAlignment="Stretch"\r
                      SnapsToDevicePixels="False"\r
+                     ToolBar.OverflowMode="Never"\r
+                     ToolBarTray.IsLocked="True"\r
                      >\r
                 <Menu Background="Transparent">\r
                     <MenuItem ItemsSource="{Binding SourceToolbarMenu}">\r