WinGui: Remove the Simple advanced options tab.

All advanced options for non-x264 encoders must now be done on the VideoTab. The x264 advanced tab can still be enabled where necessary.

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

4 files changed, 16 insertions, 69 deletions

diff --git a/win/CS/HandBrakeWPF/Views/AdvancedView.xaml b/win/CS/HandBrakeWPF/Views/AdvancedView.xaml
index 99d05b099..a4fa3ca27 100644
--- a/win/CS/HandBrakeWPF/Views/AdvancedView.xaml
+++ b/win/CS/HandBrakeWPF/Views/AdvancedView.xaml
@@ -4,6 +4,7 @@
              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"

              >

@@ -21,8 +22,9 @@
         <ContentControl x:Name="X264ViewModel"

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

 

-        <ContentControl x:Name="EncoderOptionsViewModel" 

-                        Visibility="{Binding ShowSimplePanel, 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>

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

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

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

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

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

-             x:Name="x264View"

-             mc:Ignorable="d"

-             >

-    <Grid>

-        <Grid.RowDefinitions>

-            <RowDefinition Height="Auto" />

-            <RowDefinition Height="100" />

-        </Grid.RowDefinitions>

-

-        <TextBlock Margin="10,5,10,0" Grid.Row="0"

-                           VerticalAlignment="Center"

-                           FontWeight="Bold"

-                           Text="Advanced Query"

-                           />

-        <TextBox Grid.Row="1"

-                         Margin="10,5,10,5"

-                         HorizontalAlignment="Stretch"

-                         VerticalAlignment="Stretch"

-                         Text="{Binding AdvancedOptionsString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"

-                         TextWrapping="Wrap"

-                         />

-    </Grid>

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

-// <copyright file="EncoderOptionsView.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 EncoderOptionsView.xaml

-// </summary>

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

-

-namespace HandBrakeWPF.Views

-{

-    using System.Windows.Controls;

-

-    /// <summary>

-    /// Interaction logic for AdvancedView.xaml

-    /// </summary>

-    public partial class EncoderOptionsView : UserControl

-    {

-        /// <summary>

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

-        /// </summary>

-        public EncoderOptionsView()

-        {

-            InitializeComponent();

-        }

-    }

-}

diff --git a/win/CS/HandBrakeWPF/Views/VideoView.xaml b/win/CS/HandBrakeWPF/Views/VideoView.xaml
index 99a589aa4..6aca9a1d4 100644
--- a/win/CS/HandBrakeWPF/Views/VideoView.xaml
+++ b/win/CS/HandBrakeWPF/Views/VideoView.xaml
@@ -119,19 +119,19 @@
             </StackPanel>

 

             <!-- H264 settings -->

-            <Grid Grid.Row="1" Grid.ColumnSpan="2" Margin="0,10,0,0" Visibility="{Binding DisplayOptimiseOptions, Converter={StaticResource boolToVisConverter}}">

+            <Grid Grid.Row="1" Grid.ColumnSpan="2" Margin="0,10,0,0">

                 <Grid.RowDefinitions>

                     <RowDefinition Height="Auto" />

                     <RowDefinition Height="Auto" />

                     <RowDefinition Height="*" />

                 </Grid.RowDefinitions>

 

-                <TextBlock Text="Optimise Video:" Margin="0,0,0,8" Grid.Row="0"  Grid.ColumnSpan="2" FontWeight="Bold" VerticalAlignment="Center" />

+                <TextBlock Text="Optimise Video:" Margin="0,0,0,0" Grid.Row="0"  Grid.ColumnSpan="2" FontWeight="Bold" VerticalAlignment="Center" />

 

-                <CheckBox Content="Use Advanced Tab instead" Grid.Row="1" IsChecked="{Binding UseAdvancedTab}" 

+                <CheckBox Content="Use Advanced Tab instead" Grid.Row="1" IsChecked="{Binding UseAdvancedTab}" Margin="0,5,0,0"

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

 

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

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

                     <Grid.RowDefinitions>

                         <RowDefinition Height="Auto" />

                         <RowDefinition Height="Auto" />

@@ -151,8 +151,8 @@
 

 

                     <!-- Row 1 -->

-                    <TextBlock Text="Encoder Preset:" Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" />

-                    <StackPanel Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="3" Orientation="Horizontal" >

+                    <TextBlock Text="Encoder Preset:" 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}}">

                         <Slider Minimum="0" Maximum="{Binding VideoPresetMaxValue}" Width="150" Value="{Binding VideoPresetValue, Mode=Default, UpdateSourceTrigger=PropertyChanged}" 

                             IsSnapToTickEnabled="True" TickFrequency="1" TickPlacement="BottomRight" ToolTip="{x:Static Properties:Resources.Video_EncoderPreset}" 

                             Style="{StaticResource LongToolTipHolder}" />

@@ -170,19 +170,19 @@
 

           

                     <!-- Row 2-->

-                    <TextBlock Text="H.264 Profile:" Grid.Row="3" Grid.Column="0" Margin="0,10,0,0" VerticalAlignment="Center" />

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

+                    <TextBlock Text="H.264 Profile:" Grid.Row="3" Grid.Column="0" Margin="0,10,0,0" VerticalAlignment="Center" Visibility="{Binding DisplayOptimiseOptions, Converter={StaticResource boolToVisConverter}}"/>

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

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

                           Style="{StaticResource LongToolTipHolder}" ToolTip="{x:Static Properties:Resources.Video_EncoderProfile}" />

 

-                    <TextBlock Text="H.264 Level:" Grid.Row="3" Grid.Column="2" Margin="10,10,0,0" VerticalAlignment="Center" />

-                    <ComboBox Width="100" Grid.Row="3" Grid.Column="3" Margin="5,10,5,0" Height="22" VerticalAlignment="Center"

+                    <TextBlock Text="H.264 Level:" Grid.Row="3" Grid.Column="2" Margin="10,10,0,0" VerticalAlignment="Center" Visibility="{Binding DisplayOptimiseOptions, Converter={StaticResource boolToVisConverter}}" />

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

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

                           Style="{StaticResource LongToolTipHolder}" ToolTip="{x:Static Properties:Resources.Video_EncoderLevel}"/>

 

                     <!-- Row 3 -->

-                    <TextBlock Text="Extra Options:" Grid.Row="4" Grid.Column="0" Margin="0,10,0,0" VerticalAlignment="Center" HorizontalAlignment="Left" />

-                    <TextBox Text="{Binding ExtraArguments, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"

+                    <TextBlock Text="Extra Options:" 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"

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

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

                         <TextBox.ContextMenu>