ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clean up `MainForm.ExternalToolMenuItem_DropDownOpening`

This commit is contained in:
YoshiRulz 2022-11-24 18:06:00 +10:00
parent e269bfd49f
commit f9ac3c4b32
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/BizHawk.Client.EmuHawk/MainForm.Events.cs
View File

@ -1205,18 +1205,10 @@ namespace BizHawk.Client.EmuHawk
foreach (var item in ExtToolManager.ToolStripMenu)
{
if (item.Tag is ValueTuple<string, string> tuple)
if (item.Enabled && item.Tag is ValueTuple<string, string> tuple)
{
if (item.Enabled)
{
item.Click += (clickEventSender, clickEventArgs) => Tools.LoadExternalToolForm(tuple.Item1, tuple.Item2);
}
item.Click += (_, _) => Tools.LoadExternalToolForm(tuple.Item1, tuple.Item2);
}
else
{
item.Image = Properties.Resources.ExclamationRed;
}
ExternalToolMenuItem.DropDownItems.Add(item);
}

8
src/BizHawk.Client.EmuHawk/tools/ExternalToolManager.cs
View File

@ -71,7 +71,11 @@ namespace BizHawk.Client.EmuHawk
private ToolStripMenuItem GenerateToolTipFromFileName(string fileName)
{
if (fileName == null) throw new Exception();
var item = new ToolStripMenuItem(Path.GetFileName(fileName)) { Enabled = false };
var item = new ToolStripMenuItem(Path.GetFileName(fileName))
{
Enabled = false,
Image = Properties.Resources.ExclamationRed,
};
try
{
if (!OSTailoredCode.IsUnixHost) MotWHack.RemoveMOTW(fileName);
@ -89,6 +93,8 @@ namespace BizHawk.Client.EmuHawk
{
foreach (var depFilename in toolAttribute.LoadAssemblyFiles) Assembly.LoadFrom($"{_paths[PathEntryCollection.GLOBAL, "External Tools"].Path}/{depFilename}");
}
item.Image = null; // no errors, remove error icon
var embeddedIconAttr = allAttrs.OfType<ExternalToolEmbeddedIconAttribute>().FirstOrDefault();
if (embeddedIconAttr != null)
{