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

Hex Editor - some minor code cleanup including putting highlight colors in the config file for eventually adding to the color picker

This commit is contained in:
adelikat 2012-06-10 23:34:37 +00:00
parent c7925d986c
commit da1aebe1ac
4 changed files with 29 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
BizHawk.MultiClient/Config.cs
View File

@ -1,4 +1,5 @@
using System.IO; using System.IO;
using System.Drawing;
namespace BizHawk.MultiClient namespace BizHawk.MultiClient
{ {
@ -280,9 +281,12 @@ namespace BizHawk.MultiClient
public int HexEditorDataSize = 1; public int HexEditorDataSize = 1;
//Hex Editor Colors //Hex Editor Colors
public bool hexcustom; public bool hexcustom;
public System.Drawing.Color hexbackgrnd; public Color HexBackgrndColor;
public System.Drawing.Color hexforegrnd; public Color HexForegrndColor;
public System.Drawing.Color hexmenubar; public Color HexMenubarColor;
public Color HexFreezeColor = Color.LightBlue;
public Color HexHighlightColor = Color.Pink;
public Color HexHighlightFreezeColor = Color.Violet;
// Video dumping settings // Video dumping settings
public int JMDCompression = 3; public int JMDCompression = 3;

18
BizHawk.MultiClient/tools/HexColor.cs
View File

@ -18,17 +18,17 @@ namespace BizHawk.MultiClient
private void HexColors_Form_Load(object sender, EventArgs e) private void HexColors_Form_Load(object sender, EventArgs e)
{ {
HexBackgrnd.BackColor = Global.Config.hexbackgrnd; HexBackgrnd.BackColor = Global.Config.HexBackgrndColor;
HexForegrnd.BackColor = Global.Config.hexforegrnd; HexForegrnd.BackColor = Global.Config.HexForegrndColor;
HexMenubar.BackColor = Global.Config.hexmenubar; HexMenubar.BackColor = Global.Config.HexMenubarColor;
} }
private void HexBackgrnd_Click(Object sender, MouseEventArgs e) private void HexBackgrnd_Click(Object sender, MouseEventArgs e)
{ {
if (colorDialog1.ShowDialog() == System.Windows.Forms.DialogResult.OK) if (colorDialog1.ShowDialog() == System.Windows.Forms.DialogResult.OK)
{ {
Global.Config.hexbackgrnd = colorDialog1.Color; Global.Config.HexBackgrndColor = colorDialog1.Color;
Global.MainForm.HexEditor1.MemoryViewerBox.BackColor = Global.Config.hexbackgrnd; Global.MainForm.HexEditor1.MemoryViewerBox.BackColor = Global.Config.HexBackgrndColor;
this.HexBackgrnd.BackColor = colorDialog1.Color; this.HexBackgrnd.BackColor = colorDialog1.Color;
} }
} }
@ -37,8 +37,8 @@ namespace BizHawk.MultiClient
{ {
if (colorDialog1.ShowDialog() == System.Windows.Forms.DialogResult.OK) if (colorDialog1.ShowDialog() == System.Windows.Forms.DialogResult.OK)
{ {
Global.Config.hexforegrnd = colorDialog1.Color; Global.Config.HexForegrndColor = colorDialog1.Color;
Global.MainForm.HexEditor1.MemoryViewerBox.ForeColor = Global.Config.hexforegrnd; Global.MainForm.HexEditor1.MemoryViewerBox.ForeColor = Global.Config.HexForegrndColor;
this.HexForegrnd.BackColor = colorDialog1.Color; this.HexForegrnd.BackColor = colorDialog1.Color;
} }
@ -48,8 +48,8 @@ namespace BizHawk.MultiClient
{ {
if (colorDialog1.ShowDialog() == System.Windows.Forms.DialogResult.OK) if (colorDialog1.ShowDialog() == System.Windows.Forms.DialogResult.OK)
{ {
Global.Config.hexmenubar = colorDialog1.Color; Global.Config.HexMenubarColor = colorDialog1.Color;
Global.MainForm.HexEditor1.menuStrip1.BackColor = Global.Config.hexmenubar; Global.MainForm.HexEditor1.menuStrip1.BackColor = Global.Config.HexMenubarColor;
this.HexMenubar.BackColor = colorDialog1.Color; this.HexMenubar.BackColor = colorDialog1.Color;
} }
} }

1
BizHawk.MultiClient/tools/HexEditor.Designer.cs generated
View File

@ -362,7 +362,6 @@
this.resetToDefaultToolStripMenuItem.Name = "resetToDefaultToolStripMenuItem"; this.resetToDefaultToolStripMenuItem.Name = "resetToDefaultToolStripMenuItem";
this.resetToDefaultToolStripMenuItem.Size = new System.Drawing.Size(157, 22); this.resetToDefaultToolStripMenuItem.Size = new System.Drawing.Size(157, 22);
this.resetToDefaultToolStripMenuItem.Text = "Reset to Default"; this.resetToDefaultToolStripMenuItem.Text = "Reset to Default";
this.resetToDefaultToolStripMenuItem.Click += new System.EventHandler(this.resetToDefaultToolStripMenuItem_Click);
// //
// ViewerContextMenuStrip // ViewerContextMenuStrip
// //

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

@ -107,15 +107,15 @@ namespace BizHawk.MultiClient
if (Global.Config.hexcustom) if (Global.Config.hexcustom)
{ {
menuStrip1.BackColor = Global.Config.hexmenubar; menuStrip1.BackColor = Global.Config.HexMenubarColor;
MemoryViewerBox.BackColor = Global.Config.hexbackgrnd; MemoryViewerBox.BackColor = Global.Config.HexBackgrndColor;
MemoryViewerBox.ForeColor = Global.Config.hexforegrnd; MemoryViewerBox.ForeColor = Global.Config.HexForegrndColor;
} }
else else
{ {
Global.Config.hexmenubar = this.menuStrip1.BackColor; Global.Config.HexMenubarColor = this.menuStrip1.BackColor;
Global.Config.hexbackgrnd = this.MemoryViewerBox.BackColor; Global.Config.HexBackgrndColor = this.MemoryViewerBox.BackColor;
Global.Config.hexforegrnd = this.AddressesLabel.ForeColor; Global.Config.HexForegrndColor = this.AddressesLabel.ForeColor;
Global.Config.hexcustom = true; Global.Config.hexcustom = true;
} }
@ -965,6 +965,7 @@ namespace BizHawk.MultiClient
private void MemoryViewerBox_Paint(object sender, PaintEventArgs e) private void MemoryViewerBox_Paint(object sender, PaintEventArgs e)
{ {
for (int x = 0; x < Global.CheatList.Count; x++) for (int x = 0; x < Global.CheatList.Count; x++)
{ {
if (IsVisible(Global.CheatList.cheatList[x].address)) if (IsVisible(Global.CheatList.cheatList[x].address))
@ -973,7 +974,7 @@ namespace BizHawk.MultiClient
{ {
Rectangle rect = new Rectangle(GetAddressCoordinates(Global.CheatList.cheatList[x].address), new Size(15 * DataSize, fontHeight)); Rectangle rect = new Rectangle(GetAddressCoordinates(Global.CheatList.cheatList[x].address), new Size(15 * DataSize, fontHeight));
e.Graphics.DrawRectangle(new Pen(Brushes.Black), rect); e.Graphics.DrawRectangle(new Pen(Brushes.Black), rect);
e.Graphics.FillRectangle(Brushes.LightBlue, rect); e.Graphics.FillRectangle(new SolidBrush(Global.Config.HexFreezeColor), rect);
} }
} }
} }
@ -982,9 +983,9 @@ namespace BizHawk.MultiClient
Rectangle rect = new Rectangle(GetAddressCoordinates(addressHighlighted), new Size(15 * DataSize, fontHeight)); Rectangle rect = new Rectangle(GetAddressCoordinates(addressHighlighted), new Size(15 * DataSize, fontHeight));
e.Graphics.DrawRectangle(new Pen(Brushes.Black), rect); e.Graphics.DrawRectangle(new Pen(Brushes.Black), rect);
if (Global.CheatList.IsActiveCheat(Domain, addressHighlighted)) if (Global.CheatList.IsActiveCheat(Domain, addressHighlighted))
e.Graphics.FillRectangle(Brushes.Violet, rect); e.Graphics.FillRectangle(new SolidBrush(Global.Config.HexHighlightFreezeColor), rect);
else else
e.Graphics.FillRectangle(Brushes.Pink, rect); e.Graphics.FillRectangle(new SolidBrush(Global.Config.HexHighlightColor), rect);
} }
if (HasNibbles()) if (HasNibbles())
{ {
@ -1460,16 +1461,6 @@ namespace BizHawk.MultiClient
SaveAsBinary(); SaveAsBinary();
} }
private void resetToDefaultToolStripMenuItem_Click(object sender, EventArgs e)
{
Global.Config.hexbackgrnd = Color.FromName("Control");
Global.Config.hexforegrnd = Color.FromName("ControlText");
Global.Config.hexmenubar = Color.FromName("Control");
MemoryViewerBox.BackColor = Global.Config.hexbackgrnd;
MemoryViewerBox.ForeColor = Global.Config.hexforegrnd;
menuStrip1.BackColor = Global.Config.hexmenubar;
}
private void setColorsToolStripMenuItem_Click(object sender, EventArgs e) private void setColorsToolStripMenuItem_Click(object sender, EventArgs e)
{ {
HexColors_Form h = new HexColors_Form(); HexColors_Form h = new HexColors_Form();
@ -1485,11 +1476,11 @@ namespace BizHawk.MultiClient
private void resetToDefaultToolStripMenuItem1_Click(object sender, EventArgs e) private void resetToDefaultToolStripMenuItem1_Click(object sender, EventArgs e)
{ {
this.MemoryViewerBox.BackColor = Color.FromName("Control"); this.MemoryViewerBox.BackColor = Color.FromName("Control");
Global.Config.hexbackgrnd = Color.FromName("Control"); Global.Config.HexBackgrndColor = Color.FromName("Control");
this.MemoryViewerBox.ForeColor = Color.FromName("ControlText"); this.MemoryViewerBox.ForeColor = Color.FromName("ControlText");
Global.Config.hexforegrnd = Color.FromName("ControlText"); Global.Config.HexForegrndColor = Color.FromName("ControlText");
this.menuStrip1.BackColor = Color.FromName("Control"); this.menuStrip1.BackColor = Color.FromName("Control");
Global.Config.hexmenubar = Color.FromName("Control"); Global.Config.HexMenubarColor = Color.FromName("Control");
} }
} }
} }