Fully working manu icon override

This commit is contained in:
Terry MacDonald 2021-11-01 22:02:50 +13:00
parent e3d78d3dc1
commit 19a2caa188
3 changed files with 35 additions and 5 deletions

View File

@ -26,8 +26,8 @@ using System.Resources;
[assembly: Guid("e4ceaf5e-ad01-4695-b179-31168eb74c48")] [assembly: Guid("e4ceaf5e-ad01-4695-b179-31168eb74c48")]
// Version information // Version information
[assembly: AssemblyVersion("2.1.0.89")] [assembly: AssemblyVersion("2.1.0.91")]
[assembly: AssemblyFileVersion("2.1.0.89")] [assembly: AssemblyFileVersion("2.1.0.91")]
[assembly: NeutralResourcesLanguageAttribute( "en" )] [assembly: NeutralResourcesLanguageAttribute( "en" )]
[assembly: CLSCompliant(true)] [assembly: CLSCompliant(true)]

View File

@ -131,9 +131,9 @@ namespace DisplayMagician
private Bitmap _shortcutBitmap, _originalBitmap; private Bitmap _shortcutBitmap, _originalBitmap;
[JsonIgnore] [JsonIgnore]
#pragma warning disable CS3008 // Identifier is not CLS-compliant #pragma warning disable CS3008 // Identifier is not CLS-compliant
public string _originalIconPath; private string _originalIconPath;
public bool _userChoseOwnIcon = false; private bool _userChoseOwnIcon = false;
public string _userIconPath; private string _userIconPath;
private Bitmap _userIconBitmap; private Bitmap _userIconBitmap;
[JsonIgnore] [JsonIgnore]
public string _savedShortcutIconCacheFilename; public string _savedShortcutIconCacheFilename;

View File

@ -1388,6 +1388,36 @@ namespace DisplayMagician.UIForms
// Set the shortcut name // Set the shortcut name
txt_shortcut_save_name.Text = _shortcutToEdit.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 // Set up the start programs
if (_shortcutToEdit.StartPrograms is List<StartProgram> && _shortcutToEdit.StartPrograms.Count > 0) if (_shortcutToEdit.StartPrograms is List<StartProgram> && _shortcutToEdit.StartPrograms.Count > 0)
{ {