WinGui: (WPF) Port the Advanced Panel for x264 from VidCoder.

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

1 files changed, 294 insertions, 39 deletions

diff --git a/win/CS/HandBrakeWPF/Views/AdvancedView.xaml b/win/CS/HandBrakeWPF/Views/AdvancedView.xaml
index 3fad3c54b..4221a8e5d 100644
--- a/win/CS/HandBrakeWPF/Views/AdvancedView.xaml
+++ b/win/CS/HandBrakeWPF/Views/AdvancedView.xaml
@@ -1,61 +1,316 @@
 <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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 

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

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

-             d:DesignHeight="300" d:DesignWidth="300"

-             x:Name="advancedView">

+             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:Properties="clr-namespace:HandBrakeWPF.Properties" xmlns:Helpers="clr-namespace:HandBrakeWPF.Helpers"

+             mc:Ignorable="d" x:Name="advancedView">

     <UserControl.Resources>

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

-        <Converters:EnumComboConverter x:Key="x264DisplayConverter" />

+        <Converters:AdvancedVisibilityConverter x:Key="VisibilityConverter" />

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

+        <Style x:Key="AdvancedLabel" TargetType="Label">

+            <Setter Property="HorizontalAlignment" Value="Right" />

+        </Style>

+

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

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

+        </Style>

+

+        <Style x:Key="LongToolTip" TargetType="TextBlock">

+            <Setter Property="Width" Value="400" />

+            <Setter Property="TextWrapping" Value="Wrap" />

+        </Style>

     </UserControl.Resources>

 

-    <Grid>

-        <Grid.RowDefinitions>

-            <RowDefinition Height="Auto" />

-            <RowDefinition Height="Auto" />

-            <RowDefinition Height="*" />

-        </Grid.RowDefinitions>

+    <StackPanel Orientation="Vertical">

 

-        <TextBlock Text="Advanced" FontWeight="Bold" Margin="10,5,0,0" Grid.Row="0" ></TextBlock>

+        <!-- Other Encoders -->

+        <StackPanel Margin="10" Height="100" VerticalAlignment="Top"

+                     Visibility="{Binding DisplayX264Options, Converter={StaticResource BooleanVisibilityConverter}, ConverterParameter=true}">

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

+            <TextBox Text="{Binding AdvancedOptionsString}" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Height="150" TextWrapping="Wrap" />

+        </StackPanel>

 

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

+        <!-- X264 -->

+        <Grid Visibility="{Binding DisplayX264Options, Converter={StaticResource BooleanVisibilityConverter}, ConverterParameter=false}">

             <Grid.RowDefinitions>

                 <RowDefinition Height="Auto" />

                 <RowDefinition Height="*" />

             </Grid.RowDefinitions>

+            <Grid.ColumnDefinitions>

+                <ColumnDefinition Width="Auto" />

+                <ColumnDefinition Width="Auto" />

+                <ColumnDefinition Width="Auto" />

+            </Grid.ColumnDefinitions>

+

+            <!--Left Column -->

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

+                <!-- Encoding -->

+                <StackPanel Orientation="Vertical" >

+                    <TextBlock Text="Encoding: " FontWeight="Bold" Margin="10,5,0,0" Grid.Row="0" />

+                    <Grid HorizontalAlignment="Left" Margin="0,5,0,0" VerticalAlignment="Top">

+                        <Grid.RowDefinitions>

+                            <RowDefinition Height="Auto" />

+                            <RowDefinition Height="Auto" />

+                            <RowDefinition Height="Auto" />

+                            <RowDefinition Height="Auto" />

+                            <RowDefinition Height="Auto" />

+                            <RowDefinition Height="Auto" />

+                            <RowDefinition Height="Auto" />

+                            <RowDefinition Height="Auto" />

+                        </Grid.RowDefinitions>

+                        <Grid.ColumnDefinitions>

+                            <ColumnDefinition Width="110" />

+                            <ColumnDefinition Width="100" />

+                        </Grid.ColumnDefinitions>

+

+                        <Label Content="Reference Frames:" Grid.Row="0" Grid.Column="0" Style="{StaticResource AdvancedLabel}" />

+                        <ComboBox Grid.Row="0" Grid.Column="1" Height="22"

+                              ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.ReferenceFrames}" DisplayMemberPath="Label"

+                              SelectedItem="{Binding ReferenceFrames}" Style="{StaticResource LongToolTipHolder}">

+                            <ComboBox.ToolTip>

