WinGui: Advanced Tab Changes

1. Strip out a lot of the old advanced tab infrastructure as it is no longer needed. Only the deprecated X264 Advacned Panel is left. All other encoders use the Video tab now.
2. Changed Option to "Allow use of 'Advanced Tab'" and only show the tab if the checkbox on the video tab is checked. It will no longer show based on the perference alone.
3. Fix the one-way communication from Video Tab to X264 Tab so preset options are reflected ont he X264 Tab.  The reverse is not supported but it will retain the previous options.

4 files changed, 2 insertions, 60 deletions

diff --git a/win/CS/HandBrakeWPF/Views/AdvancedView.xaml b/win/CS/HandBrakeWPF/Views/AdvancedView.xaml
deleted file mode 100644
index a4fa3ca27..000000000
--- a/win/CS/HandBrakeWPF/Views/AdvancedView.xaml
+++ /dev/null
@@ -1,31 +0,0 @@
-<UserControl x:Class="HandBrakeWPF.Views.AdvancedView"

-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"

-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"

-             xmlns:Converters="clr-namespace:HandBrakeWPF.Converters"

-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"

-             xmlns:Properties="clr-namespace:HandBrakeWPF.Properties"

-             x:Name="advancedView"

-             mc:Ignorable="d"

-             >

-    <UserControl.Resources>

-        <Converters:BooleanToVisibilityConverter x:Key="BooleanVisibilityConverter" />

-

-      </UserControl.Resources>

-    <Grid>

-        <Grid.RowDefinitions>

-            <RowDefinition Height="Auto" />

-            <RowDefinition Height="Auto" />

-            <RowDefinition Height="Auto" />

-        </Grid.RowDefinitions>

-

-        <ContentControl x:Name="X264ViewModel"

-                        Visibility="{Binding ShowX264Panel, Converter={StaticResource BooleanVisibilityConverter}}" />

-

-        <TextBlock Text="{x:Static Properties:Resources.Advanced_NoOptionsPaneAvailable}" Grid.Row="0"

-                       TextWrapping="Wrap" Width="480" Margin="0, 100, 0, 0" FontSize="12"

-                       Visibility="{Binding ShowX264Panel, Converter={StaticResource BooleanVisibilityConverter}, ConverterParameter=true}" />

-

-

-    </Grid>

-</UserControl>
\ No newline at end of file
diff --git a/win/CS/HandBrakeWPF/Views/AdvancedView.xaml.cs b/win/CS/HandBrakeWPF/Views/AdvancedView.xaml.cs
deleted file mode 100644
index a47bf3efd..000000000
--- a/win/CS/HandBrakeWPF/Views/AdvancedView.xaml.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------

-// <copyright file="AdvancedView.xaml.cs" company="HandBrake Project (http://handbrake.fr)">

-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.

-// </copyright>

-// <summary>

-//   Interaction logic for AdvancedView.xaml

-// </summary>

-// --------------------------------------------------------------------------------------------------------------------

-

-namespace HandBrakeWPF.Views

-{

-    using System.Windows.Controls;

-

-    /// <summary>

-    /// Interaction logic for AdvancedView.xaml

-    /// </summary>

-    public partial class AdvancedView : UserControl

-    {

-        /// <summary>

-        /// Initializes a new instance of the <see cref="AdvancedView"/> class.

-        /// </summary>

-        public AdvancedView()

-        {

-            InitializeComponent();

-        }

-    }

-}

diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml
index 1959c9bfe..c08ece4d6 100644
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml
@@ -481,7 +481,7 @@
                 <TabItem Name="chaptersTab" Header="{x:Static Properties:ResourcesUI.MainView_ChaptersTab}">

                     <ContentControl x:Name="ChaptersViewModel" />

                 </TabItem>

-                <TabItem Name="advancedTab" Header="{x:Static Properties:ResourcesUI.MainView_AdvancedTab}" Visibility="{Binding ShowAdvancedTab, Converter={StaticResource boolToVisConverter}}">

+                <TabItem Name="advancedTab" Header="{x:Static Properties:ResourcesUI.MainView_AdvancedTab}" Visibility="{Binding CurrentTask.ShowAdvancedTab, Converter={StaticResource boolToVisConverter}}">

                     <ContentControl x:Name="AdvancedViewModel" />

                 </TabItem>

             </TabControl>

diff --git a/win/CS/HandBrakeWPF/Views/VideoView.xaml b/win/CS/HandBrakeWPF/Views/VideoView.xaml
index e8319b785..bc6e1881e 100644
--- a/win/CS/HandBrakeWPF/Views/VideoView.xaml
+++ b/win/CS/HandBrakeWPF/Views/VideoView.xaml
@@ -131,7 +131,7 @@
                 <TextBlock Text="{x:Static Properties:ResourcesUI.VideoView_OptimiseVideo}" Margin="0,0,0,0" Grid.Row="0"  Grid.ColumnSpan="2" FontWeight="Bold" VerticalAlignment="Center" />

 

                 <CheckBox Content="{x:Static Properties:ResourcesUI.VideoView_UseAdvancedTab}" Grid.Row="1" IsChecked="{Binding UseAdvancedTab}" Margin="0,5,0,0"

-                          Visibility="{Binding ShowAdvancedTab, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}"

+                          Visibility="{Binding IsAdvancedTabOptionEnabled, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}"

                           ToolTip="{x:Static Properties:ResourcesTooltips.Video_AdvancedOptions}" />

 

                 <Grid Grid.Row="2" Margin="0,8,0,0" IsEnabled="{Binding UseAdvancedTab, Converter={StaticResource inverseConverter}}">