WinGui: Usability improvements on the Queue.

- Options dropdown is placed above the queue.
- Show only destination filename on the queue panel. Full details shown on the right panel still.  Allows 2 additional queue records to show on screen at any given time.

diff --git a/win/CS/HandBrakeWPF/App.xaml.cs b/win/CS/HandBrakeWPF/App.xaml.cs
index a091dfaf956e359c05d7b57b739660c8c62383f1..320318cbcc99d9c769969d88b84bf5cd42f55184 100644 (file)
--- a/win/CS/HandBrakeWPF/App.xaml.cs
+++ b/win/CS/HandBrakeWPF/App.xaml.cs
@@ -176,7 +176,7 @@ namespace HandBrakeWPF
             Caliburn.Micro.Execute.OnUIThreadAsync(() => {\r
                 if (e.ExceptionObject.GetType() == typeof(FileNotFoundException))\r
                 {\r
-                    GeneralApplicationException exception = new GeneralApplicationException("A file appears to be missing.", "Try re-installing Microsoft .NET Framework 4.7.1", (Exception)e.ExceptionObject);\r
+                    GeneralApplicationException exception = new GeneralApplicationException("A file appears to be missing.", "Try re-installing Microsoft .NET Framework 4.8", (Exception)e.ExceptionObject);\r
                     this.ShowError(exception);\r
                 }\r
                 else\r

diff --git a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
index 251dfb4feee6a92cabb4bfbd58cd201d7dfa7d30..799647272f6c74ffaf2a1c4c674898b313a54da5 100644 (file)
--- a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
@@ -4057,7 +4057,7 @@ namespace HandBrakeWPF.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Dest: .
+        ///   Looks up a localized string similar to Destination:.
         /// </summary>
         public static string QueueView_Destination {
             get {
@@ -4237,7 +4237,7 @@ namespace HandBrakeWPF.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Src: .
+        ///   Looks up a localized string similar to Source:.
         /// </summary>
         public static string QueueView_Source {
             get {

diff --git a/win/CS/HandBrakeWPF/Properties/Resources.resx b/win/CS/HandBrakeWPF/Properties/Resources.resx
index 6f5e4fdb217f514c8e19bcc9f2c4bff19e1b6296..4bd8e3e1f945985d45a61657e6a75753ecf510f8 100644 (file)
--- a/win/CS/HandBrakeWPF/Properties/Resources.resx
+++ b/win/CS/HandBrakeWPF/Properties/Resources.resx
@@ -1444,7 +1444,7 @@ This will not affect your current settings in the Subtitle tab.</value>
     <value>Delete</value>\r
   </data>\r
   <data name="QueueView_Destination" xml:space="preserve">\r
-    <value>Dest: </value>\r
+    <value>Destination:</value>\r
   </data>\r
   <data name="WhenDone_DoNothing" xml:space="preserve">\r
     <value>Do nothing</value>\r
@@ -1513,7 +1513,7 @@ This will not affect your current settings in the Subtitle tab.</value>
     <value>Shutdown</value>\r
   </data>\r
   <data name="QueueView_Source" xml:space="preserve">\r
-    <value>Src: </value>\r
+    <value>Source:</value>\r
   </data>\r
   <data name="QueueView_Start" xml:space="preserve">\r
     <value>Start Queue</value>\r

diff --git a/win/CS/HandBrakeWPF/Views/QueueView.xaml b/win/CS/HandBrakeWPF/Views/QueueView.xaml
index 43f851028ddd502422fe3c836592414d76527921..6b96700d57df3a382053e669ee1dc6465d01a8d8 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/QueueView.xaml
+++ b/win/CS/HandBrakeWPF/Views/QueueView.xaml
@@ -21,7 +21,8 @@
         MinHeight="300"\r
         WindowStartupLocation="CenterScreen"\r
         TextOptions.TextFormattingMode="Display"\r
-        mc:Ignorable="d">\r
+        mc:Ignorable="d"\r
+        x:Name="queueView">\r
 \r
     <Window.Resources>\r
         <Converters:BooleanToVisibilityConverter x:Key="boolToVisConverter" />\r
@@ -60,35 +61,6 @@
 \r
             <TextBlock Text="{x:Static Properties:Resources.MainView_ShowQueue}" FontSize="28" VerticalAlignment="Center" FontFamily="Segoe UI Light" Margin="10,0,0,0" />\r
             <TextBlock Text="{Binding JobsPending}"  Grid.Column="1" Margin="15,0,0,5 " VerticalAlignment="Bottom" TextWrapping="WrapWithOverflow" TextTrimming="CharacterEllipsis" />\r
-\r
-            <Menu HorizontalAlignment="Right" Background="Transparent" VerticalAlignment="Bottom" Grid.Column="3" Margin="0,0,10,0" >\r
-                <MenuItem>\r
-                    <MenuItem.Header>\r
-                        <StackPanel Height="32" Orientation="Horizontal">\r
-                            <Image Source="{Binding Converter={StaticResource themeConverter}, ConverterParameter='Advanced.png'}" Width="20" Height="20" VerticalAlignment="Center" />\r
-                            <TextBlock VerticalAlignment="Center"\r
-                                       Text="{x:Static Properties:Resources.QueueView_Options}" Margin="5,0,0,0" />\r
-                            <Path Height="5"\r
-                                  Margin="2,2,0,0"\r
-                                  Data="M 0 0 L 4 4 L 8 0 Z"\r
-                                  Fill="{DynamicResource GlyphBrush}" />\r
-                        </StackPanel>\r
-                    </MenuItem.Header>\r
-                    <MenuItem cal:Message.Attach="[Event Click] = [Action ResetFailed]" Header="{x:Static Properties:Resources.QueueView_ResetFailed}" />\r
-                    <MenuItem cal:Message.Attach="[Event Click] = [Action ResetSelectedJobs]" Header="{x:Static Properties:Resources.QueueView_ResetSelectedJobs}" />\r
-                    <MenuItem cal:Message.Attach="[Event Click] = [Action ResetAllJobs]" Header="{x:Static Properties:Resources.QueueView_ResetAllJobs}" />\r
-                    <Separator />\r
-                    <MenuItem cal:Message.Attach="[Event Click] = [Action ClearCompleted]" Header="{x:Static Properties:Resources.QueueView_ClearCompleted}" />\r
-                    <MenuItem cal:Message.Attach="[Event Click] = [Action Clear]" Header="{x:Static Properties:Resources.QueueView_ClearAll}" />\r
-                    <MenuItem cal:Message.Attach="[Event Click] = [Action RemoveSelectedJobs]" Header="{x:Static Properties:Resources.QueueView_ClearSelected}" />\r
-                    <Separator />\r
-                    <MenuItem cal:Message.Attach="[Event Click] = [Action Import]" Header="{x:Static Properties:Resources.QueueView_Import}" />\r
-                    <MenuItem cal:Message.Attach="[Event Click] = [Action Export]" Header="{x:Static Properties:Resources.QueueView_Export}" />\r
-                    <Separator />\r
-                    <MenuItem cal:Message.Attach="[Event Click] = [Action ExportCli]" Header="{x:Static Properties:Resources.QueueView_ExportCLI}" />\r
-                </MenuItem>\r
-            </Menu>\r
-\r
         </Grid>\r
 \r
         <Grid Grid.Row="2" Margin="0,15,0,0">\r
@@ -134,10 +106,33 @@
                         </StackPanel>\r
                     </Button>\r
 \r
-                    <!--<StackPanel Grid.Row="0" Grid.Column="3" Orientation="Horizontal">\r
-                        <Button Content="^" Width="20" Margin="0" cal:Message.Attach="[Event Click] = [Action MoveUp]" />\r
-                        <Button Content="v" Width="20" Margin="5,0,0,0" cal:Message.Attach="[Event Click] = [Action MoveDown]" />\r
-                    </StackPanel>-->\r
+                    <Menu HorizontalAlignment="Right" Background="Transparent" VerticalAlignment="Bottom" Grid.Column="3" Margin="0,0,0,0" >\r
+                        <MenuItem>\r
+                            <MenuItem.Header>\r
+                                <StackPanel Height="27" Orientation="Horizontal">\r
+                                    <Image Source="{Binding Converter={StaticResource themeConverter}, ConverterParameter='Advanced.png'}" Width="20" Height="20" VerticalAlignment="Center" />\r
+                                    <TextBlock VerticalAlignment="Center"\r
+                                       Text="{x:Static Properties:Resources.QueueView_Options}" Margin="5,0,0,0" />\r
+                                    <Path Height="5"\r
+                                  Margin="2,2,0,0"\r
+                                  Data="M 0 0 L 4 4 L 8 0 Z"\r
+                                  Fill="{DynamicResource GlyphBrush}" />\r
+                                </StackPanel>\r
+                            </MenuItem.Header>\r
+                            <MenuItem cal:Message.Attach="[Event Click] = [Action ResetFailed]" Header="{x:Static Properties:Resources.QueueView_ResetFailed}" />\r
+                            <MenuItem cal:Message.Attach="[Event Click] = [Action ResetSelectedJobs]" Header="{x:Static Properties:Resources.QueueView_ResetSelectedJobs}" />\r
+                            <MenuItem cal:Message.Attach="[Event Click] = [Action ResetAllJobs]" Header="{x:Static Properties:Resources.QueueView_ResetAllJobs}" />\r
+                            <Separator />\r
+                            <MenuItem cal:Message.Attach="[Event Click] = [Action ClearCompleted]" Header="{x:Static Properties:Resources.QueueView_ClearCompleted}" />\r
+                            <MenuItem cal:Message.Attach="[Event Click] = [Action Clear]" Header="{x:Static Properties:Resources.QueueView_ClearAll}" />\r
+                            <MenuItem cal:Message.Attach="[Event Click] = [Action RemoveSelectedJobs]" Header="{x:Static Properties:Resources.QueueView_ClearSelected}" />\r
+                            <Separator />\r
+                            <MenuItem cal:Message.Attach="[Event Click] = [Action Import]" Header="{x:Static Properties:Resources.QueueView_Import}" />\r
+                            <MenuItem cal:Message.Attach="[Event Click] = [Action Export]" Header="{x:Static Properties:Resources.QueueView_Export}" />\r
+                            <Separator />\r
+                            <MenuItem cal:Message.Attach="[Event Click] = [Action ExportCli]" Header="{x:Static Properties:Resources.QueueView_ExportCLI}" />\r
+                        </MenuItem>\r
+                    </Menu>\r
                 </Grid>\r
 \r
                 <ListBox Tag="{Binding}" x:Name="queueJobs" Grid.Row="1" Margin="10,0,5,0"\r
@@ -234,41 +229,27 @@
                                 </Image>\r
 \r
                                 <!--  Settings  -->\r
-                                <Grid Grid.Column="1" Margin="0,3,5,3">\r
+                                <Grid Grid.Column="1" Margin="0,3,5,3" Height="30" VerticalAlignment="Center">\r
                                     <Grid.RowDefinitions>\r
                                         <RowDefinition Height="Auto" />\r
-                                        <RowDefinition Height="Auto" />\r
-                                        <RowDefinition Height="Auto" />\r
-                                        <RowDefinition Height="Auto" />\r
                                     </Grid.RowDefinitions>\r
 \r
                                     <Grid.ColumnDefinitions>\r
-                                        <ColumnDefinition Width="Auto" />\r
                                         <ColumnDefinition Width="*" />\r
+                                        <ColumnDefinition Width="Auto" />\r
                                     </Grid.ColumnDefinitions>\r
 \r
-                                    <StackPanel Orientation="Horizontal" Grid.Row="0" Grid.ColumnSpan="2">\r
-                                        <TextBlock FontWeight="Bold" Text="Title: " />\r
-                                        <TextBlock Text="{Binding Task.Title}" />\r
+                                    <StackPanel Grid.Row="0" Grid.Column="0"  VerticalAlignment="Center">\r
+                                        <TextBlock Text="{Binding Task.Destination, Converter={StaticResource filePathToFilenameConverter}}" Grid.Row="0" Grid.Column="0"\r
+                                                   TextTrimming="CharacterEllipsis" VerticalAlignment="Center"   />\r
 \r
-                                        <TextBlock Text="{Binding Task.PointToPointMode}" Margin="10,0,0,0" FontWeight="Bold" />\r
-                                        <TextBlock Text=": " />\r
-                                        <TextBlock Text="{Binding Task.StartPoint}" />\r
-                                        <TextBlock Margin="5,0,5,0" Text="to" />\r
-                                        <TextBlock Text="{Binding Task.EndPoint}" />\r
+                                        <ProgressBar Minimum="0" Height="4" Maximum="100" Name="pbStatus" HorizontalAlignment="Stretch" Margin="0,8,10,0"\r
+                                                     Value="{Binding DataContext.ProgressValue, ElementName=queueJobs}" IsIndeterminate="{Binding DataContext.IntermediateProgress, ElementName=queueJobs}"\r
+                                                     Visibility="{Binding ShowEncodeProgress, Converter={StaticResource boolToVisConverter}}" />\r
                                     </StackPanel>\r
+                           \r
 \r
-\r
-                                    <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_Source}" Grid.Row="1" />\r
-                                    <TextBlock Text="{Binding Task.Source, Converter={StaticResource filePathToFilenameConverter}}"  Margin="2,0,0,0" Grid.Row="1" Grid.Column="1"/>\r
-                                    <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_Destination}" Grid.Row="2" />\r
-                                    <TextBlock Text="{Binding Task.Destination, Converter={StaticResource filePathToFilenameConverter}}" Margin="2,0,0,0" TextTrimming="CharacterEllipsis" Grid.Row="2" Grid.Column="1" />\r
-\r
-                                    <ProgressBar Minimum="0" Height="4" Maximum="100" Name="pbStatus" Margin="0,2,5,0" Grid.Row="3" Grid.ColumnSpan="2"\r
-                                             Value="{Binding DataContext.ProgressValue, ElementName=queueJobs}" IsIndeterminate="{Binding DataContext.IntermediateProgress, ElementName=queueJobs}"\r
-                                             Visibility="{Binding ShowEncodeProgress, Converter={StaticResource boolToVisConverter}}" />\r
-\r
-                                    <Button Grid.Row="0" Grid.Column="1" Grid.RowSpan="3" VerticalAlignment="Top" HorizontalAlignment="Right" Margin="0,0,0,0" Click="QueueDeleteJob_OnClick"\r
+                                    <Button Grid.Row="0" Grid.Column="1" VerticalAlignment="Top" HorizontalAlignment="Right" Margin="0,0,0,0" Click="QueueDeleteJob_OnClick"\r
                                             AutomationProperties.Name="{x:Static Properties:ResourcesTooltips.QueueView_DeleteJob}" ToolTip="{x:Static Properties:ResourcesTooltips.QueueView_DeleteJob}" >\r
                                         <Button.Template>\r
                                             <ControlTemplate>\r
@@ -536,4 +517,4 @@
         </Grid>\r
     </Grid>\r
 </Window>\r
-\r
+    
\ No newline at end of file