WinGui: Change the checkbox text direction to be consistent with the rest of the UI. #1174

1 files changed, 6 insertions, 15 deletions

diff --git a/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml b/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
index 3e108851e..3898682a5 100644
--- a/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
+++ b/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
@@ -160,9 +160,6 @@
                                 <ColumnDefinition Width="Auto" />

                                 <ColumnDefinition Width="Auto" />

                                 <ColumnDefinition Width="Auto" />

-                                <ColumnDefinition Width="Auto" />

-                                <ColumnDefinition Width="Auto" />

-                                <ColumnDefinition Width="Auto" />

                             </Grid.ColumnDefinitions>

 

                             <Grid.RowDefinitions>

@@ -173,11 +170,10 @@
                                       ItemsSource="{Binding DataContext.SourceTracks, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}"

                                       SelectedItem="{Binding SourceTrack}" />

 

-                            <TextBlock Grid.Column="2" VerticalAlignment="Center" FontWeight="Bold" Text="Forced Only" Margin="5,0,0,0" />

-                            <CheckBox Grid.Column="3" Margin="5,0,5,0" VerticalAlignment="Center" IsEnabled="{Binding CanBeForced}" IsChecked="{Binding Forced}" />

+                            <CheckBox Grid.Column="3" Margin="5,0,5,0" VerticalAlignment="Center" IsEnabled="{Binding CanBeForced}" IsChecked="{Binding Forced}" 

+                                      Content="Forced Only" FontWeight="Bold" />

                             

-                            <TextBlock Grid.Column="4" VerticalAlignment="Center" FontWeight="Bold" Text="Burn In" />

-                            <CheckBox Grid.Column="5" Margin="5,0,5,0" VerticalAlignment="Center" IsChecked="{Binding Burned}" x:Name="burnInCheckbox">

+                            <CheckBox Grid.Column="4" Margin="5,0,5,0" VerticalAlignment="Center" IsChecked="{Binding Burned}" x:Name="burnInCheckbox" Content="Burn In" FontWeight="Bold">

                                 <CheckBox.IsEnabled>

                                     <MultiBinding Converter="{StaticResource canBurnSubtitleConverter}">

                                         <Binding Path="CanBeBurned" />

@@ -194,8 +190,7 @@
                                 </i:Interaction.Triggers>

                             </CheckBox>

                             

-                            <TextBlock Grid.Column="6" VerticalAlignment="Center" FontWeight="Bold" Text="Default" />

-                            <CheckBox Grid.Column="7" Margin="5,0,5,0" VerticalAlignment="Center" IsChecked="{Binding Default}">

+                            <CheckBox Grid.Column="5" Margin="5,0,5,0" VerticalAlignment="Center" IsChecked="{Binding Default}" Content="Default" FontWeight="Bold">

                                 <i:Interaction.Triggers>

                                     <i:EventTrigger EventName="Click">

                                         <cal:ActionMessage MethodName="SelectDefaultTrack">

@@ -221,8 +216,6 @@
                                 <ColumnDefinition Width="Auto" />

                                 <ColumnDefinition Width="Auto" />

                                 <ColumnDefinition Width="Auto" />

-                                <ColumnDefinition Width="Auto" />

-                                <ColumnDefinition Width="Auto" />

                             </Grid.ColumnDefinitions>

 

                             <Grid.RowDefinitions>

@@ -248,8 +241,7 @@
                             <controls:NumberBox Grid.Column="7" Width="58" Height="24" Margin="5,0,5,0" Minimum="-9000000" Maximum="900000" 

                                                 IsEnabled="{Binding IsSrtSubtitle}" Number="{Binding SrtOffset, Mode=TwoWay}" />

              

-                            <TextBlock Grid.Column="8" VerticalAlignment="Center" FontWeight="Bold" Text="Burn In" />

-                            <CheckBox Grid.Column="9" Margin="5,0,5,0" VerticalAlignment="Center" IsChecked="{Binding Burned}" IsEnabled="{Binding CanBeBurned}">

+                            <CheckBox Grid.Column="8" Margin="5,0,5,0" VerticalAlignment="Center" IsChecked="{Binding Burned}" IsEnabled="{Binding CanBeBurned}" Content="Burn In" FontWeight="Bold">

                                 <i:Interaction.Triggers>

                                     <i:EventTrigger EventName="Click">

                                         <cal:ActionMessage MethodName="SetBurnedToFalseForAllExcept">

@@ -259,8 +251,7 @@
                                 </i:Interaction.Triggers>

                             </CheckBox>

 

-                            <TextBlock Grid.Column="10" VerticalAlignment="Center" FontWeight="Bold" Text="Default" />

-                            <CheckBox Grid.Column="11" Margin="5,0,5,0" VerticalAlignment="Center" IsChecked="{Binding Default}">

+                            <CheckBox Grid.Column="9" Margin="5,0,5,0" VerticalAlignment="Center" IsChecked="{Binding Default}" Content="Default" FontWeight="Bold">

                                 <i:Interaction.Triggers>

                                     <i:EventTrigger EventName="Click">

                                         <cal:ActionMessage MethodName="SelectDefaultTrack">