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

Move hex editor into ToolManager

This commit is contained in:
adelikat 2013-11-02 20:25:53 +00:00
parent 5f1640a3b1
commit df6af8e158
10 changed files with 46 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.MultiClient/MainForm.Events.cs
View File

@ -1165,7 +1165,7 @@ namespace BizHawk.MultiClient
private void HexEditorMenuItem_Click(object sender, EventArgs e) private void HexEditorMenuItem_Click(object sender, EventArgs e)
{ {
LoadHexEditor(); GlobalWinF.Tools.Load<HexEditor>();
} }
private void TraceLoggerMenuItem_Click(object sender, EventArgs e) private void TraceLoggerMenuItem_Click(object sender, EventArgs e)

23
BizHawk.MultiClient/MainForm.cs
View File

@ -85,8 +85,6 @@ namespace BizHawk.MultiClient
private Point _windowed_location; private Point _windowed_location;
//tool dialogs //tool dialogs
private HexEditor _hexeditor;
private TraceLogger _tracelogger; private TraceLogger _tracelogger;
private SNESGraphicsDebugger _snesgraphicsdebugger; private SNESGraphicsDebugger _snesgraphicsdebugger;
private NESNameTableViewer _nesnametableview; private NESNameTableViewer _nesnametableview;
@ -107,7 +105,6 @@ namespace BizHawk.MultiClient
private NESSoundConfig _nessound; 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 //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 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 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; } } public NESNameTableViewer NESNameTableViewer1 { get { return _nesnametableview ?? (_nesnametableview = new NESNameTableViewer()); } set { _nesnametableview = value; } }
@ -354,7 +351,7 @@ namespace BizHawk.MultiClient
} }
if (Global.Config.AutoLoadHexEditor) if (Global.Config.AutoLoadHexEditor)
{ {
LoadHexEditor(); GlobalWinF.Tools.Load<HexEditor>();
} }
if (Global.Config.RecentCheats.AutoLoad) if (Global.Config.RecentCheats.AutoLoad)
{ {
@ -1606,8 +1603,6 @@ namespace BizHawk.MultiClient
//} //}
GlobalWinF.Tools.Restart(); GlobalWinF.Tools.Restart();
if (_hexeditor != null) HexEditor1.Restart();
if (_nesppu != null) NESPPU1.Restart(); if (_nesppu != null) NESPPU1.Restart();
if (_nesnametableview != null) NESNameTableViewer1.Restart(); if (_nesnametableview != null) NESNameTableViewer1.Restart();
if (_nesdebugger != null) NESDebug1.Restart(); if (_nesdebugger != null) NESDebug1.Restart();
@ -2098,7 +2093,7 @@ namespace BizHawk.MultiClient
case "Ram Watch": LoadRamWatch(true); break; case "Ram Watch": LoadRamWatch(true); break;
case "Ram Search": GlobalWinF.Tools.Load<RamSearch>(); break; case "Ram Search": GlobalWinF.Tools.Load<RamSearch>(); break;
case "Hex Editor": LoadHexEditor(); break; case "Hex Editor": GlobalWinF.Tools.Load<HexEditor>(); break;
case "Trace Logger": LoadTraceLogger(); break; case "Trace Logger": LoadTraceLogger(); break;
case "Lua Console": OpenLuaConsole(); break; case "Lua Console": OpenLuaConsole(); break;
case "Cheats": LoadCheatsWindow(); break; case "Cheats": LoadCheatsWindow(); break;
@ -2364,7 +2359,6 @@ namespace BizHawk.MultiClient
#endif #endif
GlobalWinF.Tools.UpdateAfter(); 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 //The other tool updates are earlier, TAStudio needs to be later so it can display the latest
//frame of execution in its list view. //frame of execution in its list view.
@ -2722,17 +2716,6 @@ namespace BizHawk.MultiClient
SNESGraphicsDebugger1.Focus(); SNESGraphicsDebugger1.Focus();
} }
public void LoadHexEditor()
{
if (!HexEditor1.IsHandleCreated || HexEditor1.IsDisposed)
{
HexEditor1 = new HexEditor();
HexEditor1.Show();
}
else
HexEditor1.Focus();
}
public void LoadTraceLogger() public void LoadTraceLogger()
{ {
if (Global.Emulator.CoreComm.CpuTraceAvailable) if (Global.Emulator.CoreComm.CpuTraceAvailable)
@ -3190,7 +3173,6 @@ namespace BizHawk.MultiClient
RewireSound(); RewireSound();
ResetRewindBuffer(); ResetRewindBuffer();
HexEditor1.Restart();
NESPPU1.Restart(); NESPPU1.Restart();
NESNameTableViewer1.Restart(); NESNameTableViewer1.Restart();
NESDebug1.Restart(); NESDebug1.Restart();
@ -3230,7 +3212,6 @@ namespace BizHawk.MultiClient
public void CloseTools() public void CloseTools()
{ {
CloseForm(HexEditor1);
CloseForm(NESNameTableViewer1); CloseForm(NESNameTableViewer1);
CloseForm(NESPPU1); CloseForm(NESPPU1);
CloseForm(NESDebug1); CloseForm(NESDebug1);

10
BizHawk.MultiClient/tools/HexEditor/HexColor.cs
View File

@ -27,8 +27,8 @@ namespace BizHawk.MultiClient
if (colorDialog1.ShowDialog() == DialogResult.OK) if (colorDialog1.ShowDialog() == DialogResult.OK)
{ {
Global.Config.HexBackgrndColor = colorDialog1.Color; Global.Config.HexBackgrndColor = colorDialog1.Color;
GlobalWinF.MainForm.HexEditor1.Header.BackColor = colorDialog1.Color; GlobalWinF.Tools.HexEditor.Header.BackColor = colorDialog1.Color;
GlobalWinF.MainForm.HexEditor1.MemoryViewerBox.BackColor = Global.Config.HexBackgrndColor; GlobalWinF.Tools.HexEditor.MemoryViewerBox.BackColor = Global.Config.HexBackgrndColor;
HexBackgrnd.BackColor = colorDialog1.Color; HexBackgrnd.BackColor = colorDialog1.Color;
} }
} }
@ -38,8 +38,8 @@ namespace BizHawk.MultiClient
if (colorDialog1.ShowDialog() == DialogResult.OK) if (colorDialog1.ShowDialog() == DialogResult.OK)
{ {
Global.Config.HexForegrndColor = colorDialog1.Color; Global.Config.HexForegrndColor = colorDialog1.Color;
GlobalWinF.MainForm.HexEditor1.Header.ForeColor = colorDialog1.Color; GlobalWinF.Tools.HexEditor.Header.ForeColor = colorDialog1.Color;
GlobalWinF.MainForm.HexEditor1.MemoryViewerBox.ForeColor = Global.Config.HexForegrndColor; GlobalWinF.Tools.HexEditor.MemoryViewerBox.ForeColor = Global.Config.HexForegrndColor;
HexForegrnd.BackColor = colorDialog1.Color; HexForegrnd.BackColor = colorDialog1.Color;
} }
@ -50,7 +50,7 @@ namespace BizHawk.MultiClient
if (colorDialog1.ShowDialog() == DialogResult.OK) if (colorDialog1.ShowDialog() == DialogResult.OK)
{ {
Global.Config.HexMenubarColor = colorDialog1.Color; 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; HexMenubar.BackColor = colorDialog1.Color;
} }
} }

