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

Move some tool loading logic from mainform to toolmanager

This commit is contained in:
adelikat 2013-12-22 23:34:22 +00:00
parent f992672051
commit 05e2f67771
6 changed files with 49 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1129,7 +1129,7 @@ namespace BizHawk.Client.EmuHawk
private void TraceLoggerMenuItem_Click(object sender, EventArgs e)
{
LoadTraceLogger();
GlobalWin.Tools.LoadTraceLogger();
}
private void TAStudioMenuItem_Click(object sender, EventArgs e)
@ -1207,7 +1207,7 @@ namespace BizHawk.Client.EmuHawk
private void NESGameGenieCodesMenuItem_Click(object sender, EventArgs e)
{
LoadGameGenieEc();
GlobalWin.Tools.LoadGameGenieEc();
}
private void NESGraphicSettingsMenuItem_Click(object sender, EventArgs e)
@ -1342,7 +1342,7 @@ namespace BizHawk.Client.EmuHawk
private void GGGameGenieMenuItem_Click(object sender, EventArgs e)
{
LoadGameGenieEc();
GlobalWin.Tools.LoadGameGenieEc();
}
#endregion
@ -1553,7 +1553,7 @@ namespace BizHawk.Client.EmuHawk
private void GBGameGenieMenuItem_Click(object sender, EventArgs e)
{
LoadGameGenieEc();
GlobalWin.Tools.LoadGameGenieEc();
}
#endregion
@ -1658,7 +1658,7 @@ namespace BizHawk.Client.EmuHawk
private void SnesGameGenieMenuItem_Click(object sender, EventArgs e)
{
LoadGameGenieEc();
GlobalWin.Tools.LoadGameGenieEc();
}
private void SnesOptionsMenuItem_Click(object sender, EventArgs e)

