diff --git a/BizHawk.MultiClient/BizHawk.MultiClient.csproj b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
index c0c4df3150..14b4f434d7 100644
--- a/BizHawk.MultiClient/BizHawk.MultiClient.csproj
+++ b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
@@ -305,6 +305,12 @@
+
+ Form
+
+
+ HexColor.cs
+
@@ -339,6 +345,9 @@
SMSGraphicsConfig.cs
+
+ HexColor.cs
+
LuaFunctionList.cs
diff --git a/BizHawk.MultiClient/Config.cs b/BizHawk.MultiClient/Config.cs
index bda669fa0e..97e7df35bf 100644
--- a/BizHawk.MultiClient/Config.cs
+++ b/BizHawk.MultiClient/Config.cs
@@ -146,7 +146,7 @@ namespace BizHawk.MultiClient
public bool InputConfigAutoTab = true;
public bool ShowLogWindow = false;
public bool BackupSavestates = true;
- public bool AutoSavestates = false;
+ public bool AutoSavestates = false;
public bool SaveScreenshotWithStates = true;
public int AutofireOn = 1;
public int AutofireOff = 1;
@@ -278,6 +278,11 @@ namespace BizHawk.MultiClient
public int HexEditorHeight = -1;
public bool HexEditorBigEndian = false;
public int HexEditorDataSize = 1;
+ //Hex Editor Colors
+ public bool hexcustom;
+ public System.Drawing.Color hexbackgrnd;
+ public System.Drawing.Color hexforegrnd;
+ public System.Drawing.Color hexmenubar;
// Video dumping settings
public int JMDCompression = 3;
@@ -476,7 +481,7 @@ namespace BizHawk.MultiClient
public bool SmsEnableFM = true;
public bool SmsAllowOverlock = false;
public bool SmsForceStereoSeparation = false;
- public bool SmsSpriteLimit = false;
+ public bool SmsSpriteLimit = false;
public string SmsReset = "C";
public string SmsPause = "V, J1 B8";
diff --git a/BizHawk.MultiClient/Global.cs b/BizHawk.MultiClient/Global.cs
index 13966a83aa..f7074c7bb9 100644
--- a/BizHawk.MultiClient/Global.cs
+++ b/BizHawk.MultiClient/Global.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
#if WINDOWS
using SlimDX.Direct3D9;
using SlimDX.DirectSound;
+using System.Drawing;
#endif
namespace BizHawk.MultiClient
diff --git a/BizHawk.MultiClient/output/gamedb.txt b/BizHawk.MultiClient/output/gamedb.txt
index 9c9edf52a0..d14506cf86 100644
--- a/BizHawk.MultiClient/output/gamedb.txt
+++ b/BizHawk.MultiClient/output/gamedb.txt
@@ -73,9 +73,6 @@ sha1:8A5FD1061ADACDEABF422A2D2E555FF70749AE7C U Mississippi Satsujin Jiken (Alt)
;when they appear in bootgod's db then we can re-evaluate this category.
sha1:91CECCFCAC90E417E9AEE80E8F7B560A20EB33CC Ai Sensei No Oshiete - Watashi No Hoshi (J) NES board=IREM-G101;PRG=256;CHR=128;WRAM=8
-;games which might be thought to be good according to goodnes, but arent really
-sha1:C87E7E6A68DD9C7E24652CD2C7D390A14E8ADF04 B Lagrange Point NES board=KONAMI-VRC-7;PCB=352402
-
;;;;;;;;;;;;;;;;;;;-----------------------------------------------------------------------
;this is every game from goodNES which is clearly labeled as bad.
;well, it isnt very game yet. but we should make it every game, if we can! it would be a lot of games though
diff --git a/BizHawk.MultiClient/tools/HexColor.Designer.cs b/BizHawk.MultiClient/tools/HexColor.Designer.cs
new file mode 100644
index 0000000000..4db248f02f
--- /dev/null
+++ b/BizHawk.MultiClient/tools/HexColor.Designer.cs
@@ -0,0 +1,140 @@
+namespace BizHawk.MultiClient
+{
+ partial class HexColors_Form
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.HexMenubar = new System.Windows.Forms.Panel();
+ this.label3 = new System.Windows.Forms.Label();
+ this.label2 = new System.Windows.Forms.Label();
+ this.label1 = new System.Windows.Forms.Label();
+ this.HexForegrnd = new System.Windows.Forms.Panel();
+ this.HexBackgrnd = new System.Windows.Forms.Panel();
+ this.colorDialog1 = new System.Windows.Forms.ColorDialog();
+ this.groupBox1.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // groupBox1
+ //
+ this.groupBox1.Controls.Add(this.HexMenubar);
+ this.groupBox1.Location = new System.Drawing.Point(3, 2);
+ this.groupBox1.Name = "groupBox1";
+ this.groupBox1.Size = new System.Drawing.Size(154, 173);
+ this.groupBox1.TabIndex = 0;
+ this.groupBox1.TabStop = false;
+ //
+ // HexMenubar
+ //
+ this.HexMenubar.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.HexMenubar.Location = new System.Drawing.Point(4, 122);
+ this.HexMenubar.Name = "HexMenubar";
+ this.HexMenubar.Size = new System.Drawing.Size(46, 42);
+ this.HexMenubar.TabIndex = 8;
+ this.HexMenubar.MouseClick += new System.Windows.Forms.MouseEventHandler(this.HexMenubar_Click);
+ //
+ // label3
+ //
+ this.label3.AutoSize = true;
+ this.label3.Location = new System.Drawing.Point(59, 143);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(76, 13);
+ this.label3.TabIndex = 11;
+ this.label3.Text = "Menubar Color";
+ //
+ // label2
+ //
+ this.label2.AutoSize = true;
+ this.label2.Location = new System.Drawing.Point(59, 86);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(55, 13);
+ this.label2.TabIndex = 10;
+ this.label2.Text = "Font Color";
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Location = new System.Drawing.Point(59, 30);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(92, 13);
+ this.label1.TabIndex = 9;
+ this.label1.Text = "Background Color";
+ //
+ // HexForegrnd
+ //
+ this.HexForegrnd.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.HexForegrnd.Location = new System.Drawing.Point(7, 71);
+ this.HexForegrnd.Name = "HexForegrnd";
+ this.HexForegrnd.Size = new System.Drawing.Size(46, 42);
+ this.HexForegrnd.TabIndex = 7;
+ this.HexForegrnd.MouseClick += new System.Windows.Forms.MouseEventHandler(this.HexForegrnd_Click);
+ //
+ // HexBackgrnd
+ //
+ this.HexBackgrnd.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.HexBackgrnd.Location = new System.Drawing.Point(7, 15);
+ this.HexBackgrnd.Name = "HexBackgrnd";
+ this.HexBackgrnd.Size = new System.Drawing.Size(46, 42);
+ this.HexBackgrnd.TabIndex = 6;
+ this.HexBackgrnd.MouseClick += new System.Windows.Forms.MouseEventHandler(this.HexBackgrnd_Click);
+ //
+ // HexColors_Form
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(159, 178);
+ this.Controls.Add(this.label3);
+ this.Controls.Add(this.label2);
+ this.Controls.Add(this.label1);
+ this.Controls.Add(this.HexForegrnd);
+ this.Controls.Add(this.HexBackgrnd);
+ this.Controls.Add(this.groupBox1);
+ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+ this.MaximizeBox = false;
+ this.MinimizeBox = false;
+ this.Name = "HexColors_Form";
+ this.Text = "Colors";
+ this.Load += new System.EventHandler(this.HexColors_Form_Load);
+ this.groupBox1.ResumeLayout(false);
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.GroupBox groupBox1;
+ private System.Windows.Forms.Label label3;
+ private System.Windows.Forms.Label label2;
+ private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.Panel HexForegrnd;
+ private System.Windows.Forms.Panel HexBackgrnd;
+ private System.Windows.Forms.ColorDialog colorDialog1;
+ private System.Windows.Forms.Panel HexMenubar;
+
+ }
+}
\ No newline at end of file
diff --git a/BizHawk.MultiClient/tools/HexColor.cs b/BizHawk.MultiClient/tools/HexColor.cs
new file mode 100644
index 0000000000..e516f51420
--- /dev/null
+++ b/BizHawk.MultiClient/tools/HexColor.cs
@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+
+namespace BizHawk.MultiClient
+{
+ public partial class HexColors_Form : Form
+ {
+ public HexColors_Form()
+ {
+ InitializeComponent();
+ }
+
+ private void HexColors_Form_Load(object sender, EventArgs e)
+ {
+ HexBackgrnd.BackColor = Global.Config.hexbackgrnd;
+ HexForegrnd.BackColor = Global.Config.hexforegrnd;
+ HexMenubar.BackColor = Global.Config.hexmenubar;
+ }
+
+ private void HexBackgrnd_Click(Object sender, MouseEventArgs e)
+ {
+ if (colorDialog1.ShowDialog() == System.Windows.Forms.DialogResult.OK)
+ {
+ Global.Config.hexbackgrnd = colorDialog1.Color;
+ Global.MainForm.HexEditor1.MemoryViewerBox.BackColor = Global.Config.hexbackgrnd;
+ this.HexBackgrnd.BackColor = colorDialog1.Color;
+ }
+ }
+
+ private void HexForegrnd_Click(Object sender, MouseEventArgs e)
+ {
+ if (colorDialog1.ShowDialog() == System.Windows.Forms.DialogResult.OK)
+ {
+ Global.Config.hexforegrnd = colorDialog1.Color;
+ Global.MainForm.HexEditor1.MemoryViewerBox.ForeColor = Global.Config.hexforegrnd;
+ this.HexForegrnd.BackColor = colorDialog1.Color;
+
+ }
+ }
+
+ private void HexMenubar_Click(Object sender, MouseEventArgs e)
+ {
+ if (colorDialog1.ShowDialog() == System.Windows.Forms.DialogResult.OK)
+ {
+ Global.Config.hexmenubar = colorDialog1.Color;
+ Global.MainForm.HexEditor1.menuStrip1.BackColor = Global.Config.hexmenubar;
+ this.HexMenubar.BackColor = colorDialog1.Color;
+ }
+ }
+ }
+}
diff --git a/BizHawk.MultiClient/tools/HexColor.resx b/BizHawk.MultiClient/tools/HexColor.resx
new file mode 100644
index 0000000000..a48021224b
--- /dev/null
+++ b/BizHawk.MultiClient/tools/HexColor.resx
@@ -0,0 +1,123 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ 17, 17
+
+
\ No newline at end of file
diff --git a/BizHawk.MultiClient/tools/HexEditor.Designer.cs b/BizHawk.MultiClient/tools/HexEditor.Designer.cs
index 6f9e7995c0..3d9ed31315 100644
--- a/BizHawk.MultiClient/tools/HexEditor.Designer.cs
+++ b/BizHawk.MultiClient/tools/HexEditor.Designer.cs
@@ -58,6 +58,9 @@
this.saveWindowsSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
this.restoreWindowSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.setColorsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
+ this.resetToDefaultToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ViewerContextMenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components);
this.freezeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.addToRamWatchToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -70,6 +73,10 @@
this.MemoryViewerBox = new System.Windows.Forms.GroupBox();
this.vScrollBar1 = new System.Windows.Forms.VScrollBar();
this.AddressesLabel = new System.Windows.Forms.Label();
+ this.customColorsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.setColorsToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
+ this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
+ this.resetToDefaultToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.menuStrip1.SuspendLayout();
this.ViewerContextMenuStrip.SuspendLayout();
this.MemoryViewerBox.SuspendLayout();
@@ -77,6 +84,7 @@
//
// menuStrip1
//
+ this.menuStrip1.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.fileToolStripMenuItem,
this.editToolStripMenuItem,
@@ -142,7 +150,7 @@
this.copyToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Duplicate;
this.copyToolStripMenuItem.Name = "copyToolStripMenuItem";
this.copyToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.C)));
- this.copyToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.copyToolStripMenuItem.Size = new System.Drawing.Size(146, 22);
this.copyToolStripMenuItem.Text = "&Copy";
this.copyToolStripMenuItem.Click += new System.EventHandler(this.copyToolStripMenuItem_Click);
//
@@ -151,20 +159,20 @@
this.pasteToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Paste;
this.pasteToolStripMenuItem.Name = "pasteToolStripMenuItem";
this.pasteToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.V)));
- this.pasteToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.pasteToolStripMenuItem.Size = new System.Drawing.Size(146, 22);
this.pasteToolStripMenuItem.Text = "&Paste";
this.pasteToolStripMenuItem.Click += new System.EventHandler(this.pasteToolStripMenuItem_Click);
//
// toolStripSeparator6
//
this.toolStripSeparator6.Name = "toolStripSeparator6";
- this.toolStripSeparator6.Size = new System.Drawing.Size(149, 6);
+ this.toolStripSeparator6.Size = new System.Drawing.Size(143, 6);
//
// findToolStripMenuItem1
//
this.findToolStripMenuItem1.Name = "findToolStripMenuItem1";
this.findToolStripMenuItem1.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.F)));
- this.findToolStripMenuItem1.Size = new System.Drawing.Size(152, 22);
+ this.findToolStripMenuItem1.Size = new System.Drawing.Size(146, 22);
this.findToolStripMenuItem1.Text = "&Find...";
this.findToolStripMenuItem1.Click += new System.EventHandler(this.findToolStripMenuItem1_Click);
//
@@ -273,6 +281,7 @@
//
this.settingsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.autoloadToolStripMenuItem,
+ this.customColorsToolStripMenuItem,
this.saveWindowsSettingsToolStripMenuItem,
this.toolStripSeparator3,
this.restoreWindowSizeToolStripMenuItem});
@@ -307,6 +316,25 @@
this.restoreWindowSizeToolStripMenuItem.Text = "&Restore Window Size";
this.restoreWindowSizeToolStripMenuItem.Click += new System.EventHandler(this.restoreWindowSizeToolStripMenuItem_Click);
//
+ // setColorsToolStripMenuItem
+ //
+ this.setColorsToolStripMenuItem.Name = "setColorsToolStripMenuItem";
+ this.setColorsToolStripMenuItem.Size = new System.Drawing.Size(157, 22);
+ this.setColorsToolStripMenuItem.Text = "Set Colors";
+ this.setColorsToolStripMenuItem.Click += new System.EventHandler(this.setColorsToolStripMenuItem_Click);
+ //
+ // toolStripSeparator7
+ //
+ this.toolStripSeparator7.Name = "toolStripSeparator7";
+ this.toolStripSeparator7.Size = new System.Drawing.Size(154, 6);
+ //
+ // resetToDefaultToolStripMenuItem
+ //
+ this.resetToDefaultToolStripMenuItem.Name = "resetToDefaultToolStripMenuItem";
+ this.resetToDefaultToolStripMenuItem.Size = new System.Drawing.Size(157, 22);
+ this.resetToDefaultToolStripMenuItem.Text = "Reset to Default";
+ this.resetToDefaultToolStripMenuItem.Click += new System.EventHandler(this.resetToDefaultToolStripMenuItem_Click);
+ //
// ViewerContextMenuStrip
//
this.ViewerContextMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -391,6 +419,7 @@
this.MemoryViewerBox.ContextMenuStrip = this.ViewerContextMenuStrip;
this.MemoryViewerBox.Controls.Add(this.vScrollBar1);
this.MemoryViewerBox.Controls.Add(this.AddressesLabel);
+ this.MemoryViewerBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.MemoryViewerBox.Location = new System.Drawing.Point(12, 27);
this.MemoryViewerBox.MaximumSize = new System.Drawing.Size(600, 1024);
this.MemoryViewerBox.MinimumSize = new System.Drawing.Size(495, 200);
@@ -414,18 +443,45 @@
// AddressesLabel
//
this.AddressesLabel.AutoSize = true;
- this.AddressesLabel.BackColor = System.Drawing.Color.White;
this.AddressesLabel.ContextMenuStrip = this.ViewerContextMenuStrip;
- this.AddressesLabel.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.AddressesLabel.Location = new System.Drawing.Point(6, 16);
this.AddressesLabel.Name = "AddressesLabel";
- this.AddressesLabel.Size = new System.Drawing.Size(28, 14);
+ this.AddressesLabel.Size = new System.Drawing.Size(31, 13);
this.AddressesLabel.TabIndex = 0;
this.AddressesLabel.Text = "RAM";
this.AddressesLabel.MouseClick += new System.Windows.Forms.MouseEventHandler(this.AddressesLabel_MouseClick);
this.AddressesLabel.MouseLeave += new System.EventHandler(this.AddressesLabel_MouseLeave);
this.AddressesLabel.MouseMove += new System.Windows.Forms.MouseEventHandler(this.AddressesLabel_MouseMove);
//
+ // customColorsToolStripMenuItem
+ //
+ this.customColorsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.setColorsToolStripMenuItem1,
+ this.toolStripSeparator8,
+ this.resetToDefaultToolStripMenuItem1});
+ this.customColorsToolStripMenuItem.Name = "customColorsToolStripMenuItem";
+ this.customColorsToolStripMenuItem.Size = new System.Drawing.Size(192, 22);
+ this.customColorsToolStripMenuItem.Text = "Custom Colors";
+ //
+ // setColorsToolStripMenuItem1
+ //
+ this.setColorsToolStripMenuItem1.Name = "setColorsToolStripMenuItem1";
+ this.setColorsToolStripMenuItem1.Size = new System.Drawing.Size(157, 22);
+ this.setColorsToolStripMenuItem1.Text = "Set Colors";
+ this.setColorsToolStripMenuItem1.Click += new System.EventHandler(this.setColorsToolStripMenuItem1_Click);
+ //
+ // toolStripSeparator8
+ //
+ this.toolStripSeparator8.Name = "toolStripSeparator8";
+ this.toolStripSeparator8.Size = new System.Drawing.Size(154, 6);
+ //
+ // resetToDefaultToolStripMenuItem1
+ //
+ this.resetToDefaultToolStripMenuItem1.Name = "resetToDefaultToolStripMenuItem1";
+ this.resetToDefaultToolStripMenuItem1.Size = new System.Drawing.Size(157, 22);
+ this.resetToDefaultToolStripMenuItem1.Text = "Reset to Default";
+ this.resetToDefaultToolStripMenuItem1.Click += new System.EventHandler(this.resetToDefaultToolStripMenuItem1_Click);
+ //
// HexEditor
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -456,7 +512,7 @@
#endregion
- private System.Windows.Forms.MenuStrip menuStrip1;
+ public System.Windows.Forms.MenuStrip menuStrip1;
private System.Windows.Forms.ToolStripMenuItem fileToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem dumpToFileToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
@@ -480,7 +536,7 @@
private System.Windows.Forms.ToolStripMenuItem saveWindowsSettingsToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem freezeAddressToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
- private System.Windows.Forms.GroupBox MemoryViewerBox;
+ public System.Windows.Forms.GroupBox MemoryViewerBox;
private System.Windows.Forms.Label AddressesLabel;
private System.Windows.Forms.VScrollBar vScrollBar1;
private System.Windows.Forms.ToolStripMenuItem unfreezeAllToolStripMenuItem;
@@ -496,5 +552,12 @@
private System.Windows.Forms.ToolStripMenuItem findToolStripMenuItem1;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator6;
private System.Windows.Forms.ToolStripMenuItem saveAsBinaryToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem setColorsToolStripMenuItem;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator7;
+ private System.Windows.Forms.ToolStripMenuItem resetToDefaultToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem customColorsToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem setColorsToolStripMenuItem1;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator8;
+ private System.Windows.Forms.ToolStripMenuItem resetToDefaultToolStripMenuItem1;
}
}
\ No newline at end of file
diff --git a/BizHawk.MultiClient/tools/HexEditor.cs b/BizHawk.MultiClient/tools/HexEditor.cs
index b556a5e28e..5503556624 100644
--- a/BizHawk.MultiClient/tools/HexEditor.cs
+++ b/BizHawk.MultiClient/tools/HexEditor.cs
@@ -104,6 +104,21 @@ namespace BizHawk.MultiClient
if (Width_ >= 0 && Height_ >= 0)
this.Size = new System.Drawing.Size(Width_, Height_);
}
+
+ if (Global.Config.hexcustom)
+ {
+ menuStrip1.BackColor = Global.Config.hexmenubar;
+ MemoryViewerBox.BackColor = Global.Config.hexbackgrnd;
+ MemoryViewerBox.ForeColor = Global.Config.hexforegrnd;
+ }
+ else
+ {
+ Global.Config.hexmenubar = this.menuStrip1.BackColor;
+ Global.Config.hexbackgrnd = this.MemoryViewerBox.BackColor;
+ Global.Config.hexforegrnd = this.AddressesLabel.ForeColor;
+ Global.Config.hexcustom = true;
+ }
+
SetMemoryDomainMenu();
SetDataSize(DataSize);
UpdateValues();
@@ -440,7 +455,7 @@ namespace BizHawk.MultiClient
break;
}
NumDigits = GetNumDigits(Domain.Size);
- NumDigitsStr = "{0:X" + NumDigits.ToString() + "} ";
+ NumDigitsStr = "{0:X" + NumDigits.ToString() + "} ";
}
public void SetDataSize(int size)
@@ -1444,5 +1459,38 @@ namespace BizHawk.MultiClient
{
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)
+ {
+ HexColors_Form h = new HexColors_Form();
+ h.Show();
+ }
+
+ private void setColorsToolStripMenuItem1_Click(object sender, EventArgs e)
+ {
+ HexColors_Form h = new HexColors_Form();
+ h.Show();
+ }
+
+ private void resetToDefaultToolStripMenuItem1_Click(object sender, EventArgs e)
+ {
+ this.MemoryViewerBox.BackColor = Color.FromName("Control");
+ Global.Config.hexbackgrnd = Color.FromName("Control");
+ this.MemoryViewerBox.ForeColor = Color.FromName("ControlText");
+ Global.Config.hexforegrnd = Color.FromName("ControlText");
+ this.menuStrip1.BackColor = Color.FromName("Control");
+ Global.Config.hexmenubar = Color.FromName("Control");
+ }
+
}
-}
+}
\ No newline at end of file