WinGui: Some cosmetic tweaks to the preferences window to fix some alignment issues.

1 files changed, 18 insertions, 8 deletions

diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
index 0b966ba84..66ef36318 100644
--- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
@@ -19,10 +19,13 @@
         <Style TargetType="TextBox">

             <Setter Property="Padding" Value="5,2" />

             <Setter Property="MinHeight" Value="22" />

+            <Setter Property="VerticalContentAlignment" Value="Center" />

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

         </Style>

 

         <Style TargetType="CheckBox">

-            <Setter Property="Margin" Value="0,0,0,5" />

+            <Setter Property="Margin" Value="0,2,0,2" />

+            <Setter Property="VerticalAlignment" Value="Center" />

         </Style>

 

         <Style TargetType="ListBoxItem">

@@ -112,8 +115,13 @@
                             </StackPanel>

 

                             <StackPanel Orientation="Horizontal" Margin="0,5,0,0">

-                                <CheckBox Content="{x:Static Properties:ResourcesUI.Options_SendFileTo}" VerticalAlignment="Center" IsChecked="{Binding SendFileAfterEncode}" />

-                                <TextBlock Margin="5,0,5,5" VerticalAlignment="Center" Text="{Binding SendFileTo}" />

+                                <CheckBox VerticalAlignment="Center" VerticalContentAlignment="Center" IsChecked="{Binding SendFileAfterEncode}" Margin="0,1,0,0">

+                                    <StackPanel Orientation="Horizontal">

+                                        <TextBlock Text="{x:Static Properties:ResourcesUI.Options_SendFileTo}" VerticalAlignment="Center" />

+                                        <TextBlock Text="{Binding SendFileTo}" VerticalAlignment="Center" Margin="5,0,5,0"  />

+                                    </StackPanel>

+                                </CheckBox>

+       

                                 <Button Content="Browse" cal:Message.Attach="[Event Click] = [Action BrowseSendFileTo]" />

                             </StackPanel>

 

@@ -136,7 +144,7 @@
                                 <TextBox Name="vlcPath" Text="{Binding VLCPath}"  Width="250" />

                                 <Button Content="Browse" cal:Message.Attach="[Event Click] = [Action BrowseVlcPath]" Margin="5,0,0,0" />

                             </StackPanel>

-                            <TextBlock Margin="30,0,0,0" Text="{x:Static Properties:ResourcesUI.Options_VideoPreviewPath}" />

+                            <TextBlock Margin="35,0,0,0" Text="{x:Static Properties:ResourcesUI.Options_VideoPreviewPath}" />

 

                         </StackPanel>

                     </StackPanel>

@@ -170,6 +178,8 @@
                             <Grid Margin="0,5,0,0">

                                 <Grid.RowDefinitions>

                                     <RowDefinition Height="Auto"/>

+                                    <RowDefinition Height="5"/>

+

                                     <RowDefinition Height="Auto"/>

                                 </Grid.RowDefinitions>

                                 <Grid.ColumnDefinitions>

@@ -180,13 +190,13 @@
 

                                 <TextBlock VerticalAlignment="Center" Text="{x:Static Properties:ResourcesUI.Options_DefaultPath}" Grid.Column="0" Grid.Row="0" />

                                 <TextBox Name="autoNameOutputPath" Text="{Binding AutoNameDefaultPath}" Width="380" Grid.Column="1" Grid.Row="0" 

-                                         ToolTip="{x:Static Properties:Resources.Options_DefaultPathAdditionalParams}" Style="{StaticResource LongToolTipHolder}"  />

+                                         ToolTip="{x:Static Properties:Resources.Options_DefaultPathAdditionalParams}" />

                                 <Button Content="Browse" Margin="5,0,0,0" Grid.Column="2" Grid.Row="0" 

                                         cal:Message.Attach="[Event Click] = [Action BrowseAutoNamePath]" />

 

-                                <TextBlock VerticalAlignment="Center" Text="{x:Static Properties:ResourcesUI.Options_Format}"  Grid.Column="0" Grid.Row="1" Margin="0,5,0,0" />

-                                <TextBox Name="autoNameFormat" Text="{Binding AutonameFormat, UpdateSourceTrigger=PropertyChanged}" Width="380"  Grid.Column="1" Grid.Row="1"  Margin="0,5,0,0"

-                                         ToolTip="{x:Static Properties:Resources.Options_AdditionalFormatOptions}"  Style="{StaticResource LongToolTipHolder}" />

+                                <TextBlock VerticalAlignment="Center" Text="{x:Static Properties:ResourcesUI.Options_Format}"  Grid.Column="0" Grid.Row="2" Margin="0,5,0,0" />

+                                <TextBox Name="autoNameFormat" Text="{Binding AutonameFormat, UpdateSourceTrigger=PropertyChanged}" Width="380"  Grid.Column="1" Grid.Row="2"  Margin="0,0,0,0"

+                                         ToolTip="{x:Static Properties:Resources.Options_AdditionalFormatOptions}"  />

                             </Grid>

 

                             <StackPanel Orientation="Vertical" Margin="0,15,0,0">