WinGui: A number of small fixes and Improvements.

- Fix Update Preset Option.  Add CC and Foreign Audio Scan were not  setting correctly when updating a preset. Fixes #442
- Fix an issue where "Normal" Preset  was showing as default as well as "Fast".
- Fix issues in the preset loading of the Deinterlace/Decomb Presets. Fixes #443
- Make the Video Extra Options Box Fix to area to make it easier to read long option strings.
- Change the logic for enabling the Use Advanced Options box to not look at the option string. Fixes #441

7 files changed, 27 insertions, 26 deletions

diff --git a/win/CS/HandBrakeWPF/Model/Subtitles/SubtitleBehaviours.cs b/win/CS/HandBrakeWPF/Model/Subtitles/SubtitleBehaviours.cs
index 8859b1c01..11200b450 100644
--- a/win/CS/HandBrakeWPF/Model/Subtitles/SubtitleBehaviours.cs
+++ b/win/CS/HandBrakeWPF/Model/Subtitles/SubtitleBehaviours.cs
@@ -46,6 +46,8 @@ namespace HandBrakeWPF.Model.Subtitles
             this.SelectedBehaviour = behaviours.selectedBehaviour;

             this.SelectedBurnInBehaviour = behaviours.selectedBurnInBehaviour;

             this.SelectedLangauges = new BindingList<string>(behaviours.SelectedLangauges.ToList());

+            this.AddClosedCaptions = behaviours.AddClosedCaptions;

+            this.AddForeignAudioScanTrack = behaviours.AddForeignAudioScanTrack;

         }

 

         /// <summary>

diff --git a/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs b/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs
index 909ada66f..f3b1bd56f 100644
--- a/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs
+++ b/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs
@@ -107,7 +107,7 @@ namespace HandBrakeWPF.Services.Presets.Factories
                     preset.Task.Deinterlace = Deinterlace.Default;

                     preset.Task.DeinterlaceFilter = DeinterlaceFilter.Decomb;

                     break;

-                case "deinterlace":

+                case "yadif":

                     preset.Task.Decomb = Decomb.Default;

                     preset.Task.Deinterlace = Deinterlace.Default;

                     preset.Task.DeinterlaceFilter = DeinterlaceFilter.Yadif;

