WinGui: Further UI consistency tweaks to the main window. Made the layout a bit more compact. #833

5 files changed, 28 insertions, 31 deletions

diff --git a/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs b/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs
index c95cb7446..089502218 100644
--- a/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs
@@ -1015,7 +1015,7 @@ namespace HandBrakeWPF.Properties {
         }

         

         /// <summary>

-        ///   Looks up a localized string similar to Source.

+        ///   Looks up a localized string similar to Source:.

         /// </summary>

         public static string MainView_Source {

             get {

diff --git a/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx b/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx
index 4dee81b03..0b8c69afa 100644
--- a/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx
+++ b/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx
@@ -187,7 +187,7 @@
     <value>Show Queue</value>

   </data>

   <data name="MainView_Source" xml:space="preserve">

-    <value>Source</value>

+    <value>Source:</value>

   </data>

   <data name="MainView_StartEncode" xml:space="preserve">

     <value>Start Encode</value>

diff --git a/win/CS/HandBrakeWPF/Views/AudioView.xaml b/win/CS/HandBrakeWPF/Views/AudioView.xaml
index 33d5344ac..36a9bfa45 100644
--- a/win/CS/HandBrakeWPF/Views/AudioView.xaml
+++ b/win/CS/HandBrakeWPF/Views/AudioView.xaml
@@ -145,10 +145,10 @@
 

                         <!--  Marker  -->

                         <Image Grid.Column="0" Grid.Row="0"

-                               Width="16"

-                               Height="16"

+                               Width="20"

+                               Height="20"

                                Margin="5,0,5,0"

-                               Source="Images/Movies.png" />

+                               Source="Images/Movies_small.png" />

 

                         <!--  Settings  -->

                         <Grid Grid.Column="1" Grid.Row="0" HorizontalAlignment="Stretch" Margin="0,5,0,5">

diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml
index e34aa2a2f..ce937cdcd 100644
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml
@@ -299,15 +299,15 @@
                     </Grid.ColumnDefinitions>

 

                     <Label Content="{x:Static Properties:ResourcesUI.MainView_Source}" FontWeight="Bold" Grid.Column="0" />

-                    <TextBlock Text="{Binding Path=SourceLabel}" ToolTip="{Binding Path=SourceLabel}" TextTrimming="CharacterEllipsis" MaxWidth="595" Grid.Column="1" />

-                    <TextBlock Text="{Binding SourceInfo}" HorizontalAlignment="Right" VerticalAlignment="Center" Foreground="DimGray" Grid.Column="2" Margin="15,0,0,0" MaxWidth="360" />

+                    <TextBlock Text="{Binding Path=SourceLabel}" ToolTip="{Binding Path=SourceLabel}" TextTrimming="CharacterEllipsis" MaxWidth="595" Grid.Column="1" Margin="7,0,0,0" />

+                    <TextBlock Text="{Binding SourceInfo}" HorizontalAlignment="Right" VerticalAlignment="Center" Foreground="DimGray" Grid.Column="2" Margin="10,0,0,0" MaxWidth="360" />

                 </Grid>

 

-                <StackPanel Orientation="Horizontal" Grid.Row="1">

-                    <Label Margin="8,0,0,0" FontWeight="Bold" Content="{x:Static Properties:ResourcesUI.MainView_Title}" />

+                <StackPanel Orientation="Horizontal" Grid.Row="1" Margin="0,5,0,0">

+                    <Label FontWeight="Bold" Content="{x:Static Properties:ResourcesUI.MainView_Title}" />

                     <ComboBox Name="Titles"

                                   MinWidth="100"

-                                  Margin="8,0,0,0"

+                                  Margin="17,0,0,0"

                                   ItemsSource="{Binding ScannedSource.Titles}"

                                   ToolTip="{x:Static Properties:ResourcesTooltips.MainView_Title}"

                                   SelectedItem="{Binding Path=SelectedTitle}" />

@@ -366,11 +366,11 @@
             </Grid>

 

             <!--  Presets Options  -->

-            <StackPanel Grid.Row="1" Orientation="Vertical"  Margin="10,5,10,5" IsEnabled="{Binding HasSource, Converter={StaticResource booleanConverter}, ConverterParameter=false}">

-                <Label Content="Presets" FontWeight="Bold" VerticalAlignment="Center" />

-                <StackPanel Orientation="Horizontal" Margin="8,0,0,0" Visibility="{Binding IsPresetPanelShowing, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}">

+            <StackPanel Grid.Row="1" Orientation="Horizontal"  Margin="10,10,10,5" IsEnabled="{Binding HasSource, Converter={StaticResource booleanConverter}, ConverterParameter=false}">

+                <Label Content="Presets:" FontWeight="Bold" VerticalAlignment="Center" />

+                <StackPanel Orientation="Horizontal" Margin="5,0,0,0" Visibility="{Binding IsPresetPanelShowing, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}">

 

-                    <Button x:Name="SelectPresetsButton"  Margin="15,0,0,0" VerticalAlignment="Center" Click="SelectPreset_OnClick" Width="255">

+                    <Button x:Name="SelectPresetsButton"  VerticalAlignment="Center" Click="SelectPreset_OnClick" Width="255">

                         <Button.Content>

                             <Grid VerticalAlignment="Stretch" Width="235">

                                 <Grid.ColumnDefinitions>

@@ -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" />

                     <Button Content="{x:Static Properties:ResourcesUI.MainView_SaveNewPreset}" cal:Message.Attach="[Event Click] = [Action PresetAdd]"  Margin="5,0,0,0" VerticalAlignment="Center" />

                     

-                    <Button x:Name="MorePresetOptionsButton"  Margin="15,0,0,0" VerticalAlignment="Center" Click="MorePresetOptionsButton_OnClick">

+                    <Button x:Name="MorePresetOptionsButton"  Margin="15,0,0,0" VerticalAlignment="Center" Click="MorePresetOptionsButton_OnClick" Visibility="Collapsed">

                         <Button.Content>

                             <StackPanel Orientation="Horizontal">

                                 <TextBlock Margin="0,0,5,0" Padding="0"

@@ -489,21 +489,18 @@
                         Margin="10,5,10,15"

                         HorizontalAlignment="Stretch"

                         VerticalAlignment="Stretch">

-                <Label Content="{x:Static Properties:ResourcesUI.MainView_Destination}" FontWeight="Bold" />

                 <Grid>

                     <Grid.ColumnDefinitions>

-                        <ColumnDefinition Width="58" />

-                        <ColumnDefinition Width="24"/>

-                        <ColumnDefinition Width="17*" />

-                        <ColumnDefinition Width="972*"/>

+                        <ColumnDefinition Width="Auto" />

+                        <ColumnDefinition Width="*"/>

                         <ColumnDefinition Width="Auto" />

                     </Grid.ColumnDefinitions>

-                    <Label Margin="8,0,0,0" Content="{x:Static Properties:ResourcesUI.MainView_File}" Grid.ColumnSpan="2" />

+                    <Label Margin="0,0,0,0" Content="{x:Static Properties:ResourcesUI.MainView_File}" FontWeight="Bold" />

                     <TextBox Name="Destination"

-                             Grid.Column="2"

-                             Margin="8,0,0,0" ToolTip="{x:Static Properties:ResourcesTooltips.MainView_Destination}"

+                             Grid.Column="1"

+                             Margin="5,0,0,0" ToolTip="{x:Static Properties:ResourcesTooltips.MainView_Destination}"

                              Text="{Binding Destination,

-                                            UpdateSourceTrigger=PropertyChanged}" Grid.ColumnSpan="2">

+                                            UpdateSourceTrigger=PropertyChanged}">

                         <TextBox.ContextMenu>

                             <ContextMenu>

                                 <MenuItem Header="Open this Directory" cal:Message.Attach="[Event Click] = [Action OpenDestinationDirectory]" />

@@ -511,9 +508,9 @@
                         </TextBox.ContextMenu>

                     </TextBox>

                     <Button Name="DestinationBrowser"

-                            Grid.Column="4"

-                            Margin="8,2,0,1" FontWeight="Bold"

-                            Content="Browse"

+                            Grid.Column="2"

+                            Margin="10,0,0,0" FontWeight="Bold"

+                            Content="Browse" 

                             ToolTip="{x:Static Properties:ResourcesTooltips.MainView_Browse}"

                             cal:Message.Attach="[Event Click] = [Action BrowseDestination]"

                     />

diff --git a/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml b/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
index a945b6fcc..2268d5aaa 100644
--- a/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
+++ b/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
@@ -141,10 +141,10 @@
 

                         <!--  Marker  -->

                         <Image Grid.Column="0"

-                               Width="16"

-                               Height="16"

-                               Margin="10,0,10,0"

-                               Source="Images/Movies.png" />

+                               Width="20"

+                               Height="20"

+                               Margin="5,0,5,0"

+                               Source="Images/Movies_small.png" />

 

                         <!--  Standard Subtitle Settings  -->

                         <Grid Grid.Column="1" HorizontalAlignment="Stretch" Margin="0,8,0,8"