WinGui: Initial work to implement x264 Preset/Tune/Profile/Level options in-gui.

Still some stuff to tidy up but should be usable for now.

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

3 files changed, 76 insertions, 40 deletions

diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml
index 5bed28974..76dbf7872 100644
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml
@@ -486,7 +486,7 @@
                 <TabItem Name="pictureTab" Header="Picture">

                     <ContentControl x:Name="PictureSettingsViewModel" />

                 </TabItem>

-                <TabItem Name="filtersTab" Header="Video Filters">

+                <TabItem Name="filtersTab" Header="Filters">

                     <ContentControl x:Name="FiltersViewModel" />

                 </TabItem>

                 <TabItem Name="videoTab" Header="Video">

@@ -501,7 +501,7 @@
                 <TabItem Name="chaptersTab" Header="Chapters">

                     <ContentControl x:Name="ChaptersViewModel" />

                 </TabItem>

-                <TabItem Name="advancedTab" Header="Advanced">

+                <TabItem Name="advancedTab" Header="Advanced" Visibility="{Binding ShowAdvancedTab, Converter={StaticResource boolToVisConverter}}">

                     <ContentControl x:Name="AdvancedViewModel" />

                 </TabItem>

             </TabControl>

diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
index 2f3213a7f..c5d5d3e60 100644
--- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
@@ -279,6 +279,7 @@
                             <CheckBox Content="Display status messages from tray icon (balloon popups)"  Visibility="Collapsed"  IsChecked="{Binding DisplayStatusMessagesTrayIcon}" />

                             <CheckBox Content="Disable built-in preset update notification" IsChecked="{Binding DisablePresetUpdateCheckNotification}" />

                             <CheckBox Content="Always clear completed queue items after an encode completes" IsChecked="{Binding ClearQueueOnEncodeCompleted}" />

+                            <CheckBox Content="Show Advanced Tab" IsChecked="{Binding ShowAdvancedTab}" />

                             <StackPanel Orientation="Horizontal" Margin="0,10,0,0">

                                 <TextBlock Text="Number of picture previews to scan:" VerticalAlignment="Center" Width="250" />

                                 <ComboBox Name="numberOfPreviews" ItemsSource="{Binding PreviewPicturesToScan}" SelectedItem="{Binding SelectedPreviewCount}" Width="120" />

diff --git a/win/CS/HandBrakeWPF/Views/VideoView.xaml b/win/CS/HandBrakeWPF/Views/VideoView.xaml
index 27f2a2f30..ffc027786 100644
--- a/win/CS/HandBrakeWPF/Views/VideoView.xaml
+++ b/win/CS/HandBrakeWPF/Views/VideoView.xaml
@@ -4,13 +4,18 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 

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

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

-             xmlns:Video="clr-namespace:HandBrakeWPF.Converters.Video" mc:Ignorable="d" >

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

+             xmlns:Properties="clr-namespace:HandBrakeWPF.Properties" mc:Ignorable="d" >

 

     <UserControl.Resources>

         <Converters:BooleanConverter x:Key="boolConverter" />

         <Converters:BooleanToVisibilityConverter x:Key="boolToVisConverter" />

         <Converters:EnumComboConverter x:Key="enumComboConverter" />

         <Video:VideoEncoderConverter x:Key="videoEncoderConverter" />

+

+        <Style x:Key="LongToolTipHolder" TargetType="FrameworkElement">

+            <Setter Property="ToolTipService.ShowDuration" Value="20000" />

+        </Style>

     </UserControl.Resources>

    

     <Grid Margin="10,5,0,0">

@@ -25,6 +30,11 @@
                 <ColumnDefinition Width="*" />

                 <ColumnDefinition Width="*" />

             </Grid.ColumnDefinitions>

+            

+            <Grid.RowDefinitions>

+                <RowDefinition Height="Auto" />

+                <RowDefinition Height="Auto" />

+            </Grid.RowDefinitions>

 

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

 

@@ -54,8 +64,10 @@
                     <StackPanel Orientation="Vertical">

                         <ComboBox Width="120" ItemsSource="{Binding Framerates}" SelectedItem="{Binding SelectedFramerate}" />

                         <RadioButton Content="Constant Framerate" IsChecked="{Binding IsConstantFramerate}" Margin="0,10,0,0" />

-                        <RadioButton Content="Variable Framerate" IsChecked="{Binding IsVariableFramerate}" Visibility="{Binding ShowPeakFramerate, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />

-                        <RadioButton Content="Peak Framerate" IsChecked="{Binding IsPeakFramerate}" Visibility="{Binding ShowPeakFramerate, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />

+                        <RadioButton Content="Variable Framerate" IsChecked="{Binding IsVariableFramerate}" Margin="0,5,0,0" 

+                                     Visibility="{Binding ShowPeakFramerate, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />

+                        <RadioButton Content="Peak Framerate" IsChecked="{Binding IsPeakFramerate}" Margin="0,5,0,0"

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

                     </StackPanel>

                 </StackPanel>

             </StackPanel>

@@ -70,8 +82,10 @@
                     <TextBlock Text="RF" FontWeight="Bold" />

                 </StackPanel>

 

-                <Slider Width="240" Value="{Binding RF}"  Maximum="{Binding QualityMax}" Minimum="{Binding QualityMin}"

-                        IsEnabled="{Binding IsConstantQuantity}" Margin="0,0,0,20" />

+                <Slider Width="280" Value="{Binding RF}" HorizontalAlignment="Left"  Maximum="{Binding QualityMax}" Minimum="{Binding QualityMin}"