@@ -121,7 +121,7 @@ namespace HandBrakeWPF.Services.Presets.Factories
 

             if (preset.Task.DeinterlaceFilter == DeinterlaceFilter.Decomb)

             {

-                switch (importedPreset.PictureDeinterlaceFilter)

+                switch (importedPreset.PictureDeinterlacePreset)

                 {

                     case "custom":

                         preset.Task.Decomb = Decomb.Custom;

@@ -151,7 +151,7 @@ namespace HandBrakeWPF.Services.Presets.Factories
 

             if (preset.Task.DeinterlaceFilter == DeinterlaceFilter.Yadif)

             {

-                switch (importedPreset.PictureDeinterlaceFilter)

+                switch (importedPreset.PictureDeinterlacePreset)

                 {

                     case "custom":

                         preset.Task.Deinterlace = Deinterlace.Custom;

@@ -595,12 +595,19 @@ namespace HandBrakeWPF.Services.Presets.Factories
             preset.PictureDeinterlaceFilter = export.Task.DeinterlaceFilter == DeinterlaceFilter.Decomb

                 ? "decomb"

                 : export.Task.DeinterlaceFilter == DeinterlaceFilter.Yadif ? "yadif" : "off";

+

+

             preset.PictureDeinterlacePreset = export.Task.DeinterlaceFilter == DeinterlaceFilter.Decomb

                 ? EnumHelper<Decomb>.GetShortName(export.Task.Decomb)

                 : export.Task.DeinterlaceFilter == DeinterlaceFilter.Yadif ? EnumHelper<Deinterlace>.GetShortName(export.Task.Deinterlace) : string.Empty;

+

             preset.PictureDeinterlaceCustom = export.Task.DeinterlaceFilter == DeinterlaceFilter.Decomb

                 ? export.Task.CustomDecomb

                 : export.Task.DeinterlaceFilter == DeinterlaceFilter.Yadif ? export.Task.CustomDeinterlace : string.Empty;

+

+            preset.PictureCombDetectPreset = EnumHelper<CombDetect>.GetShortName(export.Task.CombDetect);

+            preset.PictureCombDetectCustom = export.Task.CustomCombDetect;

+

             preset.PictureDeinterlaceCustom = export.Task.CustomDeinterlace;

             preset.PictureDenoiseCustom = export.Task.CustomDenoise;

             preset.PictureDenoiseFilter = EnumHelper<Denoise>.GetShortName(export.Task.Denoise);

@@ -608,8 +615,7 @@ namespace HandBrakeWPF.Services.Presets.Factories
             preset.PictureDenoiseTune = EnumHelper<DenoiseTune>.GetShortName(export.Task.DenoiseTune);

             preset.PictureDetelecine = EnumHelper<Detelecine>.GetShortName(export.Task.Detelecine);

             preset.PictureDetelecineCustom = export.Task.CustomDetelecine;

-            preset.PictureCombDetectPreset = EnumHelper<CombDetect>.GetShortName(export.Task.CombDetect);

-            preset.PictureCombDetectCustom = export.Task.CustomCombDetect;

+      

 

             // Video

             preset.VideoEncoder = EnumHelper<VideoEncoder>.GetShortName(export.Task.VideoEncoder);

diff --git a/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs b/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs
index 8af0b3d03..6869b89a2 100644
--- a/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs
+++ b/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs
@@ -384,11 +384,6 @@ namespace HandBrakeWPF.Services.Presets
 

                     preset.Task.AllowedPassthruOptions = new AllowedPassthru(true); // We don't want to override the built-in preset

 

-                    if (preset.Name == "Normal")

-                    {

-                        preset.IsDefault = true;

-                    }

-

                     this.presets.Add(preset);

                 }

             }

diff --git a/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs
index 3c5e13f82..67476f57f 100644
--- a/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs
@@ -634,6 +634,8 @@ namespace HandBrakeWPF.ViewModels
                     this.SelectedDeinterlaceFilter = DeinterlaceFilter.Off;

                 }

 

+                this.SelectedCombDetectPreset = preset.Task.CombDetect;

+

                 this.Grayscale = preset.Task.Grayscale;

                 this.DeblockValue = preset.Task.Deblock == 0 ? 4 : preset.Task.Deblock;

                 this.SelectedDenoisePreset = preset.Task.DenoisePreset;

diff --git a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
index 7b3cf7813..9b9daf5c6 100644
--- a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
@@ -946,7 +946,7 @@ namespace HandBrakeWPF.ViewModels
                 }

 

                 this.ExtraArguments = preset.Task.ExtraAdvancedArguments;

-                this.UseAdvancedTab = (!string.IsNullOrEmpty(preset.Task.AdvancedEncoderOptions) && this.IsAdvancedTabOptionEnabled) || preset.Task.ShowAdvancedTab;

+                this.UseAdvancedTab = this.IsAdvancedTabOptionEnabled && preset.Task.ShowAdvancedTab;

             }

         }

 

diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml
index cac30d9e5..e257a4ea8 100644
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml
@@ -471,7 +471,7 @@
                     <ContentControl x:Name="FiltersViewModel" />

                 </TabItem>

                 <TabItem Name="videoTab" Header="{x:Static Properties:ResourcesUI.MainView_VideoTab}">

-                    <ContentControl x:Name="VideoViewModel" />

+                    <ContentControl x:Name="VideoViewModel" VerticalAlignment="Stretch" />

                 </TabItem>

                 <TabItem Name="audioTab" Header="{x:Static Properties:ResourcesUI.MainView_AudioTab}">

                     <ContentControl x:Name="AudioViewModel" />