7
BizHawk.MultiClient/tools/HexEditor/HexEditor.cs
View File

@ -13,7 +13,7 @@ using BizHawk.Client.Common;
namespace BizHawk.MultiClient namespace BizHawk.MultiClient
{ {
public partial class HexEditor : Form public partial class HexEditor : Form, IToolForm
{ {
//TODO: //TODO:
//Increment/Decrement wrapping logic for 4 byte values is messed up //Increment/Decrement wrapping logic for 4 byte values is messed up
@ -53,7 +53,10 @@ namespace BizHawk.MultiClient
private bool BigEndian; private bool BigEndian;
private int DataSize; 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() public HexEditor()
{ {

6
BizHawk.MultiClient/tools/HexEditor/HexFind.cs
View File

@ -60,12 +60,12 @@ namespace BizHawk.MultiClient
private void Find_Prev_Click(object sender, EventArgs e) 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) private void Find_Next_Click(object sender, EventArgs e)
{ {
GlobalWinF.MainForm.HexEditor1.FindNext(GetFindBoxChars(), false); GlobalWinF.Tools.HexEditor.FindNext(GetFindBoxChars(), false);
} }
private void ChangeCasing() private void ChangeCasing()
@ -94,7 +94,7 @@ namespace BizHawk.MultiClient
{ {
if (e.KeyData == Keys.Enter) if (e.KeyData == Keys.Enter)
{ {
GlobalWinF.MainForm.HexEditor1.FindNext(GetFindBoxChars(), false); GlobalWinF.Tools.HexEditor.FindNext(GetFindBoxChars(), false);
} }
} }
} }

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

@ -117,7 +117,7 @@ namespace BizHawk.MultiClient
public static void client_openhexeditor() public static void client_openhexeditor()
{ {
GlobalWinF.MainForm.LoadHexEditor(); GlobalWinF.Tools.Load<HexEditor>();
} }
public static void client_openramwatch() public static void client_openramwatch()

2
BizHawk.MultiClient/tools/ToolBox.cs
View File

@ -103,7 +103,7 @@ namespace BizHawk.MultiClient
private void HexEditor_Click(object sender, EventArgs e) private void HexEditor_Click(object sender, EventArgs e)
{ {
GlobalWinF.MainForm.LoadHexEditor(); GlobalWinF.Tools.Load<HexEditor>();
} }
private void toolStripButton5_Click(object sender, EventArgs e) private void toolStripButton5_Click(object sender, EventArgs e)

8
BizHawk.MultiClient/tools/ToolHelpers.cs
View File

@ -208,7 +208,7 @@ namespace BizHawk.MultiClient
{ {
GlobalWinF.Tools.UpdateValues<RamWatch>(); GlobalWinF.Tools.UpdateValues<RamWatch>();
GlobalWinF.Tools.UpdateValues<RamSearch>(); GlobalWinF.Tools.UpdateValues<RamSearch>();
GlobalWinF.MainForm.HexEditor1.UpdateValues(); GlobalWinF.Tools.UpdateValues<HexEditor>();
GlobalWinF.MainForm.Cheats_UpdateValues(); GlobalWinF.MainForm.Cheats_UpdateValues();
GlobalWinF.MainForm.UpdateCheatStatus(); GlobalWinF.MainForm.UpdateCheatStatus();
} }
@ -249,9 +249,9 @@ namespace BizHawk.MultiClient
public static void ViewInHexEditor(MemoryDomain domain, IEnumerable<int> addresses) public static void ViewInHexEditor(MemoryDomain domain, IEnumerable<int> addresses)
{ {
GlobalWinF.MainForm.LoadHexEditor(); GlobalWinF.Tools.Load<HexEditor>();
GlobalWinF.MainForm.HexEditor1.SetDomain(domain); GlobalWinF.Tools.HexEditor.SetDomain(domain);
GlobalWinF.MainForm.HexEditor1.SetToAddresses(addresses.ToList()); GlobalWinF.Tools.HexEditor.SetToAddresses(addresses.ToList());
} }
public static MemoryDomain DomainByName(string name) public static MemoryDomain DomainByName(string name)

23
BizHawk.MultiClient/tools/ToolManager.cs
View File

@ -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 #endregion
} }
} }

2
BizHawk.MultiClient/tools/Watch/RamWatch.cs
View File

@ -1154,7 +1154,7 @@ namespace BizHawk.MultiClient
var selected = SelectedWatches; var selected = SelectedWatches;
if (selected.Any()) if (selected.Any())
{ {
GlobalWinF.MainForm.LoadHexEditor(); GlobalWinF.Tools.Load<HexEditor>();
if (selected.Select(x => x.Domain).Distinct().Count() > 1) if (selected.Select(x => x.Domain).Distinct().Count() > 1)
{ {