WinGui: Improvements in the options screen layout

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

diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
index bb41c30ccb5886fc6173c7f3b37800137ac91baf..0bbde63c32c1939b766a1cb665afebd09dca7f1c 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
@@ -168,19 +168,13 @@
                             Visibility="{Binding SelectedTab, Converter={StaticResource tabConverter}, ConverterParameter='Language'}">\r
 \r
                     <Border BorderThickness="0 0 0 1" BorderBrush="LightGray">\r
-                        <TextBlock Text="Automatic Language Selection" FontSize="16" />\r
+                        <TextBlock Text="Audio and Subtitle Language Handling" FontSize="16" />\r
                     </Border>\r
 \r
-                    <TextBlock Text="Audio and Subtitle Language Selection" Grid.Column="0" Margin="10,10,0,0" FontSize="14"/>\r
+                    <TextBlock Text="Select your preferred language" Grid.Column="0" Margin="10,10,0,0" FontSize="14"/>\r
 \r
                     <Grid Margin="20,10,0,0" >\r
-                        <Grid.ColumnDefinitions>\r
-                            <ColumnDefinition Width="140" />\r
-                            <ColumnDefinition Width="*" />\r
-                        </Grid.ColumnDefinitions>\r
-\r
-                        <TextBlock Text="Preferred Language:" Grid.Column="0"/>\r
-                        <StackPanel Orientation="Horizontal" Grid.Column="1">\r
+                        <StackPanel Orientation="Horizontal">\r
                             <TextBlock VerticalAlignment="Center"  Text="Audio: " FontSize="10" />\r
                             <ComboBox Name="primaryAudioLanguage" VerticalAlignment="Center"  ItemsSource="{Binding PreferredLanguages}" SelectedItem="{Binding SelectedPreferredLangauge}" Width="120" />\r
                             <TextBlock VerticalAlignment="Center"  Text="Subtitles: " FontSize="10" Margin="10,0,0,0" />\r
@@ -188,14 +182,14 @@
                         </StackPanel>\r
                     </Grid>\r
 \r
+                    <TextBlock Text="Select languages for automatic inclusion" Grid.Column="0" Margin="10,20,0,0" FontSize="14"/>\r
+\r
                     <Grid Margin="20,10,0,0">\r
                         <Grid.ColumnDefinitions>\r
-                            <ColumnDefinition Width="100" />\r
                             <ColumnDefinition Width="*" />\r
                         </Grid.ColumnDefinitions>\r
 \r
-                        <TextBlock Text="Additional Tracks:" Grid.Column="0"/>\r
-                        <StackPanel Orientation="Horizontal" Grid.Column="1">\r
+                        <StackPanel Orientation="Horizontal">\r
                             <Grid Margin="10,0,0,0">\r
                                 <Grid.ColumnDefinitions>\r
                                     <ColumnDefinition Width="*" />\r
@@ -233,8 +227,8 @@
                         </StackPanel>\r
                     </Grid>\r
 \r
-                    <GroupBox Header="Add Additional Tracks" Margin="20,0,10,0" >\r
-                        <StackPanel Orientation="Vertical">\r
+                    <GroupBox Header="What to do (Automatically Add Tracks)" Margin="20,5,10,0" >\r
+                        <StackPanel Orientation="Vertical" Margin="0,5,0,5">\r
                             <StackPanel Orientation="Horizontal">\r
                                 <TextBlock Text="Audio:" VerticalAlignment="Center" Margin="15,0,5,0" Width="100" />\r
                                 <ComboBox Name="autoAudioMode" ItemsSource="{Binding AddAudioModeOptions}" SelectedIndex="{Binding SelectedAddAudioMode}" Width="120" Margin="0,0,5,0" />\r
@@ -250,7 +244,7 @@
                         </StackPanel>\r
                     </GroupBox>\r
 \r
-                    <StackPanel Orientation="Vertical">\r
+                    <StackPanel Orientation="Vertical" Margin="0,10,0,0">\r
                         <Label Content="Audio Tab Options" FontSize="14"/>\r
                         <CheckBox IsChecked="{Binding ShowAdvancedPassthruOpts}" Content="Show advanced audio passthru options. (Requires Restart)"\r
                                   Margin="20,0,0,0" />\r