+                        IsEnabled="{Binding IsConstantQuantity}" Margin="20,0,0,20"

+                        ToolTip="{x:Static Properties:Resources.Video_QualitySlider}" Style="{StaticResource LongToolTipHolder}" 

+                        IsSnapToTickEnabled="True" TickFrequency="1" TickPlacement="BottomRight" />

 

                 <StackPanel Orientation="Horizontal" Margin="0,0,0,10">

                     <RadioButton Content="Avg Bitrate (kbps):" IsChecked="{Binding IsConstantQuantity, Converter={StaticResource boolConverter}, ConverterParameter=true}" Margin="0,0,10,0"/>

@@ -87,46 +101,67 @@
 

             </StackPanel>

 

-

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

+            <!-- H264 settings -->

+            <Grid Grid.Row="1" Grid.ColumnSpan="2" Margin="0,20,0,0" Visibility="{Binding DisplayX264Options, Converter={StaticResource boolToVisConverter}}">

                 <Grid.RowDefinitions>

                     <RowDefinition Height="Auto" />

+                    <RowDefinition Height="Auto" />

+                    <RowDefinition Height="Auto" />

+                    <RowDefinition Height="Auto" />

+                    <RowDefinition Height="Auto" />

                     <RowDefinition Height="*" />

                 </Grid.RowDefinitions>

-

-                <StackPanel Grid.Row="0" Orientation="Vertical" Margin="0,0,0,10">

-

-                    <TextBlock Text="X264 Advanced Options:" Margin="0,0,0,5" FontWeight="Bold" VerticalAlignment="Center" />

-

-                    <StackPanel Grid.Row="1" Orientation="Horizontal" Margin="0,0,0,10">

-                        <TextBlock Text="Preset:" VerticalAlignment="Center" />

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

-                          ItemsSource="{Binding X264Presets, Converter={StaticResource x264DisplayConverter}}" 

-                          SelectedItem="{Binding X264Preset, Converter={StaticResource x264DisplayConverter}}"/>

-

-                        <TextBlock Text="Profile:" VerticalAlignment="Center" />

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

-                          ItemsSource="{Binding X264Profiles, Converter={StaticResource x264DisplayConverter}}" 

-                          SelectedItem="{Binding X264Profile, Converter={StaticResource x264DisplayConverter}}"/>

-

-

-                        <TextBlock Text="Tune:" VerticalAlignment="Center" />

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

-                          ItemsSource="{Binding X264Tunes, Converter={StaticResource x264DisplayConverter}}" 

-                          SelectedItem="{Binding X264Tune, Converter={StaticResource x264DisplayConverter}}"/>

-                    </StackPanel>

+                

+                <Grid.ColumnDefinitions>

+                    <ColumnDefinition Width="Auto" />

+                    <ColumnDefinition Width="Auto" />

+                    <ColumnDefinition Width="Auto" />

+                    <ColumnDefinition Width="Auto" />

+                </Grid.ColumnDefinitions>

+

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

+

+                <!-- Row 1 -->

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

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

+                    <Slider Minimum="0" Maximum="9" Width="150" Value="{Binding X264PresetValue, Mode=Default, UpdateSourceTrigger=PropertyChanged}" 

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

+                            Style="{StaticResource LongToolTipHolder}" />

+                    <TextBlock Text="{Binding X264Preset, Converter={StaticResource enumComboConverter}}" Margin="5,0,0,0" />

                 </StackPanel>

 

+                <TextBlock Text="x264 Tune:" Grid.Row="2" Grid.Column="0" VerticalAlignment="Center" Margin="0,10,0,0"  />

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

+                          ItemsSource="{Binding X264Tunes, Converter={StaticResource enumComboConverter}}" 

+                          SelectedItem="{Binding X264Tune, Converter={StaticResource enumComboConverter}}"

+                          ToolTip="{x:Static Properties:Resources.Video_x264Tune}"

+                          Style="{StaticResource LongToolTipHolder}" />

+                <CheckBox IsChecked="{Binding FastDecode}" Content="Fast Decode" Grid.Row="2" Grid.Column="2" Margin="10,10,10,0" VerticalAlignment="Center"

+                          ToolTip="{x:Static Properties:Resources.Video_x264FastDecode}"/>

+                

+

+                <!-- 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"

+                          ItemsSource="{Binding H264Profiles, Converter={StaticResource enumComboConverter}}" 

+                          SelectedItem="{Binding H264Profile, Converter={StaticResource enumComboConverter}}"

+                          Style="{StaticResource LongToolTipHolder}"

+                          ToolTip="{x:Static Properties:Resources.Video_x264Profile}" />

+

+                <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"

+                          ItemsSource="{Binding H264Levels}" 

+                          SelectedItem="{Binding H264Level}"

+                          Style="{StaticResource LongToolTipHolder}"

+                          ToolTip="{x:Static Properties:Resources.Video_x264Level}"/>

+                

+                <!-- 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}" Height="30" MaxLines="2" Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="3" Margin="5,10,0,0" VerticalAlignment="Center"

+                         ToolTip="{Binding FullOptionsTooltip}"/>

+                

+                

             </Grid>

-

-            <StackPanel Grid.Row="2" Margin="10" Height="100" VerticalAlignment="Top" >

-                <TextBlock Text="Advanced Query" Margin="0,0,0,5" FontWeight="Bold" VerticalAlignment="Center" />

-                <TextBox Text="{Binding Query}" 

-                 VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Height="150" TextWrapping="Wrap" />

-            </StackPanel>-->

-

-

-

         </Grid>

 

     </Grid>