WinGui: UI consistency Tweaks. #833

7 files changed, 108 insertions, 61 deletions

diff --git a/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.Designer.cs b/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.Designer.cs
index b92043992..74ef418c0 100644
--- a/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.Designer.cs
@@ -355,6 +355,15 @@ namespace HandBrakeWPF.Properties {
         }

         

         /// <summary>

+        ///   Looks up a localized string similar to The end point for this range..

+        /// </summary>

+        public static string MainView_EndPoint {

+            get {

+                return ResourceManager.GetString("MainView_EndPoint", resourceCulture);

+            }

+        }

+        

+        /// <summary>

         ///   Looks up a localized string similar to Add a special MP4 marker to allow playback on vintage iPod 5th Generation devices circa 2006. Other settings may affect compatibility..

         /// </summary>

         public static string MainView_IpodAtom {

@@ -429,6 +438,15 @@ namespace HandBrakeWPF.Properties {
         }

         

         /// <summary>

+        ///   Looks up a localized string similar to The start point for this range..

+        /// </summary>

+        public static string MainView_StartPoint {

+            get {

+                return ResourceManager.GetString("MainView_StartPoint", resourceCulture);

+            }

+        }

+        

+        /// <summary>

         ///   Looks up a localized string similar to Title, or video clip, to encode.

         ///Blu-ray and DVD sources often have multiple titles, the longest of which is typically the main feature.

         /// </summary>

diff --git a/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.resx b/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.resx
index 12f7809cb..ae79c9c1c 100644
--- a/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.resx
+++ b/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.resx
@@ -460,4 +460,10 @@ Lapsharp's Sprite tune is useful for 1-/4-/8-/16-bit 2-dimensional games. Sprite
   <data name="MainView_PresetOptionsContextMenu" xml:space="preserve">

     <value>Options to control presets.</value>

   </data>

+  <data name="MainView_EndPoint" xml:space="preserve">

+    <value>The end point for this range.</value>

+  </data>

+  <data name="MainView_StartPoint" xml:space="preserve">

+    <value>The start point for this range.</value>

+  </data>

 </root>
\ No newline at end of file
diff --git a/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs b/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs
index 045992d05..0546fc14d 100644
--- a/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs
@@ -709,7 +709,7 @@ namespace HandBrakeWPF.Properties {
         }

         

         /// <summary>

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

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

         /// </summary>

         public static string MainView_Angle {

             get {

@@ -772,7 +772,7 @@ namespace HandBrakeWPF.Properties {
         }

         

         /// <summary>

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

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

         /// </summary>

         public static string MainView_Duration {

             get {

@@ -781,7 +781,7 @@ namespace HandBrakeWPF.Properties {
         }

         

         /// <summary>

-        ///   Looks up a localized string similar to Save To.

+        ///   Looks up a localized string similar to Save As:.

         /// </summary>

         public static string MainView_File {

             get {

@@ -925,6 +925,15 @@ namespace HandBrakeWPF.Properties {
         }

         

         /// <summary>

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

+        /// </summary>

+        public static string MainView_Range {

+            get {

+                return ResourceManager.GetString("MainView_Range", resourceCulture);

+            }

+        }

+        

+        /// <summary>

         ///   Looks up a localized string similar to Remove.

         /// </summary>

         public static string MainView_Remove {

@@ -1042,7 +1051,7 @@ namespace HandBrakeWPF.Properties {
         }

         

         /// <summary>

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

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

         /// </summary>

         public static string MainView_through {

             get {

@@ -1051,7 +1060,7 @@ namespace HandBrakeWPF.Properties {
         }

         

         /// <summary>

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

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

         /// </summary>

         public static string MainView_Title {

             get {

diff --git a/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx b/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx
index 0112f0ff5..4dd72b89b 100644
--- a/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx
+++ b/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx
@@ -130,7 +130,7 @@
     <value>Advanced</value>

   </data>

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

-    <value>Angle</value>

+    <value>Angle: </value>

   </data>

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

     <value>Audio</value>

@@ -148,10 +148,10 @@
     <value>Destination</value>

   </data>

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

-    <value>Duration</value>

+    <value>Duration: </value>

   </data>

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

-    <value>Save To</value>

+    <value>Save As:</value>

   </data>

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

     <value>Filters</value>

@@ -202,10 +202,10 @@
     <value>Subtitles</value>

   </data>

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

-    <value>through</value>

+    <value> - </value>

   </data>

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

-    <value>Title</value>

+    <value>Title: </value>

   </data>

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

     <value>Tools</value>

@@ -1001,4 +1001,7 @@ This will not affect your current settings in the Subtitle tab.</value>
   <data name="MainView_PresetOptionsContextMenu" xml:space="preserve">

     <value>Preset Options Context Menu</value>

   </data>

+  <data name="MainView_Range" xml:space="preserve">

+    <value>Range:</value>

+  </data>

 </root>
\ No newline at end of file
diff --git a/win/CS/HandBrakeWPF/Services/Presets/Model/Preset.cs b/win/CS/HandBrakeWPF/Services/Presets/Model/Preset.cs
index d0cd4c617..e5545d136 100644
--- a/win/CS/HandBrakeWPF/Services/Presets/Model/Preset.cs
+++ b/win/CS/HandBrakeWPF/Services/Presets/Model/Preset.cs
@@ -82,7 +82,7 @@ namespace HandBrakeWPF.Services.Presets.Model
             get

             {

                 string globalCateogry = this.IsBuildIn ? ResourcesUI.Preset_Official : ResourcesUI.Preset_Custom;

-                return string.Format("{0} > {1} > {2}", globalCateogry, this.Category, this.Name);

+                return string.Format("{0}", this.Name);

             }

         }

 

diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml
index c6e08f7fb..cf6b45635 100644
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml
@@ -142,6 +142,44 @@
 

                 <Separator />

 

+                <Button PreviewMouseLeftButtonDown="AddToQueue_PreviewMouseDown" ContextMenuService.IsEnabled="False" AutomationProperties.Name="{x:Static Properties:ResourcesUI.MainView_AddToQueue}">

+                    <StackPanel Orientation="Horizontal">

+                        <StackPanel Orientation="Horizontal">

+                            <Image Width="32" Height="32" SnapsToDevicePixels="True" Source="Images/AddToQueue_small.png" />

+                            <Label Margin="8,0,0,0" VerticalAlignment="Center" Content="{x:Static Properties:ResourcesUI.MainView_AddToQueue}" />

+                        </StackPanel>

+

+                        <Grid x:Name="dropdown" Background="Transparent" >

+                            <Path Height="5" Margin="2,2,2,0" VerticalAlignment="Center" HorizontalAlignment="Center"

+                                  Data="M 0 0 L 4 4 L 8 0 Z"

+                                  Fill="{DynamicResource GlyphBrush}" x:Name="dropdownArrow" />

+                        </Grid>

+

+                    </StackPanel>

+                    <Button.ContextMenu>

+                        <ContextMenu>

+                            <MenuItem Header="{x:Static Properties:ResourcesUI.MainView_AddCurrent}" cal:Message.Attach="[Event Click] = [Action AddToQueue]" AutomationProperties.Name="Add Current" />

+                            <MenuItem Header="{x:Static Properties:ResourcesUI.MainView_AddAll}" cal:Message.Attach="[Event Click] = [Action AddAllToQueue]" AutomationProperties.Name="Add all to Queue" />

+                            <MenuItem Header="{x:Static Properties:ResourcesUI.MainView_AddSelection}" cal:Message.Attach="[Event Click] = [Action AddSelectionToQueue]" AutomationProperties.Name="Add Selection to Queue" />

+                        </ContextMenu>

+                    </Button.ContextMenu>

+

+                </Button>

+

+                <Button Name="ShowQueue" AutomationProperties.Name="Show Queue" cal:Message.Attach="[Event Click] = [Action OpenQueueWindow]">

+                    <StackPanel Orientation="Horizontal">

+                        <Image Width="32"

+                               Height="32"

+                               SnapsToDevicePixels="True"

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

+                        <Label Margin="8,0,0,0"

+                               VerticalAlignment="Center"

+                               Content="{Binding QueueLabel, FallbackValue='{x:Static Properties:ResourcesUI.MainView_ShowQueue}'}"/>

+                    </StackPanel>

+                </Button>

+

+                <Separator />

+

                 <Button Name="Start" AutomationProperties.Name="{x:Static Properties:ResourcesUI.MainView_StartEncode}"

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

                         Visibility="{Binding IsEncoding,

@@ -189,42 +227,6 @@
                     </StackPanel>

                 </Button>

 

-                <Button PreviewMouseLeftButtonDown="AddToQueue_PreviewMouseDown" ContextMenuService.IsEnabled="False" AutomationProperties.Name="{x:Static Properties:ResourcesUI.MainView_AddToQueue}">

-                    <StackPanel Orientation="Horizontal">

-                        <StackPanel Orientation="Horizontal">

-                            <Image Width="32" Height="32" SnapsToDevicePixels="True" Source="Images/AddToQueue_small.png" />

-                            <Label Margin="8,0,0,0" VerticalAlignment="Center" Content="{x:Static Properties:ResourcesUI.MainView_AddToQueue}" />

-                        </StackPanel>

-

-                        <Grid x:Name="dropdown" Background="Transparent" >

-                            <Path Height="5" Margin="2,2,2,0" VerticalAlignment="Center" HorizontalAlignment="Center"

-                                  Data="M 0 0 L 4 4 L 8 0 Z"

-                                  Fill="{DynamicResource GlyphBrush}" x:Name="dropdownArrow" />

-                        </Grid>

-

-                    </StackPanel>

-                    <Button.ContextMenu>

-                        <ContextMenu>

-                            <MenuItem Header="{x:Static Properties:ResourcesUI.MainView_AddCurrent}" cal:Message.Attach="[Event Click] = [Action AddToQueue]" AutomationProperties.Name="Add Current" />

-                            <MenuItem Header="{x:Static Properties:ResourcesUI.MainView_AddAll}" cal:Message.Attach="[Event Click] = [Action AddAllToQueue]" AutomationProperties.Name="Add all to Queue" />

-                            <MenuItem Header="{x:Static Properties:ResourcesUI.MainView_AddSelection}" cal:Message.Attach="[Event Click] = [Action AddSelectionToQueue]" AutomationProperties.Name="Add Selection to Queue" />

-                        </ContextMenu>

-                    </Button.ContextMenu>

-

-                </Button>

-

-                <Button Name="ShowQueue" AutomationProperties.Name="Show Queue" cal:Message.Attach="[Event Click] = [Action OpenQueueWindow]">

-                    <StackPanel Orientation="Horizontal">

-                        <Image Width="32"

-                               Height="32"

-                               SnapsToDevicePixels="True"

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

-                        <Label Margin="8,0,0,0"

-                               VerticalAlignment="Center"

-                               Content="{Binding QueueLabel, FallbackValue='{x:Static Properties:ResourcesUI.MainView_ShowQueue}'}"/>

-                    </StackPanel>

-                </Button>

-

                 <Separator />

 

                 <Button Name="Preview" AutomationProperties.Name="Preview Encode" cal:Message.Attach="[Event Click] = [Action OpenPreviewWindow]" >

@@ -280,18 +282,18 @@
 

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

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

-                        <TextBlock Text="{Binding SourceInfo}" HorizontalAlignment="Right" VerticalAlignment="Center" Foreground="Gray" FontFamily="Segoe UI Light" Grid.Column="2" MaxWidth="400" />

+                        <TextBlock Text="{Binding SourceInfo}" HorizontalAlignment="Right" VerticalAlignment="Center" Foreground="DimGray" Grid.Column="2" MaxWidth="400" />

                     </Grid>

 

                     <StackPanel Orientation="Horizontal">

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

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

                         <ComboBox Name="Titles"

                                   MinWidth="100"

                                   Margin="8,0,0,0"

                                   ItemsSource="{Binding ScannedSource.Titles}"

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

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

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

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

 

                         <ComboBox Name="Angles"

                                   MinWidth="60"

@@ -299,6 +301,8 @@
                                   ItemsSource="{Binding Angles}"

                                   SelectedItem="{Binding SelectedAngle}"

                                   ToolTip="{x:Static Properties:ResourcesTooltips.MainView_Angle}" />

+

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

                         <ComboBox Name="PointToPointMode"

                                   MinWidth="80"

                                   Margin="8,0,0,0"

@@ -309,11 +313,13 @@
                                   Margin="8,0,0,0"

                                   ItemsSource="{Binding StartEndRangeItems}"

                                   SelectedItem="{Binding SelectedStartPoint}"

+                                  ToolTip="{x:Static Properties:ResourcesTooltips.MainView_StartPoint}"

                                   Visibility="{Binding ShowTextEntryForPointToPointMode,

                                                        Converter={StaticResource boolToVisConverter},

                                                        ConverterParameter=true}" />

                         <Controls:TimeSpanBox  Number="{Binding SelectedStartPoint, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"

                                                Minimum="0" AllowEmpty="False" ShowTimeSpan="{Binding IsTimespanRange}"

+                                               ToolTip="{x:Static Properties:ResourcesTooltips.MainView_StartPoint}"

                                                MinWidth="80" Margin="8,0,0,0"  Visibility="{Binding ShowTextEntryForPointToPointMode,

                                                        Converter={StaticResource boolToVisConverter},

                                                        ConverterParameter=false}" />

@@ -324,16 +330,18 @@
                                   Margin="4,0,0,0"

                                   ItemsSource="{Binding StartEndRangeItems}"

                                   SelectedItem="{Binding SelectedEndPoint}"

+                                  ToolTip="{x:Static Properties:ResourcesTooltips.MainView_EndPoint}"

                                   Visibility="{Binding ShowTextEntryForPointToPointMode,

                                                        Converter={StaticResource boolToVisConverter},

                                                        ConverterParameter=true}" />

                         <Controls:TimeSpanBox  Number="{Binding SelectedEndPoint, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"

                                                Minimum="0" AllowEmpty="False" ShowTimeSpan="{Binding IsTimespanRange}"

+                                               ToolTip="{x:Static Properties:ResourcesTooltips.MainView_EndPoint}"

                                                MinWidth="80" Margin="8,0,0,0"  Visibility="{Binding ShowTextEntryForPointToPointMode,

                                                        Converter={StaticResource boolToVisConverter},

                                                        ConverterParameter=false}" />

 

-                        <Label Margin="4,0,0,0" Content="{x:Static Properties:ResourcesUI.MainView_Duration}" ToolTip="{x:Static Properties:ResourcesTooltips.MainView_Duration}" />

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

                         <Label Margin="4,0,0,0" Content="{Binding Duration}" ToolTip="{x:Static Properties:ResourcesTooltips.MainView_Duration}" />

 

                     </StackPanel>

@@ -345,12 +353,12 @@
                 <Label Content="Presets" FontWeight="Bold" VerticalAlignment="Center" />

                 <StackPanel Orientation="Horizontal" Margin="8,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="350">

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

                         <Button.Content>

                             <StackPanel Orientation="Horizontal" VerticalAlignment="Stretch">

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

-                                           VerticalAlignment="Center" Width="315"

-                                           Text="{Binding SelectedPreset.DisplayValue}" />

+                                           VerticalAlignment="Center" Width="215"

+                                           Text="{Binding SelectedPreset.DisplayValue}" TextTrimming="CharacterEllipsis" />

 

                                 <Path Height="8" Margin="2,0,0,1" VerticalAlignment="Center" HorizontalAlignment="Center"

                                       Data="M 0 0 L 4 4 L 0 8 Z"

diff --git a/win/CS/HandBrakeWPF/Views/SummaryView.xaml b/win/CS/HandBrakeWPF/Views/SummaryView.xaml
index fc58d2e3b..e0da631d4 100644
--- a/win/CS/HandBrakeWPF/Views/SummaryView.xaml
+++ b/win/CS/HandBrakeWPF/Views/SummaryView.xaml
@@ -39,6 +39,8 @@
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="10" />
                 <RowDefinition Height="Auto" />
+                <RowDefinition Height="10" />
+                <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="*" />
             </Grid.RowDefinitions>
@@ -82,6 +84,14 @@
 
             <TextBlock Text="Filters:" FontWeight="Bold" Grid.Row="10" Grid.Column="0" VerticalAlignment="Center" />
             <TextBlock Text="{Binding FiltersInfo}" Grid.Row="10" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Stretch" TextWrapping="Wrap" />
+
+
+
+            <TextBlock Text="Size:" FontWeight="Bold" Grid.Row="12" Grid.Column="0" VerticalAlignment="Center" />
+            <TextBlock Text="{Binding DimensionInfo}" HorizontalAlignment="Left" VerticalAlignment="Center"  Grid.Row="12" Grid.Column="1" />
+
+            <TextBlock Text="Aspect:" FontSize="14" Grid.Row="13" Grid.Column="0" VerticalAlignment="Center" Visibility="Collapsed" />
+            <TextBlock Text="{Binding AspectInfo}" HorizontalAlignment="Left" VerticalAlignment="Center"  Grid.Row="13" Grid.Column="1" Margin="5,0,0,0" Visibility="Collapsed" />
         </Grid>
 
         <!-- Column 2 -->
@@ -124,13 +134,6 @@
                         Background="Black" Opacity="0.75" Margin="0,5,0,10">
                     <TextBlock Text="{Binding PreviewInfo}" FontSize="14" Foreground="White" Padding="8,3" Visibility="{Binding IsPreviewInfoVisible, Converter={StaticResource boolToVisConverter}}" />
                 </Border>
-
-                <TextBlock Text="Dimensions:" FontSize="14" FontFamily="Sergio Light" Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" />
-                <TextBlock Text="{Binding DimensionInfo}" HorizontalAlignment="Left" VerticalAlignment="Center"  Grid.Row="1" Grid.Column="1" Margin="5,0,0,0" />
-
-                <TextBlock Text="Aspect:" FontSize="14" FontFamily="Sergio Light" Grid.Row="2" Grid.Column="0" VerticalAlignment="Center" Visibility="Collapsed" />
-                <TextBlock Text="{Binding AspectInfo}" HorizontalAlignment="Left" VerticalAlignment="Center"  Grid.Row="2" Grid.Column="1" Margin="5,0,0,0" Visibility="Collapsed" />
-
             </Grid>
         </Grid>