make it easier to change memory domains in the hex editor. adelikat might not like this, feel free to revert.

This commit is contained in:
zeromus 2013-08-26 07:57:31 +00:00
parent 513ceba3d2
commit ba25e7045f
2 changed files with 593 additions and 552 deletions

View File

@ -65,6 +65,7 @@
this.resetToDefaultToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.saveWindowsSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
this.alwaysOnTopToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.restoreWindowSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.setColorsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
@ -86,7 +87,7 @@
this.vScrollBar1 = new System.Windows.Forms.VScrollBar();
this.AddressesLabel = new System.Windows.Forms.Label();
this.Header = new System.Windows.Forms.Label();
this.alwaysOnTopToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripComboBox_SelectDomain = new System.Windows.Forms.ToolStripComboBox();
this.menuStrip1.SuspendLayout();
this.ViewerContextMenuStrip.SuspendLayout();
this.MemoryViewerBox.SuspendLayout();
@ -94,14 +95,16 @@
//
// menuStrip1
//
this.menuStrip1.ClickThrough = true;
this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.fileToolStripMenuItem,
this.editToolStripMenuItem,
this.optionsToolStripMenuItem,
this.settingsToolStripMenuItem});
this.settingsToolStripMenuItem,
this.toolStripComboBox_SelectDomain});
this.menuStrip1.Location = new System.Drawing.Point(0, 0);
this.menuStrip1.Name = "menuStrip1";
this.menuStrip1.Size = new System.Drawing.Size(584, 24);
this.menuStrip1.Size = new System.Drawing.Size(584, 25);
this.menuStrip1.TabIndex = 1;
this.menuStrip1.Text = "menuStrip1";
//
@ -114,7 +117,7 @@
this.toolStripSeparator1,
this.exitToolStripMenuItem});
this.fileToolStripMenuItem.Name = "fileToolStripMenuItem";
this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20);
this.fileToolStripMenuItem.Size = new System.Drawing.Size(35, 21);
this.fileToolStripMenuItem.Text = "&File";
this.fileToolStripMenuItem.DropDownOpened += new System.EventHandler(this.fileToolStripMenuItem_DropDownOpened);
//
@ -123,7 +126,7 @@
this.saveToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.SaveAs;
this.saveToolStripMenuItem.Name = "saveToolStripMenuItem";
this.saveToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S)));
this.saveToolStripMenuItem.Size = new System.Drawing.Size(229, 22);
this.saveToolStripMenuItem.Size = new System.Drawing.Size(225, 22);
this.saveToolStripMenuItem.Text = "Save";
this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click);
//
@ -132,27 +135,27 @@
this.saveAsBinaryToolStripMenuItem.Name = "saveAsBinaryToolStripMenuItem";
this.saveAsBinaryToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)
| System.Windows.Forms.Keys.S)));
this.saveAsBinaryToolStripMenuItem.Size = new System.Drawing.Size(229, 22);
this.saveAsBinaryToolStripMenuItem.Size = new System.Drawing.Size(225, 22);
this.saveAsBinaryToolStripMenuItem.Text = "Save as binary...";
this.saveAsBinaryToolStripMenuItem.Click += new System.EventHandler(this.saveAsBinaryToolStripMenuItem_Click);
//
// dumpToFileToolStripMenuItem
//
this.dumpToFileToolStripMenuItem.Name = "dumpToFileToolStripMenuItem";
this.dumpToFileToolStripMenuItem.Size = new System.Drawing.Size(229, 22);
this.dumpToFileToolStripMenuItem.Size = new System.Drawing.Size(225, 22);
this.dumpToFileToolStripMenuItem.Text = "Save as text...";
this.dumpToFileToolStripMenuItem.Click += new System.EventHandler(this.dumpToFileToolStripMenuItem_Click);
//
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
this.toolStripSeparator1.Size = new System.Drawing.Size(226, 6);
this.toolStripSeparator1.Size = new System.Drawing.Size(222, 6);
//
// exitToolStripMenuItem
//
this.exitToolStripMenuItem.Name = "exitToolStripMenuItem";
this.exitToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4)));
this.exitToolStripMenuItem.Size = new System.Drawing.Size(229, 22);
this.exitToolStripMenuItem.Size = new System.Drawing.Size(225, 22);
this.exitToolStripMenuItem.Text = "E&xit";
this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click);
//
@ -166,7 +169,7 @@
this.findNextToolStripMenuItem,
this.findPrevToolStripMenuItem});
this.editToolStripMenuItem.Name = "editToolStripMenuItem";
this.editToolStripMenuItem.Size = new System.Drawing.Size(39, 20);
this.editToolStripMenuItem.Size = new System.Drawing.Size(37, 21);
this.editToolStripMenuItem.Text = "&Edit";
this.editToolStripMenuItem.DropDownOpened += new System.EventHandler(this.editToolStripMenuItem_DropDownOpened);
//
@ -175,7 +178,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(146, 22);
this.copyToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
this.copyToolStripMenuItem.Text = "&Copy";
this.copyToolStripMenuItem.Click += new System.EventHandler(this.copyToolStripMenuItem_Click);
//
@ -184,20 +187,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(146, 22);
this.pasteToolStripMenuItem.Size = new System.Drawing.Size(144, 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(143, 6);
this.toolStripSeparator6.Size = new System.Drawing.Size(141, 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(146, 22);
this.findToolStripMenuItem1.Size = new System.Drawing.Size(144, 22);
this.findToolStripMenuItem1.Text = "&Find...";
this.findToolStripMenuItem1.Click += new System.EventHandler(this.findToolStripMenuItem1_Click);
//
@ -205,7 +208,7 @@
//
this.findNextToolStripMenuItem.Name = "findNextToolStripMenuItem";
this.findNextToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F3;
this.findNextToolStripMenuItem.Size = new System.Drawing.Size(146, 22);
this.findNextToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
this.findNextToolStripMenuItem.Text = "Find Next";
this.findNextToolStripMenuItem.Click += new System.EventHandler(this.findNextToolStripMenuItem_Click);
//
@ -213,7 +216,7 @@
//
this.findPrevToolStripMenuItem.Name = "findPrevToolStripMenuItem";
this.findPrevToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F2;
this.findPrevToolStripMenuItem.Size = new System.Drawing.Size(146, 22);
this.findPrevToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
this.findPrevToolStripMenuItem.Text = "Find Prev";
this.findPrevToolStripMenuItem.Click += new System.EventHandler(this.findPrevToolStripMenuItem_Click);
//
@ -230,14 +233,14 @@
this.unfreezeAllToolStripMenuItem,
this.pokeAddressToolStripMenuItem});
this.optionsToolStripMenuItem.Name = "optionsToolStripMenuItem";
this.optionsToolStripMenuItem.Size = new System.Drawing.Size(61, 20);
this.optionsToolStripMenuItem.Size = new System.Drawing.Size(56, 21);
this.optionsToolStripMenuItem.Text = "&Options";
this.optionsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.optionsToolStripMenuItem_DropDownOpened);
//
// memoryDomainsToolStripMenuItem
//
this.memoryDomainsToolStripMenuItem.Name = "memoryDomainsToolStripMenuItem";
this.memoryDomainsToolStripMenuItem.Size = new System.Drawing.Size(219, 22);
this.memoryDomainsToolStripMenuItem.Size = new System.Drawing.Size(206, 22);
this.memoryDomainsToolStripMenuItem.Text = "&Memory Domains";
this.memoryDomainsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.memoryDomainsToolStripMenuItem_DropDownOpened);
//
@ -248,47 +251,47 @@
this.byteToolStripMenuItem1,
this.byteToolStripMenuItem2});
this.dataSizeToolStripMenuItem.Name = "dataSizeToolStripMenuItem";
this.dataSizeToolStripMenuItem.Size = new System.Drawing.Size(219, 22);
this.dataSizeToolStripMenuItem.Size = new System.Drawing.Size(206, 22);
this.dataSizeToolStripMenuItem.Text = "Data Size";
//
// byteToolStripMenuItem
//
this.byteToolStripMenuItem.Name = "byteToolStripMenuItem";
this.byteToolStripMenuItem.Size = new System.Drawing.Size(106, 22);
this.byteToolStripMenuItem.Size = new System.Drawing.Size(105, 22);
this.byteToolStripMenuItem.Text = "1 Byte";
this.byteToolStripMenuItem.Click += new System.EventHandler(this.byteToolStripMenuItem_Click);
//
// byteToolStripMenuItem1
//
this.byteToolStripMenuItem1.Name = "byteToolStripMenuItem1";
this.byteToolStripMenuItem1.Size = new System.Drawing.Size(106, 22);
this.byteToolStripMenuItem1.Size = new System.Drawing.Size(105, 22);
this.byteToolStripMenuItem1.Text = "2 Byte";
this.byteToolStripMenuItem1.Click += new System.EventHandler(this.byteToolStripMenuItem1_Click);
//
// byteToolStripMenuItem2
//
this.byteToolStripMenuItem2.Name = "byteToolStripMenuItem2";
this.byteToolStripMenuItem2.Size = new System.Drawing.Size(106, 22);
this.byteToolStripMenuItem2.Size = new System.Drawing.Size(105, 22);
this.byteToolStripMenuItem2.Text = "4 Byte";
this.byteToolStripMenuItem2.Click += new System.EventHandler(this.byteToolStripMenuItem2_Click);
//
// enToolStripMenuItem
//
this.enToolStripMenuItem.Name = "enToolStripMenuItem";
this.enToolStripMenuItem.Size = new System.Drawing.Size(219, 22);
this.enToolStripMenuItem.Size = new System.Drawing.Size(206, 22);
this.enToolStripMenuItem.Text = "Big Endian";
this.enToolStripMenuItem.Click += new System.EventHandler(this.enToolStripMenuItem_Click);
//
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
this.toolStripSeparator2.Size = new System.Drawing.Size(216, 6);
this.toolStripSeparator2.Size = new System.Drawing.Size(203, 6);
//
// goToAddressToolStripMenuItem
//
this.goToAddressToolStripMenuItem.Name = "goToAddressToolStripMenuItem";
this.goToAddressToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.G)));
this.goToAddressToolStripMenuItem.Size = new System.Drawing.Size(219, 22);
this.goToAddressToolStripMenuItem.Size = new System.Drawing.Size(206, 22);
this.goToAddressToolStripMenuItem.Text = "&Go to Address...";
this.goToAddressToolStripMenuItem.Click += new System.EventHandler(this.goToAddressToolStripMenuItem_Click);
//
@ -297,7 +300,7 @@
this.addToRamWatchToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.FindHS;
this.addToRamWatchToolStripMenuItem1.Name = "addToRamWatchToolStripMenuItem1";
this.addToRamWatchToolStripMenuItem1.ShortcutKeyDisplayString = "Ctrl+W";
this.addToRamWatchToolStripMenuItem1.Size = new System.Drawing.Size(219, 22);
this.addToRamWatchToolStripMenuItem1.Size = new System.Drawing.Size(206, 22);
this.addToRamWatchToolStripMenuItem1.Text = "Add to Ram Watch";
this.addToRamWatchToolStripMenuItem1.Click += new System.EventHandler(this.addToRamWatchToolStripMenuItem1_Click);
//
@ -306,7 +309,7 @@
this.freezeAddressToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Freeze;
this.freezeAddressToolStripMenuItem.Name = "freezeAddressToolStripMenuItem";
this.freezeAddressToolStripMenuItem.ShortcutKeyDisplayString = "Space";
this.freezeAddressToolStripMenuItem.Size = new System.Drawing.Size(219, 22);
this.freezeAddressToolStripMenuItem.Size = new System.Drawing.Size(206, 22);
this.freezeAddressToolStripMenuItem.Text = "&Freeze Address";
this.freezeAddressToolStripMenuItem.Click += new System.EventHandler(this.freezeAddressToolStripMenuItem_Click);
//
@ -315,7 +318,7 @@
this.unfreezeAllToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Unfreeze;
this.unfreezeAllToolStripMenuItem.Name = "unfreezeAllToolStripMenuItem";
this.unfreezeAllToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.Delete)));
this.unfreezeAllToolStripMenuItem.Size = new System.Drawing.Size(219, 22);
this.unfreezeAllToolStripMenuItem.Size = new System.Drawing.Size(206, 22);
this.unfreezeAllToolStripMenuItem.Text = "Unfreeze All";
this.unfreezeAllToolStripMenuItem.Click += new System.EventHandler(this.unfreezeAllToolStripMenuItem_Click);
//
@ -324,7 +327,7 @@
this.pokeAddressToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.poke;
this.pokeAddressToolStripMenuItem.Name = "pokeAddressToolStripMenuItem";
this.pokeAddressToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.P)));
this.pokeAddressToolStripMenuItem.Size = new System.Drawing.Size(219, 22);
this.pokeAddressToolStripMenuItem.Size = new System.Drawing.Size(206, 22);
this.pokeAddressToolStripMenuItem.Text = "&Poke Address";
this.pokeAddressToolStripMenuItem.Click += new System.EventHandler(this.pokeAddressToolStripMenuItem_Click);
//
@ -338,14 +341,14 @@
this.alwaysOnTopToolStripMenuItem,
this.restoreWindowSizeToolStripMenuItem});
this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem";
this.settingsToolStripMenuItem.Size = new System.Drawing.Size(61, 20);
this.settingsToolStripMenuItem.Size = new System.Drawing.Size(58, 21);
this.settingsToolStripMenuItem.Text = "&Settings";
this.settingsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.settingsToolStripMenuItem_DropDownOpened);
//
// autoloadToolStripMenuItem
//
this.autoloadToolStripMenuItem.Name = "autoloadToolStripMenuItem";
this.autoloadToolStripMenuItem.Size = new System.Drawing.Size(192, 22);
this.autoloadToolStripMenuItem.Size = new System.Drawing.Size(183, 22);
this.autoloadToolStripMenuItem.Text = "Auto-load";
this.autoloadToolStripMenuItem.Click += new System.EventHandler(this.autoloadToolStripMenuItem_Click);
//
@ -356,44 +359,51 @@
this.toolStripSeparator8,
this.resetToDefaultToolStripMenuItem1});
this.customColorsToolStripMenuItem.Name = "customColorsToolStripMenuItem";
this.customColorsToolStripMenuItem.Size = new System.Drawing.Size(192, 22);
this.customColorsToolStripMenuItem.Size = new System.Drawing.Size(183, 22);
this.customColorsToolStripMenuItem.Text = "Custom Colors";
//
// setColorsToolStripMenuItem1
//
this.setColorsToolStripMenuItem1.Name = "setColorsToolStripMenuItem1";
this.setColorsToolStripMenuItem1.Size = new System.Drawing.Size(157, 22);
this.setColorsToolStripMenuItem1.Size = new System.Drawing.Size(153, 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);
this.toolStripSeparator8.Size = new System.Drawing.Size(150, 6);
//
// resetToDefaultToolStripMenuItem1
//
this.resetToDefaultToolStripMenuItem1.Name = "resetToDefaultToolStripMenuItem1";
this.resetToDefaultToolStripMenuItem1.Size = new System.Drawing.Size(157, 22);
this.resetToDefaultToolStripMenuItem1.Size = new System.Drawing.Size(153, 22);
this.resetToDefaultToolStripMenuItem1.Text = "Reset to Default";
this.resetToDefaultToolStripMenuItem1.Click += new System.EventHandler(this.resetToDefaultToolStripMenuItem1_Click);
//
// saveWindowsSettingsToolStripMenuItem
//
this.saveWindowsSettingsToolStripMenuItem.Name = "saveWindowsSettingsToolStripMenuItem";
this.saveWindowsSettingsToolStripMenuItem.Size = new System.Drawing.Size(192, 22);
this.saveWindowsSettingsToolStripMenuItem.Size = new System.Drawing.Size(183, 22);
this.saveWindowsSettingsToolStripMenuItem.Text = "Save windows settings";
this.saveWindowsSettingsToolStripMenuItem.Click += new System.EventHandler(this.saveWindowsSettingsToolStripMenuItem_Click);
//
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
this.toolStripSeparator3.Size = new System.Drawing.Size(189, 6);
this.toolStripSeparator3.Size = new System.Drawing.Size(180, 6);
//
// alwaysOnTopToolStripMenuItem
//
this.alwaysOnTopToolStripMenuItem.Name = "alwaysOnTopToolStripMenuItem";
this.alwaysOnTopToolStripMenuItem.Size = new System.Drawing.Size(183, 22);
this.alwaysOnTopToolStripMenuItem.Text = "Always On Top";
this.alwaysOnTopToolStripMenuItem.Click += new System.EventHandler(this.alwaysOnTopToolStripMenuItem_Click);
//
// restoreWindowSizeToolStripMenuItem
//
this.restoreWindowSizeToolStripMenuItem.Name = "restoreWindowSizeToolStripMenuItem";
this.restoreWindowSizeToolStripMenuItem.Size = new System.Drawing.Size(192, 22);
this.restoreWindowSizeToolStripMenuItem.Size = new System.Drawing.Size(183, 22);
this.restoreWindowSizeToolStripMenuItem.Text = "&Restore Window Size";
this.restoreWindowSizeToolStripMenuItem.Click += new System.EventHandler(this.restoreWindowSizeToolStripMenuItem_Click);
//
@ -430,7 +440,7 @@
this.toolStripSeparator5,
this.gotoAddressToolStripMenuItem1});
this.ViewerContextMenuStrip.Name = "ViewerContextMenuStrip";
this.ViewerContextMenuStrip.Size = new System.Drawing.Size(220, 214);
this.ViewerContextMenuStrip.Size = new System.Drawing.Size(207, 214);
this.ViewerContextMenuStrip.Opening += new System.ComponentModel.CancelEventHandler(this.ViewerContextMenuStrip_Opening);
//
// copyToolStripMenuItem1
@ -438,7 +448,7 @@
this.copyToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.Duplicate;
this.copyToolStripMenuItem1.Name = "copyToolStripMenuItem1";
this.copyToolStripMenuItem1.ShortcutKeyDisplayString = "Ctrl+C";
this.copyToolStripMenuItem1.Size = new System.Drawing.Size(219, 22);
this.copyToolStripMenuItem1.Size = new System.Drawing.Size(206, 22);
this.copyToolStripMenuItem1.Text = "&Copy";
this.copyToolStripMenuItem1.Click += new System.EventHandler(this.copyToolStripMenuItem1_Click);
//
@ -447,7 +457,7 @@
this.pasteToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.Paste;
this.pasteToolStripMenuItem1.Name = "pasteToolStripMenuItem1";
this.pasteToolStripMenuItem1.ShortcutKeyDisplayString = "Ctrl+V";
this.pasteToolStripMenuItem1.Size = new System.Drawing.Size(219, 22);
this.pasteToolStripMenuItem1.Size = new System.Drawing.Size(206, 22);
this.pasteToolStripMenuItem1.Text = "&Paste";
this.pasteToolStripMenuItem1.Click += new System.EventHandler(this.pasteToolStripMenuItem1_Click);
//
@ -456,7 +466,7 @@
this.freezeToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Freeze;
this.freezeToolStripMenuItem.Name = "freezeToolStripMenuItem";
this.freezeToolStripMenuItem.ShortcutKeyDisplayString = "Space";
this.freezeToolStripMenuItem.Size = new System.Drawing.Size(219, 22);
this.freezeToolStripMenuItem.Size = new System.Drawing.Size(206, 22);
this.freezeToolStripMenuItem.Text = "&Freeze";
this.freezeToolStripMenuItem.Click += new System.EventHandler(this.freezeToolStripMenuItem_Click);
//
@ -465,7 +475,7 @@
this.addToRamWatchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.FindHS;
this.addToRamWatchToolStripMenuItem.Name = "addToRamWatchToolStripMenuItem";
this.addToRamWatchToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+W";
this.addToRamWatchToolStripMenuItem.Size = new System.Drawing.Size(219, 22);
this.addToRamWatchToolStripMenuItem.Size = new System.Drawing.Size(206, 22);
this.addToRamWatchToolStripMenuItem.Text = "&Add to Ram Watch";
this.addToRamWatchToolStripMenuItem.Click += new System.EventHandler(this.addToRamWatchToolStripMenuItem_Click);
//
@ -474,7 +484,7 @@
this.unfreezeAllToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.Unfreeze;
this.unfreezeAllToolStripMenuItem1.Name = "unfreezeAllToolStripMenuItem1";
this.unfreezeAllToolStripMenuItem1.ShortcutKeyDisplayString = "Shift+Del";
this.unfreezeAllToolStripMenuItem1.Size = new System.Drawing.Size(219, 22);
this.unfreezeAllToolStripMenuItem1.Size = new System.Drawing.Size(206, 22);
this.unfreezeAllToolStripMenuItem1.Text = "&Unfreeze All";
this.unfreezeAllToolStripMenuItem1.Click += new System.EventHandler(this.unfreezeAllToolStripMenuItem1_Click);
//
@ -483,20 +493,20 @@
this.pokeAddressToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.poke;
this.pokeAddressToolStripMenuItem1.Name = "pokeAddressToolStripMenuItem1";
this.pokeAddressToolStripMenuItem1.ShortcutKeyDisplayString = "Ctrl+P";
this.pokeAddressToolStripMenuItem1.Size = new System.Drawing.Size(219, 22);
this.pokeAddressToolStripMenuItem1.Size = new System.Drawing.Size(206, 22);
this.pokeAddressToolStripMenuItem1.Text = "&Poke Address";
this.pokeAddressToolStripMenuItem1.Click += new System.EventHandler(this.pokeAddressToolStripMenuItem1_Click);
//
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
this.toolStripSeparator4.Size = new System.Drawing.Size(216, 6);
this.toolStripSeparator4.Size = new System.Drawing.Size(203, 6);
//
// incrementToolStripMenuItem
//
this.incrementToolStripMenuItem.Name = "incrementToolStripMenuItem";
this.incrementToolStripMenuItem.ShortcutKeyDisplayString = "+";
this.incrementToolStripMenuItem.Size = new System.Drawing.Size(219, 22);
this.incrementToolStripMenuItem.Size = new System.Drawing.Size(206, 22);
this.incrementToolStripMenuItem.Text = "&Increment";
this.incrementToolStripMenuItem.Click += new System.EventHandler(this.incrementToolStripMenuItem_Click);
//
@ -504,20 +514,20 @@
//
this.decrementToolStripMenuItem.Name = "decrementToolStripMenuItem";
this.decrementToolStripMenuItem.ShortcutKeyDisplayString = "-";
this.decrementToolStripMenuItem.Size = new System.Drawing.Size(219, 22);
this.decrementToolStripMenuItem.Size = new System.Drawing.Size(206, 22);
this.decrementToolStripMenuItem.Text = "&Decrement";
this.decrementToolStripMenuItem.Click += new System.EventHandler(this.decrementToolStripMenuItem_Click);
//
// toolStripSeparator5
//
this.toolStripSeparator5.Name = "toolStripSeparator5";
this.toolStripSeparator5.Size = new System.Drawing.Size(216, 6);
this.toolStripSeparator5.Size = new System.Drawing.Size(203, 6);
//
// gotoAddressToolStripMenuItem1
//
this.gotoAddressToolStripMenuItem1.Name = "gotoAddressToolStripMenuItem1";
this.gotoAddressToolStripMenuItem1.ShortcutKeyDisplayString = "Ctrl+G";
this.gotoAddressToolStripMenuItem1.Size = new System.Drawing.Size(219, 22);
this.gotoAddressToolStripMenuItem1.Size = new System.Drawing.Size(206, 22);
this.gotoAddressToolStripMenuItem1.Text = "&Go to Address...";
this.gotoAddressToolStripMenuItem1.Click += new System.EventHandler(this.gotoAddressToolStripMenuItem1_Click);
//
@ -588,12 +598,12 @@
this.Header.TabIndex = 2;
this.Header.Text = "label1";
//
// alwaysOnTopToolStripMenuItem
// toolStripComboBox_SelectDomain
//
this.alwaysOnTopToolStripMenuItem.Name = "alwaysOnTopToolStripMenuItem";
this.alwaysOnTopToolStripMenuItem.Size = new System.Drawing.Size(192, 22);
this.alwaysOnTopToolStripMenuItem.Text = "Always On Top";
this.alwaysOnTopToolStripMenuItem.Click += new System.EventHandler(this.alwaysOnTopToolStripMenuItem_Click);
this.toolStripComboBox_SelectDomain.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.toolStripComboBox_SelectDomain.Name = "toolStripComboBox_SelectDomain";
this.toolStripComboBox_SelectDomain.Size = new System.Drawing.Size(121, 21);
this.toolStripComboBox_SelectDomain.Click += new System.EventHandler(this.toolStripComboBox_SelectDomain_Click);
//
// HexEditor
//
@ -683,5 +693,6 @@
private System.Windows.Forms.ToolStripMenuItem pokeAddressToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem pokeAddressToolStripMenuItem1;
private System.Windows.Forms.ToolStripMenuItem alwaysOnTopToolStripMenuItem;
private System.Windows.Forms.ToolStripComboBox toolStripComboBox_SelectDomain;
}
}

