Skip to content

Commit c09e423

Browse files
author
RandomEngy
committed
Some tooltip updates.
1 parent f9ab34f commit c09e423

7 files changed

Lines changed: 125 additions & 16 deletions

File tree

‎Lib/HandBrakeInterop.dll‎

0 Bytes
Binary file not shown.

‎Lib/HandBrakeInterop.pdb‎

0 Bytes
Binary file not shown.

‎VidCoder/Properties/Resources.Designer.cs‎

Lines changed: 72 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎VidCoder/Properties/Resources.resx‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,4 +124,28 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY
124124

125125
A full copy of the GNU General Public License has been included along with this program.</value>
126126
</data>
127+
<data name="BurnedSubtitleToolTip" xml:space="preserve">
128+
<value>Burn the subtitles onto the picture. With burned subtitles, you cannot disable them during playback.</value>
129+
</data>
130+
<data name="DefaultSubtitleToolTip" xml:space="preserve">
131+
<value>Mark this subtitle track as the default. This will show up during playback until another track is picked.</value>
132+
</data>
133+
<data name="ForcedSubtitleToolTip" xml:space="preserve">
134+
<value>Only display forced subtitles from the given track. Usually this means small bits of foreign dialogue.</value>
135+
</data>
136+
<data name="IncludeChapterMarkersToolTip" xml:space="preserve">
137+
<value>Include chapter markers from the input video in the encoded video.</value>
138+
</data>
139+
<data name="IPod5GSupportToolTip" xml:space="preserve">
140+
<value>Applies a marker to the file that older iPods require before they'll allow H.264 video to sync.</value>
141+
</data>
142+
<data name="LargeFileSizeToolTip" xml:space="preserve">
143+
<value>Allows files over 4GB. When enabled, uses 64-bit numbers in encoding. Some devices such as the iPod and PS3 are incompatible with this option.</value>
144+
</data>
145+
<data name="OffsetSubtitleToolTip" xml:space="preserve">
146+
<value>The amount of time to push forward or delay the appearance of the given subtitles.</value>
147+
</data>
148+
<data name="WebOptimizedToolTip" xml:space="preserve">
149+
<value>Arrange file to play better as a progressive download.</value>
150+
</data>
127151
</root>

‎VidCoder/View/EncodingWindow.xaml‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
xmlns:HandBrakeControls="clr-namespace:VidCoder.Controls"
66
xmlns:model="clr-namespace:HandBrake.Interop;assembly=HandBrakeInterop"
77
xmlns:converters="clr-namespace:VidCoder.Converters"
8+
xmlns:resx="clr-namespace:VidCoder.Properties"
89
Title="{Binding WindowTitle}" Width="671" Height="467" MinWidth="588" MinHeight="467"
910
Style="{StaticResource NormalWindow}" WindowStartupLocation="CenterOwner"
1011
Closing="Window_Closing"
@@ -173,18 +174,26 @@
173174
<RadioButton Height="16" Margin="221.422,56,0,0" Name="radioButton4" VerticalAlignment="Top" HorizontalAlignment="Left" Width="53.578"
174175
IsChecked="{Binding PreferredExtension, Converter={StaticResource EnumBoolConverter}, ConverterParameter=M4v}"
175176
Visibility="{Binding ShowMp4Choices, Converter={StaticResource VisibilityConverter}}">.m4v</RadioButton>
176-
<CheckBox Margin="277.093,41,0,0" Visibility="{Binding ShowMp4Choices, Converter={StaticResource VisibilityConverter}}"
177-
IsChecked="{Binding LargeFile}" HorizontalAlignment="Left" Width="98.907" Height="16" VerticalAlignment="Top">Large file size</CheckBox>
178-
<CheckBox Height="16" Margin="277,59,0,0" VerticalAlignment="Top" Visibility="{Binding ShowMp4Choices, Converter={StaticResource VisibilityConverter}}"
179-
IsChecked="{Binding Optimize}" HorizontalAlignment="Left" Width="111">Web optimized</CheckBox>
177+
<CheckBox
178+
Content="Large file size" ToolTip="{x:Static resx:Resources.LargeFileSizeToolTip}"
179+
Margin="277.093,41,0,0" HorizontalAlignment="Left" Width="98.907" Height="16" VerticalAlignment="Top"
180+
Visibility="{Binding ShowMp4Choices, Converter={StaticResource VisibilityConverter}}"
181+
IsChecked="{Binding LargeFile}" />
182+
<CheckBox
183+
Content="Web optimized" ToolTip="{x:Static resx:Resources.WebOptimizedToolTip}"
184+
Height="16" Margin="277,59,0,0" VerticalAlignment="Top" Visibility="{Binding ShowMp4Choices, Converter={StaticResource VisibilityConverter}}"
185+
IsChecked="{Binding Optimize}" HorizontalAlignment="Left" Width="111" />
180186
<Grid Height="35" HorizontalAlignment="Left" Margin="385.995,41,0,0" VerticalAlignment="Top" Width="150">
181187
<StackPanel Orientation="Vertical" VerticalAlignment="Center">
182-
<CheckBox Height="18" VerticalAlignment="Center"
188+
<CheckBox
189+
Content="iPod 5G support" ToolTip="{x:Static resx:Resources.IPod5GSupportToolTip}"
190+
Height="18" VerticalAlignment="Center"
183191
Visibility="{Binding ShowMp4Choices, Converter={StaticResource VisibilityConverter}}"
184-
IsChecked="{Binding IPod5GSupport}">iPod 5G support</CheckBox>
192+
IsChecked="{Binding IPod5GSupport}" />
185193
<CheckBox
194+
Content="Include chapter markers" ToolTip="{x:Static resx:Resources.IncludeChapterMarkersToolTip}"
186195
VerticalAlignment="Center"
187-
IsChecked="{Binding IncludeChapterMarkers}">Include chapter markers</CheckBox>
196+
IsChecked="{Binding IncludeChapterMarkers}" />
188197
</StackPanel>
189198
</Grid>
190199