41
BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -314,7 +314,7 @@ namespace BizHawk.Client.EmuHawk
if (Global.Config.NESGGAutoload && Global.Emulator is NES)
{
LoadGameGenieEc();
GlobalWin.Tools.LoadGameGenieEc();
}
if (Global.Config.AutoLoadGBGPUView && Global.Emulator is Gameboy)
@ -349,10 +349,7 @@ namespace BizHawk.Client.EmuHawk
if (Global.Config.TraceLoggerAutoLoad)
{
if (Global.CoreComm.CpuTraceAvailable)
{
LoadTraceLogger();
}
GlobalWin.Tools.LoadTraceLogger();
}
if (Global.Config.DisplayStatusBar == false)
@ -695,34 +692,6 @@ namespace BizHawk.Client.EmuHawk
GlobalWin.OSD.AddMessage(fi.Name + " saved.");
}
public void LoadGameGenieEc()
{
if (Global.Emulator is NES)
{
GlobalWin.Tools.Load<NESGameGenie>();
}
else if (Global.Emulator is LibsnesCore)
{
GlobalWin.Tools.Load<SNESGameGenie>();
}
else if ((Global.Emulator.SystemId == "GB") || (Global.Game.System == "GG"))
{
GlobalWin.Tools.Load<GBGameGenie>();
}
else if (Global.Emulator.SystemId == "GEN" && VersionInfo.INTERIM)
{
GlobalWin.Tools.Load<GenGameGenie>();
}
}
public void LoadTraceLogger()
{
if (Global.Emulator.CoreComm.CpuTraceAvailable)
{
GlobalWin.Tools.Load<TraceLogger>();
}
}
public void FrameBufferResized()
{
// run this entire thing exactly twice, since the first resize may adjust the menu stacking
@ -1211,7 +1180,7 @@ namespace BizHawk.Client.EmuHawk
case "MT Increment Player":
Global.MovieSession.MultiTrack.CurrentPlayer++;
Global.MovieSession.MultiTrack.RecordAll = false;
if (Global.MovieSession.MultiTrack.CurrentPlayer > 5) //TODO: Replace with console's maximum or current maximum players??!
if (Global.MovieSession.MultiTrack.CurrentPlayer > 5) // TODO: Replace with console's maximum or current maximum players??!
{
Global.MovieSession.MultiTrack.CurrentPlayer = 1;
}
@ -1223,7 +1192,7 @@ namespace BizHawk.Client.EmuHawk
Global.MovieSession.MultiTrack.RecordAll = false;
if (Global.MovieSession.MultiTrack.CurrentPlayer < 1)
{
Global.MovieSession.MultiTrack.CurrentPlayer = 5;//TODO: Replace with console's maximum or current maximum players??!
Global.MovieSession.MultiTrack.CurrentPlayer = 5; // TODO: Replace with console's maximum or current maximum players??!
}
GlobalWin.OSD.MT = "Recording Player " + Global.MovieSession.MultiTrack.CurrentPlayer;
GlobalWin.DisplayManager.NeedsToPaint = true;
@ -1233,7 +1202,7 @@ namespace BizHawk.Client.EmuHawk
case "Ram Watch": GlobalWin.Tools.LoadRamWatch(true); break;
case "Ram Search": GlobalWin.Tools.Load<RamSearch>(); break;
case "Hex Editor": GlobalWin.Tools.Load<HexEditor>(); break;
case "Trace Logger": LoadTraceLogger(); break;
case "Trace Logger": GlobalWin.Tools.LoadTraceLogger(); break;
case "Lua Console": OpenLuaConsole(); break;
case "Cheats": GlobalWin.Tools.Load<Cheats>(); break;
case "TAStudio": LoadTAStudio(); break;

2
BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs
View File

@ -673,7 +673,7 @@ namespace BizHawk.Client.EmuHawk
private void OpenGameGenieEncoderDecoderMenuItem_Click(object sender, EventArgs e)
{
GlobalWin.MainForm.LoadGameGenieEc();
GlobalWin.Tools.LoadGameGenieEc();
}
#endregion

2
BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Client.cs
View File

@ -147,7 +147,7 @@ namespace BizHawk.Client.EmuHawk
public static void client_opentracelogger()
{
GlobalWin.MainForm.LoadTraceLogger();
GlobalWin.Tools.LoadTraceLogger();
}
public static void client_paint()

8
BizHawk.Client.EmuHawk/tools/ToolBox.cs
View File

@ -151,7 +151,7 @@ namespace BizHawk.Client.EmuHawk
private void NesGameGenieToolbarItem_Click(object sender, EventArgs e)
{
GlobalWin.MainForm.LoadGameGenieEc();
GlobalWin.Tools.LoadGameGenieEc();
}
private void NesNameTableToolbarItem_Click(object sender, EventArgs e)
@ -181,17 +181,17 @@ namespace BizHawk.Client.EmuHawk
private void SNESGameGenieToolbarItem_Click(object sender, EventArgs e)
{
GlobalWin.MainForm.LoadGameGenieEc();
GlobalWin.Tools.LoadGameGenieEc();
}
private void GGGameGenieToolbarItem_Click(object sender, EventArgs e)
{
GlobalWin.MainForm.LoadGameGenieEc();
GlobalWin.Tools.LoadGameGenieEc();
}
private void GBGameGenieToolbarItem_Click(object sender, EventArgs e)
{
GlobalWin.MainForm.LoadGameGenieEc();
GlobalWin.Tools.LoadGameGenieEc();
}
private void GbGpuViewerToolBarItem_Click(object sender, EventArgs e)

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

@ -408,17 +408,49 @@ namespace BizHawk.Client.EmuHawk
#endregion
//TODO: this shouldn't be necessary
#region Specialized Tool Loading Logic
public void LoadRamWatch(bool loadDialog)
{
if (Global.Config.RecentWatches.AutoLoad && !Global.Config.RecentWatches.Empty)
{
GlobalWin.Tools.RamWatch.LoadFileFromRecent(Global.Config.RecentWatches[0]);
}
if (loadDialog)
{
GlobalWin.Tools.Load<RamWatch>();
}
}
public void LoadTraceLogger()
{
if (Global.Emulator.CoreComm.CpuTraceAvailable)
{
Load<TraceLogger>();
}
}
public void LoadGameGenieEc()
{
if (Global.Emulator.SystemId == "NES")
{
Load<NESGameGenie>();
}
else if (Global.Emulator.SystemId == "SNES")
{
Load<SNESGameGenie>();
}
else if ((Global.Emulator.SystemId == "GB") || (Global.Game.System == "GG"))
{
Load<GBGameGenie>();
}
else if (Global.Emulator.SystemId == "GEN" && VersionInfo.INTERIM)
{
Load<GenGameGenie>();
}
}
#endregion
}
}