diff --git a/BizHawk.MultiClient/Config.cs b/BizHawk.MultiClient/Config.cs index 3a4eda5b35..89a56a5ea5 100644 --- a/BizHawk.MultiClient/Config.cs +++ b/BizHawk.MultiClient/Config.cs @@ -76,6 +76,14 @@ public bool RamSearchPreviewMode = true; public bool AlwaysExludeRamWatch = false; + // HexEditor Settings + public bool AutoLoadHexEditor = false; + public bool HexEditorSaveWindowPosition = true; + public int HexEditorWndx = -1; //Negative numbers will be ignored even with save window position set + public int HexEditorWndy = -1; + public int HexEditorWidth = -1; + public int HexEditorHeight = -1; + //Movie Settings public RecentFiles RecentMovies = new RecentFiles(8); diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs index c377deb368..6853c6cfb7 100644 --- a/BizHawk.MultiClient/MainForm.cs +++ b/BizHawk.MultiClient/MainForm.cs @@ -42,6 +42,7 @@ namespace BizHawk.MultiClient //tool dialogs public RamWatch RamWatch1 = new RamWatch(); public RamSearch RamSearch1 = new RamSearch(); + public HexEditor HexEditor1 = new HexEditor(); public MainForm(string[] args) { @@ -123,6 +124,8 @@ namespace BizHawk.MultiClient LoadRamWatch(); if (Global.Config.AutoLoadRamSearch) LoadRamSearch(); + if (Global.Config.AutoLoadHexEditor) + LoadHexEditor(); if (Global.Config.MainWndx >= 0 && Global.Config.MainWndy >= 0 && Global.Config.SaveWindowPosition) this.Location = new Point(Global.Config.MainWndx, Global.Config.MainWndy); @@ -467,6 +470,7 @@ namespace BizHawk.MultiClient SetSpeedPercent(Global.Config.SpeedPercent); } RamSearch1.Restart(); + HexEditor1.Restart(); CurrentlyOpenRom = path; return true; } @@ -659,6 +663,7 @@ namespace BizHawk.MultiClient Global.Emulator.FrameAdvance(!throttle.skipnextframe); RamWatch1.UpdateValues(); RamSearch1.UpdateValues(); + HexEditor1.UpdateValues(); if (InputLog.GetMovieMode() == MOVIEMODE.RECORD) InputLog.GetMnemonic(); } @@ -927,6 +932,17 @@ namespace BizHawk.MultiClient RamSearch1.Focus(); } + private void LoadHexEditor() + { + if (!HexEditor1.IsHandleCreated || HexEditor1.IsDisposed) + { + HexEditor1 = new HexEditor(); + HexEditor1.Show(); + } + else + HexEditor1.Focus(); + } + private int lastWidth = -1; private int lastHeight = -1; @@ -1114,6 +1130,8 @@ namespace BizHawk.MultiClient RamWatch1.SaveConfigSettings(); if (!RamSearch1.IsDisposed) RamSearch1.SaveConfigSettings(); + if (!HexEditor1.IsDisposed) + HexEditor1.SaveConfigSettings(); ConfigService.Save("config.ini", Global.Config); } @@ -1137,8 +1155,7 @@ namespace BizHawk.MultiClient private void hexEditorToolStripMenuItem_Click(object sender, EventArgs e) { - HexEditor h = new HexEditor(); - h.Show(); //TODO: make global + autoload capabilities + LoadHexEditor(); } } } \ No newline at end of file diff --git a/BizHawk.MultiClient/tools/HexEditor.Designer.cs b/BizHawk.MultiClient/tools/HexEditor.Designer.cs index 8309bb70fa..01cbf4a4fc 100644 --- a/BizHawk.MultiClient/tools/HexEditor.Designer.cs +++ b/BizHawk.MultiClient/tools/HexEditor.Designer.cs @@ -40,11 +40,16 @@ this.byteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.byteToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.byteToolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.restoreWindowSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.menuStrip1.SuspendLayout(); this.SuspendLayout(); // // MemoryViewer // + this.MemoryViewer.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.MemoryViewer.Location = new System.Drawing.Point(12, 37); this.MemoryViewer.Name = "MemoryViewer"; this.MemoryViewer.Size = new System.Drawing.Size(484, 328); @@ -97,7 +102,9 @@ // this.optionsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.memoryDomainsToolStripMenuItem, - this.dataSizeToolStripMenuItem}); + this.dataSizeToolStripMenuItem, + this.toolStripSeparator2, + this.restoreWindowSizeToolStripMenuItem}); this.optionsToolStripMenuItem.Name = "optionsToolStripMenuItem"; this.optionsToolStripMenuItem.Size = new System.Drawing.Size(56, 20); this.optionsToolStripMenuItem.Text = "&Options"; @@ -136,6 +143,18 @@ this.byteToolStripMenuItem2.Size = new System.Drawing.Size(152, 22); this.byteToolStripMenuItem2.Text = "4 Byte"; // + // toolStripSeparator2 + // + this.toolStripSeparator2.Name = "toolStripSeparator2"; + this.toolStripSeparator2.Size = new System.Drawing.Size(183, 6); + // + // restoreWindowSizeToolStripMenuItem + // + this.restoreWindowSizeToolStripMenuItem.Name = "restoreWindowSizeToolStripMenuItem"; + this.restoreWindowSizeToolStripMenuItem.Size = new System.Drawing.Size(186, 22); + this.restoreWindowSizeToolStripMenuItem.Text = "&Restore Window Size"; + this.restoreWindowSizeToolStripMenuItem.Click += new System.EventHandler(this.restoreWindowSizeToolStripMenuItem_Click); + // // HexEditor // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -168,5 +187,7 @@ private System.Windows.Forms.ToolStripMenuItem byteToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem byteToolStripMenuItem1; private System.Windows.Forms.ToolStripMenuItem byteToolStripMenuItem2; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; + private System.Windows.Forms.ToolStripMenuItem restoreWindowSizeToolStripMenuItem; } } \ No newline at end of file diff --git a/BizHawk.MultiClient/tools/HexEditor.cs b/BizHawk.MultiClient/tools/HexEditor.cs index aa9565785b..03b16aa061 100644 --- a/BizHawk.MultiClient/tools/HexEditor.cs +++ b/BizHawk.MultiClient/tools/HexEditor.cs @@ -11,14 +11,39 @@ namespace BizHawk.MultiClient { public partial class HexEditor : Form { + //TODO: + //Everything + + int defaultWidth; + int defaultHeight; + MemoryDomain Domain = new MemoryDomain("NULL", 1, Endian.Little, addr => 0, (a, v) => { }); + public HexEditor() { InitializeComponent(); + Closing += (o, e) => SaveConfigSettings(); + } + + public void SaveConfigSettings() + { + Global.Config.HexEditorWndx = this.Location.X; + Global.Config.HexEditorWndy = this.Location.Y; + Global.Config.HexEditorWidth = this.Right - this.Left; + Global.Config.HexEditorHeight = this.Bottom - this.Top; } private void HexEditor_Load(object sender, EventArgs e) { + defaultWidth = this.Size.Width; //Save these first so that the user can restore to its original size + defaultHeight = this.Size.Height; + if (Global.Config.HexEditorWndx >= 0 && Global.Config.HexEditorWndy >= 0) + this.Location = new Point(Global.Config.HexEditorWndx, Global.Config.HexEditorWndy); + + if (Global.Config.HexEditorWidth >= 0 && Global.Config.HexEditorHeight >= 0) + { + this.Size = new System.Drawing.Size(Global.Config.HexEditorWidth, Global.Config.HexEditorHeight); + } } private void exitToolStripMenuItem_Click(object sender, EventArgs e) @@ -40,5 +65,21 @@ namespace BizHawk.MultiClient this.Right, this.Bottom); } + + public void UpdateValues() + { + if (!this.IsHandleCreated || this.IsDisposed) return; + //TODO + } + + public void Restart() + { + //TODO + } + + private void restoreWindowSizeToolStripMenuItem_Click(object sender, EventArgs e) + { + this.Size = new System.Drawing.Size(defaultWidth, defaultHeight); + } } } diff --git a/BizHawk.MultiClient/tools/RamSearch.Designer.cs b/BizHawk.MultiClient/tools/RamSearch.Designer.cs index b383b57795..51e9d9f986 100644 --- a/BizHawk.MultiClient/tools/RamSearch.Designer.cs +++ b/BizHawk.MultiClient/tools/RamSearch.Designer.cs @@ -31,15 +31,8 @@ this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RamSearch)); this.SearchtoolStrip1 = new System.Windows.Forms.ToolStrip(); - this.openToolStripButton = new System.Windows.Forms.ToolStripButton(); - this.saveToolStripButton = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator = new System.Windows.Forms.ToolStripSeparator(); - this.cutToolStripButton = new System.Windows.Forms.ToolStripButton(); - this.TruncateFromFiletoolStripButton2 = new System.Windows.Forms.ToolStripButton(); - this.ExcludeRamWatchtoolStripButton2 = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator(); - this.WatchtoolStripButton1 = new System.Windows.Forms.ToolStripButton(); - this.PoketoolStripButton1 = new System.Windows.Forms.ToolStripButton(); this.TotalSearchLabel = new System.Windows.Forms.Label(); this.SearchListView = new BizHawk.VirtualListView(); this.Address = new System.Windows.Forms.ColumnHeader(); @@ -67,6 +60,7 @@ this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.searchToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.memoryDomainsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.searchToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.undoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.copyValueToPrevToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -87,27 +81,9 @@ this.alwaysExludeRamSearchListToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripContainer1 = new System.Windows.Forms.ToolStripContainer(); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); - this.NewSearchtoolStripButton = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator(); - this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator(); - this.SetCurrToPrevtoolStripButton2 = new System.Windows.Forms.ToolStripButton(); - this.ClearChangeCountstoolStripButton = new System.Windows.Forms.ToolStripButton(); - this.UndotoolStripButton = new System.Windows.Forms.ToolStripButton(); this.toolStrip2 = new System.Windows.Forms.ToolStrip(); - this.DataSizetoolStripSplitButton1 = new System.Windows.Forms.ToolStripSplitButton(); - this.byteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.bytesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.dWordToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.DataTypetoolStripSplitButton1 = new System.Windows.Forms.ToolStripSplitButton(); - this.unsignedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.signedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.hexadecimalToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); - this.includeMisalignedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.EndiantoolSplitButton = new System.Windows.Forms.ToolStripSplitButton(); - this.bigEndianToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.littleEndianToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.CompareToBox = new System.Windows.Forms.GroupBox(); this.label1 = new System.Windows.Forms.Label(); this.NumberOfChangesBox = new System.Windows.Forms.TextBox(); @@ -129,7 +105,31 @@ this.AutoSearchCheckBox = new System.Windows.Forms.CheckBox(); this.MemDomainLabel = new System.Windows.Forms.Label(); this.OutputLabel = new System.Windows.Forms.Label(); - this.memoryDomainsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.NewSearchtoolStripButton = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); + this.SetCurrToPrevtoolStripButton2 = new System.Windows.Forms.ToolStripButton(); + this.ClearChangeCountstoolStripButton = new System.Windows.Forms.ToolStripButton(); + this.UndotoolStripButton = new System.Windows.Forms.ToolStripButton(); + this.openToolStripButton = new System.Windows.Forms.ToolStripButton(); + this.saveToolStripButton = new System.Windows.Forms.ToolStripButton(); + this.cutToolStripButton = new System.Windows.Forms.ToolStripButton(); + this.TruncateFromFiletoolStripButton2 = new System.Windows.Forms.ToolStripButton(); + this.ExcludeRamWatchtoolStripButton2 = new System.Windows.Forms.ToolStripButton(); + this.WatchtoolStripButton1 = new System.Windows.Forms.ToolStripButton(); + this.PoketoolStripButton1 = new System.Windows.Forms.ToolStripButton(); + this.DataSizetoolStripSplitButton1 = new System.Windows.Forms.ToolStripSplitButton(); + this.byteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.bytesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.dWordToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.DataTypetoolStripSplitButton1 = new System.Windows.Forms.ToolStripSplitButton(); + this.unsignedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.signedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.hexadecimalToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); + this.includeMisalignedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.EndiantoolSplitButton = new System.Windows.Forms.ToolStripSplitButton(); + this.bigEndianToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.littleEndianToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.SearchtoolStrip1.SuspendLayout(); this.contextMenuStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout(); @@ -160,89 +160,16 @@ this.SearchtoolStrip1.TabIndex = 0; this.SearchtoolStrip1.Text = "Search"; // - // openToolStripButton - // - this.openToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.openToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("openToolStripButton.Image"))); - this.openToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.openToolStripButton.Name = "openToolStripButton"; - this.openToolStripButton.Size = new System.Drawing.Size(23, 22); - this.openToolStripButton.Text = "&Open"; - this.openToolStripButton.ToolTipText = "Open Search List"; - this.openToolStripButton.Click += new System.EventHandler(this.openToolStripButton_Click); - // - // saveToolStripButton - // - this.saveToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.saveToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("saveToolStripButton.Image"))); - this.saveToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.saveToolStripButton.Name = "saveToolStripButton"; - this.saveToolStripButton.Size = new System.Drawing.Size(23, 22); - this.saveToolStripButton.Text = "&Save"; - this.saveToolStripButton.ToolTipText = "Save Watch List"; - this.saveToolStripButton.Click += new System.EventHandler(this.saveToolStripMenuItem_Click); - // // toolStripSeparator // this.toolStripSeparator.Name = "toolStripSeparator"; this.toolStripSeparator.Size = new System.Drawing.Size(6, 25); // - // cutToolStripButton - // - this.cutToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.cutToolStripButton.Image = global::BizHawk.MultiClient.Properties.Resources.BuilderDialog_delete; - this.cutToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.cutToolStripButton.Name = "cutToolStripButton"; - this.cutToolStripButton.Size = new System.Drawing.Size(23, 22); - this.cutToolStripButton.Text = "C&ut"; - this.cutToolStripButton.ToolTipText = "Eliminate Selected Items"; - this.cutToolStripButton.Click += new System.EventHandler(this.cutToolStripButton_Click); - // - // TruncateFromFiletoolStripButton2 - // - this.TruncateFromFiletoolStripButton2.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.TruncateFromFiletoolStripButton2.Image = global::BizHawk.MultiClient.Properties.Resources.TruncateFromFile; - this.TruncateFromFiletoolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta; - this.TruncateFromFiletoolStripButton2.Name = "TruncateFromFiletoolStripButton2"; - this.TruncateFromFiletoolStripButton2.Size = new System.Drawing.Size(23, 22); - this.TruncateFromFiletoolStripButton2.Text = "Eliminate from File"; - this.TruncateFromFiletoolStripButton2.Click += new System.EventHandler(this.TruncateFromFiletoolStripButton2_Click); - // - // ExcludeRamWatchtoolStripButton2 - // - this.ExcludeRamWatchtoolStripButton2.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.ExcludeRamWatchtoolStripButton2.Image = global::BizHawk.MultiClient.Properties.Resources.TruncateFromRW; - this.ExcludeRamWatchtoolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta; - this.ExcludeRamWatchtoolStripButton2.Name = "ExcludeRamWatchtoolStripButton2"; - this.ExcludeRamWatchtoolStripButton2.Size = new System.Drawing.Size(23, 22); - this.ExcludeRamWatchtoolStripButton2.Text = "Elmininate Ram Watch list"; - this.ExcludeRamWatchtoolStripButton2.Click += new System.EventHandler(this.ExcludeRamWatchtoolStripButton2_Click); - // // toolStripSeparator8 // this.toolStripSeparator8.Name = "toolStripSeparator8"; this.toolStripSeparator8.Size = new System.Drawing.Size(6, 25); // - // WatchtoolStripButton1 - // - this.WatchtoolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.WatchtoolStripButton1.Image = global::BizHawk.MultiClient.Properties.Resources.FindHS; - this.WatchtoolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; - this.WatchtoolStripButton1.Name = "WatchtoolStripButton1"; - this.WatchtoolStripButton1.Size = new System.Drawing.Size(23, 22); - this.WatchtoolStripButton1.Text = "toolStripButton1"; - this.WatchtoolStripButton1.Click += new System.EventHandler(this.WatchtoolStripButton1_Click); - // - // PoketoolStripButton1 - // - this.PoketoolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.PoketoolStripButton1.Image = global::BizHawk.MultiClient.Properties.Resources.poke; - this.PoketoolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; - this.PoketoolStripButton1.Name = "PoketoolStripButton1"; - this.PoketoolStripButton1.Size = new System.Drawing.Size(23, 22); - this.PoketoolStripButton1.Text = "Poke"; - this.PoketoolStripButton1.Click += new System.EventHandler(this.PoketoolStripButton1_Click); - // // TotalSearchLabel // this.TotalSearchLabel.AutoSize = true; @@ -475,6 +402,12 @@ this.searchToolStripMenuItem.Text = "&Search"; this.searchToolStripMenuItem.DropDownOpened += new System.EventHandler(this.searchToolStripMenuItem_DropDownOpened); // + // memoryDomainsToolStripMenuItem + // + this.memoryDomainsToolStripMenuItem.Name = "memoryDomainsToolStripMenuItem"; + this.memoryDomainsToolStripMenuItem.Size = new System.Drawing.Size(218, 22); + this.memoryDomainsToolStripMenuItem.Text = "&Memory Domains"; + // // searchToolStripMenuItem1 // this.searchToolStripMenuItem1.Name = "searchToolStripMenuItem1"; @@ -586,6 +519,7 @@ this.restoreOriginalWindowSizeToolStripMenuItem.Name = "restoreOriginalWindowSizeToolStripMenuItem"; this.restoreOriginalWindowSizeToolStripMenuItem.Size = new System.Drawing.Size(233, 22); this.restoreOriginalWindowSizeToolStripMenuItem.Text = "Restore Window Size"; + this.restoreOriginalWindowSizeToolStripMenuItem.Click += new System.EventHandler(this.restoreOriginalWindowSizeToolStripMenuItem_Click); // // saveWindowPositionToolStripMenuItem // @@ -644,68 +578,16 @@ this.toolStrip1.Size = new System.Drawing.Size(137, 25); this.toolStrip1.TabIndex = 1; // - // NewSearchtoolStripButton - // - this.NewSearchtoolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.NewSearchtoolStripButton.Image = global::BizHawk.MultiClient.Properties.Resources.restart; - this.NewSearchtoolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.NewSearchtoolStripButton.Name = "NewSearchtoolStripButton"; - this.NewSearchtoolStripButton.Size = new System.Drawing.Size(23, 22); - this.NewSearchtoolStripButton.Text = "New Search"; - this.NewSearchtoolStripButton.Click += new System.EventHandler(this.NewSearchtoolStripButton_Click); - // // toolStripSeparator6 // this.toolStripSeparator6.Name = "toolStripSeparator6"; this.toolStripSeparator6.Size = new System.Drawing.Size(6, 25); // - // toolStripButton1 - // - this.toolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image"))); - this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton1.Name = "toolStripButton1"; - this.toolStripButton1.Size = new System.Drawing.Size(23, 22); - this.toolStripButton1.Text = "Search"; - this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); - // // toolStripSeparator7 // this.toolStripSeparator7.Name = "toolStripSeparator7"; this.toolStripSeparator7.Size = new System.Drawing.Size(6, 25); // - // SetCurrToPrevtoolStripButton2 - // - this.SetCurrToPrevtoolStripButton2.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.SetCurrToPrevtoolStripButton2.Image = global::BizHawk.MultiClient.Properties.Resources.Refresh; - this.SetCurrToPrevtoolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta; - this.SetCurrToPrevtoolStripButton2.Name = "SetCurrToPrevtoolStripButton2"; - this.SetCurrToPrevtoolStripButton2.Size = new System.Drawing.Size(23, 22); - this.SetCurrToPrevtoolStripButton2.Text = "Copy Value to Prev"; - this.SetCurrToPrevtoolStripButton2.Click += new System.EventHandler(this.SetCurrToPrevtoolStripButton2_Click); - // - // ClearChangeCountstoolStripButton - // - this.ClearChangeCountstoolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; - this.ClearChangeCountstoolStripButton.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.ClearChangeCountstoolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("ClearChangeCountstoolStripButton.Image"))); - this.ClearChangeCountstoolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.ClearChangeCountstoolStripButton.Name = "ClearChangeCountstoolStripButton"; - this.ClearChangeCountstoolStripButton.Size = new System.Drawing.Size(23, 22); - this.ClearChangeCountstoolStripButton.Text = "C"; - this.ClearChangeCountstoolStripButton.ToolTipText = "Clear Change Counts"; - this.ClearChangeCountstoolStripButton.Click += new System.EventHandler(this.ClearChangeCountstoolStripButton_Click); - // - // UndotoolStripButton - // - this.UndotoolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.UndotoolStripButton.Image = global::BizHawk.MultiClient.Properties.Resources.undo; - this.UndotoolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.UndotoolStripButton.Name = "UndotoolStripButton"; - this.UndotoolStripButton.Size = new System.Drawing.Size(23, 22); - this.UndotoolStripButton.Text = "Undo Search"; - this.UndotoolStripButton.Click += new System.EventHandler(this.UndotoolStripButton_Click_1); - // // toolStrip2 // this.toolStrip2.Dock = System.Windows.Forms.DockStyle.None; @@ -718,120 +600,6 @@ this.toolStrip2.Size = new System.Drawing.Size(206, 25); this.toolStrip2.TabIndex = 2; // - // DataSizetoolStripSplitButton1 - // - this.DataSizetoolStripSplitButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; - this.DataSizetoolStripSplitButton1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.byteToolStripMenuItem, - this.bytesToolStripMenuItem, - this.dWordToolStripMenuItem1}); - this.DataSizetoolStripSplitButton1.Image = ((System.Drawing.Image)(resources.GetObject("DataSizetoolStripSplitButton1.Image"))); - this.DataSizetoolStripSplitButton1.ImageTransparentColor = System.Drawing.Color.Magenta; - this.DataSizetoolStripSplitButton1.Name = "DataSizetoolStripSplitButton1"; - this.DataSizetoolStripSplitButton1.Size = new System.Drawing.Size(68, 22); - this.DataSizetoolStripSplitButton1.Text = "Data Size"; - // - // byteToolStripMenuItem - // - this.byteToolStripMenuItem.Checked = true; - this.byteToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; - this.byteToolStripMenuItem.Name = "byteToolStripMenuItem"; - this.byteToolStripMenuItem.Size = new System.Drawing.Size(121, 22); - this.byteToolStripMenuItem.Text = "1 Byte"; - this.byteToolStripMenuItem.Click += new System.EventHandler(this.byteToolStripMenuItem_Click); - // - // bytesToolStripMenuItem - // - this.bytesToolStripMenuItem.Name = "bytesToolStripMenuItem"; - this.bytesToolStripMenuItem.Size = new System.Drawing.Size(121, 22); - this.bytesToolStripMenuItem.Text = "2 Bytes"; - this.bytesToolStripMenuItem.Click += new System.EventHandler(this.bytesToolStripMenuItem_Click); - // - // dWordToolStripMenuItem1 - // - this.dWordToolStripMenuItem1.Name = "dWordToolStripMenuItem1"; - this.dWordToolStripMenuItem1.Size = new System.Drawing.Size(121, 22); - this.dWordToolStripMenuItem1.Text = "4 Bytes"; - this.dWordToolStripMenuItem1.Click += new System.EventHandler(this.dWordToolStripMenuItem1_Click); - // - // DataTypetoolStripSplitButton1 - // - this.DataTypetoolStripSplitButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; - this.DataTypetoolStripSplitButton1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.unsignedToolStripMenuItem, - this.signedToolStripMenuItem, - this.hexadecimalToolStripMenuItem, - this.toolStripSeparator3, - this.includeMisalignedToolStripMenuItem}); - this.DataTypetoolStripSplitButton1.Image = ((System.Drawing.Image)(resources.GetObject("DataTypetoolStripSplitButton1.Image"))); - this.DataTypetoolStripSplitButton1.ImageTransparentColor = System.Drawing.Color.Magenta; - this.DataTypetoolStripSplitButton1.Name = "DataTypetoolStripSplitButton1"; - this.DataTypetoolStripSplitButton1.Size = new System.Drawing.Size(73, 22); - this.DataTypetoolStripSplitButton1.Text = "Data Type"; - // - // unsignedToolStripMenuItem - // - this.unsignedToolStripMenuItem.Checked = true; - this.unsignedToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; - this.unsignedToolStripMenuItem.Name = "unsignedToolStripMenuItem"; - this.unsignedToolStripMenuItem.Size = new System.Drawing.Size(176, 22); - this.unsignedToolStripMenuItem.Text = "Unsigned"; - this.unsignedToolStripMenuItem.Click += new System.EventHandler(this.unsignedToolStripMenuItem_Click); - // - // signedToolStripMenuItem - // - this.signedToolStripMenuItem.Name = "signedToolStripMenuItem"; - this.signedToolStripMenuItem.Size = new System.Drawing.Size(176, 22); - this.signedToolStripMenuItem.Text = "Signed"; - this.signedToolStripMenuItem.Click += new System.EventHandler(this.signedToolStripMenuItem_Click); - // - // hexadecimalToolStripMenuItem - // - this.hexadecimalToolStripMenuItem.Name = "hexadecimalToolStripMenuItem"; - this.hexadecimalToolStripMenuItem.Size = new System.Drawing.Size(176, 22); - this.hexadecimalToolStripMenuItem.Text = "Hexadecimal"; - this.hexadecimalToolStripMenuItem.Click += new System.EventHandler(this.hexadecimalToolStripMenuItem_Click); - // - // toolStripSeparator3 - // - this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(173, 6); - // - // includeMisalignedToolStripMenuItem - // - this.includeMisalignedToolStripMenuItem.Name = "includeMisalignedToolStripMenuItem"; - this.includeMisalignedToolStripMenuItem.Size = new System.Drawing.Size(176, 22); - this.includeMisalignedToolStripMenuItem.Text = "Include mis-aligned"; - this.includeMisalignedToolStripMenuItem.Click += new System.EventHandler(this.includeMisalignedToolStripMenuItem_Click); - // - // EndiantoolSplitButton - // - this.EndiantoolSplitButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; - this.EndiantoolSplitButton.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.bigEndianToolStripMenuItem, - this.littleEndianToolStripMenuItem}); - this.EndiantoolSplitButton.Image = ((System.Drawing.Image)(resources.GetObject("EndiantoolSplitButton.Image"))); - this.EndiantoolSplitButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.EndiantoolSplitButton.Name = "EndiantoolSplitButton"; - this.EndiantoolSplitButton.Size = new System.Drawing.Size(55, 22); - this.EndiantoolSplitButton.Text = "Endian"; - // - // bigEndianToolStripMenuItem - // - this.bigEndianToolStripMenuItem.Checked = true; - this.bigEndianToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; - this.bigEndianToolStripMenuItem.Name = "bigEndianToolStripMenuItem"; - this.bigEndianToolStripMenuItem.Size = new System.Drawing.Size(143, 22); - this.bigEndianToolStripMenuItem.Text = "Big Endian"; - this.bigEndianToolStripMenuItem.Click += new System.EventHandler(this.bigEndianToolStripMenuItem_Click); - // - // littleEndianToolStripMenuItem - // - this.littleEndianToolStripMenuItem.Name = "littleEndianToolStripMenuItem"; - this.littleEndianToolStripMenuItem.Size = new System.Drawing.Size(143, 22); - this.littleEndianToolStripMenuItem.Text = "Little Endian"; - this.littleEndianToolStripMenuItem.Click += new System.EventHandler(this.littleEndianToolStripMenuItem_Click); - // // CompareToBox // this.CompareToBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); @@ -1082,11 +850,244 @@ this.OutputLabel.TabIndex = 9; this.OutputLabel.Text = " "; // - // memoryDomainsToolStripMenuItem + // NewSearchtoolStripButton // - this.memoryDomainsToolStripMenuItem.Name = "memoryDomainsToolStripMenuItem"; - this.memoryDomainsToolStripMenuItem.Size = new System.Drawing.Size(218, 22); - this.memoryDomainsToolStripMenuItem.Text = "&Memory Domains"; + this.NewSearchtoolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.NewSearchtoolStripButton.Image = global::BizHawk.MultiClient.Properties.Resources.restart; + this.NewSearchtoolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.NewSearchtoolStripButton.Name = "NewSearchtoolStripButton"; + this.NewSearchtoolStripButton.Size = new System.Drawing.Size(23, 22); + this.NewSearchtoolStripButton.Text = "New Search"; + this.NewSearchtoolStripButton.Click += new System.EventHandler(this.NewSearchtoolStripButton_Click); + // + // toolStripButton1 + // + this.toolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image"))); + this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton1.Name = "toolStripButton1"; + this.toolStripButton1.Size = new System.Drawing.Size(23, 22); + this.toolStripButton1.Text = "Search"; + this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); + // + // SetCurrToPrevtoolStripButton2 + // + this.SetCurrToPrevtoolStripButton2.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.SetCurrToPrevtoolStripButton2.Image = global::BizHawk.MultiClient.Properties.Resources.Refresh; + this.SetCurrToPrevtoolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta; + this.SetCurrToPrevtoolStripButton2.Name = "SetCurrToPrevtoolStripButton2"; + this.SetCurrToPrevtoolStripButton2.Size = new System.Drawing.Size(23, 22); + this.SetCurrToPrevtoolStripButton2.Text = "Copy Value to Prev"; + this.SetCurrToPrevtoolStripButton2.Click += new System.EventHandler(this.SetCurrToPrevtoolStripButton2_Click); + // + // ClearChangeCountstoolStripButton + // + this.ClearChangeCountstoolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; + this.ClearChangeCountstoolStripButton.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.ClearChangeCountstoolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("ClearChangeCountstoolStripButton.Image"))); + this.ClearChangeCountstoolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.ClearChangeCountstoolStripButton.Name = "ClearChangeCountstoolStripButton"; + this.ClearChangeCountstoolStripButton.Size = new System.Drawing.Size(23, 22); + this.ClearChangeCountstoolStripButton.Text = "C"; + this.ClearChangeCountstoolStripButton.ToolTipText = "Clear Change Counts"; + this.ClearChangeCountstoolStripButton.Click += new System.EventHandler(this.ClearChangeCountstoolStripButton_Click); + // + // UndotoolStripButton + // + this.UndotoolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.UndotoolStripButton.Image = global::BizHawk.MultiClient.Properties.Resources.undo; + this.UndotoolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.UndotoolStripButton.Name = "UndotoolStripButton"; + this.UndotoolStripButton.Size = new System.Drawing.Size(23, 22); + this.UndotoolStripButton.Text = "Undo Search"; + this.UndotoolStripButton.Click += new System.EventHandler(this.UndotoolStripButton_Click_1); + // + // openToolStripButton + // + this.openToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.openToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("openToolStripButton.Image"))); + this.openToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.openToolStripButton.Name = "openToolStripButton"; + this.openToolStripButton.Size = new System.Drawing.Size(23, 22); + this.openToolStripButton.Text = "&Open"; + this.openToolStripButton.ToolTipText = "Open Search List"; + this.openToolStripButton.Click += new System.EventHandler(this.openToolStripButton_Click); + // + // saveToolStripButton + // + this.saveToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.saveToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("saveToolStripButton.Image"))); + this.saveToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.saveToolStripButton.Name = "saveToolStripButton"; + this.saveToolStripButton.Size = new System.Drawing.Size(23, 22); + this.saveToolStripButton.Text = "&Save"; + this.saveToolStripButton.ToolTipText = "Save Watch List"; + this.saveToolStripButton.Click += new System.EventHandler(this.saveToolStripMenuItem_Click); + // + // cutToolStripButton + // + this.cutToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.cutToolStripButton.Image = global::BizHawk.MultiClient.Properties.Resources.BuilderDialog_delete; + this.cutToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.cutToolStripButton.Name = "cutToolStripButton"; + this.cutToolStripButton.Size = new System.Drawing.Size(23, 22); + this.cutToolStripButton.Text = "C&ut"; + this.cutToolStripButton.ToolTipText = "Eliminate Selected Items"; + this.cutToolStripButton.Click += new System.EventHandler(this.cutToolStripButton_Click); + // + // TruncateFromFiletoolStripButton2 + // + this.TruncateFromFiletoolStripButton2.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.TruncateFromFiletoolStripButton2.Image = global::BizHawk.MultiClient.Properties.Resources.TruncateFromFile; + this.TruncateFromFiletoolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta; + this.TruncateFromFiletoolStripButton2.Name = "TruncateFromFiletoolStripButton2"; + this.TruncateFromFiletoolStripButton2.Size = new System.Drawing.Size(23, 22); + this.TruncateFromFiletoolStripButton2.Text = "Eliminate from File"; + this.TruncateFromFiletoolStripButton2.Click += new System.EventHandler(this.TruncateFromFiletoolStripButton2_Click); + // + // ExcludeRamWatchtoolStripButton2 + // + this.ExcludeRamWatchtoolStripButton2.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.ExcludeRamWatchtoolStripButton2.Image = global::BizHawk.MultiClient.Properties.Resources.TruncateFromRW; + this.ExcludeRamWatchtoolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta; + this.ExcludeRamWatchtoolStripButton2.Name = "ExcludeRamWatchtoolStripButton2"; + this.ExcludeRamWatchtoolStripButton2.Size = new System.Drawing.Size(23, 22); + this.ExcludeRamWatchtoolStripButton2.Text = "Elmininate Ram Watch list"; + this.ExcludeRamWatchtoolStripButton2.Click += new System.EventHandler(this.ExcludeRamWatchtoolStripButton2_Click); + // + // WatchtoolStripButton1 + // + this.WatchtoolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.WatchtoolStripButton1.Image = global::BizHawk.MultiClient.Properties.Resources.FindHS; + this.WatchtoolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; + this.WatchtoolStripButton1.Name = "WatchtoolStripButton1"; + this.WatchtoolStripButton1.Size = new System.Drawing.Size(23, 22); + this.WatchtoolStripButton1.Text = "toolStripButton1"; + this.WatchtoolStripButton1.Click += new System.EventHandler(this.WatchtoolStripButton1_Click); + // + // PoketoolStripButton1 + // + this.PoketoolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.PoketoolStripButton1.Image = global::BizHawk.MultiClient.Properties.Resources.poke; + this.PoketoolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; + this.PoketoolStripButton1.Name = "PoketoolStripButton1"; + this.PoketoolStripButton1.Size = new System.Drawing.Size(23, 22); + this.PoketoolStripButton1.Text = "Poke"; + this.PoketoolStripButton1.Click += new System.EventHandler(this.PoketoolStripButton1_Click); + // + // DataSizetoolStripSplitButton1 + // + this.DataSizetoolStripSplitButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; + this.DataSizetoolStripSplitButton1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.byteToolStripMenuItem, + this.bytesToolStripMenuItem, + this.dWordToolStripMenuItem1}); + this.DataSizetoolStripSplitButton1.Image = ((System.Drawing.Image)(resources.GetObject("DataSizetoolStripSplitButton1.Image"))); + this.DataSizetoolStripSplitButton1.ImageTransparentColor = System.Drawing.Color.Magenta; + this.DataSizetoolStripSplitButton1.Name = "DataSizetoolStripSplitButton1"; + this.DataSizetoolStripSplitButton1.Size = new System.Drawing.Size(68, 22); + this.DataSizetoolStripSplitButton1.Text = "Data Size"; + // + // byteToolStripMenuItem + // + this.byteToolStripMenuItem.Checked = true; + this.byteToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; + this.byteToolStripMenuItem.Name = "byteToolStripMenuItem"; + this.byteToolStripMenuItem.Size = new System.Drawing.Size(121, 22); + this.byteToolStripMenuItem.Text = "1 Byte"; + this.byteToolStripMenuItem.Click += new System.EventHandler(this.byteToolStripMenuItem_Click); + // + // bytesToolStripMenuItem + // + this.bytesToolStripMenuItem.Name = "bytesToolStripMenuItem"; + this.bytesToolStripMenuItem.Size = new System.Drawing.Size(121, 22); + this.bytesToolStripMenuItem.Text = "2 Bytes"; + this.bytesToolStripMenuItem.Click += new System.EventHandler(this.bytesToolStripMenuItem_Click); + // + // dWordToolStripMenuItem1 + // + this.dWordToolStripMenuItem1.Name = "dWordToolStripMenuItem1"; + this.dWordToolStripMenuItem1.Size = new System.Drawing.Size(121, 22); + this.dWordToolStripMenuItem1.Text = "4 Bytes"; + this.dWordToolStripMenuItem1.Click += new System.EventHandler(this.dWordToolStripMenuItem1_Click); + // + // DataTypetoolStripSplitButton1 + // + this.DataTypetoolStripSplitButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; + this.DataTypetoolStripSplitButton1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.unsignedToolStripMenuItem, + this.signedToolStripMenuItem, + this.hexadecimalToolStripMenuItem, + this.toolStripSeparator3, + this.includeMisalignedToolStripMenuItem}); + this.DataTypetoolStripSplitButton1.Image = ((System.Drawing.Image)(resources.GetObject("DataTypetoolStripSplitButton1.Image"))); + this.DataTypetoolStripSplitButton1.ImageTransparentColor = System.Drawing.Color.Magenta; + this.DataTypetoolStripSplitButton1.Name = "DataTypetoolStripSplitButton1"; + this.DataTypetoolStripSplitButton1.Size = new System.Drawing.Size(73, 22); + this.DataTypetoolStripSplitButton1.Text = "Data Type"; + // + // unsignedToolStripMenuItem + // + this.unsignedToolStripMenuItem.Checked = true; + this.unsignedToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; + this.unsignedToolStripMenuItem.Name = "unsignedToolStripMenuItem"; + this.unsignedToolStripMenuItem.Size = new System.Drawing.Size(176, 22); + this.unsignedToolStripMenuItem.Text = "Unsigned"; + this.unsignedToolStripMenuItem.Click += new System.EventHandler(this.unsignedToolStripMenuItem_Click); + // + // signedToolStripMenuItem + // + this.signedToolStripMenuItem.Name = "signedToolStripMenuItem"; + this.signedToolStripMenuItem.Size = new System.Drawing.Size(176, 22); + this.signedToolStripMenuItem.Text = "Signed"; + this.signedToolStripMenuItem.Click += new System.EventHandler(this.signedToolStripMenuItem_Click); + // + // hexadecimalToolStripMenuItem + // + this.hexadecimalToolStripMenuItem.Name = "hexadecimalToolStripMenuItem"; + this.hexadecimalToolStripMenuItem.Size = new System.Drawing.Size(176, 22); + this.hexadecimalToolStripMenuItem.Text = "Hexadecimal"; + this.hexadecimalToolStripMenuItem.Click += new System.EventHandler(this.hexadecimalToolStripMenuItem_Click); + // + // toolStripSeparator3 + // + this.toolStripSeparator3.Name = "toolStripSeparator3"; + this.toolStripSeparator3.Size = new System.Drawing.Size(173, 6); + // + // includeMisalignedToolStripMenuItem + // + this.includeMisalignedToolStripMenuItem.Name = "includeMisalignedToolStripMenuItem"; + this.includeMisalignedToolStripMenuItem.Size = new System.Drawing.Size(176, 22); + this.includeMisalignedToolStripMenuItem.Text = "Include mis-aligned"; + this.includeMisalignedToolStripMenuItem.Click += new System.EventHandler(this.includeMisalignedToolStripMenuItem_Click); + // + // EndiantoolSplitButton + // + this.EndiantoolSplitButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; + this.EndiantoolSplitButton.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.bigEndianToolStripMenuItem, + this.littleEndianToolStripMenuItem}); + this.EndiantoolSplitButton.Image = ((System.Drawing.Image)(resources.GetObject("EndiantoolSplitButton.Image"))); + this.EndiantoolSplitButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.EndiantoolSplitButton.Name = "EndiantoolSplitButton"; + this.EndiantoolSplitButton.Size = new System.Drawing.Size(55, 22); + this.EndiantoolSplitButton.Text = "Endian"; + // + // bigEndianToolStripMenuItem + // + this.bigEndianToolStripMenuItem.Checked = true; + this.bigEndianToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; + this.bigEndianToolStripMenuItem.Name = "bigEndianToolStripMenuItem"; + this.bigEndianToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.bigEndianToolStripMenuItem.Text = "Big Endian"; + this.bigEndianToolStripMenuItem.Click += new System.EventHandler(this.bigEndianToolStripMenuItem_Click); + // + // littleEndianToolStripMenuItem + // + this.littleEndianToolStripMenuItem.Name = "littleEndianToolStripMenuItem"; + this.littleEndianToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.littleEndianToolStripMenuItem.Text = "Little Endian"; + this.littleEndianToolStripMenuItem.Click += new System.EventHandler(this.littleEndianToolStripMenuItem_Click); // // RamSearch // diff --git a/BizHawk.MultiClient/tools/RamSearch.cs b/BizHawk.MultiClient/tools/RamSearch.cs index 8332b34cb2..bf9f94a7d6 100644 --- a/BizHawk.MultiClient/tools/RamSearch.cs +++ b/BizHawk.MultiClient/tools/RamSearch.cs @@ -1703,6 +1703,4 @@ namespace BizHawk.MultiClient else return 8; } } - - } diff --git a/BizHawk.MultiClient/tools/RamSearch.resx b/BizHawk.MultiClient/tools/RamSearch.resx index 767de0f927..5eacb1739b 100644 --- a/BizHawk.MultiClient/tools/RamSearch.resx +++ b/BizHawk.MultiClient/tools/RamSearch.resx @@ -120,7 +120,50 @@ 17, 17 + + 457, 17 + + + 150, 17 + + + 259, 17 + + + 358, 17 + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAjpJREFUOE+Nkl9I + U2EYxl0RQuFQI7oIuqno30U3XXoRVCAJXbibWkTgRRd2MZoZjcks12iptLQIIsi2Ylu2dJrQFslkljZo + rXWxtalMsZVIus2xTFc9PefslFnH6oMf34Hv/J73fb9zFEV/WXq9S1u2a5Nm1erizaWl5UW52ZnsZDR+ + p9l41EgtTfIr6lfafNaxZAZTeSD4GXg6CwxlgXuhHE7rOiMUt5Ni2QCLZaDGH09BWNPzgO8j4EoA7kmg + Pw0432RRVaV5LIX8mXHLER4MfgKic4CXki8D+HPA8ALwjIFDPDvT3JeleUyuA4Xdl0SAgvc9W2cjQXYS + JSPkLQl/Aa65XoJyk2zA3f5CQOdYoXKEUpJwEnwgMXKzVwxolw24evtFwM+2e96xXbYtVBZk3ic4AeLE + ZOmeXzGgocF2wR5IYYB3IMwstD1F+DHEFZ/JoqLi+IjsCPmuQ02Puh1PzC0PcD+UwXOOEP5a6GKUjKdy + 0NS1TFO2EvWyERYfVtq+eVQItR6BTqudUKvrY+dbvbkb7lfoGh5HR8frfLVKM0rJRmrJtp8Bi86Dohwx + HoBDp8OpWnOCh23kHLkozXudu0n6fIJc+JGEtuFVIWbaL8qNjfa5kpL1Lh6dJLvJFrKD7CRbyQayRpQX + 3Idr4KleJiuV5b080pE9UhUF919ZGr2v/cRgwrwPzrN1YmVJ1vONvWStJC4Jvz8ZDAbP5XpBtqaVyrIe + nv+Q1/1TlsI2SpdyibtWqvzf8nekLoIPBKj+ywAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAgxJREFUOE+lkvtL + U2EYx+0PEbtpFwnBKPGKiJImGP0gYhIYs1E5GF5gIxkpA00JRSmMEF0ohMh+GaRWYlqabMVcNdS2QpaI + VqiDIYhk397vA6fXhCjyhYdzeM/5fp7vczkAdeL2cwho7v/wWzT1zcN+Pwhr51uY2/y41PQaF+wzKKiZ + QvaN58g0jyLd5KEUcQbg+84P/Cm2tncQjW3j68YWIqubCC3FcOJc478BAuGoZM6zvoRnakXEruEIjhc4 + /g5gZop9c+voGAyLbQIfeBZxLL9BA1jzXvuGbWamuKh+GmmVbswE19A59FEBbmoAG7YbsLtm2mZmiml9 + cvabNDwpz6YB7LYBoMXCumkJr7LOmnnHzBQ/9X2Bo2cOibm1GsBREbAQiYmw/8lnuCeWkVzcgnZlnw1j + 3HV/wuNXK6i/9x5Hc6wawDlTXHbLJ+LZUBQPRyKwdQdxutwl1h+NLXHh5Ht1ewBHsiwawCW57HyDAfWR + dvl0uhZQ1eqX8aVc7EKLqrum651ATLf9OJx5XQM4KmY0xPzZ0hFAiQJnXB0WwME0E3IsL5B17ZlADqWb + NYDrOepdlcysmTWWOrxqbceRWtaLk0VO1XW72D5Vckd2gMBfq8zdpmUG62NJvKM4+XyziDk24xmfWoGE + s1c0gHPmbrPTpHNJKOCo2G1mZs20zcwUJ5yp1AB5+8/zEwgF5GMVDxh4AAAAAElFTkSuQmCC + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -152,49 +195,6 @@ e41tHNbucUGnKxICiqXjHpTPJgHBZ/Nv4U1oHqGZJVwstiNe72JwI+J3PYA2MV8IMjOG2dzLfOatBg+2 7JDQ0tEPX9cguvv8GHg5hH0mC9S6eiQweLumDhqNVQgo06dP9fN4UsIoJHRnOhVtmxZGM1NXKoJ3JmTH Cv71r/4OTrQ4xWMwWlcAAAAASUVORK5CYII= - - - - 457, 17 - - - 150, 17 - - - 259, 17 - - - 358, 17 - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAjpJREFUOE+Nkl9I - U2EYxl0RQuFQI7oIuqno30U3XXoRVCAJXbibWkTgRRd2MZoZjcks12iptLQIIsi2Ylu2dJrQFslkljZo - rXWxtalMsZVIus2xTFc9PefslFnH6oMf34Hv/J73fb9zFEV/WXq9S1u2a5Nm1erizaWl5UW52ZnsZDR+ - p9l41EgtTfIr6lfafNaxZAZTeSD4GXg6CwxlgXuhHE7rOiMUt5Ni2QCLZaDGH09BWNPzgO8j4EoA7kmg - Pw0432RRVaV5LIX8mXHLER4MfgKic4CXki8D+HPA8ALwjIFDPDvT3JeleUyuA4Xdl0SAgvc9W2cjQXYS - JSPkLQl/Aa65XoJyk2zA3f5CQOdYoXKEUpJwEnwgMXKzVwxolw24evtFwM+2e96xXbYtVBZk3ic4AeLE - ZOmeXzGgocF2wR5IYYB3IMwstD1F+DHEFZ/JoqLi+IjsCPmuQ02Puh1PzC0PcD+UwXOOEP5a6GKUjKdy - 0NS1TFO2EvWyERYfVtq+eVQItR6BTqudUKvrY+dbvbkb7lfoGh5HR8frfLVKM0rJRmrJtp8Bi86Dohwx - HoBDp8OpWnOCh23kHLkozXudu0n6fIJc+JGEtuFVIWbaL8qNjfa5kpL1Lh6dJLvJFrKD7CRbyQayRpQX - 3Idr4KleJiuV5b080pE9UhUF919ZGr2v/cRgwrwPzrN1YmVJ1vONvWStJC4Jvz8ZDAbP5XpBtqaVyrIe - nv+Q1/1TlsI2SpdyibtWqvzf8nekLoIPBKj+ywAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAgxJREFUOE+lkvtL - U2EYx+0PEbtpFwnBKPGKiJImGP0gYhIYs1E5GF5gIxkpA00JRSmMEF0ohMh+GaRWYlqabMVcNdS2QpaI - VqiDIYhk397vA6fXhCjyhYdzeM/5fp7vczkAdeL2cwho7v/wWzT1zcN+Pwhr51uY2/y41PQaF+wzKKiZ - QvaN58g0jyLd5KEUcQbg+84P/Cm2tncQjW3j68YWIqubCC3FcOJc478BAuGoZM6zvoRnakXEruEIjhc4 - /g5gZop9c+voGAyLbQIfeBZxLL9BA1jzXvuGbWamuKh+GmmVbswE19A59FEBbmoAG7YbsLtm2mZmiml9 - cvabNDwpz6YB7LYBoMXCumkJr7LOmnnHzBQ/9X2Bo2cOibm1GsBREbAQiYmw/8lnuCeWkVzcgnZlnw1j - 3HV/wuNXK6i/9x5Hc6wawDlTXHbLJ+LZUBQPRyKwdQdxutwl1h+NLXHh5Ht1ewBHsiwawCW57HyDAfWR - dvl0uhZQ1eqX8aVc7EKLqrum651ATLf9OJx5XQM4KmY0xPzZ0hFAiQJnXB0WwME0E3IsL5B17ZlADqWb - NYDrOepdlcysmTWWOrxqbceRWtaLk0VO1XW72D5Vckd2gMBfq8zdpmUG62NJvKM4+XyziDk24xmfWoGE - s1c0gHPmbrPTpHNJKOCo2G1mZs20zcwUJ5yp1AB5+8/zEwgF5GMVDxh4AAAAAElFTkSuQmCC