WinGui: Further UI consistency tweaks to the main window. Made the layout a bit...

diff --git a/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs b/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs
index c95cb7446a89320ab665d9a9c0a8fbd3dd327226..089502218bf47adfec799f3f436785b40bd8efe4 100644 (file)
--- a/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs
@@ -1015,7 +1015,7 @@ namespace HandBrakeWPF.Properties {
         }\r
         \r
         /// <summary>\r
-        ///   Looks up a localized string similar to Source.\r
+        ///   Looks up a localized string similar to Source:.\r
         /// </summary>\r
         public static string MainView_Source {\r
             get {\r

diff --git a/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx b/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx
index 4dee81b03f98ba61fb0cc7970d10d3bf7956fb0b..0b8c69afa880f8ccff49826a3b207bd0f77eca70 100644 (file)
--- a/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx
+++ b/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx
@@ -187,7 +187,7 @@
     <value>Show Queue</value>\r
   </data>\r
   <data name="MainView_Source" xml:space="preserve">\r
-    <value>Source</value>\r
+    <value>Source:</value>\r
   </data>\r
   <data name="MainView_StartEncode" xml:space="preserve">\r
     <value>Start Encode</value>\r

diff --git a/win/CS/HandBrakeWPF/Views/AudioView.xaml b/win/CS/HandBrakeWPF/Views/AudioView.xaml
index 33d5344ac75cc6741448b86af2666389189c0475..36a9bfa450dbea79830b0cdb46b6e91eeb8b8419 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/AudioView.xaml
+++ b/win/CS/HandBrakeWPF/Views/AudioView.xaml
@@ -145,10 +145,10 @@
 \r
                         <!--  Marker  -->\r
                         <Image Grid.Column="0" Grid.Row="0"\r
-                               Width="16"\r
-                               Height="16"\r
+                               Width="20"\r
+                               Height="20"\r
                                Margin="5,0,5,0"\r
-                               Source="Images/Movies.png" />\r
+                               Source="Images/Movies_small.png" />\r
 \r
                         <!--  Settings  -->\r
                         <Grid Grid.Column="1" Grid.Row="0" HorizontalAlignment="Stretch" Margin="0,5,0,5">\r

diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml
index e34aa2a2f340d3f186911fc95246129e0273b28f..ce937cdcdc8a686589df8e59dc58505e523e9fa8 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml
@@ -299,15 +299,15 @@
                     </Grid.ColumnDefinitions>\r
 \r
                     <Label Content="{x:Static Properties:ResourcesUI.MainView_Source}" FontWeight="Bold" Grid.Column="0" />\r
-                    <TextBlock Text="{Binding Path=SourceLabel}" ToolTip="{Binding Path=SourceLabel}" TextTrimming="CharacterEllipsis" MaxWidth="595" Grid.Column="1" />\r
-                    <TextBlock Text="{Binding SourceInfo}" HorizontalAlignment="Right" VerticalAlignment="Center" Foreground="DimGray" Grid.Column="2" Margin="15,0,0,0" MaxWidth="360" />\r
+                    <TextBlock Text="{Binding Path=SourceLabel}" ToolTip="{Binding Path=SourceLabel}" TextTrimming="CharacterEllipsis" MaxWidth="595" Grid.Column="1" Margin="7,0,0,0" />\r
+                    <TextBlock Text="{Binding SourceInfo}" HorizontalAlignment="Right" VerticalAlignment="Center" Foreground="DimGray" Grid.Column="2" Margin="10,0,0,0" MaxWidth="360" />\r
                 </Grid>\r
 \r
-                <StackPanel Orientation="Horizontal" Grid.Row="1">\r
-                    <Label Margin="8,0,0,0" FontWeight="Bold" Content="{x:Static Properties:ResourcesUI.MainView_Title}" />\r
+                <StackPanel Orientation="Horizontal" Grid.Row="1" Margin="0,5,0,0">\r
+                    <Label FontWeight="Bold" Content="{x:Static Properties:ResourcesUI.MainView_Title}" />\r
                     <ComboBox Name="Titles"\r
                                   MinWidth="100"\r
-                                  Margin="8,0,0,0"\r
+                                  Margin="17,0,0,0"\r
                                   ItemsSource="{Binding ScannedSource.Titles}"\r
                                   ToolTip="{x:Static Properties:ResourcesTooltips.MainView_Title}"\r
                                   SelectedItem="{Binding Path=SelectedTitle}" />\r
@@ -366,11 +366,11 @@
             </Grid>\r
 \r
             <!--  Presets Options  -->\r
-            <StackPanel Grid.Row="1" Orientation="Vertical"  Margin="10,5,10,5" IsEnabled="{Binding HasSource, Converter={StaticResource booleanConverter}, ConverterParameter=false}">\r
-                <Label Content="Presets" FontWeight="Bold" VerticalAlignment="Center" />\r
-                <StackPanel Orientation="Horizontal" Margin="8,0,0,0" Visibility="{Binding IsPresetPanelShowing, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}">\r
+            <StackPanel Grid.Row="1" Orientation="Horizontal"  Margin="10,10,10,5" IsEnabled="{Binding HasSource, Converter={StaticResource booleanConverter}, ConverterParameter=false}">\r
+                <Label Content="Presets:" FontWeight="Bold" VerticalAlignment="Center" />\r
+                <StackPanel Orientation="Horizontal" Margin="5,0,0,0" Visibility="{Binding IsPresetPanelShowing, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}">\r
 \r
-                    <Button x:Name="SelectPresetsButton"  Margin="15,0,0,0" VerticalAlignment="Center" Click="SelectPreset_OnClick" Width="255">\r
+                    <Button x:Name="SelectPresetsButton"  VerticalAlignment="Center" Click="SelectPreset_OnClick" Width="255">\r
                         <Button.Content>\r
                             <Grid VerticalAlignment="Stretch" Width="235">\r
                                 <Grid.ColumnDefinitions>\r
@@ -401,7 +401,7 @@
                     <Button Content="{x:Static Properties:ResourcesUI.MainView_Reload}" cal:Message.Attach="[Event Click] = [Action PresetSelect]"  Margin="15,0,0,0" VerticalAlignment="Center" />\r
                     <Button Content="{x:Static Properties:ResourcesUI.MainView_SaveNewPreset}" cal:Message.Attach="[Event Click] = [Action PresetAdd]"  Margin="5,0,0,0" VerticalAlignment="Center" />\r
                     \r
-                    <Button x:Name="MorePresetOptionsButton"  Margin="15,0,0,0" VerticalAlignment="Center" Click="MorePresetOptionsButton_OnClick">\r
+                    <Button x:Name="MorePresetOptionsButton"  Margin="15,0,0,0" VerticalAlignment="Center" Click="MorePresetOptionsButton_OnClick" Visibility="Collapsed">\r
                         <Button.Content>\r
                             <StackPanel Orientation="Horizontal">\r
                                 <TextBlock Margin="0,0,5,0" Padding="0"\r
@@ -489,21 +489,18 @@
                         Margin="10,5,10,15"\r
                         HorizontalAlignment="Stretch"\r
                         VerticalAlignment="Stretch">\r
-                <Label Content="{x:Static Properties:ResourcesUI.MainView_Destination}" FontWeight="Bold" />\r
                 <Grid>\r
                     <Grid.ColumnDefinitions>\r
-                        <ColumnDefinition Width="58" />\r
-                        <ColumnDefinition Width="24"/>\r
-                        <ColumnDefinition Width="17*" />\r
-                        <ColumnDefinition Width="972*"/>\r
+                        <ColumnDefinition Width="Auto" />\r
+                        <ColumnDefinition Width="*"/>\r
                         <ColumnDefinition Width="Auto" />\r
                     </Grid.ColumnDefinitions>\r
-                    <Label Margin="8,0,0,0" Content="{x:Static Properties:ResourcesUI.MainView_File}" Grid.ColumnSpan="2" />\r
+                    <Label Margin="0,0,0,0" Content="{x:Static Properties:ResourcesUI.MainView_File}" FontWeight="Bold" />\r
                     <TextBox Name="Destination"\r
-                             Grid.Column="2"\r
-                             Margin="8,0,0,0" ToolTip="{x:Static Properties:ResourcesTooltips.MainView_Destination}"\r
+                             Grid.Column="1"\r
+                             Margin="5,0,0,0" ToolTip="{x:Static Properties:ResourcesTooltips.MainView_Destination}"\r
                              Text="{Binding Destination,\r
-                                            UpdateSourceTrigger=PropertyChanged}" Grid.ColumnSpan="2">\r
+                                            UpdateSourceTrigger=PropertyChanged}">\r
                         <TextBox.ContextMenu>\r
                             <ContextMenu>\r
                                 <MenuItem Header="Open this Directory" cal:Message.Attach="[Event Click] = [Action OpenDestinationDirectory]" />\r