diff --git a/win/CS/HandBrakeWPF/Views/VideoView.xaml b/win/CS/HandBrakeWPF/Views/VideoView.xaml
index bc6e1881e..ac615b18b 100644
--- a/win/CS/HandBrakeWPF/Views/VideoView.xaml
+++ b/win/CS/HandBrakeWPF/Views/VideoView.xaml
@@ -32,7 +32,7 @@
 

             <Grid.RowDefinitions>

                 <RowDefinition Height="Auto" />

-                <RowDefinition Height="Auto" />

+                <RowDefinition Height="*" />

             </Grid.RowDefinitions>

 

             <StackPanel Orientation="Vertical" Grid.Column="0" >

@@ -75,7 +75,6 @@
                 </StackPanel>

             </StackPanel>

 

-

             <StackPanel Orientation="Vertical" Grid.Column="1">

                 <TextBlock Text="Quality" FontWeight="Bold" Margin="0,0,0,10"/>

 

@@ -140,7 +139,6 @@
                         <RowDefinition Height="Auto" />

                         <RowDefinition Height="Auto" />

                         <RowDefinition Height="Auto" />

-                        <RowDefinition Height="Auto" />

                         <RowDefinition Height="*" />

                     </Grid.RowDefinitions>

 

@@ -152,8 +150,6 @@
                         <ColumnDefinition Width="*" />

                     </Grid.ColumnDefinitions>

 

-

-

                     <!-- Row 1 -->

                     <TextBlock Text="{x:Static Properties:ResourcesUI.VideoView_EncoderPreset}" Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" Visibility="{Binding DisplayOptimiseOptions, Converter={StaticResource boolToVisConverter}}" />

                     <StackPanel Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="3" Orientation="Horizontal" Visibility="{Binding DisplayOptimiseOptions, Converter={StaticResource boolToVisConverter}}">

@@ -163,31 +159,31 @@
                         <TextBlock Text="{Binding VideoPreset.DisplayName}" Margin="5,0,0,0" />

                     </StackPanel>

 

-                    <TextBlock Text="{x:Static Properties:ResourcesUI.VideoView_EncodeTune}" Grid.Row="2" Grid.Column="0" VerticalAlignment="Center" Margin="0,10,0,0"

+                    <TextBlock Text="{x:Static Properties:ResourcesUI.VideoView_EncodeTune}" Grid.Row="2" Grid.Column="0" VerticalAlignment="Center" Margin="0,5,0,0"

                                Visibility="{Binding DisplayTuneControls, Converter={StaticResource boolToVisConverter}}"/>

-                    <ComboBox Width="100" Grid.Row="2" Grid.Column="1" Margin="5,10,5,0" Height="22"

+                    <ComboBox Width="100" Grid.Row="2" Grid.Column="1" Margin="5,5,5,0" Height="22"

                               ItemsSource="{Binding VideoTunes}" DisplayMemberPath="DisplayName" SelectedItem="{Binding VideoTune}"

                               ToolTip="{x:Static Properties:ResourcesTooltips.Video_EncoderTune}"  Visibility="{Binding DisplayTuneControls, Converter={StaticResource boolToVisConverter}}"

                               Style="{StaticResource LongToolTipHolder}" />

-                    <CheckBox IsChecked="{Binding FastDecode}" Content="{x:Static Properties:ResourcesUI.VideoView_FastDecode}" Grid.Row="2" Grid.Column="2" Margin="10,10,10,0" VerticalAlignment="Center"

+                    <CheckBox IsChecked="{Binding FastDecode}" Content="{x:Static Properties:ResourcesUI.VideoView_FastDecode}" Grid.Row="2" Grid.Column="2" Margin="10,5,10,0" VerticalAlignment="Center" VerticalContentAlignment="Center"

                               ToolTip="{x:Static Properties:ResourcesTooltips.Video_FastDecode}"  Visibility="{Binding DisplayTuneControls, Converter={StaticResource boolToVisConverter}}"/>

 

           

                     <!-- Row 2-->