+                                <TextBlock Text="{x:Static Properties:Resources.Advanced_ReferenceFramesToolTip}" Style="{StaticResource LongToolTip}" />

+                            </ComboBox.ToolTip>

+                        </ComboBox>

+

+                        <Label Content="Maximum B-Frames:" Grid.Row="1" Grid.Column="0" Style="{StaticResource AdvancedLabel}" />

+                        <ComboBox Grid.Row="1" Grid.Column="1" Height="22"

+                              ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.BFrames}" DisplayMemberPath="Label"

+                              SelectedItem="{Binding BFrames}" Style="{StaticResource LongToolTipHolder}">

+                            <ComboBox.ToolTip>

+                                <TextBlock Text="{x:Static Properties:Resources.Advanced_BFramesToolTip}" Style="{StaticResource LongToolTip}" />

+                            </ComboBox.ToolTip>

+                        </ComboBox>

+

 

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

+                        <Label Content="CABAC:" Height="28" Grid.Row="4" Grid.Column="0" Style="{StaticResource AdvancedLabel}" />

+                        <CheckBox Height="16" Grid.Row="4" Grid.Column="1" IsChecked="{Binding CabacEntropyCoding}" Style="{StaticResource LongToolTipHolder}">

+                            <CheckBox.ToolTip>

+                                <TextBlock Text="{x:Static Properties:Resources.Advanced_CabacToolTip}" Style="{StaticResource LongToolTip}" />

+                            </CheckBox.ToolTip>

+                        </CheckBox>

 

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

+                        <Label Content="8x8 Transform:" Height="28" Grid.Row="5" Grid.Column="0"

+                           Visibility="{Binding EightByEightDctVisible, Converter={StaticResource VisibilityConverter}}"

+                           Style="{StaticResource AdvancedLabel}" />

+                        <CheckBox Height="16" Grid.Row="5" Grid.Column="1" IsChecked="{Binding EightByEightDct}"

+                              Visibility="{Binding EightByEightDctVisible, Converter={StaticResource VisibilityConverter}}"

+                              Style="{StaticResource LongToolTipHolder}">

+                            <CheckBox.ToolTip>

+                                <TextBlock Text="{x:Static Properties:Resources.Advanced_EightByEightDctToolTip}" Style="{StaticResource LongToolTip}" />

+                            </CheckBox.ToolTip>

+                        </CheckBox>

 

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

+                        <Label Content="Weighted P-Frames:" Grid.Row="6" Grid.Column="0" Style="{StaticResource AdvancedLabel}" />

+                        <CheckBox Grid.Row="6" Grid.Column="1" VerticalAlignment="Center" IsChecked="{Binding WeightedPFrames}" Style="{StaticResource LongToolTipHolder}">

+                            <CheckBox.ToolTip>

+                                <TextBlock Text="{x:Static Properties:Resources.Advanced_WeightPToolTip}" Style="{StaticResource LongToolTip}" />

+                            </CheckBox.ToolTip>

+                        </CheckBox>

 

+                        <Label Content="Pyramidal B-Frames:" Grid.Row="7" Grid.Column="0"

+                           Visibility="{Binding PyramidalBFramesVisible, Converter={StaticResource VisibilityConverter}}"

+                           Style="{StaticResource AdvancedLabel}" />

+                        <ComboBox Grid.Row="7" Grid.Column="1" Height="22" ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.PyramidalBFrames}" DisplayMemberPath="Label"

+                              SelectedItem="{Binding PyramidalBFrames}"

+                              Visibility="{Binding PyramidalBFramesVisible, Converter={StaticResource VisibilityConverter}}"

+                              Style="{StaticResource LongToolTipHolder}">

+                            <ComboBox.ToolTip>

+                                <TextBlock Text="{x:Static Properties:Resources.Advanced_PyramidalBFramesToolTip}" Style="{StaticResource LongToolTip}" />

+                            </ComboBox.ToolTip>

+                        </ComboBox>

+                    </Grid>

+                </StackPanel>

+

+                <!-- Psychvisual -->

+                <StackPanel Orientation="Vertical" >

+                    <TextBlock Text="Psychvisual: " FontWeight="Bold" Margin="10,5,0,0" Grid.Row="0" />

+                    <StackPanel Orientation="Horizontal">

+                        <Label Content="No DCT-Decimate:" Width="110" HorizontalAlignment="Left" HorizontalContentAlignment="Right"  VerticalAlignment="Center" />

