WinGui: Adding a number of new tooltips for some of the more complicated controls.

3 files changed, 22 insertions, 11 deletions

diff --git a/win/CS/HandBrakeWPF/Views/FiltersView.xaml b/win/CS/HandBrakeWPF/Views/FiltersView.xaml
index d8304c1c6..471d41049 100644
--- a/win/CS/HandBrakeWPF/Views/FiltersView.xaml
+++ b/win/CS/HandBrakeWPF/Views/FiltersView.xaml
@@ -48,6 +48,7 @@
                 <TextBlock Text="{x:Static Properties:ResourcesUI.FiltersView_Detelecine}" Grid.Row="0" Grid.Column="0" Margin="0,0,0,10" />

                 <ComboBox Width="120" Grid.Row="0" ItemsSource="{Binding DetelecineOptions, Converter={StaticResource boolComboConverter}}" 

                           SelectedItem="{Binding SelectedDetelecine, Converter={StaticResource boolComboConverter}}" Grid.Column="1" Margin="0,0,0,10"

+                          ToolTip="{x:Static Properties:ResourcesTooltips.FilterView_Detelecine}"

                           HorizontalAlignment="Left"/>

                 <TextBox Width="120" Grid.Row="0" Grid.Column="2" Margin="0,0,0,10" Text="{Binding CustomDetelecine, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Left"

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

@@ -55,8 +56,10 @@
                 <TextBlock Text="{Binding DeinterlaceControlText}" Grid.Row="1" Grid.Column="0" Margin="0,0,0,10" VerticalAlignment="Top"/>

                 <StackPanel Grid.Row="1" Grid.Column="1" >

                     <StackPanel Orientation="Horizontal">

-                        <RadioButton GroupName="Interlace" Content="{x:Static Properties:ResourcesUI.FiltersView_Deinterlace}" IsChecked="{Binding IsDeinterlaceMode}" />

-                        <RadioButton GroupName="Interlace" Content="{x:Static Properties:ResourcesUI.FiltersView_Decomb}" Margin="10,0,0,0" IsChecked="{Binding IsDeinterlaceMode, Converter={StaticResource inverseBooleanConverter}}" />

+                        <RadioButton GroupName="Interlace" Content="{x:Static Properties:ResourcesUI.FiltersView_Deinterlace}" IsChecked="{Binding IsDeinterlaceMode}" 

+                                     ToolTip="{x:Static Properties:ResourcesTooltips.FilterView_DecombDeinterlace}" />

+                        <RadioButton GroupName="Interlace" Content="{x:Static Properties:ResourcesUI.FiltersView_Decomb}" Margin="10,0,0,0" IsChecked="{Binding IsDeinterlaceMode, Converter={StaticResource inverseBooleanConverter}}"

+                                     ToolTip="{x:Static Properties:ResourcesTooltips.FilterView_DecombDeinterlace}"/>

                     </StackPanel>

 

                     <ComboBox Width="120" ItemsSource="{Binding DecombOptions, Converter={StaticResource boolComboConverter}}" HorizontalAlignment="Left"

@@ -77,7 +80,7 @@
                 <TextBlock Text="{x:Static Properties:ResourcesUI.FiltersView_Denoise}" Grid.Row="3" Grid.Column="0" Margin="0,0,0,10"/>

                 <ComboBox Width="120" Grid.Row="3" ItemsSource="{Binding DenoiseOptions, Converter={StaticResource boolComboConverter}}" 

                           SelectedItem="{Binding SelectedDenoise, Converter={StaticResource boolComboConverter}}" Grid.Column="1"

-                          HorizontalAlignment="Left" VerticalAlignment="Center" Margin="0,0,0,10" />

+                          HorizontalAlignment="Left" VerticalAlignment="Center" Margin="0,0,0,10" ToolTip="{x:Static Properties:ResourcesTooltips.FilterView_Denoise}" />

 

                 <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Grid.Row="3" Grid.Column="2" Margin="0,0,0,10" 

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

@@ -107,10 +110,11 @@
 

                 <TextBlock Text="{x:Static Properties:ResourcesUI.FiltersView_Deblock}" Grid.Row="4" Grid.Column="0" Margin="0,0,0,10"/>

                 <Slider Width="120" Value="{Binding DeblockValue}" TickPlacement="BottomRight" Minimum="4" Maximum="15" Grid.Row="4" Grid.Column="1" Margin="0,0,0,10"

-                        HorizontalAlignment="Left" />

+                        HorizontalAlignment="Left" ToolTip="{x:Static Properties:ResourcesTooltips.FilterView_Deblock}" />

                 <TextBlock Text="{Binding DeblockText}" Grid.Row="4" Grid.Column="2" Margin="0,0,0,10"/>

 

-                <CheckBox Content="{x:Static Properties:ResourcesUI.FiltersView_Grayscale}" IsChecked="{Binding Grayscale}" Grid.Row="5" Grid.Column="1" Margin="0,0,0,10"/>

+                <CheckBox Content="{x:Static Properties:ResourcesUI.FiltersView_Grayscale}" IsChecked="{Binding Grayscale}" Grid.Row="5" Grid.Column="1" Margin="0,0,0,10"

+                          ToolTip="{x:Static Properties:ResourcesTooltips.FilterView_Grayscale}" />

             </Grid>

 

         </StackPanel>

diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml
index ff8ebc600..da7c7d0cc 100644
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml
@@ -351,6 +351,7 @@
                                   MinWidth="100"

                                   Margin="8,0,0,0"

                                   ItemsSource="{Binding ScannedSource.Titles}"

+                                  ToolTip="{x:Static Properties:ResourcesTooltips.MainView_Title}"

                                   SelectedItem="{Binding Path=SelectedTitle}"

                                   />

                         <Label Margin="8,0,0,0" Content="{x:Static Properties:ResourcesUI.MainView_Angle}" />

@@ -364,7 +365,7 @@
                         <ComboBox Name="PointToPointMode"

                                   MinWidth="80"

                                   Margin="8,0,0,0"

-                                  ItemsSource="{Binding RangeMode}"

+                                  ItemsSource="{Binding RangeMode}" ToolTip="{x:Static Properties:ResourcesTooltips.MainView_Range}"

                                   SelectedItem="{Binding SelectedPointToPoint}"

                                   />

                         <ComboBox Name="StartPoint"

@@ -423,7 +424,7 @@
                     <Label Margin="8,0,0,0" Content="{x:Static Properties:ResourcesUI.MainView_File}" />

                     <TextBox Name="Destination"

                              Grid.Column="1"

-                             Margin="8,0,0,0"

+                             Margin="8,0,0,0" ToolTip="{x:Static Properties:ResourcesTooltips.MainView_Destination}"

                              Text="{Binding Destination,

                                             UpdateSourceTrigger=PropertyChanged}"

                              >

@@ -454,6 +455,7 @@
                     <ComboBox Name="Container"

                               MinWidth="100"

                               Margin="8,0,0,0"

+                              ToolTip="{x:Static Properties:ResourcesTooltips.MainView_Mux}"

                               ItemsSource="{Binding OutputFormats, Converter={StaticResource enumComboConverter}}"

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

                               />

@@ -462,6 +464,7 @@
                               VerticalAlignment="Center"

                               Content="{x:Static Properties:ResourcesUI.MainView_WebOptimized}"

                               IsChecked="{Binding Path=CurrentTask.OptimizeMP4}"

+                              ToolTip="{x:Static Properties:ResourcesTooltips.MainView_Optimise}"

                               Visibility="{Binding IsMkv,

                                                    Converter={StaticResource boolToVisConverter},

                                                    ConverterParameter=true}"

@@ -470,6 +473,7 @@
                               Margin="8,0,0,0"

                               VerticalAlignment="Center"

                               Content="{x:Static Properties:ResourcesUI.MainView_iPod5G}"

+                              ToolTip="{x:Static Properties:ResourcesTooltips.MainView_IpodAtom}"

                               IsChecked="{Binding Path=CurrentTask.IPod5GSupport}"

                               Visibility="{Binding IsMkv,

                                                    Converter={StaticResource boolToVisConverter},

diff --git a/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml b/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml
index 1d76cc49f..be53554d9 100644
--- a/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml
@@ -69,9 +69,10 @@
                     <Label Content="{x:Static Properties:ResourcesUI.PictureSettingsView_Modulus}" Grid.Row="1" Grid.Column="0" 

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

 

-                    <ComboBox Width="110" Grid.Row="0" ItemsSource="{Binding AnamorphicModes}" SelectedItem="{Binding SelectedAnamorphicMode}" Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5" />

+                    <ComboBox Width="110" Grid.Row="0" ItemsSource="{Binding AnamorphicModes}" SelectedItem="{Binding SelectedAnamorphicMode}" Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5"

+                              ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_Anamorphic}" />

                     <ComboBox Width="110" Grid.Row="1" ItemsSource="{Binding ModulusValues}" SelectedItem="{Binding SelectedModulus}" 

-                          Visibility="{Binding ShowModulus, Converter={StaticResource boolToVisConverter}}"

+                          Visibility="{Binding ShowModulus, Converter={StaticResource boolToVisConverter}}" ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_Modulus}"

                           Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5" />

                 </Grid>

 

@@ -95,9 +96,11 @@
                     <controls:NumberBox Width="60" Number="{Binding DisplayWidth, Mode=TwoWay}" Grid.Row="0" Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5" 

                                     AllowEmpty="False" />

                     <controls:NumberBox Width="60" Number="{Binding ParWidth, Mode=TwoWay}" Grid.Row="1" Grid.Column="1" HorizontalAlignment="Left" AllowEmpty="False"

-                                             IsEnabled="{Binding MaintainAspectRatio, Converter={StaticResource boolConverter}, ConverterParameter=true}" Margin="0,0,0,5" />

+                                             IsEnabled="{Binding MaintainAspectRatio, Converter={StaticResource boolConverter}, ConverterParameter=true}" Margin="0,0,0,5"

+                                             ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_PAR}"/>

                     <controls:NumberBox Width="60" Number="{Binding ParHeight, Mode=TwoWay}" Grid.Row="2" Grid.Column="1" HorizontalAlignment="Left" AllowEmpty="False"

-                                             IsEnabled="{Binding MaintainAspectRatio, Converter={StaticResource boolConverter}, ConverterParameter=true}" Margin="0,0,0,5" />

+                                             IsEnabled="{Binding MaintainAspectRatio, Converter={StaticResource boolConverter}, ConverterParameter=true}" Margin="0,0,0,5"

+                                             ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_PAR}"/>

                 </Grid>

 

             </StackPanel>