WinGui: Manually merged the QuickSync UI changes from the qsv branch to trunk

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

1 files changed, 48 insertions, 27 deletions

diff --git a/win/CS/HandBrakeWPF/Views/VideoView.xaml b/win/CS/HandBrakeWPF/Views/VideoView.xaml
index c4bd565c7..fffbfd0b2 100644
--- a/win/CS/HandBrakeWPF/Views/VideoView.xaml
+++ b/win/CS/HandBrakeWPF/Views/VideoView.xaml
@@ -6,7 +6,8 @@
              xmlns:Converters="clr-namespace:HandBrakeWPF.Converters"

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

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

-             xmlns:Micro="clr-namespace:Caliburn.Micro;assembly=Caliburn.Micro" mc:Ignorable="d" >

+             xmlns:cal="http://www.caliburnproject.org"

+             mc:Ignorable="d" >

 

     <UserControl.Resources>

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

@@ -74,12 +75,18 @@
                 <StackPanel Orientation="Horizontal">

                     <TextBlock Text="Framerate (FPS):" VerticalAlignment="Top" Margin="0,5,0,0" Width="100"/>

                     <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}" Margin="0,5,0,0" 

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

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

+                        <TextBlock Text="Same as source"  VerticalAlignment="Center" Margin="0,5,0,0"

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

+

+                        <StackPanel Orientation="Vertical" Visibility="{Binding DisplayNonQSVControls, Converter={StaticResource boolToVisConverter}}">

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

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

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

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

+                        </StackPanel>

                     </StackPanel>

                 </StackPanel>

             </StackPanel>

@@ -89,7 +96,7 @@
                 <TextBlock Text="Quality" FontWeight="Bold" Margin="0,0,0,10"/>

 

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

-                    <RadioButton Content="Constant Quality:" IsChecked="{Binding IsConstantQuantity}"  Margin="0,0,10,0"/>

+                    <RadioButton Content="Constant Quality:" IsChecked="{Binding IsConstantQuantity}"  Margin="0,0,10,0" Checked="qsv_preset_radiobutton"/>

                     <TextBlock Text="{Binding DisplayRF}" MinWidth="30" />

                     <TextBlock Text="{Binding Rfqp}" FontWeight="Bold" Margin="5,0,0,0" />

 

@@ -112,22 +119,21 @@
                 </Grid>

 

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

-                    <TextBox Width="75" Text="{Binding Task.VideoBitrate, UpdateSourceTrigger=PropertyChanged}" 

-                             IsEnabled="{Binding IsConstantQuantity, Converter={StaticResource boolConverter}, ConverterParameter=true}" />

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

+                    <TextBox Width="75" Text="{Binding Task.VideoBitrate, UpdateSourceTrigger=PropertyChanged}" IsEnabled="{Binding IsConstantQuantity, Converter={StaticResource boolConverter}, ConverterParameter=true}" />

                 </StackPanel>

 

-                <StackPanel Orientation="Horizontal" Margin="30,0,0,0">

+                <StackPanel Orientation="Horizontal" Margin="30,0,0,0" Visibility="{Binding DisplayNonQSVControls, Converter={StaticResource boolToVisConverter}}">

                     <CheckBox Content="2-Pass Encoding" IsEnabled="{Binding IsConstantQuantity, Converter={StaticResource boolConverter}, ConverterParameter=true}"

-                              IsChecked="{Binding Task.TwoPass}" Margin="0,0,10,0" />

+                              IsChecked="{Binding TwoPass}" Margin="0,0,10,0" />

                     <CheckBox Content="Turbo first pass" IsEnabled="{Binding IsConstantQuantity, Converter={StaticResource boolConverter}, ConverterParameter=true}"

-                              IsChecked="{Binding Task.TurboFirstPass}" />

+                              IsChecked="{Binding TurboFirstPass}" />

                 </StackPanel>

 

             </StackPanel>

 

             <!-- H264 settings -->

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

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

                 <Grid.RowDefinitions>

                     <RowDefinition Height="Auto" />

                     <RowDefinition Height="Auto" />

@@ -139,8 +145,7 @@
                 <CheckBox Content="Use Advanced Tab instead" Grid.Row="1" IsChecked="{Binding UseAdvancedTab}" 

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

 

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

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

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

                     <Grid.RowDefinitions>

                         <RowDefinition Height="Auto" />

                         <RowDefinition Height="Auto" />

@@ -160,22 +165,36 @@
 

 

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

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

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

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

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

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

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

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

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

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

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

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

+

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

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

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

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

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

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

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

+                    </StackPanel>

 

 

                     <!-- Row 2-->

@@ -194,13 +213,15 @@
                           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" />

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

+                               Visibility="{Binding DisplayX264Options, 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}">

+                             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 DisplayX264Options, Converter={StaticResource boolToVisConverter}}" >

                         <TextBox.ContextMenu>

                             <ContextMenu>

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

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

                             </ContextMenu>

                         </TextBox.ContextMenu>

                     </TextBox>