From 641316650dcc211bb836d24ef2f1571a8f971558 Mon Sep 17 00:00:00 2001
From: sr55 <sr55.hb@outlook.com>
Date: Sat, 6 Apr 2019 16:04:31 +0100
Subject: [PATCH] WinGui: Minor bug fixes and UX improvements to the new queue
 design.

---
 win/CS/HandBrakeWPF/HandBrakeWPF.csproj        |   4 +++-
 .../HandBrakeWPF/ViewModels/QueueViewModel.cs  |   5 +++++
 win/CS/HandBrakeWPF/Views/Images/close64.png   | Bin 0 -> 807 bytes
 win/CS/HandBrakeWPF/Views/QueueView.xaml       |  17 ++++++++++++++---
 4 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 win/CS/HandBrakeWPF/Views/Images/close64.png

diff --git a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
index fbd4cac0b..a4f6105d0 100644
--- a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
+++ b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
@@ -707,7 +707,9 @@
       <Name>HandBrake.Interop</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Resource Include="Views\Images\close64.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <TargetFrameworkSDKToolsDirectory Condition=" '$(Platform)' == 'x64'">$(TargetFrameworkSDKToolsDirectory)$(Platform)\</TargetFrameworkSDKToolsDirectory>
diff --git a/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs
index bdd2fd844..a5df085b0 100644
--- a/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs
@@ -460,6 +460,11 @@ namespace HandBrakeWPF.ViewModels
         /// </param>
         public void RetryJob(QueueTask task)
         {
+            if (task == null)
+            {
+                return;
+            }
+
             task.Status = QueueItemStatus.Waiting;
             this.queueProcessor.BackupQueue(null);
             this.JobsPending = string.Format(Resources.QueueViewModel_JobsPending, this.queueProcessor.Count);
diff --git a/win/CS/HandBrakeWPF/Views/Images/close64.png b/win/CS/HandBrakeWPF/Views/Images/close64.png
new file mode 100644
index 0000000000000000000000000000000000000000..f06889226e0086cb6b3af261b8f000dee6fd0ad1
GIT binary patch
literal 807
zcmV+?1K9kDP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00004XF*Lt006O%
z3;baP00009a7bBm000ic000ic0Tn1pfB*mh7<5HgbW?9;ba!ELWdLwtX>N2bZe?^J
zG%hhNHvLWs=l}o$rAb6VR7gvumb+_IK@`TXjVOYeU^H&j(n^Are}JfkCJI_;A!4^0
zQbYwS{{-y?QHUUDA$bzTAS<lw`|ZZUDp4dU6bwcX<GTLN?3rZla<lhpJ~+(G`Mz^z
z?mVy83B_VDRxX!ED5ndB!aU`2sZ?5~T)<|i-^%532UQ*&*=)9#1P@5?3u}hhD%#OZ
zCUZc;J0qXZpC;f-K%y}FM%;N#6AVOG5dC%oY3HzErs`<DUhht&Qr)!s8OU|Yx2_gz
z;EQWIKOj$FtB&|H;z6Z11RbA3yI|vpkxtGk-9oKa>%zI{h~6>6{Yr;|m>yyZPW;z&
zI=xS6vs><35?f+aeM-p)cT;R>wfsmXlU-W%DwWD!@_e#+*md^}L1h=jcS}&eWC%cg
zRDH7~*r9GOkw|RAH>EMp)h)ROoIF1%dnCza>qPLr*=(B8vY=bx{x|_|q!USw?uGS>
zu|;>99soLbs^Ze?Bgb(^bp~)xEvI|}pBymPH>Gj|+BY2TnK&}mLGW?a8OT@Qo3MPl
z5&Md5yIti5tl2S#uS*9Xtb-GLSaoZVPT(f3#u{<6?a2lBV~%byQU`p+raI_2MeyTJ
zfY0E<r--Egw8)rmk+DgY8_>as<<Oc%UfZVB=b~&=+EKUZH5sKGv=zsBQMDp|qQ2Jw
z2W?upF?GvLe8$PsI%ona_bh=eLB<RL7{DI;RqYT?tM)$n=;Uc#6@sA4P97blLm?dz
z<Gbw0xqjIRAWmYw>zcp;r8flAB60IJj^qu>b4vTc4!DZI_uyb@YzTk9+@4~*!$)Yx
zv1FUJ!JvjTT`+W^{`bkeplLco=AVFvSm>j#U;MaQtwwwFU2sbKNN|(So}rXq71_=|
lFxf3HY2SuBr1AiG-e2O(h$I?|&IAAe002ovPDHLkV1j8=am@e#

literal 0
HcmV?d00001

diff --git a/win/CS/HandBrakeWPF/Views/QueueView.xaml b/win/CS/HandBrakeWPF/Views/QueueView.xaml
index 14dbb56c4..c6f9dd93f 100644
--- a/win/CS/HandBrakeWPF/Views/QueueView.xaml
+++ b/win/CS/HandBrakeWPF/Views/QueueView.xaml
@@ -131,10 +131,10 @@
                         </StackPanel>
                     </Button>
 
-                    <StackPanel Grid.Row="0" Grid.Column="3" Orientation="Horizontal">
+                    <!--<StackPanel Grid.Row="0" Grid.Column="3" Orientation="Horizontal">
                         <Button Content="^" Width="20" Margin="0" cal:Message.Attach="[Event Click] = [Action MoveUp]" />
                         <Button Content="v" Width="20" Margin="5,0,0,0" cal:Message.Attach="[Event Click] = [Action MoveDown]" />
-                    </StackPanel>
+                    </StackPanel>-->
                 </Grid>
 
                 <ListBox Tag="{Binding}" x:Name="queueJobs" Grid.Row="1" Margin="10,0,5,0"
@@ -232,7 +232,7 @@
                                 </Image>
 
                                 <!--  Settings  -->
-                                <Grid Grid.Column="1" Margin="0,3,15,3">
+                                <Grid Grid.Column="1" Margin="0,3,5,3">
                                     <Grid.RowDefinitions>
                                         <RowDefinition Height="Auto" />
                                         <RowDefinition Height="Auto" />
@@ -265,6 +265,17 @@
                                     <ProgressBar Minimum="0" Height="4" Maximum="100" Name="pbStatus" Margin="0,2,5,0" Grid.Row="3" Grid.ColumnSpan="2"
                                              Value="{Binding DataContext.ProgressValue, ElementName=queueJobs}" IsIndeterminate="{Binding DataContext.IntermediateProgress, ElementName=queueJobs}"
                                              Visibility="{Binding ShowEncodeProgress, Converter={StaticResource boolToVisConverter}}" />
+
+                                    <Image Source="Images\close64.png" Width="16" Height="16" Grid.Row="0" Grid.Column="1" Grid.RowSpan="3" 
+                                           VerticalAlignment="Top" HorizontalAlignment="Right" Margin="0,0,0,0" >
+                                        <i:Interaction.Triggers>
+                                            <i:EventTrigger EventName="MouseLeftButtonDown">
+                                                <cal:ActionMessage MethodName="RemoveJob">
+                                                    <cal:Parameter Value="{Binding}" />
+                                                </cal:ActionMessage>
+                                            </i:EventTrigger>
+                                        </i:Interaction.Triggers>
+                                    </Image>
                                 </Grid>
                             </Grid>
                         </DataTemplate>
-- 
2.40.0