WinGui: Enable Burn In for SRT files

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

diff --git a/win/CS/HandBrake.ApplicationServices/Model/Encoding/SubtitleTrack.cs b/win/CS/HandBrake.ApplicationServices/Model/Encoding/SubtitleTrack.cs
index 512aa9b4465d80ac03396a9a35e964a66115a097..54861d75c807d7a7dff99400b4305104c5244af0 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Model/Encoding/SubtitleTrack.cs
+++ b/win/CS/HandBrake.ApplicationServices/Model/Encoding/SubtitleTrack.cs
@@ -249,7 +249,12 @@ namespace HandBrake.ApplicationServices.Model.Encoding
             {    \r
                 if (this.SourceTrack != null)\r
                 {\r
-                    return this.SourceTrack.CanBurnIn || this.SourceTrack.SubtitleType == SubtitleType.ForeignAudioSearch;\r
+                    return this.SourceTrack.CanBurnIn || this.SourceTrack.SubtitleType == SubtitleType.ForeignAudioSearch || this.SubtitleType == SubtitleType.SRT;\r
+                }\r
+\r
+                if (this.SubtitleType == SubtitleType.SRT)\r
+                {\r
+                    return true;\r
                 }\r
 \r
                 return false;\r

diff --git a/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml b/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
index 48a4110265aa64b75e6df2d3ec6ca195c203135c..043fcc480bdb85a8357a14233b4dceeff984e7f2 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
+++ b/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
@@ -8,7 +8,6 @@
              xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"\r
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"\r
              xmlns:controls="clr-namespace:HandBrakeWPF.Controls"\r
-             xmlns:dropButton="clr-namespace:HandBrakeWPF.Controls.DropButton"\r
              xmlns:splitButton="clr-namespace:HandBrakeWPF.Controls.SplitButton"\r
              xmlns:helpers="clr-namespace:HandBrakeWPF.Helpers"\r
              xmlns:subtitles="clr-namespace:HandBrakeWPF.Converters.Subtitles"\r
@@ -211,21 +210,21 @@
 \r
                             <!--  Row 1  -->\r
                             <TextBlock Grid.Column="0" VerticalAlignment="Center" FontWeight="Bold" Text="Source" />\r
-                            <TextBlock Grid.Column="1" VerticalAlignment="Center" Text="{Binding SrtFileName}" Margin="5,0,5,0" Width="80" TextWrapping="NoWrap" TextTrimming="WordEllipsis"\r
+                            <TextBlock Grid.Column="1" VerticalAlignment="Center" Text="{Binding SrtFileName}" Margin="5,0,5,0" Width="75" TextWrapping="NoWrap" TextTrimming="WordEllipsis"\r
                                        Visibility="{Binding IsSrtSubtitle, Converter={StaticResource booleanToVisConverter}, ConverterParameter=false}" />\r
 \r
                             <TextBlock  Grid.Column="2" VerticalAlignment="Center" FontWeight="Bold" Text="Lang" />\r
-                            <ComboBox  Grid.Column="3" Height="22" Width="100" Margin="5,0,5,0" HorizontalAlignment="Stretch" IsEnabled="{Binding IsSrtSubtitle}"\r
+                            <ComboBox  Grid.Column="3" Height="22" Width="85" Margin="5,0,5,0" HorizontalAlignment="Stretch" IsEnabled="{Binding IsSrtSubtitle}"\r
                                       ItemsSource="{Binding DataContext.Langauges, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}"\r
                                       SelectedItem="{Binding SrtLang}" />\r
                             \r
                             <TextBlock  Grid.Column="4" VerticalAlignment="Center" FontWeight="Bold" Text="Char Code" />\r
-                            <ComboBox Grid.Column="5" Width="75" Height="22" Margin="5,0,5,0" IsEnabled="{Binding IsSrtSubtitle}"\r
+                            <ComboBox Grid.Column="5" Width="70" Height="22" Margin="5,0,5,0" IsEnabled="{Binding IsSrtSubtitle}"\r
                                       ItemsSource="{Binding DataContext.CharacterCodes, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}"\r
                                       SelectedItem="{Binding SrtCharCode}" />\r
                             \r
                             <TextBlock Grid.Column="6" VerticalAlignment="Center" FontWeight="Bold" Text="Offset (ms)" />\r
-                            <controls:NumberBox Grid.Column="7" Width="65" Height="24" Margin="5,0,5,0" Minimum="-900000" Maximum="900000" \r
+                            <controls:NumberBox Grid.Column="7" Width="58" Height="24" Margin="5,0,5,0" Minimum="-9000000" Maximum="900000" \r
                                                 IsEnabled="{Binding IsSrtSubtitle}" Number="{Binding SrtOffset, Mode=TwoWay}" />\r
 \r
                             <TextBlock Grid.Column="8" VerticalAlignment="Center" FontWeight="Bold" Text="Default" />\r
@@ -256,7 +255,7 @@
                         <Image Grid.Column="2"\r
                                Width="16"\r
                                Height="16"\r
-                               Margin="10,0,10,0"\r
+                               Margin="5,0,10,0"\r
                                Source="Images/delete.png">\r
                             <i:Interaction.Triggers>\r
                                 <i:EventTrigger EventName="MouseDown">\r