WinGui: Fix the x264 preset/tune/profile tooltip so that it now shows the equivalent x264 query. Also added an option to disable libhb features such as this incase this turns out to be problematic.

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

2 files changed, 13 insertions, 2 deletions

diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
index 0394adbff..c2e88150d 100644
--- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
@@ -294,6 +294,7 @@
                             <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}" />

+                            <CheckBox Content="Disable LibHB Features" IsChecked="{Binding DisableLibHbFeatures}" />

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

@@ -365,7 +366,7 @@
 

                         <StackPanel Orientation="Vertical" Grid.Column="1" Margin="20,0,0,0">

                             

-                            <CheckBox Content="Enable LibHB (uses hb.dll instead of HandBrakeCLI.exe)" Margin="0,5,0,0" IsChecked="{Binding EnableLibHb}" />

+                            <CheckBox Content="Enable LibHB Scanning and Encoding (uses hb.dll instead of HandBrakeCLI.exe)" Margin="0,5,0,0" IsChecked="{Binding EnableLibHb}" />

                             <CheckBox Content="Enable Process Isolation (Run Scans and Encodes via an intermediate service)" Margin="20,10,0,0" IsChecked="{Binding EnableProcessIsolation}" />

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

                                 <TextBlock Text="Server Port:" VerticalAlignment="Center" />

diff --git a/win/CS/HandBrakeWPF/Views/VideoView.xaml b/win/CS/HandBrakeWPF/Views/VideoView.xaml
index 313216def..9e098596a 100644
--- a/win/CS/HandBrakeWPF/Views/VideoView.xaml
+++ b/win/CS/HandBrakeWPF/Views/VideoView.xaml
@@ -17,6 +17,16 @@
         <Style x:Key="LongToolTipHolder" TargetType="FrameworkElement">

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

         </Style>

+

+        <Style TargetType="ToolTip">

+            <Setter Property="ContentTemplate">

+                <Setter.Value>

+                    <DataTemplate>

+                        <TextBlock TextWrapping="Wrap" Width="450" Text="{Binding}" />

+                    </DataTemplate>

+                </Setter.Value>

+            </Setter>

+        </Style>

     </UserControl.Resources>

    

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

@@ -177,7 +187,7 @@
                     <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}"

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

-                         ToolTip="{Binding FullOptionsTooltip}"/>

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

 

 

                 </Grid>