From df6af8e158bf0ed53a961159f942084c06cfa072 Mon Sep 17 00:00:00 2001 From: adelikat Date: Sat, 2 Nov 2013 20:25:53 +0000 Subject: [PATCH] Move hex editor into ToolManager --- BizHawk.MultiClient/MainForm.Events.cs | 2 +- BizHawk.MultiClient/MainForm.cs | 23 ++----------------- .../tools/HexEditor/HexColor.cs | 10 ++++---- .../tools/HexEditor/HexEditor.cs | 7 ++++-- .../tools/HexEditor/HexFind.cs | 6 ++--- .../Lua/Libraries/EmuLuaLibrary.Client.cs | 2 +- BizHawk.MultiClient/tools/ToolBox.cs | 2 +- BizHawk.MultiClient/tools/ToolHelpers.cs | 8 +++---- BizHawk.MultiClient/tools/ToolManager.cs | 23 +++++++++++++++++++ BizHawk.MultiClient/tools/Watch/RamWatch.cs | 2 +- 10 files changed, 46 insertions(+), 39 deletions(-) diff --git a/BizHawk.MultiClient/MainForm.Events.cs b/BizHawk.MultiClient/MainForm.Events.cs index ba642f84d5..64fc34851f 100644 --- a/BizHawk.MultiClient/MainForm.Events.cs +++ b/BizHawk.MultiClient/MainForm.Events.cs @@ -1165,7 +1165,7 @@ namespace BizHawk.MultiClient private void HexEditorMenuItem_Click(object sender, EventArgs e) { - LoadHexEditor(); + GlobalWinF.Tools.Load(); } private void TraceLoggerMenuItem_Click(object sender, EventArgs e) diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs index ec8b254e68..a77a4d73d8 100644 --- a/BizHawk.MultiClient/MainForm.cs +++ b/BizHawk.MultiClient/MainForm.cs @@ -85,8 +85,6 @@ namespace BizHawk.MultiClient private Point _windowed_location; //tool dialogs - - private HexEditor _hexeditor; private TraceLogger _tracelogger; private SNESGraphicsDebugger _snesgraphicsdebugger; private NESNameTableViewer _nesnametableview; @@ -107,7 +105,6 @@ namespace BizHawk.MultiClient private NESSoundConfig _nessound; //TODO: this is a lazy way to refactor things, but works for now. The point is to not have these objects created until needed, without refactoring a lot of code - public HexEditor HexEditor1 { get { if (_hexeditor == null) _hexeditor = new HexEditor(); return _hexeditor; } set { _hexeditor = value; } } public TraceLogger TraceLogger1 { get { if (_tracelogger == null) _tracelogger = new TraceLogger(); return _tracelogger; } set { _tracelogger = value; } } public SNESGraphicsDebugger SNESGraphicsDebugger1 { get { if (_snesgraphicsdebugger == null) _snesgraphicsdebugger = new SNESGraphicsDebugger(); return _snesgraphicsdebugger; } set { _snesgraphicsdebugger = value; } } public NESNameTableViewer NESNameTableViewer1 { get { return _nesnametableview ?? (_nesnametableview = new NESNameTableViewer()); } set { _nesnametableview = value; } } @@ -354,7 +351,7 @@ namespace BizHawk.MultiClient } if (Global.Config.AutoLoadHexEditor) { - LoadHexEditor(); + GlobalWinF.Tools.Load(); } if (Global.Config.RecentCheats.AutoLoad) { @@ -1606,8 +1603,6 @@ namespace BizHawk.MultiClient //} GlobalWinF.Tools.Restart(); - - if (_hexeditor != null) HexEditor1.Restart(); if (_nesppu != null) NESPPU1.Restart(); if (_nesnametableview != null) NESNameTableViewer1.Restart(); if (_nesdebugger != null) NESDebug1.Restart(); @@ -2098,7 +2093,7 @@ namespace BizHawk.MultiClient case "Ram Watch": LoadRamWatch(true); break; case "Ram Search": GlobalWinF.Tools.Load(); break; - case "Hex Editor": LoadHexEditor(); break; + case "Hex Editor": GlobalWinF.Tools.Load(); break; case "Trace Logger": LoadTraceLogger(); break; case "Lua Console": OpenLuaConsole(); break; case "Cheats": LoadCheatsWindow(); break; @@ -2364,7 +2359,6 @@ namespace BizHawk.MultiClient #endif GlobalWinF.Tools.UpdateAfter(); - if (_hexeditor != null) HexEditor1.UpdateValues(); //The other tool updates are earlier, TAStudio needs to be later so it can display the latest //frame of execution in its list view. @@ -2722,17 +2716,6 @@ namespace BizHawk.MultiClient SNESGraphicsDebugger1.Focus(); } - public void LoadHexEditor() - { - if (!HexEditor1.IsHandleCreated || HexEditor1.IsDisposed) - { - HexEditor1 = new HexEditor(); - HexEditor1.Show(); - } - else - HexEditor1.Focus(); - } - public void LoadTraceLogger() { if (Global.Emulator.CoreComm.CpuTraceAvailable) @@ -3190,7 +3173,6 @@ namespace BizHawk.MultiClient RewireSound(); ResetRewindBuffer(); - HexEditor1.Restart(); NESPPU1.Restart(); NESNameTableViewer1.Restart(); NESDebug1.Restart(); @@ -3230,7 +3212,6 @@ namespace BizHawk.MultiClient public void CloseTools() { - CloseForm(HexEditor1); CloseForm(NESNameTableViewer1); CloseForm(NESPPU1); CloseForm(NESDebug1); diff --git a/BizHawk.MultiClient/tools/HexEditor/HexColor.cs b/BizHawk.MultiClient/tools/HexEditor/HexColor.cs index ac606925ed..e488772771 100644 --- a/BizHawk.MultiClient/tools/HexEditor/HexColor.cs +++ b/BizHawk.MultiClient/tools/HexEditor/HexColor.cs @@ -27,8 +27,8 @@ namespace BizHawk.MultiClient if (colorDialog1.ShowDialog() == DialogResult.OK) { Global.Config.HexBackgrndColor = colorDialog1.Color; - GlobalWinF.MainForm.HexEditor1.Header.BackColor = colorDialog1.Color; - GlobalWinF.MainForm.HexEditor1.MemoryViewerBox.BackColor = Global.Config.HexBackgrndColor; + GlobalWinF.Tools.HexEditor.Header.BackColor = colorDialog1.Color; + GlobalWinF.Tools.HexEditor.MemoryViewerBox.BackColor = Global.Config.HexBackgrndColor; HexBackgrnd.BackColor = colorDialog1.Color; } } @@ -38,8 +38,8 @@ namespace BizHawk.MultiClient if (colorDialog1.ShowDialog() == DialogResult.OK) { Global.Config.HexForegrndColor = colorDialog1.Color; - GlobalWinF.MainForm.HexEditor1.Header.ForeColor = colorDialog1.Color; - GlobalWinF.MainForm.HexEditor1.MemoryViewerBox.ForeColor = Global.Config.HexForegrndColor; + GlobalWinF.Tools.HexEditor.Header.ForeColor = colorDialog1.Color; + GlobalWinF.Tools.HexEditor.MemoryViewerBox.ForeColor = Global.Config.HexForegrndColor; HexForegrnd.BackColor = colorDialog1.Color; } @@ -50,7 +50,7 @@ namespace BizHawk.MultiClient if (colorDialog1.ShowDialog() == DialogResult.OK) { Global.Config.HexMenubarColor = colorDialog1.Color; - GlobalWinF.MainForm.HexEditor1.menuStrip1.BackColor = Global.Config.HexMenubarColor; + GlobalWinF.Tools.HexEditor.menuStrip1.BackColor = Global.Config.HexMenubarColor; HexMenubar.BackColor = colorDialog1.Color; } } diff --git a/BizHawk.MultiClient/tools/HexEditor/HexEditor.cs b/BizHawk.MultiClient/tools/HexEditor/HexEditor.cs index a780b6120c..153cd5a300 100644 --- a/BizHawk.MultiClient/tools/HexEditor/HexEditor.cs +++ b/BizHawk.MultiClient/tools/HexEditor/HexEditor.cs @@ -13,7 +13,7 @@ using BizHawk.Client.Common; namespace BizHawk.MultiClient { - public partial class HexEditor : Form + public partial class HexEditor : Form, IToolForm { //TODO: //Increment/Decrement wrapping logic for 4 byte values is messed up @@ -53,7 +53,10 @@ namespace BizHawk.MultiClient private bool BigEndian; private int DataSize; - HexFind HexFind1 = new HexFind(); + private HexFind HexFind1 = new HexFind(); + + public bool AskSave() { return true; } + public bool UpdateBefore { get { return false; } } public HexEditor() { diff --git a/BizHawk.MultiClient/tools/HexEditor/HexFind.cs b/BizHawk.MultiClient/tools/HexEditor/HexFind.cs index c0a0d3427e..cc6698b222 100644 --- a/BizHawk.MultiClient/tools/HexEditor/HexFind.cs +++ b/BizHawk.MultiClient/tools/HexEditor/HexFind.cs @@ -60,12 +60,12 @@ namespace BizHawk.MultiClient private void Find_Prev_Click(object sender, EventArgs e) { - GlobalWinF.MainForm.HexEditor1.FindPrev(GetFindBoxChars(), false); + GlobalWinF.Tools.HexEditor.FindPrev(GetFindBoxChars(), false); } private void Find_Next_Click(object sender, EventArgs e) { - GlobalWinF.MainForm.HexEditor1.FindNext(GetFindBoxChars(), false); + GlobalWinF.Tools.HexEditor.FindNext(GetFindBoxChars(), false); } private void ChangeCasing() @@ -94,7 +94,7 @@ namespace BizHawk.MultiClient { if (e.KeyData == Keys.Enter) { - GlobalWinF.MainForm.HexEditor1.FindNext(GetFindBoxChars(), false); + GlobalWinF.Tools.HexEditor.FindNext(GetFindBoxChars(), false); } } } diff --git a/BizHawk.MultiClient/tools/Lua/Libraries/EmuLuaLibrary.Client.cs b/BizHawk.MultiClient/tools/Lua/Libraries/EmuLuaLibrary.Client.cs index e513bcd94d..014b081eb4 100644 --- a/BizHawk.MultiClient/tools/Lua/Libraries/EmuLuaLibrary.Client.cs +++ b/BizHawk.MultiClient/tools/Lua/Libraries/EmuLuaLibrary.Client.cs @@ -117,7 +117,7 @@ namespace BizHawk.MultiClient public static void client_openhexeditor() { - GlobalWinF.MainForm.LoadHexEditor(); + GlobalWinF.Tools.Load(); } public static void client_openramwatch() diff --git a/BizHawk.MultiClient/tools/ToolBox.cs b/BizHawk.MultiClient/tools/ToolBox.cs index ea39d08524..2cb75ca1f3 100644 --- a/BizHawk.MultiClient/tools/ToolBox.cs +++ b/BizHawk.MultiClient/tools/ToolBox.cs @@ -103,7 +103,7 @@ namespace BizHawk.MultiClient private void HexEditor_Click(object sender, EventArgs e) { - GlobalWinF.MainForm.LoadHexEditor(); + GlobalWinF.Tools.Load(); } private void toolStripButton5_Click(object sender, EventArgs e) diff --git a/BizHawk.MultiClient/tools/ToolHelpers.cs b/BizHawk.MultiClient/tools/ToolHelpers.cs index 92d5fd043b..68d972bb24 100644 --- a/BizHawk.MultiClient/tools/ToolHelpers.cs +++ b/BizHawk.MultiClient/tools/ToolHelpers.cs @@ -208,7 +208,7 @@ namespace BizHawk.MultiClient { GlobalWinF.Tools.UpdateValues(); GlobalWinF.Tools.UpdateValues(); - GlobalWinF.MainForm.HexEditor1.UpdateValues(); + GlobalWinF.Tools.UpdateValues(); GlobalWinF.MainForm.Cheats_UpdateValues(); GlobalWinF.MainForm.UpdateCheatStatus(); } @@ -249,9 +249,9 @@ namespace BizHawk.MultiClient public static void ViewInHexEditor(MemoryDomain domain, IEnumerable addresses) { - GlobalWinF.MainForm.LoadHexEditor(); - GlobalWinF.MainForm.HexEditor1.SetDomain(domain); - GlobalWinF.MainForm.HexEditor1.SetToAddresses(addresses.ToList()); + GlobalWinF.Tools.Load(); + GlobalWinF.Tools.HexEditor.SetDomain(domain); + GlobalWinF.Tools.HexEditor.SetToAddresses(addresses.ToList()); } public static MemoryDomain DomainByName(string name) diff --git a/BizHawk.MultiClient/tools/ToolManager.cs b/BizHawk.MultiClient/tools/ToolManager.cs index 295f1c3595..147fe9a1a4 100644 --- a/BizHawk.MultiClient/tools/ToolManager.cs +++ b/BizHawk.MultiClient/tools/ToolManager.cs @@ -227,6 +227,29 @@ namespace BizHawk.MultiClient } } + public HexEditor HexEditor + { + get + { + var tool = _tools.FirstOrDefault(x => x is HexEditor); + if (tool != null) + { + if (tool.IsDisposed) + { + _tools.Remove(tool); + } + else + { + return tool as HexEditor; + } + } + + var ramWatch = new HexEditor(); + _tools.Add(ramWatch); + return ramWatch; + } + } + #endregion } } diff --git a/BizHawk.MultiClient/tools/Watch/RamWatch.cs b/BizHawk.MultiClient/tools/Watch/RamWatch.cs index 8240d8995b..a151052fe4 100644 --- a/BizHawk.MultiClient/tools/Watch/RamWatch.cs +++ b/BizHawk.MultiClient/tools/Watch/RamWatch.cs @@ -1154,7 +1154,7 @@ namespace BizHawk.MultiClient var selected = SelectedWatches; if (selected.Any()) { - GlobalWinF.MainForm.LoadHexEditor(); + GlobalWinF.Tools.Load(); if (selected.Select(x => x.Domain).Distinct().Count() > 1) {