WinGui: x265 UI patch by Zhang Zhigiang.

This enables support for the x265 encoder from the GUI when paired with a build of HandBrake that has x265 enabled. 
Thanks

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

1 files changed, 82 insertions, 4 deletions

diff --git a/win/CS/HandBrakeWPF/Views/VideoView.xaml b/win/CS/HandBrakeWPF/Views/VideoView.xaml
index 1f0b31764..a7b87a3a7 100644
--- a/win/CS/HandBrakeWPF/Views/VideoView.xaml
+++ b/win/CS/HandBrakeWPF/Views/VideoView.xaml
@@ -170,7 +170,7 @@
                     <StackPanel Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="3" Orientation="Horizontal"

                                 Visibility="{Binding DisplayX264Options, Converter={StaticResource boolToVisConverter}}" >

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

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

                             Style="{StaticResource LongToolTipHolder}" />

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

                     </StackPanel>

@@ -181,7 +181,7 @@
                               ItemsSource="{Binding X264Tunes, Converter={StaticResource enumComboConverter}}" 

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

                               Visibility="{Binding DisplayX264Options, Converter={StaticResource boolToVisConverter}}"

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

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

                               Style="{StaticResource LongToolTipHolder}" />

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

                               Visibility="{Binding DisplayX264Options, Converter={StaticResource boolToVisConverter}}"

@@ -203,14 +203,14 @@
                           ItemsSource="{Binding H264Profiles, Converter={StaticResource enumComboConverter}}" 

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

                           Style="{StaticResource LongToolTipHolder}"

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

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

                           ItemsSource="{Binding H264Levels}" 

                           SelectedItem="{Binding H264Level}"

                           Style="{StaticResource LongToolTipHolder}"

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

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

@@ -231,6 +231,84 @@
             </Grid>

 

 

+            <!-- H265 settings -->

+

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

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

+

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

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

+

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

+

+                    <Grid.RowDefinitions>

+                        <RowDefinition Height="Auto" />

+                        <RowDefinition Height="Auto" />

+                        <RowDefinition Height="Auto" />

+                        <RowDefinition Height="Auto" />

+                        <RowDefinition Height="Auto" />

+                        <RowDefinition Height="*" />

+                    </Grid.RowDefinitions>

+

+                    <Grid.ColumnDefinitions>

+                        <ColumnDefinition Width="Auto" />

+                        <ColumnDefinition Width="Auto" />

+                        <ColumnDefinition Width="Auto" />

+                        <ColumnDefinition Width="Auto" />

+                    </Grid.ColumnDefinitions>

+

+

+                    <!-- Row 1 -->

+

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

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

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

+                                 Visibility="{Binding DisplayX265Options, Converter={StaticResource boolToVisConverter}}" >

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

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

+                             Style="{StaticResource LongToolTipHolder}" />

+                        <TextBlock Text="{Binding X265Preset}" Margin="5,0,0,0" />

+                    </StackPanel>

+

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

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

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

+                               ItemsSource="{Binding X265Tunes}" 

+                               SelectedItem="{Binding X265Tune}"

+                               Visibility="{Binding DisplayX265Options, Converter={StaticResource boolToVisConverter}}"

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

+                               Style="{StaticResource LongToolTipHolder}" />

+

+                    <TextBlock Text="H.265 Profile:" Grid.Row="2" Grid.Column="2" Margin="10,10,0,0" VerticalAlignment="Center" 

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

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

+                               Visibility="{Binding DisplayX265Options, Converter={StaticResource boolToVisConverter}}"

+                           ItemsSource="{Binding H265Profiles}" 

+                           SelectedItem="{Binding H265Profile}"

+                           Style="{StaticResource LongToolTipHolder}"

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

+

+                    <!-- Row 3 -->

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

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

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

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

+                              Visibility="{Binding DisplayX265Options, Converter={StaticResource boolToVisConverter}}" >

+                        <TextBox.ContextMenu>

+                            <ContextMenu>

+                                <MenuItem Header="Copy Full Query" cal:Message.Attach="[Event Click] = [Action CopyQuery]"  />

+                            </ContextMenu>

+                        </TextBox.ContextMenu>

+                    </TextBox>

+                </Grid>

+            </Grid>

         </Grid>

 

     </Grid>