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

Correct Error with RAMWatch and seperatorToolStripButton. Also unified all RamWatch internal button names.

This commit is contained in:
hegyak 2014-08-07 22:48:10 +00:00
parent 88b6699713
commit 42caa87c67
3 changed files with 129 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

249
BizHawk.Client.EmuHawk/tools/Watch/RamWatch.Designer.cs generated
View File

@ -57,17 +57,19 @@
this.openToolStripButton = new System.Windows.Forms.ToolStripButton(); this.openToolStripButton = new System.Windows.Forms.ToolStripButton();
this.saveToolStripButton = new System.Windows.Forms.ToolStripButton(); this.saveToolStripButton = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator = new System.Windows.Forms.ToolStripSeparator();
this.NewWatchStripButton1 = new System.Windows.Forms.ToolStripButton(); this.newWatchToolStripButton = new System.Windows.Forms.ToolStripButton();
this.EditWatchToolStripButton1 = new System.Windows.Forms.ToolStripButton(); this.editWatchToolStripButton = new System.Windows.Forms.ToolStripButton();
this.cutToolStripButton = new System.Windows.Forms.ToolStripButton(); this.cutToolStripButton = new System.Windows.Forms.ToolStripButton();
this.ClearChangeCountstoolStripButton = new System.Windows.Forms.ToolStripButton(); this.clearChangeCountsToolStripButton = new System.Windows.Forms.ToolStripButton();
this.DuplicateWatchToolStripButton = new System.Windows.Forms.ToolStripButton(); this.duplicateWatchToolStripButton = new System.Windows.Forms.ToolStripButton();
this.PoketoolStripButton2 = new System.Windows.Forms.ToolStripButton(); this.pokeToolStripButton = new System.Windows.Forms.ToolStripButton();
this.FreezetoolStripButton2 = new System.Windows.Forms.ToolStripButton(); this.freezeToolStripButton = new System.Windows.Forms.ToolStripButton();
this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); this.seperatorToolStripButton = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
this.moveUpToolStripButton = new System.Windows.Forms.ToolStripButton();
this.moveDownToolStripButton = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
this.MoveUpStripButton1 = new System.Windows.Forms.ToolStripButton(); this.pauseToolStripButton = new System.Windows.Forms.ToolStripButton();
this.MoveDownStripButton1 = new System.Windows.Forms.ToolStripButton();
this.menuStrip1 = new MenuStripEx(); this.menuStrip1 = new MenuStripEx();
this.FileSubMenu = new System.Windows.Forms.ToolStripMenuItem(); this.FileSubMenu = new System.Windows.Forms.ToolStripMenuItem();
this.NewListMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.NewListMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@ -122,8 +124,6 @@
this.DiffColumn = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.DiffColumn = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.DomainColumn = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.DomainColumn = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.NotesColumn = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.NotesColumn = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.PauseToolbarButton = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
this.ListViewContextMenu.SuspendLayout(); this.ListViewContextMenu.SuspendLayout();
this.statusStrip1.SuspendLayout(); this.statusStrip1.SuspendLayout();
this.toolStrip1.SuspendLayout(); this.toolStrip1.SuspendLayout();
@ -334,19 +334,19 @@
this.openToolStripButton, this.openToolStripButton,
this.saveToolStripButton, this.saveToolStripButton,
this.toolStripSeparator, this.toolStripSeparator,
this.NewWatchStripButton1, this.newWatchToolStripButton,
this.EditWatchToolStripButton1, this.editWatchToolStripButton,
this.cutToolStripButton, this.cutToolStripButton,
this.ClearChangeCountstoolStripButton, this.clearChangeCountsToolStripButton,
this.DuplicateWatchToolStripButton, this.duplicateWatchToolStripButton,
this.PoketoolStripButton2, this.pokeToolStripButton,
this.FreezetoolStripButton2, this.freezeToolStripButton,
this.toolStripButton1, this.seperatorToolStripButton,
this.toolStripSeparator6, this.toolStripSeparator6,
this.MoveUpStripButton1, this.moveUpToolStripButton,
this.MoveDownStripButton1, this.moveDownToolStripButton,
this.toolStripSeparator5, this.toolStripSeparator5,
this.PauseToolbarButton}); this.pauseToolStripButton});
this.toolStrip1.Location = new System.Drawing.Point(0, 24); this.toolStrip1.Location = new System.Drawing.Point(0, 24);
this.toolStrip1.Name = "toolStrip1"; this.toolStrip1.Name = "toolStrip1";
this.toolStrip1.Size = new System.Drawing.Size(364, 25); this.toolStrip1.Size = new System.Drawing.Size(364, 25);
@ -389,26 +389,26 @@
this.toolStripSeparator.Name = "toolStripSeparator"; this.toolStripSeparator.Name = "toolStripSeparator";
this.toolStripSeparator.Size = new System.Drawing.Size(6, 25); this.toolStripSeparator.Size = new System.Drawing.Size(6, 25);
// //
// NewWatchStripButton1 // newWatchToolStripButton
// //
this.NewWatchStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; this.newWatchToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.NewWatchStripButton1.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.addWatch; this.newWatchToolStripButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.addWatch;
this.NewWatchStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.newWatchToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
this.NewWatchStripButton1.Name = "NewWatchStripButton1"; this.newWatchToolStripButton.Name = "newWatchToolStripButton";
this.NewWatchStripButton1.Size = new System.Drawing.Size(23, 22); this.newWatchToolStripButton.Size = new System.Drawing.Size(23, 22);
this.NewWatchStripButton1.Text = "New Watch"; this.newWatchToolStripButton.Text = "New Watch";
this.NewWatchStripButton1.ToolTipText = "New Watch"; this.newWatchToolStripButton.ToolTipText = "New Watch";
this.NewWatchStripButton1.Click += new System.EventHandler(this.NewWatchMenuItem_Click); this.newWatchToolStripButton.Click += new System.EventHandler(this.NewWatchMenuItem_Click);
// //
// EditWatchToolStripButton1 // editWatchToolStripButton
// //
this.EditWatchToolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; this.editWatchToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.EditWatchToolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("EditWatchToolStripButton1.Image"))); this.editWatchToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("editWatchToolStripButton.Image")));
this.EditWatchToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.editWatchToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
this.EditWatchToolStripButton1.Name = "EditWatchToolStripButton1"; this.editWatchToolStripButton.Name = "editWatchToolStripButton";
this.EditWatchToolStripButton1.Size = new System.Drawing.Size(23, 22); this.editWatchToolStripButton.Size = new System.Drawing.Size(23, 22);
this.EditWatchToolStripButton1.Text = "Edit Watch"; this.editWatchToolStripButton.Text = "Edit Watch";
this.EditWatchToolStripButton1.Click += new System.EventHandler(this.EditWatchMenuItem_Click); this.editWatchToolStripButton.Click += new System.EventHandler(this.EditWatchMenuItem_Click);
// //
// cutToolStripButton // cutToolStripButton
// //
@ -421,83 +421,98 @@
this.cutToolStripButton.ToolTipText = "Remove Watch"; this.cutToolStripButton.ToolTipText = "Remove Watch";
this.cutToolStripButton.Click += new System.EventHandler(this.RemoveWatchMenuItem_Click); this.cutToolStripButton.Click += new System.EventHandler(this.RemoveWatchMenuItem_Click);
// //
// ClearChangeCountstoolStripButton // clearChangeCountsToolStripButton
// //
this.ClearChangeCountstoolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; this.clearChangeCountsToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
this.ClearChangeCountstoolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("ClearChangeCountstoolStripButton.Image"))); this.clearChangeCountsToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("clearChangeCountsToolStripButton.Image")));
this.ClearChangeCountstoolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.clearChangeCountsToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
this.ClearChangeCountstoolStripButton.Name = "ClearChangeCountstoolStripButton"; this.clearChangeCountsToolStripButton.Name = "clearChangeCountsToolStripButton";
this.ClearChangeCountstoolStripButton.Size = new System.Drawing.Size(23, 22); this.clearChangeCountsToolStripButton.Size = new System.Drawing.Size(23, 22);
this.ClearChangeCountstoolStripButton.Text = "C"; this.clearChangeCountsToolStripButton.Text = "C";
this.ClearChangeCountstoolStripButton.ToolTipText = "Clear Change Counts"; this.clearChangeCountsToolStripButton.ToolTipText = "Clear Change Counts";
this.ClearChangeCountstoolStripButton.Click += new System.EventHandler(this.ClearChangeCountsMenuItem_Click); this.clearChangeCountsToolStripButton.Click += new System.EventHandler(this.ClearChangeCountsMenuItem_Click);
// //
// DuplicateWatchToolStripButton // duplicateWatchToolStripButton
// //
this.DuplicateWatchToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; this.duplicateWatchToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.DuplicateWatchToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("DuplicateWatchToolStripButton.Image"))); this.duplicateWatchToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("duplicateWatchToolStripButton.Image")));
this.DuplicateWatchToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.duplicateWatchToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
this.DuplicateWatchToolStripButton.Name = "DuplicateWatchToolStripButton"; this.duplicateWatchToolStripButton.Name = "duplicateWatchToolStripButton";
this.DuplicateWatchToolStripButton.Size = new System.Drawing.Size(23, 22); this.duplicateWatchToolStripButton.Size = new System.Drawing.Size(23, 22);
this.DuplicateWatchToolStripButton.Text = "Duplicate Watch"; this.duplicateWatchToolStripButton.Text = "Duplicate Watch";
this.DuplicateWatchToolStripButton.Click += new System.EventHandler(this.DuplicateWatchMenuItem_Click); this.duplicateWatchToolStripButton.Click += new System.EventHandler(this.DuplicateWatchMenuItem_Click);
// //
// PoketoolStripButton2 // pokeToolStripButton
// //
this.PoketoolStripButton2.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; this.pokeToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.PoketoolStripButton2.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.poke; this.pokeToolStripButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.poke;
this.PoketoolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta; this.pokeToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
this.PoketoolStripButton2.Name = "PoketoolStripButton2"; this.pokeToolStripButton.Name = "pokeToolStripButton";
this.PoketoolStripButton2.Size = new System.Drawing.Size(23, 22); this.pokeToolStripButton.Size = new System.Drawing.Size(23, 22);
this.PoketoolStripButton2.Text = "toolStripButton2"; this.pokeToolStripButton.Text = "toolStripButton2";
this.PoketoolStripButton2.ToolTipText = "Poke address"; this.pokeToolStripButton.ToolTipText = "Poke address";
this.PoketoolStripButton2.Click += new System.EventHandler(this.PokeAddressMenuItem_Click); this.pokeToolStripButton.Click += new System.EventHandler(this.PokeAddressMenuItem_Click);
// //
// FreezetoolStripButton2 // freezeToolStripButton
// //
this.FreezetoolStripButton2.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; this.freezeToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.FreezetoolStripButton2.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Freeze; this.freezeToolStripButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Freeze;
this.FreezetoolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta; this.freezeToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
this.FreezetoolStripButton2.Name = "FreezetoolStripButton2"; this.freezeToolStripButton.Name = "freezeToolStripButton";
this.FreezetoolStripButton2.Size = new System.Drawing.Size(23, 22); this.freezeToolStripButton.Size = new System.Drawing.Size(23, 22);
this.FreezetoolStripButton2.Text = "Freeze Address"; this.freezeToolStripButton.Text = "Freeze Address";
this.FreezetoolStripButton2.Click += new System.EventHandler(this.FreezeAddressMenuItem_Click); this.freezeToolStripButton.Click += new System.EventHandler(this.FreezeAddressMenuItem_Click);
// //
// toolStripButton1 // seperatorToolStripButton
// //
this.toolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; this.seperatorToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.toolStripButton1.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.InsertSeparator; this.seperatorToolStripButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.InsertSeparator;
this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.seperatorToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton1.Name = "toolStripButton1"; this.seperatorToolStripButton.Name = "seperatorToolStripButton";
this.toolStripButton1.Size = new System.Drawing.Size(23, 22); this.seperatorToolStripButton.Size = new System.Drawing.Size(23, 22);
this.toolStripButton1.Text = "-"; this.seperatorToolStripButton.Text = "-";
this.toolStripButton1.ToolTipText = "Insert Separator"; this.seperatorToolStripButton.ToolTipText = "Insert Separator";
this.toolStripButton1.Click += new System.EventHandler(this.InsertSeparatorMenuItem_Click); this.seperatorToolStripButton.Click += new System.EventHandler(this.InsertSeparatorMenuItem_Click);
//
// toolStripSeparator6
//
this.toolStripSeparator6.Name = "toolStripSeparator6";
this.toolStripSeparator6.Size = new System.Drawing.Size(6, 25);
//
// moveUpToolStripButton
//
this.moveUpToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.moveUpToolStripButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveUp;
this.moveUpToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
this.moveUpToolStripButton.Name = "moveUpToolStripButton";
this.moveUpToolStripButton.Size = new System.Drawing.Size(23, 22);
this.moveUpToolStripButton.Text = "Move Up";
this.moveUpToolStripButton.Click += new System.EventHandler(this.MoveUpMenuItem_Click);
//
// moveDownToolStripButton
//
this.moveDownToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.moveDownToolStripButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveDown;
this.moveDownToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
this.moveDownToolStripButton.Name = "moveDownToolStripButton";
this.moveDownToolStripButton.Size = new System.Drawing.Size(23, 22);
this.moveDownToolStripButton.Text = "Move Down";
this.moveDownToolStripButton.Click += new System.EventHandler(this.MoveDownMenuItem_Click);
// //
// toolStripSeparator5 // toolStripSeparator5
// //
this.toolStripSeparator5.Name = "toolStripSeparator5"; this.toolStripSeparator5.Name = "toolStripSeparator5";
this.toolStripSeparator5.Size = new System.Drawing.Size(6, 25); this.toolStripSeparator5.Size = new System.Drawing.Size(6, 25);
// //
// MoveUpStripButton1 // pauseToolStripButton
// //
this.MoveUpStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; this.pauseToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.MoveUpStripButton1.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveUp; this.pauseToolStripButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Pause;
this.MoveUpStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.pauseToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
this.MoveUpStripButton1.Name = "MoveUpStripButton1"; this.pauseToolStripButton.Name = "pauseToolStripButton";
this.MoveUpStripButton1.Size = new System.Drawing.Size(23, 22); this.pauseToolStripButton.Size = new System.Drawing.Size(23, 20);
this.MoveUpStripButton1.Text = "Move Up"; this.pauseToolStripButton.Text = "Pause";
this.MoveUpStripButton1.Click += new System.EventHandler(this.MoveUpMenuItem_Click); this.pauseToolStripButton.Click += new System.EventHandler(this.PauseMenuItem_Click);
//
// MoveDownStripButton1
//
this.MoveDownStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.MoveDownStripButton1.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveDown;
this.MoveDownStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
this.MoveDownStripButton1.Name = "MoveDownStripButton1";
this.MoveDownStripButton1.Size = new System.Drawing.Size(23, 22);
this.MoveDownStripButton1.Text = "Move Down";
this.MoveDownStripButton1.Click += new System.EventHandler(this.MoveDownMenuItem_Click);
// //
// menuStrip1 // menuStrip1
// //
@ -925,6 +940,7 @@
this.WatchListView.Size = new System.Drawing.Size(332, 281); this.WatchListView.Size = new System.Drawing.Size(332, 281);
this.WatchListView.TabIndex = 2; this.WatchListView.TabIndex = 2;
this.WatchListView.UseCompatibleStateImageBehavior = false; this.WatchListView.UseCompatibleStateImageBehavior = false;
this.WatchListView.UseCustomBackground = true;
this.WatchListView.View = System.Windows.Forms.View.Details; this.WatchListView.View = System.Windows.Forms.View.Details;
this.WatchListView.ColumnClick += new System.Windows.Forms.ColumnClickEventHandler(this.WatchListView_ColumnClick); this.WatchListView.ColumnClick += new System.Windows.Forms.ColumnClickEventHandler(this.WatchListView_ColumnClick);
this.WatchListView.DragDrop += new System.Windows.Forms.DragEventHandler(this.NewRamWatch_DragDrop); this.WatchListView.DragDrop += new System.Windows.Forms.DragEventHandler(this.NewRamWatch_DragDrop);
@ -977,21 +993,6 @@
this.NotesColumn.Text = "Notes"; this.NotesColumn.Text = "Notes";
this.NotesColumn.Width = 128; this.NotesColumn.Width = 128;
// //
// PauseToolbarButton
//
this.PauseToolbarButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.PauseToolbarButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Pause;
this.PauseToolbarButton.ImageTransparentColor = System.Drawing.Color.Magenta;
this.PauseToolbarButton.Name = "PauseToolbarButton";
this.PauseToolbarButton.Size = new System.Drawing.Size(23, 22);
this.PauseToolbarButton.Text = "Pause";
this.PauseToolbarButton.Click += new System.EventHandler(this.PauseMenuItem_Click);
//
// toolStripSeparator6
//
this.toolStripSeparator6.Name = "toolStripSeparator6";
this.toolStripSeparator6.Size = new System.Drawing.Size(6, 25);
//
// RamWatch // RamWatch
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@ -1078,17 +1079,17 @@
private System.Windows.Forms.ToolStripButton openToolStripButton; private System.Windows.Forms.ToolStripButton openToolStripButton;
private System.Windows.Forms.ToolStripButton saveToolStripButton; private System.Windows.Forms.ToolStripButton saveToolStripButton;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator; private System.Windows.Forms.ToolStripSeparator toolStripSeparator;
private System.Windows.Forms.ToolStripButton NewWatchStripButton1; private System.Windows.Forms.ToolStripButton newWatchToolStripButton;
private System.Windows.Forms.ToolStripButton EditWatchToolStripButton1; private System.Windows.Forms.ToolStripButton editWatchToolStripButton;
private System.Windows.Forms.ToolStripButton cutToolStripButton; private System.Windows.Forms.ToolStripButton cutToolStripButton;
private System.Windows.Forms.ToolStripButton ClearChangeCountstoolStripButton; private System.Windows.Forms.ToolStripButton clearChangeCountsToolStripButton;
private System.Windows.Forms.ToolStripButton DuplicateWatchToolStripButton; private System.Windows.Forms.ToolStripButton duplicateWatchToolStripButton;
private System.Windows.Forms.ToolStripButton PoketoolStripButton2; private System.Windows.Forms.ToolStripButton pokeToolStripButton;
private System.Windows.Forms.ToolStripButton FreezetoolStripButton2; private System.Windows.Forms.ToolStripButton freezeToolStripButton;
private System.Windows.Forms.ToolStripButton toolStripButton1; private System.Windows.Forms.ToolStripButton seperatorToolStripButton;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator5; private System.Windows.Forms.ToolStripSeparator toolStripSeparator5;
private System.Windows.Forms.ToolStripButton MoveUpStripButton1; private System.Windows.Forms.ToolStripButton moveUpToolStripButton;
private System.Windows.Forms.ToolStripButton MoveDownStripButton1; private System.Windows.Forms.ToolStripButton moveDownToolStripButton;
private System.Windows.Forms.Label WatchCountLabel; private System.Windows.Forms.Label WatchCountLabel;
private System.Windows.Forms.Label MemDomainLabel; private System.Windows.Forms.Label MemDomainLabel;
private System.Windows.Forms.ToolStripSeparator Separator2; private System.Windows.Forms.ToolStripSeparator Separator2;
@ -1118,7 +1119,7 @@
private System.Windows.Forms.ToolStripMenuItem ShowAddressMenuItem; private System.Windows.Forms.ToolStripMenuItem ShowAddressMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
private System.Windows.Forms.ToolStripMenuItem PauseMenuItem; private System.Windows.Forms.ToolStripMenuItem PauseMenuItem;
private System.Windows.Forms.ToolStripButton PauseToolbarButton; private System.Windows.Forms.ToolStripButton pauseToolStripButton;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator6; private System.Windows.Forms.ToolStripSeparator toolStripSeparator6;
} }
} }