+                        <CheckBox VerticalAlignment="Center" HorizontalAlignment="Left" IsChecked="{Binding NoDctDecimate}" 

+                              Style="{StaticResource LongToolTipHolder}">

+                            <CheckBox.ToolTip>

+                                <TextBlock Text="{x:Static Properties:Resources.Advanced_NoDctDecimateToolTip}" Style="{StaticResource LongToolTip}" />

+                            </CheckBox.ToolTip>

+                        </CheckBox>

 

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

                 </StackPanel>

+

             </StackPanel>

 

-        </Grid>

+            <!-- Analysis (Center Column)-->

+            <StackPanel Orientation="Vertical" Grid.Column="1" Grid.Row="0" >

+                <TextBlock Text="Analysis: " FontWeight="Bold" Margin="10,5,0,0" Grid.Row="0" />

+                <Grid HorizontalAlignment="Left" VerticalAlignment="Top">

+                    <Grid.RowDefinitions>

+                        <RowDefinition Height="Auto" />

+                        <RowDefinition Height="Auto" />

+                        <RowDefinition Height="Auto" />

+                        <RowDefinition Height="Auto" />

+                        <RowDefinition Height="Auto" />

+                    </Grid.RowDefinitions>

+                    <Grid.ColumnDefinitions>

+                        <ColumnDefinition Width="Auto" />

+                        <ColumnDefinition />

+                    </Grid.ColumnDefinitions>

 

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

+                    <Label Content="Adaptive B-Frames:" Grid.Row="0" Grid.Column="0"

+                       Visibility="{Binding BFramesOptionsVisible, Converter={StaticResource VisibilityConverter}}"

+                       Style="{StaticResource AdvancedLabel}" />

+                    <ComboBox Grid.Row="0" Grid.Column="1" Height="22" ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.AdaptiveBFrames}" DisplayMemberPath="Label"

+                          SelectedItem="{Binding AdaptiveBFrames}" Visibility="{Binding BFramesOptionsVisible, Converter={StaticResource VisibilityConverter}}"

+                          Style="{StaticResource LongToolTipHolder}" MaxWidth="120" Width="120">

+                        <ComboBox.ToolTip>

+                            <TextBlock Text="{x:Static Properties:Resources.Advanced_AdaptiveBFramesToolTip}" Style="{StaticResource LongToolTip}" />

+                        </ComboBox.ToolTip>

+                    </ComboBox>

+

+                    <Label Content="Adaptive Direct Mode:" Grid.Row="1" Grid.Column="0"

+                       Visibility="{Binding BFramesOptionsVisible, Converter={StaticResource VisibilityConverter}}"

+                       Style="{StaticResource AdvancedLabel}" />

+                    <ComboBox Grid.Row="1" Grid.Column="1" Height="22" MaxWidth="120" Width="120"

+                          ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.DirectPrediction}" DisplayMemberPath="Label"

+                          SelectedItem="{Binding DirectPrediction}" 

+                          Visibility="{Binding BFramesOptionsVisible, Converter={StaticResource VisibilityConverter}}"

+                          Style="{StaticResource LongToolTipHolder}">

+                        <ComboBox.ToolTip>

+                            <TextBlock Text="{x:Static Properties:Resources.Advanced_AdaptiveDirectModeToolTip}" Style="{StaticResource LongToolTip}" />

+                        </ComboBox.ToolTip>

+                    </ComboBox>

+

+                    <Label Content="Motion Estimation Method:" Grid.Row="2" Grid.Column="0" Style="{StaticResource AdvancedLabel}" />

+                    <ComboBox Grid.Row="2" Grid.Column="1" Height="22" MaxWidth="120" Width="120"

+                          ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.MotionEstimationMethod}" DisplayMemberPath="Label"

+                          SelectedItem="{Binding MotionEstimationMethod}" Style="{StaticResource LongToolTipHolder}">

+                        <ComboBox.ToolTip>

+                            <TextBlock Text="{x:Static Properties:Resources.Advanced_MotionEstimationMethodToolTip}" Style="{StaticResource LongToolTip}" />

+                        </ComboBox.ToolTip>

+                    </ComboBox>

+

+                    <Label Content="Subpixel Motion Estimation:" Grid.Row="3" Grid.Column="0" Style="{StaticResource AdvancedLabel}" />

+                    <ComboBox Grid.Row="3" Grid.Column="1" Height="22" MaxWidth="120" Width="120"

+                          ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.SubpixelMotionEstimation}" DisplayMemberPath="Label"

