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

Refactor `ToolBox.SetTools`

This commit is contained in:
YoshiRulz 2023-02-07 05:20:19 +10:00
parent b93eb948fd
commit 0d02d5c498
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
1 changed files with 41 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/BizHawk.Client.EmuHawk/tools/ToolBox.cs
View File

@ -12,6 +12,15 @@ namespace BizHawk.Client.EmuHawk
{ {
public partial class ToolBox : ToolFormBase public partial class ToolBox : ToolFormBase
{ {
private static readonly Lazy<Image> IconMissingIcon = new(() => Properties.Resources.Logo.ToBitmap());
private static readonly Lazy<IReadOnlyCollection<Type>> ToolTypes = new(() => EmuHawk.ReflectionCache.Types
.Where(static t => typeof(IToolForm).IsAssignableFrom(t) && typeof(Form).IsAssignableFrom(t))
.Where(VersionInfo.DeveloperBuild
? static t => true
: static t => !t.GetCustomAttributes(false).OfType<ToolAttribute>().Any(static a => !a.Released))
.Except(new[] { typeof(ToolBox), typeof(ToolFormBase) }).ToList());
[RequiredService] [RequiredService]
private IEmulator Emulator { get; set; } private IEmulator Emulator { get; set; }
@ -43,29 +52,10 @@ namespace BizHawk.Client.EmuHawk
private void SetTools() private void SetTools()
{ {
ToolBoxStrip.Items.Clear(); ToolBoxStrip.Items.Clear();
foreach (var t in ToolTypes.Value)
var tools = EmuHawk.ReflectionCache.Types
.Where(t => typeof(IToolForm).IsAssignableFrom(t) && typeof(Form).IsAssignableFrom(t)
&& !typeof(ToolBox).IsAssignableFrom(t)
&& ServiceInjector.IsAvailable(Emulator.ServiceProvider, t)
&& (VersionInfo.DeveloperBuild || !t.GetCustomAttributes(false).OfType<ToolAttribute>().Any(static a => !a.Released)));
/*
for (int i = 0; i < tools.Count(); i++)
{ {
Console.WriteLine(tools.ElementAt(i).FullName); if (!ServiceInjector.IsAvailable(Emulator.ServiceProvider, t)) continue;
} Icon/*?*/ image_t = null;
*/
foreach (var t in tools)
{
if (t.FullName != "BizHawk.Client.EmuHawk.ToolFormBase")
{
//var instance = Activator.CreateInstance(t);
var image_t = Properties.Resources.Logo;
var text_t = "";
if (t.FullName == "BizHawk.Client.EmuHawk.CoreFeatureAnalysis") { image_t = Properties.Resources.Logo; } if (t.FullName == "BizHawk.Client.EmuHawk.CoreFeatureAnalysis") { image_t = Properties.Resources.Logo; }
if (t.FullName == "BizHawk.Client.EmuHawk.LogWindow") { image_t = Properties.Resources.CommandWindow; } if (t.FullName == "BizHawk.Client.EmuHawk.LogWindow") { image_t = Properties.Resources.CommandWindow; }
if (t.FullName == "BizHawk.Client.EmuHawk.LuaConsole") { image_t = Properties.Resources.TextDocIcon; } if (t.FullName == "BizHawk.Client.EmuHawk.LuaConsole") { image_t = Properties.Resources.TextDocIcon; }
@ -89,27 +79,14 @@ namespace BizHawk.Client.EmuHawk
if (t.FullName == "BizHawk.Client.EmuHawk.NesPPU") { image_t = Properties.Resources.MonitorIcon; } if (t.FullName == "BizHawk.Client.EmuHawk.NesPPU") { image_t = Properties.Resources.MonitorIcon; }
if (t.FullName == "BizHawk.Client.EmuHawk.NESNameTableViewer") { image_t = Properties.Resources.MonitorIcon; } if (t.FullName == "BizHawk.Client.EmuHawk.NESNameTableViewer") { image_t = Properties.Resources.MonitorIcon; }
if (t.FullName == "BizHawk.Client.EmuHawk.SmsVdpViewer") { image_t = Properties.Resources.SmsIcon; } if (t.FullName == "BizHawk.Client.EmuHawk.SmsVdpViewer") { image_t = Properties.Resources.SmsIcon; }
ToolStripButton tsb = new() {
var tsb = new ToolStripButton DisplayStyle = ToolStripItemDisplayStyle.Image,
{ Image = image_t?.ToBitmap() ?? IconMissingIcon.Value,
Image = image_t.ToBitmap(),
Text = text_t,
DisplayStyle = ToolStripItemDisplayStyle.Image
//Image = ((Form)instance).Icon.ToBitmap(),
//Text = ((Form)instance).Text,
//DisplayStyle = ((Form)instance).ShowIcon ? ToolStripItemDisplayStyle.Image : ToolStripItemDisplayStyle.Text
}; };
tsb.Click += (_, _) => Tools.Load(t);
tsb.Click += (o, e) =>
{
Tools.Load(t);
//Close();
};
ToolBoxStrip.Items.Add(tsb); ToolBoxStrip.Items.Add(tsb);
} }
} }
}
private void SetSize() private void SetSize()
{ {