@@ -511,9 +508,9 @@
                         </TextBox.ContextMenu>\r
                     </TextBox>\r
                     <Button Name="DestinationBrowser"\r
-                            Grid.Column="4"\r
-                            Margin="8,2,0,1" FontWeight="Bold"\r
-                            Content="Browse"\r
+                            Grid.Column="2"\r
+                            Margin="10,0,0,0" FontWeight="Bold"\r
+                            Content="Browse" \r
                             ToolTip="{x:Static Properties:ResourcesTooltips.MainView_Browse}"\r
                             cal:Message.Attach="[Event Click] = [Action BrowseDestination]"\r
                     />\r

diff --git a/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml b/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
index a945b6fccaefe39332fb210262e14e8f8414b03d..2268d5aaa9a4d478250af05ecf4798529774da52 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
+++ b/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
@@ -141,10 +141,10 @@
 \r
                         <!--  Marker  -->\r
                         <Image Grid.Column="0"\r
-                               Width="16"\r
-                               Height="16"\r
-                               Margin="10,0,10,0"\r
-                               Source="Images/Movies.png" />\r
+                               Width="20"\r
+                               Height="20"\r
+                               Margin="5,0,5,0"\r
+                               Source="Images/Movies_small.png" />\r
 \r
                         <!--  Standard Subtitle Settings  -->\r
                         <Grid Grid.Column="1" HorizontalAlignment="Stretch" Margin="0,8,0,8"\r