-                    <TextBlock Text="{x:Static Properties:ResourcesUI.VideoView_EncoderProfile}" Grid.Row="3" Grid.Column="0" Margin="0,10,0,0" VerticalAlignment="Center" Visibility="{Binding DisplayProfileControl, Converter={StaticResource boolToVisConverter}}"/>

-                    <ComboBox Width="100" Grid.Row="3" Grid.Column="1" Margin="5,10,5,0" Height="22" VerticalAlignment="Center" Visibility="{Binding DisplayProfileControl, Converter={StaticResource boolToVisConverter}}"

+                    <TextBlock Text="{x:Static Properties:ResourcesUI.VideoView_EncoderProfile}" Grid.Row="3" Grid.Column="0" Margin="0,5,0,0" VerticalAlignment="Center" Visibility="{Binding DisplayProfileControl, Converter={StaticResource boolToVisConverter}}"/>

+                    <ComboBox Width="100" Grid.Row="3" Grid.Column="1" Margin="5,5,5,0" Height="22" VerticalAlignment="Center" Visibility="{Binding DisplayProfileControl, Converter={StaticResource boolToVisConverter}}"

                           ItemsSource="{Binding VideoProfiles}" DisplayMemberPath="DisplayName" SelectedItem="{Binding VideoProfile}"

                           Style="{StaticResource LongToolTipHolder}" ToolTip="{x:Static Properties:ResourcesTooltips.Video_Profile}"  />

 

-                    <TextBlock Text="{x:Static Properties:ResourcesUI.VideoView_EncoderLevel}" Grid.Row="3" Grid.Column="2" Margin="10,10,0,0" VerticalAlignment="Center" Visibility="{Binding DisplayLevelControl, Converter={StaticResource boolToVisConverter}}" />

-                    <ComboBox Width="100" Grid.Row="3" Grid.Column="3" Margin="5,10,5,0" Height="22" VerticalAlignment="Center" Visibility="{Binding DisplayLevelControl, Converter={StaticResource boolToVisConverter}}"

+                    <TextBlock Text="{x:Static Properties:ResourcesUI.VideoView_EncoderLevel}" Grid.Row="3" Grid.Column="2" Margin="10,5,0,0" VerticalAlignment="Center" Visibility="{Binding DisplayLevelControl, Converter={StaticResource boolToVisConverter}}" />

+                    <ComboBox Width="100" Grid.Row="3" Grid.Column="3" Margin="5,5,5,0" Height="22" VerticalAlignment="Center" Visibility="{Binding DisplayLevelControl, Converter={StaticResource boolToVisConverter}}"

                           ItemsSource="{Binding VideoLevels}"  DisplayMemberPath="DisplayName" SelectedItem="{Binding VideoLevel}"

                           Style="{StaticResource LongToolTipHolder}" ToolTip="{x:Static Properties:ResourcesTooltips.Video_Level}" />

 

                     <!-- Row 3 -->

                     <TextBlock Text="{x:Static Properties:ResourcesUI.VideoView_ExtraOptions}" Grid.Row="4" Grid.Column="0" Margin="0,5,0,0" VerticalAlignment="Center" HorizontalAlignment="Left" />

-                    <TextBox Text="{Binding ExtraArguments, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" MinWidth="200" Width="365" HorizontalAlignment="Left" TextWrapping="WrapWithOverflow"

-                             Height="30" MaxLines="3" Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="4" Margin="5,10,0,0" VerticalAlignment="Center"

+                    <TextBox Text="{Binding ExtraArguments, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" TextWrapping="WrapWithOverflow"

+                             MaxLines="4" Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="4" Margin="5,5,5,2" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" VerticalContentAlignment="Stretch"

                              ToolTip="{Binding FullOptionsTooltip}" Style="{StaticResource LongToolTipHolder}" >

                         <TextBox.ContextMenu>

                             <ContextMenu>