+                          SelectedItem="{Binding SubpixelMotionEstimation}" Style="{StaticResource LongToolTipHolder}">

+                        <ComboBox.ToolTip>

+                            <TextBlock Text="{x:Static Properties:Resources.Advanced_SubpixelMotionEstimationToolTip}" Style="{StaticResource LongToolTip}" />

+                        </ComboBox.ToolTip>

+                    </ComboBox>

+

+                    <Label Content="Motion Estimation Range:" Grid.Row="4" Grid.Column="0"

+                       Visibility="{Binding MotionEstimationRangeVisible, Converter={StaticResource VisibilityConverter}}"

+                       Style="{StaticResource AdvancedLabel}" />

+                    <ComboBox Grid.Row="4" Grid.Column="1" Height="22" MaxWidth="120" Width="120"

+                          ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.MotionEstimationRange}" DisplayMemberPath="Label"

+                          SelectedItem="{Binding MotionEstimationRange}"

+                          Visibility="{Binding MotionEstimationRangeVisible, Converter={StaticResource VisibilityConverter}}"

+                          Style="{StaticResource LongToolTipHolder}">

+                        <ComboBox.ToolTip>

+                            <TextBlock Text="{x:Static Properties:Resources.Advanced_MotionEstimationRangeToolTip}" Style="{StaticResource LongToolTip}" />

+                        </ComboBox.ToolTip>

+                    </ComboBox>

+                </Grid>

+

+                <Grid Height="80" HorizontalAlignment="Left" VerticalAlignment="Top" Width="300">

+                    <Grid.RowDefinitions>

+                        <RowDefinition Height="Auto" />

+                        <RowDefinition Height="Auto" />

+                        <RowDefinition Height="Auto" />

+                    </Grid.RowDefinitions>

+                    <Grid.ColumnDefinitions>

+                        <ColumnDefinition Width="Auto" />

+                        <ColumnDefinition />

+                    </Grid.ColumnDefinitions>

+

+                    <Label Content="Adaptive Quantization Strength:" Grid.Row="0" Grid.Column="0" Style="{StaticResource AdvancedLabel}" />

+                    <Slider Grid.Row="0" Grid.Column="1" Minimum="0.0" Maximum="2.0" TickPlacement="BottomRight"

+                        TickFrequency="0.1" SmallChange="0.1" LargeChange="0.2" IsSnapToTickEnabled="True"

+                        Value="{Binding AdaptiveQuantizationStrength}" Style="{StaticResource LongToolTipHolder}">

+                        <Slider.ToolTip>

+                            <TextBlock Text="{x:Static Properties:Resources.Advanced_AdaptiveQuantizationStrengthToolTip}" Style="{StaticResource LongToolTip}" />

+                        </Slider.ToolTip>

+                    </Slider>

+

+                    <Label Content="Psychovisual Rate Distortion:" Grid.Row="1" Grid.Column="0" Style="{StaticResource AdvancedLabel}" />

+                    <Slider Grid.Row="1" Grid.Column="1" Minimum="0.0" Maximum="2.0" TickPlacement="BottomRight"

+                        TickFrequency="0.1" SmallChange="0.1" LargeChange="0.2" IsSnapToTickEnabled="True"

+                        Value="{Binding PsychovisualRateDistortion}" Style="{StaticResource LongToolTipHolder}">

+                        <Slider.ToolTip>

+                            <TextBlock Text="{x:Static Properties:Resources.Advanced_PsychovisualRateDistortionToolTip}" Style="{StaticResource LongToolTip}" />

+                        </Slider.ToolTip>

+                    </Slider>

+

+                    <Label Content="Psychovisual Trellis:" Grid.Row="2" Grid.Column="0" Style="{StaticResource AdvancedLabel}"

+                       Visibility="{Binding PsychovisualTrellisVisible, Converter={StaticResource VisibilityConverter}}" />

+                    <Slider Grid.Row="2" Grid.Column="1" Minimum="0.0" Maximum="1.0" TickPlacement="BottomRight"

+                        TickFrequency="0.05" SmallChange="0.05" LargeChange="0.2" IsSnapToTickEnabled="True"

+                        Value="{Binding PsychovisualTrellis}"

+                        Visibility="{Binding PsychovisualTrellisVisible, Converter={StaticResource VisibilityConverter}}"

+                        Style="{StaticResource LongToolTipHolder}">

+                        <Slider.ToolTip>

+                            <TextBlock Text="{x:Static Properties:Resources.Advanced_PsychovisualTrellisToolTip}" Style="{StaticResource LongToolTip}" />