View File

@ -62,6 +62,22 @@ namespace BizHawk.MultiClient
Header.Font = new Font("Courier New", 8);
AddressesLabel.Font = new Font("Courier New", 8);
AddressLabel.Font = new Font("Courier New", 8);
memoryDomainsToolStripMenuItem.DropDownItemClicked += new ToolStripItemClickedEventHandler(memoryDomainsToolStripMenuItem_DropDownItemClicked);
toolStripComboBox_SelectDomain.SelectedIndexChanged += new EventHandler(toolStripComboBox_SelectDomain_SelectedIndexChanged);
}
void toolStripComboBox_SelectDomain_SelectedIndexChanged(object sender, EventArgs e)
{
var tsmi = (ToolStripMenuItem)toolStripComboBox_SelectDomain.SelectedItem;
SetMemoryDomain((int)tsmi.Tag);
}
void memoryDomainsToolStripMenuItem_DropDownItemClicked(object sender, ToolStripItemClickedEventArgs e)
{
//if (HACK_WTF_REENTRANCY) return;
//HACK_WTF_REENTRANCY = true;
//e.ClickedItem.PerformClick();
//HACK_WTF_REENTRANCY = false;
}
private void LoadConfigSettings()
@ -490,13 +506,14 @@ namespace BizHawk.MultiClient
var item = new ToolStripMenuItem {Text = str};
{
int z = i;
item.Click += (o, ev) => SetMemoryDomain(z);
}
if (i == 0)
item.Click += (o, ev) =>
{
SetMemoryDomain(i);
toolStripComboBox_SelectDomain.SelectedItem = item;
};
item.Tag = z;
}
memoryDomainsToolStripMenuItem.DropDownItems.Add(item);
toolStripComboBox_SelectDomain.Items.Add(item);
domainMenuItems.Add(item);
}
}
@ -507,6 +524,13 @@ namespace BizHawk.MultiClient
rom_item.Click += (o, ev) => SetMemoryDomain(999); //999 will denote ROM file
memoryDomainsToolStripMenuItem.DropDownItems.Add(rom_item);
domainMenuItems.Add(rom_item);
if (Global.Emulator.MemoryDomains.Count > 0)
{
toolStripComboBox_SelectDomain.SelectedItem = toolStripComboBox_SelectDomain.Items[0];
AddressesLabel.Focus();
}
}
@ -2223,6 +2247,7 @@ namespace BizHawk.MultiClient
{
if (e.Button == MouseButtons.Left)
{
AddressesLabel.Focus();
int pointed_address = GetPointedAddress(e.X, e.Y);
if (pointed_address >= 0)
{
@ -2282,6 +2307,11 @@ namespace BizHawk.MultiClient
{
alwaysOnTopToolStripMenuItem.Checked = alwaysOnTopToolStripMenuItem.Checked == false;
this.TopMost = alwaysOnTopToolStripMenuItem.Checked;
}
private void toolStripComboBox_SelectDomain_Click(object sender, EventArgs e)
{
}
}
}