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

diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
index 0b966ba848a6b018507740bedded7f08c973c2be..66ef363182ad46f56ee5454c149a0bd9bb1dc404 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
@@ -19,10 +19,13 @@
         <Style TargetType="TextBox">\r
             <Setter Property="Padding" Value="5,2" />\r
             <Setter Property="MinHeight" Value="22" />\r
+            <Setter Property="VerticalContentAlignment" Value="Center" />\r
+            <Setter Property="ToolTipService.ShowDuration" Value="20000" />\r
         </Style>\r
 \r
         <Style TargetType="CheckBox">\r
-            <Setter Property="Margin" Value="0,0,0,5" />\r
+            <Setter Property="Margin" Value="0,2,0,2" />\r
+            <Setter Property="VerticalAlignment" Value="Center" />\r
         </Style>\r
 \r
         <Style TargetType="ListBoxItem">\r
@@ -112,8 +115,13 @@
                             </StackPanel>\r
 \r
                             <StackPanel Orientation="Horizontal" Margin="0,5,0,0">\r
-                                <CheckBox Content="{x:Static Properties:ResourcesUI.Options_SendFileTo}" VerticalAlignment="Center" IsChecked="{Binding SendFileAfterEncode}" />\r
-                                <TextBlock Margin="5,0,5,5" VerticalAlignment="Center" Text="{Binding SendFileTo}" />\r
+                                <CheckBox VerticalAlignment="Center" VerticalContentAlignment="Center" IsChecked="{Binding SendFileAfterEncode}" Margin="0,1,0,0">\r
+                                    <StackPanel Orientation="Horizontal">\r
+                                        <TextBlock Text="{x:Static Properties:ResourcesUI.Options_SendFileTo}" VerticalAlignment="Center" />\r
+                                        <TextBlock Text="{Binding SendFileTo}" VerticalAlignment="Center" Margin="5,0,5,0"  />\r
+                                    </StackPanel>\r
+                                </CheckBox>\r
+       \r
                                 <Button Content="Browse" cal:Message.Attach="[Event Click] = [Action BrowseSendFileTo]" />\r
                             </StackPanel>\r
 \r
@@ -136,7 +144,7 @@
                                 <TextBox Name="vlcPath" Text="{Binding VLCPath}"  Width="250" />\r
                                 <Button Content="Browse" cal:Message.Attach="[Event Click] = [Action BrowseVlcPath]" Margin="5,0,0,0" />\r
                             </StackPanel>\r
-                            <TextBlock Margin="30,0,0,0" Text="{x:Static Properties:ResourcesUI.Options_VideoPreviewPath}" />\r
+                            <TextBlock Margin="35,0,0,0" Text="{x:Static Properties:ResourcesUI.Options_VideoPreviewPath}" />\r
 \r
                         </StackPanel>\r
                     </StackPanel>\r
@@ -170,6 +178,8 @@
                             <Grid Margin="0,5,0,0">\r
                                 <Grid.RowDefinitions>\r
                                     <RowDefinition Height="Auto"/>\r
+                                    <RowDefinition Height="5"/>\r
+\r
                                     <RowDefinition Height="Auto"/>\r
                                 </Grid.RowDefinitions>\r
                                 <Grid.ColumnDefinitions>\r
@@ -180,13 +190,13 @@
 \r
                                 <TextBlock VerticalAlignment="Center" Text="{x:Static Properties:ResourcesUI.Options_DefaultPath}" Grid.Column="0" Grid.Row="0" />\r
                                 <TextBox Name="autoNameOutputPath" Text="{Binding AutoNameDefaultPath}" Width="380" Grid.Column="1" Grid.Row="0" \r
-                                         ToolTip="{x:Static Properties:Resources.Options_DefaultPathAdditionalParams}" Style="{StaticResource LongToolTipHolder}"  />\r
+                                         ToolTip="{x:Static Properties:Resources.Options_DefaultPathAdditionalParams}" />\r
                                 <Button Content="Browse" Margin="5,0,0,0" Grid.Column="2" Grid.Row="0" \r
                                         cal:Message.Attach="[Event Click] = [Action BrowseAutoNamePath]" />\r
 \r
-                                <TextBlock VerticalAlignment="Center" Text="{x:Static Properties:ResourcesUI.Options_Format}"  Grid.Column="0" Grid.Row="1" Margin="0,5,0,0" />\r
-                                <TextBox Name="autoNameFormat" Text="{Binding AutonameFormat, UpdateSourceTrigger=PropertyChanged}" Width="380"  Grid.Column="1" Grid.Row="1"  Margin="0,5,0,0"\r
-                                         ToolTip="{x:Static Properties:Resources.Options_AdditionalFormatOptions}"  Style="{StaticResource LongToolTipHolder}" />\r
+                                <TextBlock VerticalAlignment="Center" Text="{x:Static Properties:ResourcesUI.Options_Format}"  Grid.Column="0" Grid.Row="2" Margin="0,5,0,0" />\r
+                                <TextBox Name="autoNameFormat" Text="{Binding AutonameFormat, UpdateSourceTrigger=PropertyChanged}" Width="380"  Grid.Column="1" Grid.Row="2"  Margin="0,0,0,0"\r
+                                         ToolTip="{x:Static Properties:Resources.Options_AdditionalFormatOptions}"  />\r
                             </Grid>\r
 \r
                             <StackPanel Orientation="Vertical" Margin="0,15,0,0">\r