2
BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs
View File

@ -581,7 +581,7 @@ namespace BizHawk.Client.EmuHawk
} }
} }
ErrorIconButton.Visible = _watches.Any(watch => (watch.Address ?? 0) >= watch.Domain.Size); ErrorIconButton.Visible = _watches.Where(watch => !watch.IsSeparator).Any(watch => (watch.Address ?? 0) >= watch.Domain.Size);
MessageLabel.Text = message; MessageLabel.Text = message;
} }

6
BizHawk.Client.EmuHawk/tools/Watch/RamWatch.resx
View File

@ -170,7 +170,7 @@
AElFTkSuQmCC AElFTkSuQmCC
</value> </value>
</data> </data>
<data name="EditWatchToolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="editWatchToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGDSURBVDhPrZFNSwJRGIX9NYGbFoUlFElY1EJQKEYhCJsi YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGDSURBVDhPrZFNSwJRGIX9NYGbFoUlFElY1EJQKEYhCJsi
@ -183,7 +183,7 @@
TNAAAAAASUVORK5CYII= TNAAAAAASUVORK5CYII=
</value> </value>
</data> </data>
<data name="ClearChangeCountstoolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="clearChangeCountsToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
@ -198,7 +198,7 @@
TgDQASA1MVpwzwAAAABJRU5ErkJggg== TgDQASA1MVpwzwAAAABJRU5ErkJggg==
</value> </value>
</data> </data>
<data name="DuplicateWatchToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="duplicateWatchToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHkSURBVDhPvZHfS1NhHIf3p5QypLr2D4goMwoMCi/qIugH YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHkSURBVDhPvZHfS1NhHIf3p5QypLr2D4goMwoMCi/qIugH