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

A slight refactor with MainForm events

This commit is contained in:
adelikat 2015-01-01 00:06:00 +00:00
parent dba923d8b9
commit b4c703580a
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
BizHawk.Client.EmuHawk/MainForm.Events.cs
View File

@ -1100,11 +1100,6 @@ namespace BizHawk.Client.EmuHawk
#region Tools #region Tools
static bool ToolAvailable<T>()
{
return ServiceInjector.IsAvailable(Global.Emulator.ServiceProvider, typeof(T));
}
private void ToolsSubMenu_DropDownOpened(object sender, EventArgs e) private void ToolsSubMenu_DropDownOpened(object sender, EventArgs e)
{ {
ToolBoxMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["ToolBox"].Bindings; ToolBoxMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["ToolBox"].Bindings;
@ -1116,17 +1111,17 @@ namespace BizHawk.Client.EmuHawk
TAStudioMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["TAStudio"].Bindings; TAStudioMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["TAStudio"].Bindings;
VirtualPadMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Virtual Pad"].Bindings; VirtualPadMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Virtual Pad"].Bindings;
TraceLoggerMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Trace Logger"].Bindings; TraceLoggerMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Trace Logger"].Bindings;
TraceLoggerMenuItem.Enabled = ToolAvailable<TraceLogger>(); TraceLoggerMenuItem.Enabled = GlobalWin.Tools.IsAvailable<TraceLogger>();
TAStudioMenuItem.Enabled = ToolAvailable<TAStudio>(); TAStudioMenuItem.Enabled = GlobalWin.Tools.IsAvailable<TAStudio>();
CheatsMenuItem.Enabled = ToolAvailable<Cheats>(); CheatsMenuItem.Enabled = GlobalWin.Tools.IsAvailable<Cheats>();
HexEditorMenuItem.Enabled = ToolAvailable<HexEditor>(); HexEditorMenuItem.Enabled = GlobalWin.Tools.IsAvailable<HexEditor>();
RamSearchMenuItem.Enabled = ToolAvailable<RamSearch>(); RamSearchMenuItem.Enabled = GlobalWin.Tools.IsAvailable<RamSearch>();
RamWatchMenuItem.Enabled = ToolAvailable<RamWatch>(); RamWatchMenuItem.Enabled = GlobalWin.Tools.IsAvailable<RamWatch>();
DebuggerMenuItem.Visible = VersionInfo.DeveloperBuild; DebuggerMenuItem.Visible = VersionInfo.DeveloperBuild;
DebuggerMenuItem.Enabled = ToolAvailable<GenericDebugger>(); DebuggerMenuItem.Enabled = GlobalWin.Tools.IsAvailable<GenericDebugger>();
batchRunnerToolStripMenuItem.Visible = VersionInfo.DeveloperBuild; batchRunnerToolStripMenuItem.Visible = VersionInfo.DeveloperBuild;
} }
@ -1213,11 +1208,11 @@ namespace BizHawk.Client.EmuHawk
{ {
FDSControlsMenuItem.Enabled = Global.Emulator.BoardName == "FDS"; FDSControlsMenuItem.Enabled = Global.Emulator.BoardName == "FDS";
NESSoundChannelsMenuItem.Enabled = ToolAvailable<NESSoundConfig>(); NESSoundChannelsMenuItem.Enabled = GlobalWin.Tools.IsAvailable<NESSoundConfig>();
MovieSettingsMenuItem.Enabled = ToolAvailable<NESSyncSettingsForm>() MovieSettingsMenuItem.Enabled = GlobalWin.Tools.IsAvailable<NESSyncSettingsForm>()
&& !Global.MovieSession.Movie.IsActive; && !Global.MovieSession.Movie.IsActive;
NesControllerSettingsMenuItem.Enabled = ToolAvailable<NesControllerSettings>() NesControllerSettingsMenuItem.Enabled = GlobalWin.Tools.IsAvailable<NesControllerSettings>()
&& !Global.MovieSession.Movie.IsActive; && !Global.MovieSession.Movie.IsActive;
barcodeReaderToolStripMenuItem.Enabled = ServiceInjector.IsAvailable(Global.Emulator.ServiceProvider, typeof(BarcodeEntry)); barcodeReaderToolStripMenuItem.Enabled = ServiceInjector.IsAvailable(Global.Emulator.ServiceProvider, typeof(BarcodeEntry));

5
BizHawk.Client.EmuHawk/tools/ToolManager.cs
View File

@ -530,6 +530,11 @@ namespace BizHawk.Client.EmuHawk
} }
} }
public bool IsAvailable<T>()
{
return ServiceInjector.IsAvailable(Global.Emulator.ServiceProvider, typeof(T));
}
// Note: Referencing these properties creates an instance of the tool and persists it. They should be referenced by type if this is not desired // Note: Referencing these properties creates an instance of the tool and persists it. They should be referenced by type if this is not desired
#region Tools #region Tools