From 19a2caa1886cecc7ab3c865253bad078cc6d97ec Mon Sep 17 00:00:00 2001
From: Terry MacDonald <terry.macdonald@cosive.com>
Date: Mon, 1 Nov 2021 22:02:50 +1300
Subject: [PATCH] Fully working manu icon override

---
 DisplayMagician/Properties/AssemblyInfo.cs |  4 +--
 DisplayMagician/ShortcutItem.cs            |  6 ++---
 DisplayMagician/UIForms/ShortcutForm.cs    | 30 ++++++++++++++++++++++
 3 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/DisplayMagician/Properties/AssemblyInfo.cs b/DisplayMagician/Properties/AssemblyInfo.cs
index 8487dd3..18a755c 100644
--- a/DisplayMagician/Properties/AssemblyInfo.cs
+++ b/DisplayMagician/Properties/AssemblyInfo.cs
@@ -26,8 +26,8 @@ using System.Resources;
 [assembly: Guid("e4ceaf5e-ad01-4695-b179-31168eb74c48")]
 
 // Version information
-[assembly: AssemblyVersion("2.1.0.89")]
-[assembly: AssemblyFileVersion("2.1.0.89")]
+[assembly: AssemblyVersion("2.1.0.91")]
+[assembly: AssemblyFileVersion("2.1.0.91")]
 [assembly: NeutralResourcesLanguageAttribute( "en" )]
 [assembly: CLSCompliant(true)]
 
diff --git a/DisplayMagician/ShortcutItem.cs b/DisplayMagician/ShortcutItem.cs
index dfefe58..b58fed4 100644
--- a/DisplayMagician/ShortcutItem.cs
+++ b/DisplayMagician/ShortcutItem.cs
@@ -131,9 +131,9 @@ namespace DisplayMagician
         private Bitmap _shortcutBitmap, _originalBitmap;
         [JsonIgnore]
 #pragma warning disable CS3008 // Identifier is not CLS-compliant
-        public string _originalIconPath;
-        public bool _userChoseOwnIcon = false;
-        public string _userIconPath;
+        private string _originalIconPath;
+        private bool _userChoseOwnIcon = false;
+        private string _userIconPath;
         private Bitmap _userIconBitmap;
         [JsonIgnore]
         public string _savedShortcutIconCacheFilename;
diff --git a/DisplayMagician/UIForms/ShortcutForm.cs b/DisplayMagician/UIForms/ShortcutForm.cs
index 20835d1..b640dba 100644
--- a/DisplayMagician/UIForms/ShortcutForm.cs
+++ b/DisplayMagician/UIForms/ShortcutForm.cs
@@ -1388,6 +1388,36 @@ namespace DisplayMagician.UIForms
             // Set the shortcut name
             txt_shortcut_save_name.Text = _shortcutToEdit.Name;
 
+            if (_shortcutToEdit.Category == ShortcutCategory.Game)
+            {
+                _userGameIconPath = _shortcutToEdit.UserIconPath;
+                txt_game_use_different_icon.Text = _userGameIconPath;
+                _userChoseOwnGameIcon = _shortcutToEdit.UserChoseOwnIcon;
+                if (_shortcutToEdit.UserChoseOwnIcon)
+                {                    
+                    cb_game_use_different_icon.Checked = true;
+                }
+                else
+                {
+                    cb_game_use_different_icon.Checked = false;
+                }
+            }
+            else if (_shortcutToEdit.Category == ShortcutCategory.Application)
+            {
+                _userExeIconPath = _shortcutToEdit.UserIconPath;
+                txt_exe_use_different_icon.Text = _userExeIconPath;
+                _userChoseOwnExeIcon = _shortcutToEdit.UserChoseOwnIcon;
+                if (_shortcutToEdit.UserChoseOwnIcon)
+                {
+                    cb_exe_use_different_icon.Checked = true;
+                }
+                else
+                {
+                    cb_exe_use_different_icon.Checked = false;
+                }
+            }            
+
+
             // Set up the start programs
             if (_shortcutToEdit.StartPrograms is List<StartProgram> && _shortcutToEdit.StartPrograms.Count > 0)
             {