+                        </Slider.ToolTip>

+                    </Slider>

+                </Grid>

+

+            </StackPanel>

+

+            <!-- Analysis (Right Column)-->

+            <StackPanel Orientation="Vertical" Grid.Column="2" Grid.Row="0">

+                <Grid Margin="0,20,0,0">

+                    <Grid.RowDefinitions>

+                        <RowDefinition Height="Auto" />

+                        <RowDefinition Height="Auto" />

+                        <RowDefinition Height="Auto" />

+                        <RowDefinition Height="Auto" />

+                    </Grid.RowDefinitions>

+                    <Grid.ColumnDefinitions>

+                        <ColumnDefinition Width="Auto" />

+                        <ColumnDefinition Width="100" />

+                    </Grid.ColumnDefinitions>

+                    <Label Content="Partition Type:" Height="28" HorizontalAlignment="Right" VerticalAlignment="Top" Grid.Column="0" />

+                    <ComboBox Height="23" HorizontalAlignment="Right"  VerticalAlignment="Top" Width="100" MaxWidth="100"

+                      ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.Analysis}" DisplayMemberPath="Label" Grid.Column="1" 

+                      SelectedItem="{Binding Analysis}" Style="{StaticResource LongToolTipHolder}">

+                        <ComboBox.ToolTip>

+                            <TextBlock Text="{x:Static Properties:Resources.Advanced_AnalysisToolTip}" Style="{StaticResource LongToolTip}" />

+                        </ComboBox.ToolTip>

+                    </ComboBox>

+

+                    <Label Content="Trellis:" Height="28" HorizontalAlignment="Right"  VerticalAlignment="Top" Grid.Column="0" Grid.Row="1" />

+                    <ComboBox Height="23" HorizontalAlignment="Right" VerticalAlignment="Top" Width="100" MaxWidth="100" Grid.Row="1"

+                      ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.Trellis}" DisplayMemberPath="Label" Grid.Column="1" 

+                      SelectedItem="{Binding Trellis}" Style="{StaticResource LongToolTipHolder}">

+                        <ComboBox.ToolTip>

+                            <TextBlock Text="{x:Static Properties:Resources.Advanced_TrellisToolTip}" Style="{StaticResource LongToolTip}" />

+                        </ComboBox.ToolTip>

+                    </ComboBox>

+

+

+                    <Label Content="Deblocking:" Height="28" HorizontalAlignment="Right" VerticalAlignment="Top" Grid.Column="0" Grid.Row="2"  />

+                    <ComboBox Height="23" HorizontalAlignment="Right" VerticalAlignment="Top" Width="100" MaxWidth="100"

+                          ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.DeblockingStrength}" DisplayMemberPath="Label" Grid.Column="1" Grid.Row="2" 

+                          SelectedItem="{Binding DeblockingStrength}" Style="{StaticResource LongToolTipHolder}">

+                        <ComboBox.ToolTip>

+                            <TextBlock Text="{x:Static Properties:Resources.Advanced_DeblockingToolTip}" Style="{StaticResource LongToolTip}" />

+                        </ComboBox.ToolTip>

+                    </ComboBox>

+                    <ComboBox Height="23" HorizontalAlignment="Right"  VerticalAlignment="Top" Width="100" MaxWidth="100"  Grid.Column="1" Grid.Row="3" 

+                          ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.DeblockingThreshold}" DisplayMemberPath="Label"

+                          SelectedItem="{Binding DeblockingThreshold}" Style="{StaticResource LongToolTipHolder}">

+                        <ComboBox.ToolTip>

+                            <TextBlock Text="{x:Static Properties:Resources.Advanced_DeblockingToolTip}" Style="{StaticResource LongToolTip}" />

+                        </ComboBox.ToolTip>

+                    </ComboBox>

+                </Grid>

+            </StackPanel>

+

+            <!-- Query -->

+            <StackPanel Orientation="Vertical" Grid.Row="1" Grid.ColumnSpan="3" Margin="0,10,0,0" HorizontalAlignment="Stretch">

+                <TextBox Text="{Binding AdvancedOptionsString, UpdateSourceTrigger=PropertyChanged}" Height="35" MaxWidth="700" 

+                         HorizontalAlignment="Stretch" TextWrapping="Wrap" />

+            </StackPanel>

+        </Grid>

 

-    </Grid>

-</UserControl>

+    </StackPanel>

+</UserControl>
\ No newline at end of file