From d7f34f0672eed0ab77f7d4d633d5d0a0d8c7a1de Mon Sep 17 00:00:00 2001
From: sr55 <sr55.hb@outlook.com>
Date: Fri, 19 Apr 2019 22:49:17 +0100
Subject: WinGui: Remove legacy delete.png icon and replace with grey X
 variant. Better matches the rest of the apps icon styles.   _dark variant
 still needs work.

---
 win/CS/HandBrakeWPF/HandBrakeWPF.csproj           |   4 +++-
 win/CS/HandBrakeWPF/Views/AudioDefaultsView.xaml  |   2 +-
 win/CS/HandBrakeWPF/Views/AudioView.xaml          |   2 +-
 win/CS/HandBrakeWPF/Views/Images/close64_dark.png | Bin 0 -> 645 bytes
 win/CS/HandBrakeWPF/Views/Images/delete.png       | Bin 1887 -> 0 bytes
 win/CS/HandBrakeWPF/Views/Queue/Embedded.xaml     |   2 +-
 win/CS/HandBrakeWPF/Views/QueueView.xaml          |   2 +-
 win/CS/HandBrakeWPF/Views/SubtitlesView.xaml      |   2 +-
 8 files changed, 8 insertions(+), 6 deletions(-)
 create mode 100644 win/CS/HandBrakeWPF/Views/Images/close64_dark.png
 delete mode 100644 win/CS/HandBrakeWPF/Views/Images/delete.png

(limited to 'win/CS/HandBrakeWPF')

diff --git a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
index a4f6105d0..9ea38eacd 100644
--- a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
+++ b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
@@ -633,7 +633,6 @@
     <Resource Include="Views\Images\Complete.png" />
     <Resource Include="Views\Images\Working0.png" />
     <Resource Include="handbrakepineapple.ico" />
-    <Resource Include="Views\Images\delete.png" />
     <Resource Include="Views\Images\Close.png" />
     <Resource Include="Views\Images\Options24.png" />
   </ItemGroup>
@@ -710,6 +709,9 @@
   <ItemGroup>
     <Resource Include="Views\Images\close64.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Views\Images\close64_dark.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <TargetFrameworkSDKToolsDirectory Condition=" '$(Platform)' == 'x64'">$(TargetFrameworkSDKToolsDirectory)$(Platform)\</TargetFrameworkSDKToolsDirectory>
diff --git a/win/CS/HandBrakeWPF/Views/AudioDefaultsView.xaml b/win/CS/HandBrakeWPF/Views/AudioDefaultsView.xaml
index bc6ba347f..8449f68d7 100644
--- a/win/CS/HandBrakeWPF/Views/AudioDefaultsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/AudioDefaultsView.xaml
@@ -292,7 +292,7 @@
 
                         <!--  Delete  -->
                         <StackPanel Grid.Column="2" Grid.Row="0" VerticalAlignment="Center">
-                            <Image Width="16" Height="16" Margin="10,0,10,0" Source="Images/delete.png">
+                            <Image Width="16" Height="16" Margin="10,0,10,0" Source="Images/close64.png">
                                 <i:Interaction.Triggers>
                                     <i:EventTrigger EventName="MouseDown">
                                         <cal:ActionMessage MethodName="RemoveTrack">
diff --git a/win/CS/HandBrakeWPF/Views/AudioView.xaml b/win/CS/HandBrakeWPF/Views/AudioView.xaml
index 2b2aafc49..ecb53ae4d 100644
--- a/win/CS/HandBrakeWPF/Views/AudioView.xaml
+++ b/win/CS/HandBrakeWPF/Views/AudioView.xaml
@@ -235,7 +235,7 @@
 
                         <!--  Delete  -->
                         <StackPanel Grid.Column="2" Grid.Row="0" VerticalAlignment="Center">
-                            <Image Width="16" Height="16" Margin="10,0,10,0" Source="Images/delete.png">
+                            <Image Width="16" Height="16" Margin="10,0,10,0" Source="Images/close64.png">
                                 <i:Interaction.Triggers>
                                     <i:EventTrigger EventName="MouseDown">
                                         <cal:ActionMessage MethodName="Remove">
diff --git a/win/CS/HandBrakeWPF/Views/Images/close64_dark.png b/win/CS/HandBrakeWPF/Views/Images/close64_dark.png
new file mode 100644
index 000000000..f6becdac1
Binary files /dev/null and b/win/CS/HandBrakeWPF/Views/Images/close64_dark.png differ
diff --git a/win/CS/HandBrakeWPF/Views/Images/delete.png b/win/CS/HandBrakeWPF/Views/Images/delete.png
deleted file mode 100644
index da1303111..000000000
Binary files a/win/CS/HandBrakeWPF/Views/Images/delete.png and /dev/null differ
diff --git a/win/CS/HandBrakeWPF/Views/Queue/Embedded.xaml b/win/CS/HandBrakeWPF/Views/Queue/Embedded.xaml
index e19c1bede..15d3255ef 100644
--- a/win/CS/HandBrakeWPF/Views/Queue/Embedded.xaml
+++ b/win/CS/HandBrakeWPF/Views/Queue/Embedded.xaml
@@ -256,7 +256,7 @@
                                     <ControlTemplate>
                                         <Image Width="20" 
                                                Height="20" VerticalAlignment="Center" 
-                                               Source="../Images/delete.png"
+                                               Source="../Images/close64.png"
                                                ToolTip="{x:Static Properties:ResourcesTooltips.QueueView_DeleteJob}">
                                         </Image>
                                     </ControlTemplate>
diff --git a/win/CS/HandBrakeWPF/Views/QueueView.xaml b/win/CS/HandBrakeWPF/Views/QueueView.xaml
index 94af3982e..8ff2831b3 100644
--- a/win/CS/HandBrakeWPF/Views/QueueView.xaml
+++ b/win/CS/HandBrakeWPF/Views/QueueView.xaml
@@ -379,7 +379,7 @@
                                     <Button.Content>
                                         <StackPanel Orientation="Horizontal">
                                             <Image Width="20" Height="20" VerticalAlignment="Center" Margin="0,0,5,0" 
-                                               Source="Images/delete.png">
+                                               Source="Images/close64_dark.png">
                                             </Image>
                                             <TextBlock Text="{x:Static Properties:Resources.QueueView_Delete}" />
                                         </StackPanel>
diff --git a/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml b/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
index 1fedb3962..f7ed98288 100644
--- a/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
+++ b/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
@@ -272,7 +272,7 @@
                                Width="16"
                                Height="16"
                                Margin="5,0,10,0"
-                               Source="Images/delete.png">
+                               Source="Images/close64.png">
                             <i:Interaction.Triggers>
                                 <i:EventTrigger EventName="MouseDown">
                                     <cal:ActionMessage MethodName="Remove">
-- 
cgit v1.2.3