@@ -473,8 +482,6 @@
473482
Text="{Binding QualitySliderLeftText}"/>
474483
<TextBlock Height="21" HorizontalAlignment="Right" Margin="0,149,6,0" VerticalAlignment="Top" Width="93" TextAlignment="Right"
475484
Text="{Binding QualitySliderRightText}"/>
476-
<!--<Label Margin="280.2,149,0,0" Name="label14" Height="28.04" VerticalAlignment="Top" HorizontalAlignment="Left" Width="89">High Quality</Label>
477-
<Label HorizontalAlignment="Right" Margin="0,149,6,0" Name="label15" Width="90" Height="28.04" VerticalAlignment="Top" HorizontalContentAlignment="Right">Low Quality</Label>-->
478485
</Grid>
479486
</TabItem>
480487
<TabItem Header="Audio">

‎VidCoder/View/SubtitleDialog.xaml‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
xmlns:HandBrakeControls="clr-namespace:VidCoder.Controls"
55
xmlns:HandBrakeDragDrop="clr-namespace:VidCoder.DragDropUtils"
6+
xmlns:resx="clr-namespace:VidCoder.Properties"
67
Title="Subtitles" Height="352" Width="572" MinWidth="430" MinHeight="250"
78
Style="{StaticResource NormalWindow}" WindowStartupLocation="CenterOwner"
89
DataContextChanged="OnDataContextChanged"
@@ -35,12 +36,14 @@
3536
SelectedIndex="{Binding TrackNumber}" />
3637
</DataTemplate>
3738
<DataTemplate x:Key="ForcedTemplate">
38-
<CheckBox IsChecked="{Binding Forced}" />
39+
<CheckBox IsChecked="{Binding Forced}" ToolTip="{x:Static resx:Resources.ForcedSubtitleToolTip}" />
3940
</DataTemplate>
4041
<DataTemplate x:Key="BurnedInTemplate">
4142
<CheckBox
4243
IsChecked="{Binding BurnedIn}"
43-
IsEnabled="{Binding BurnedInEnabled}"/>
44+
IsEnabled="{Binding BurnedInEnabled}"
45+
ToolTip="{x:Static resx:Resources.BurnedSubtitleToolTip}"
46+
ToolTipService.ShowOnDisabled="True"/>
4447
</DataTemplate>
4548
<DataTemplate x:Key="SrtDragTemplate">
4649
<TextBox Text="{Binding FileName, Mode=OneWay}" />
@@ -51,7 +54,9 @@
5154
<DataTemplate x:Key="DefaultTemplate">
5255
<CheckBox
5356
IsChecked="{Binding Default}"
54-
IsEnabled="{Binding SubtitleDialogViewModel.DefaultsEnabled}"/>
57+
IsEnabled="{Binding SubtitleDialogViewModel.DefaultsEnabled}"
58+
ToolTip="{x:Static resx:Resources.DefaultSubtitleToolTip}"
59+
ToolTipService.ShowOnDisabled="True"/>
5560
</DataTemplate>
5661
<DataTemplate x:Key="LanguageTemplate">
5762
<ComboBox
@@ -65,8 +70,10 @@
6570
Style="{StaticResource SubtitleControl}" />
6671
</DataTemplate>
6772
<DataTemplate x:Key="OffsetTemplate">
68-
<HandBrakeControls:NumberBox Width="40" Height="22"
69-
Number="{Binding Offset, Mode=TwoWay}" AllowNegative="True" AllowEmpty="False" />
73+
<HandBrakeControls:NumberBox
74+
Width="40" Height="22"
75+
Number="{Binding Offset, Mode=TwoWay}" AllowNegative="True" AllowEmpty="False"
76+
ToolTip="{x:Static resx:Resources.OffsetSubtitleToolTip}"/>
7077
</DataTemplate>
7178
<DataTemplate x:Key="RemoveTemplate">
7279
<Button Command="{Binding RemoveSubtitle}" VerticalAlignment="Center" Style="{StaticResource RemoveButtonStyle}">Remove subtitle track</Button>
@@ -94,7 +101,7 @@
94101
<GridView.Columns>
95102
<GridViewColumn Header="Track" CellTemplate="{StaticResource TrackTemplate}" x:Name="sourceTrackColumn" />
96103
<GridViewColumn Header="Default" CellTemplate="{StaticResource DefaultTemplate}" />
97-
<GridViewColumn Header="Forced" CellTemplate="{StaticResource ForcedTemplate}" />
104+
<GridViewColumn Header="Forced Only" CellTemplate="{StaticResource ForcedTemplate}" />
98105
<GridViewColumn Header="Burned In" CellTemplate="{StaticResource BurnedInTemplate}" />
99106
<GridViewColumn CellTemplate="{StaticResource RemoveTemplate}" />
100107
</GridView.Columns>

‎VidCoder/ViewModel/MainViewModel.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ public class MainViewModel : ViewModelBase
7676
private ICommand addTrackCommand;
7777
private ICommand openEncodingWindowCommand;
7878
private ICommand openPreviewWindowCommand;
79-
private ICommand deletePresetCommand;
8079
private ICommand pickOutputFolderCommand;
8180
private ICommand pickOutputPathCommand;
8281
private ICommand encodeCommand;

0 commit comments

Comments
 (0)