diff --git a/BizHawk.Client.Common/tools/Watch/SeparatorWatch.cs b/BizHawk.Client.Common/tools/Watch/SeparatorWatch.cs index 1e1ef09fcf..91153369e3 100644 --- a/BizHawk.Client.Common/tools/Watch/SeparatorWatch.cs +++ b/BizHawk.Client.Common/tools/Watch/SeparatorWatch.cs @@ -21,6 +21,14 @@ namespace BizHawk.Client.Common /// public static SeparatorWatch Instance => new SeparatorWatch(); + public static SeparatorWatch NewSeparatorWatch(string description) + { + return new SeparatorWatch + { + Notes = description + }; + } + /// /// Get the appropriate DisplayType /// @@ -45,10 +53,10 @@ namespace BizHawk.Client.Common /// public override int Previous => 0; - /// - /// Ignore that stuff - /// - public override string ValueString => ""; + /// + /// Ignore that stuff + /// + public override string ValueString => Notes; //""; /// /// Ignore that stuff @@ -62,13 +70,26 @@ namespace BizHawk.Client.Common /// A well formatted string representation public override string ToDisplayString() { - return "----"; + if (Notes == null || Notes == "") + return "----"; + else + return Notes; } - /// - /// Ignore that stuff + /// + /// Transforms the current instance into a string /// - public override bool Poke(string value) + /// A representation of the current + public override string ToString() + { + return $"0\tS\t_\t1\t\t{Notes.Trim('\r', '\n')}"; + //return $"{(Domain == null && Address == 0 ? "0" : Address.ToHexString((Domain?.Size ?? 0xFF - 1).NumHexDigits()))}\t{SizeAsChar}\t{TypeAsChar}\t{Convert.ToInt32(BigEndian)}\t{Domain?.Name}\t{Notes.Trim('\r', '\n')}"; + } + + /// + /// Ignore that stuff + /// + public override bool Poke(string value) { return false; } @@ -95,6 +116,8 @@ namespace BizHawk.Client.Common /// public override void Update() { - } + //AddressString = (Notes == null || Notes == "") ? "" : Notes; + + } } } diff --git a/BizHawk.Client.Common/tools/Watch/Watch.cs b/BizHawk.Client.Common/tools/Watch/Watch.cs index 37d4f7cf20..4b4aa4ca5f 100644 --- a/BizHawk.Client.Common/tools/Watch/Watch.cs +++ b/BizHawk.Client.Common/tools/Watch/Watch.cs @@ -142,7 +142,7 @@ namespace BizHawk.Client.Common { default: case WatchSize.Separator: - return SeparatorWatch.Instance; + return SeparatorWatch.NewSeparatorWatch(note); case WatchSize.Byte: return new ByteWatch(domain, address, type, bigEndian, note, (byte)value, (byte)prev, changeCount); case WatchSize.Word: diff --git a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj index a5b9eaf9d6..10e149c0a6 100644 --- a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj +++ b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj @@ -1840,6 +1840,9 @@ + + + diff --git a/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs b/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs index 7504818e28..8cb04e3e15 100644 --- a/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs +++ b/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs @@ -900,6 +900,16 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap MoveBottom { + get { + object obj = ResourceManager.GetObject("MoveBottom", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -930,6 +940,16 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap MoveTop { + get { + object obj = ResourceManager.GetObject("MoveTop", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/BizHawk.Client.EmuHawk/Properties/Resources.resx b/BizHawk.Client.EmuHawk/Properties/Resources.resx index 7e21e9ffc9..301536707a 100644 --- a/BizHawk.Client.EmuHawk/Properties/Resources.resx +++ b/BizHawk.Client.EmuHawk/Properties/Resources.resx @@ -1560,4 +1560,10 @@ ..\config\ControllerImages\ZXSpectrumKeyboards.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + + ..\Resources\MoveBottom.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\MoveTop.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + \ No newline at end of file diff --git a/BizHawk.Client.EmuHawk/Resources/MoveBottom.png b/BizHawk.Client.EmuHawk/Resources/MoveBottom.png new file mode 100644 index 0000000000..7befbdd795 Binary files /dev/null and b/BizHawk.Client.EmuHawk/Resources/MoveBottom.png differ diff --git a/BizHawk.Client.EmuHawk/Resources/MoveTop.png b/BizHawk.Client.EmuHawk/Resources/MoveTop.png new file mode 100644 index 0000000000..397032df28 Binary files /dev/null and b/BizHawk.Client.EmuHawk/Resources/MoveTop.png differ diff --git a/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.Designer.cs b/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.Designer.cs index 7daaf35e86..cafc1c6a6d 100644 --- a/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.Designer.cs +++ b/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.Designer.cs @@ -28,113 +28,117 @@ /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RamWatch)); - this.WatchCountLabel = new System.Windows.Forms.Label(); - this.ListViewContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components); - this.newToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.EditContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.RemoveContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.DuplicateContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.PokeContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.FreezeContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.UnfreezeAllContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.ViewInHexEditorContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.Separator4 = new System.Windows.Forms.ToolStripSeparator(); - this.ReadBreakpointContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.WriteBreakpointContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.Separator6 = new System.Windows.Forms.ToolStripSeparator(); - this.InsertSeperatorContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.MoveUpContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.MoveDownContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.statusStrip1 = new StatusStripEx(); - this.ErrorIconButton = new System.Windows.Forms.ToolStripButton(); - this.MessageLabel = new System.Windows.Forms.ToolStripStatusLabel(); - this.toolStrip1 = new ToolStripEx(); - this.newToolStripButton = new System.Windows.Forms.ToolStripButton(); - this.openToolStripButton = new System.Windows.Forms.ToolStripButton(); - this.saveToolStripButton = new System.Windows.Forms.ToolStripButton(); - this.toolStripSeparator = new System.Windows.Forms.ToolStripSeparator(); - this.newWatchToolStripButton = new System.Windows.Forms.ToolStripButton(); - this.editWatchToolStripButton = new System.Windows.Forms.ToolStripButton(); - this.cutToolStripButton = new System.Windows.Forms.ToolStripButton(); - this.clearChangeCountsToolStripButton = new System.Windows.Forms.ToolStripButton(); - this.duplicateWatchToolStripButton = new System.Windows.Forms.ToolStripButton(); - this.PokeAddressToolBarItem = new System.Windows.Forms.ToolStripButton(); - this.FreezeAddressToolBarItem = 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.pauseToolStripButton = new System.Windows.Forms.ToolStripButton(); - this.RamWatchMenu = new MenuStripEx(); - this.FileSubMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.NewListMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.OpenMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SaveMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SaveAsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.AppendMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.RecentSubMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.noneToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); - this.ExitMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.WatchesSubMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.MemoryDomainsSubMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.Separator2 = new System.Windows.Forms.ToolStripSeparator(); - this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator(); - this.NewWatchMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.EditWatchMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.RemoveWatchMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.DuplicateWatchMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.PokeAddressMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.FreezeAddressMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.InsertSeparatorMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.ClearChangeCountsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); - this.MoveUpMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.MoveDownMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SelectAllMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); - this.PauseMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.OptionsSubMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.DefinePreviousValueSubMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.PreviousFrameMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.LastChangeMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.OriginalMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.WatchesOnScreenMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SaveWindowPositionMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.AlwaysOnTopMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.FloatingWindowMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator(); - this.RestoreWindowSizeMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.WatchListView = new BizHawk.Client.EmuHawk.VirtualListView(); - this.AddressColumn = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.ValueColumn = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.PrevColumn = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.ChangesColumn = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.DiffColumn = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.TypeColumn = ((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.ListViewContextMenu.SuspendLayout(); - this.statusStrip1.SuspendLayout(); - this.toolStrip1.SuspendLayout(); - this.RamWatchMenu.SuspendLayout(); - this.SuspendLayout(); - // - // WatchCountLabel - // - this.WatchCountLabel.AutoSize = true; - this.WatchCountLabel.Location = new System.Drawing.Point(16, 57); - this.WatchCountLabel.Name = "WatchCountLabel"; - this.WatchCountLabel.Size = new System.Drawing.Size(56, 13); - this.WatchCountLabel.TabIndex = 5; - this.WatchCountLabel.Text = "0 watches"; - // - // ListViewContextMenu - // - this.ListViewContextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RamWatch)); + this.WatchCountLabel = new System.Windows.Forms.Label(); + this.ListViewContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components); + this.newToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.EditContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.RemoveContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.DuplicateContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.PokeContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.FreezeContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.UnfreezeAllContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.ViewInHexEditorContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.Separator4 = new System.Windows.Forms.ToolStripSeparator(); + this.ReadBreakpointContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.WriteBreakpointContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.Separator6 = new System.Windows.Forms.ToolStripSeparator(); + this.InsertSeperatorContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.MoveUpContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.MoveDownContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.MoveTopContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.MoveBottomContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.statusStrip1 = new StatusStripEx(); + this.ErrorIconButton = new System.Windows.Forms.ToolStripButton(); + this.MessageLabel = new System.Windows.Forms.ToolStripStatusLabel(); + this.toolStrip1 = new ToolStripEx(); + this.newToolStripButton = new System.Windows.Forms.ToolStripButton(); + this.openToolStripButton = new System.Windows.Forms.ToolStripButton(); + this.saveToolStripButton = new System.Windows.Forms.ToolStripButton(); + this.toolStripSeparator = new System.Windows.Forms.ToolStripSeparator(); + this.newWatchToolStripButton = new System.Windows.Forms.ToolStripButton(); + this.editWatchToolStripButton = new System.Windows.Forms.ToolStripButton(); + this.cutToolStripButton = new System.Windows.Forms.ToolStripButton(); + this.clearChangeCountsToolStripButton = new System.Windows.Forms.ToolStripButton(); + this.duplicateWatchToolStripButton = new System.Windows.Forms.ToolStripButton(); + this.PokeAddressToolBarItem = new System.Windows.Forms.ToolStripButton(); + this.FreezeAddressToolBarItem = 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.pauseToolStripButton = new System.Windows.Forms.ToolStripButton(); + this.RamWatchMenu = new MenuStripEx(); + this.FileSubMenu = new System.Windows.Forms.ToolStripMenuItem(); + this.NewListMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.OpenMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.SaveMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.SaveAsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.AppendMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.RecentSubMenu = new System.Windows.Forms.ToolStripMenuItem(); + this.noneToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.ExitMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.WatchesSubMenu = new System.Windows.Forms.ToolStripMenuItem(); + this.MemoryDomainsSubMenu = new System.Windows.Forms.ToolStripMenuItem(); + this.Separator2 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator(); + this.NewWatchMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.EditWatchMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.RemoveWatchMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.DuplicateWatchMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.PokeAddressMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.FreezeAddressMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.InsertSeparatorMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.ClearChangeCountsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); + this.MoveUpMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.MoveDownMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.MoveTopMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.MoveBottomMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.SelectAllMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.PauseMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.OptionsSubMenu = new System.Windows.Forms.ToolStripMenuItem(); + this.DefinePreviousValueSubMenu = new System.Windows.Forms.ToolStripMenuItem(); + this.PreviousFrameMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.LastChangeMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.OriginalMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.WatchesOnScreenMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.SaveWindowPositionMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.AlwaysOnTopMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.FloatingWindowMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator(); + this.RestoreWindowSizeMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.WatchListView = new BizHawk.Client.EmuHawk.VirtualListView(); + this.AddressColumn = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.ValueColumn = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.PrevColumn = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.ChangesColumn = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.DiffColumn = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.TypeColumn = ((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.ListViewContextMenu.SuspendLayout(); + this.statusStrip1.SuspendLayout(); + this.toolStrip1.SuspendLayout(); + this.RamWatchMenu.SuspendLayout(); + this.SuspendLayout(); + // + // WatchCountLabel + // + this.WatchCountLabel.AutoSize = true; + this.WatchCountLabel.Location = new System.Drawing.Point(16, 57); + this.WatchCountLabel.Name = "WatchCountLabel"; + this.WatchCountLabel.Size = new System.Drawing.Size(56, 13); + this.WatchCountLabel.TabIndex = 5; + this.WatchCountLabel.Text = "0 watches"; + // + // ListViewContextMenu + // + this.ListViewContextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.newToolStripMenuItem, this.EditContextMenuItem, this.RemoveContextMenuItem, @@ -149,163 +153,185 @@ this.Separator6, this.InsertSeperatorContextMenuItem, this.MoveUpContextMenuItem, - this.MoveDownContextMenuItem}); - this.ListViewContextMenu.Name = "contextMenuStrip1"; - this.ListViewContextMenu.Size = new System.Drawing.Size(204, 302); - this.ListViewContextMenu.Opening += new System.ComponentModel.CancelEventHandler(this.ListViewContextMenu_Opening); - // - // newToolStripMenuItem - // - this.newToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.addWatch; - this.newToolStripMenuItem.Name = "newToolStripMenuItem"; - this.newToolStripMenuItem.Size = new System.Drawing.Size(203, 22); - this.newToolStripMenuItem.Text = "&New Watch"; - this.newToolStripMenuItem.Click += new System.EventHandler(this.NewWatchMenuItem_Click); - // - // EditContextMenuItem - // - this.EditContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.CutHS; - this.EditContextMenuItem.Name = "EditContextMenuItem"; - this.EditContextMenuItem.ShortcutKeyDisplayString = "Ctrl+E"; - this.EditContextMenuItem.Size = new System.Drawing.Size(203, 22); - this.EditContextMenuItem.Text = "&Edit"; - this.EditContextMenuItem.Click += new System.EventHandler(this.EditWatchMenuItem_Click); - // - // RemoveContextMenuItem - // - this.RemoveContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Delete; - this.RemoveContextMenuItem.Name = "RemoveContextMenuItem"; - this.RemoveContextMenuItem.ShortcutKeyDisplayString = "Ctrl+R"; - this.RemoveContextMenuItem.Size = new System.Drawing.Size(203, 22); - this.RemoveContextMenuItem.Text = "&Remove"; - this.RemoveContextMenuItem.Click += new System.EventHandler(this.RemoveWatchMenuItem_Click); - // - // DuplicateContextMenuItem - // - this.DuplicateContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Duplicate; - this.DuplicateContextMenuItem.Name = "DuplicateContextMenuItem"; - this.DuplicateContextMenuItem.ShortcutKeyDisplayString = "Ctrl+D"; - this.DuplicateContextMenuItem.Size = new System.Drawing.Size(203, 22); - this.DuplicateContextMenuItem.Text = "&Duplicate"; - this.DuplicateContextMenuItem.Click += new System.EventHandler(this.DuplicateWatchMenuItem_Click); - // - // PokeContextMenuItem - // - this.PokeContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.poke; - this.PokeContextMenuItem.Name = "PokeContextMenuItem"; - this.PokeContextMenuItem.ShortcutKeyDisplayString = "Ctrl+P"; - this.PokeContextMenuItem.Size = new System.Drawing.Size(203, 22); - this.PokeContextMenuItem.Text = "&Poke"; - this.PokeContextMenuItem.Click += new System.EventHandler(this.PokeAddressMenuItem_Click); - // - // FreezeContextMenuItem - // - this.FreezeContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Freeze; - this.FreezeContextMenuItem.Name = "FreezeContextMenuItem"; - this.FreezeContextMenuItem.ShortcutKeyDisplayString = "Ctrl+F"; - this.FreezeContextMenuItem.Size = new System.Drawing.Size(203, 22); - this.FreezeContextMenuItem.Text = "&Freeze"; - this.FreezeContextMenuItem.Click += new System.EventHandler(this.FreezeAddressMenuItem_Click); - // - // UnfreezeAllContextMenuItem - // - this.UnfreezeAllContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Unfreeze; - this.UnfreezeAllContextMenuItem.Name = "UnfreezeAllContextMenuItem"; - this.UnfreezeAllContextMenuItem.Size = new System.Drawing.Size(203, 22); - this.UnfreezeAllContextMenuItem.Text = "Unfreeze &All"; - this.UnfreezeAllContextMenuItem.Click += new System.EventHandler(this.UnfreezeAllContextMenuItem_Click); - // - // ViewInHexEditorContextMenuItem - // - this.ViewInHexEditorContextMenuItem.Name = "ViewInHexEditorContextMenuItem"; - this.ViewInHexEditorContextMenuItem.Size = new System.Drawing.Size(203, 22); - this.ViewInHexEditorContextMenuItem.Text = "View in Hex Editor"; - this.ViewInHexEditorContextMenuItem.Click += new System.EventHandler(this.ViewInHexEditorContextMenuItem_Click); - // - // Separator4 - // - this.Separator4.Name = "Separator4"; - this.Separator4.Size = new System.Drawing.Size(200, 6); - // - // ReadBreakpointContextMenuItem - // - this.ReadBreakpointContextMenuItem.Name = "ReadBreakpointContextMenuItem"; - this.ReadBreakpointContextMenuItem.Size = new System.Drawing.Size(203, 22); - this.ReadBreakpointContextMenuItem.Text = "Set Read Breakpoint"; - this.ReadBreakpointContextMenuItem.Click += new System.EventHandler(this.ReadBreakpointContextMenuItem_Click); - // - // WriteBreakpointContextMenuItem - // - this.WriteBreakpointContextMenuItem.Name = "WriteBreakpointContextMenuItem"; - this.WriteBreakpointContextMenuItem.Size = new System.Drawing.Size(203, 22); - this.WriteBreakpointContextMenuItem.Text = "Set Write Breakpoint"; - this.WriteBreakpointContextMenuItem.Click += new System.EventHandler(this.WriteBreakpointContextMenuItem_Click); - // - // Separator6 - // - this.Separator6.Name = "Separator6"; - this.Separator6.Size = new System.Drawing.Size(200, 6); - // - // InsertSeperatorContextMenuItem - // - this.InsertSeperatorContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.InsertSeparator; - this.InsertSeperatorContextMenuItem.Name = "InsertSeperatorContextMenuItem"; - this.InsertSeperatorContextMenuItem.ShortcutKeyDisplayString = "Ctrl+I"; - this.InsertSeperatorContextMenuItem.Size = new System.Drawing.Size(203, 22); - this.InsertSeperatorContextMenuItem.Text = "&Insert Separator"; - this.InsertSeperatorContextMenuItem.Click += new System.EventHandler(this.InsertSeparatorMenuItem_Click); - // - // MoveUpContextMenuItem - // - this.MoveUpContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveUp; - this.MoveUpContextMenuItem.Name = "MoveUpContextMenuItem"; - this.MoveUpContextMenuItem.ShortcutKeyDisplayString = "Ctrl+Up"; - this.MoveUpContextMenuItem.Size = new System.Drawing.Size(203, 22); - this.MoveUpContextMenuItem.Text = "Move &Up"; - this.MoveUpContextMenuItem.Click += new System.EventHandler(this.MoveUpMenuItem_Click); - // - // MoveDownContextMenuItem - // - this.MoveDownContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveDown; - this.MoveDownContextMenuItem.Name = "MoveDownContextMenuItem"; - this.MoveDownContextMenuItem.ShortcutKeyDisplayString = "Ctrl+Down"; - this.MoveDownContextMenuItem.Size = new System.Drawing.Size(203, 22); - this.MoveDownContextMenuItem.Text = "Move &Down"; - this.MoveDownContextMenuItem.Click += new System.EventHandler(this.MoveDownMenuItem_Click); - // - // statusStrip1 - // - this.statusStrip1.ClickThrough = true; - this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.MoveDownContextMenuItem, + this.MoveTopContextMenuItem, + this.MoveBottomContextMenuItem}); + this.ListViewContextMenu.Name = "contextMenuStrip1"; + this.ListViewContextMenu.Size = new System.Drawing.Size(245, 346); + this.ListViewContextMenu.Opening += new System.ComponentModel.CancelEventHandler(this.ListViewContextMenu_Opening); + // + // newToolStripMenuItem + // + this.newToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.addWatch; + this.newToolStripMenuItem.Name = "newToolStripMenuItem"; + this.newToolStripMenuItem.Size = new System.Drawing.Size(244, 22); + this.newToolStripMenuItem.Text = "&New Watch"; + this.newToolStripMenuItem.Click += new System.EventHandler(this.NewWatchMenuItem_Click); + // + // EditContextMenuItem + // + this.EditContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.CutHS; + this.EditContextMenuItem.Name = "EditContextMenuItem"; + this.EditContextMenuItem.ShortcutKeyDisplayString = "Ctrl+E"; + this.EditContextMenuItem.Size = new System.Drawing.Size(244, 22); + this.EditContextMenuItem.Text = "&Edit"; + this.EditContextMenuItem.Click += new System.EventHandler(this.EditWatchMenuItem_Click); + // + // RemoveContextMenuItem + // + this.RemoveContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Delete; + this.RemoveContextMenuItem.Name = "RemoveContextMenuItem"; + this.RemoveContextMenuItem.ShortcutKeyDisplayString = "Ctrl+R"; + this.RemoveContextMenuItem.Size = new System.Drawing.Size(244, 22); + this.RemoveContextMenuItem.Text = "&Remove"; + this.RemoveContextMenuItem.Click += new System.EventHandler(this.RemoveWatchMenuItem_Click); + // + // DuplicateContextMenuItem + // + this.DuplicateContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Duplicate; + this.DuplicateContextMenuItem.Name = "DuplicateContextMenuItem"; + this.DuplicateContextMenuItem.ShortcutKeyDisplayString = "Ctrl+D"; + this.DuplicateContextMenuItem.Size = new System.Drawing.Size(244, 22); + this.DuplicateContextMenuItem.Text = "&Duplicate"; + this.DuplicateContextMenuItem.Click += new System.EventHandler(this.DuplicateWatchMenuItem_Click); + // + // PokeContextMenuItem + // + this.PokeContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.poke; + this.PokeContextMenuItem.Name = "PokeContextMenuItem"; + this.PokeContextMenuItem.ShortcutKeyDisplayString = "Ctrl+P"; + this.PokeContextMenuItem.Size = new System.Drawing.Size(244, 22); + this.PokeContextMenuItem.Text = "&Poke"; + this.PokeContextMenuItem.Click += new System.EventHandler(this.PokeAddressMenuItem_Click); + // + // FreezeContextMenuItem + // + this.FreezeContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Freeze; + this.FreezeContextMenuItem.Name = "FreezeContextMenuItem"; + this.FreezeContextMenuItem.ShortcutKeyDisplayString = "Ctrl+F"; + this.FreezeContextMenuItem.Size = new System.Drawing.Size(244, 22); + this.FreezeContextMenuItem.Text = "&Freeze"; + this.FreezeContextMenuItem.Click += new System.EventHandler(this.FreezeAddressMenuItem_Click); + // + // UnfreezeAllContextMenuItem + // + this.UnfreezeAllContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Unfreeze; + this.UnfreezeAllContextMenuItem.Name = "UnfreezeAllContextMenuItem"; + this.UnfreezeAllContextMenuItem.Size = new System.Drawing.Size(244, 22); + this.UnfreezeAllContextMenuItem.Text = "Unfreeze &All"; + this.UnfreezeAllContextMenuItem.Click += new System.EventHandler(this.UnfreezeAllContextMenuItem_Click); + // + // ViewInHexEditorContextMenuItem + // + this.ViewInHexEditorContextMenuItem.Name = "ViewInHexEditorContextMenuItem"; + this.ViewInHexEditorContextMenuItem.Size = new System.Drawing.Size(244, 22); + this.ViewInHexEditorContextMenuItem.Text = "View in Hex Editor"; + this.ViewInHexEditorContextMenuItem.Click += new System.EventHandler(this.ViewInHexEditorContextMenuItem_Click); + // + // Separator4 + // + this.Separator4.Name = "Separator4"; + this.Separator4.Size = new System.Drawing.Size(241, 6); + // + // ReadBreakpointContextMenuItem + // + this.ReadBreakpointContextMenuItem.Name = "ReadBreakpointContextMenuItem"; + this.ReadBreakpointContextMenuItem.Size = new System.Drawing.Size(244, 22); + this.ReadBreakpointContextMenuItem.Text = "Set Read Breakpoint"; + this.ReadBreakpointContextMenuItem.Click += new System.EventHandler(this.ReadBreakpointContextMenuItem_Click); + // + // WriteBreakpointContextMenuItem + // + this.WriteBreakpointContextMenuItem.Name = "WriteBreakpointContextMenuItem"; + this.WriteBreakpointContextMenuItem.Size = new System.Drawing.Size(244, 22); + this.WriteBreakpointContextMenuItem.Text = "Set Write Breakpoint"; + this.WriteBreakpointContextMenuItem.Click += new System.EventHandler(this.WriteBreakpointContextMenuItem_Click); + // + // Separator6 + // + this.Separator6.Name = "Separator6"; + this.Separator6.Size = new System.Drawing.Size(241, 6); + // + // InsertSeperatorContextMenuItem + // + this.InsertSeperatorContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.InsertSeparator; + this.InsertSeperatorContextMenuItem.Name = "InsertSeperatorContextMenuItem"; + this.InsertSeperatorContextMenuItem.ShortcutKeyDisplayString = "Ctrl+I"; + this.InsertSeperatorContextMenuItem.Size = new System.Drawing.Size(244, 22); + this.InsertSeperatorContextMenuItem.Text = "&Insert Separator"; + this.InsertSeperatorContextMenuItem.Click += new System.EventHandler(this.InsertSeparatorMenuItem_Click); + // + // MoveUpContextMenuItem + // + this.MoveUpContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveUp; + this.MoveUpContextMenuItem.Name = "MoveUpContextMenuItem"; + this.MoveUpContextMenuItem.ShortcutKeyDisplayString = "Ctrl+Up"; + this.MoveUpContextMenuItem.Size = new System.Drawing.Size(244, 22); + this.MoveUpContextMenuItem.Text = "Move &Up"; + this.MoveUpContextMenuItem.Click += new System.EventHandler(this.MoveUpMenuItem_Click); + // + // MoveDownContextMenuItem + // + this.MoveDownContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveDown; + this.MoveDownContextMenuItem.Name = "MoveDownContextMenuItem"; + this.MoveDownContextMenuItem.ShortcutKeyDisplayString = "Ctrl+Down"; + this.MoveDownContextMenuItem.Size = new System.Drawing.Size(244, 22); + this.MoveDownContextMenuItem.Text = "Move &Down"; + this.MoveDownContextMenuItem.Click += new System.EventHandler(this.MoveDownMenuItem_Click); + // + // MoveTopContextMenuItem + // + this.MoveTopContextMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("MoveTopContextMenuItem.Image"))); + this.MoveTopContextMenuItem.Name = "MoveTopContextMenuItem"; + this.MoveTopContextMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) + | System.Windows.Forms.Keys.Up))); + this.MoveTopContextMenuItem.Size = new System.Drawing.Size(244, 22); + this.MoveTopContextMenuItem.Text = "Move &Top"; + this.MoveTopContextMenuItem.Click += new System.EventHandler(this.MoveTopMenuItem_Click); + // + // MoveBottomContextMenuItem + // + this.MoveBottomContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveBottom; + this.MoveBottomContextMenuItem.Name = "MoveBottomContextMenuItem"; + this.MoveBottomContextMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) + | System.Windows.Forms.Keys.Down))); + this.MoveBottomContextMenuItem.Size = new System.Drawing.Size(244, 22); + this.MoveBottomContextMenuItem.Text = "Move &Bottom"; + this.MoveBottomContextMenuItem.Click += new System.EventHandler(this.MoveBottomMenuItem_Click); + // + // statusStrip1 + // + this.statusStrip1.ClickThrough = true; + this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.ErrorIconButton, this.MessageLabel}); - this.statusStrip1.Location = new System.Drawing.Point(0, 356); - this.statusStrip1.Name = "statusStrip1"; - this.statusStrip1.Size = new System.Drawing.Size(364, 22); - this.statusStrip1.TabIndex = 8; - this.statusStrip1.Text = "statusStrip1"; - // - // ErrorIconButton - // - this.ErrorIconButton.BackColor = System.Drawing.Color.NavajoWhite; - this.ErrorIconButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.ErrorIconButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.ExclamationRed; - this.ErrorIconButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.ErrorIconButton.Name = "ErrorIconButton"; - this.ErrorIconButton.Size = new System.Drawing.Size(23, 20); - this.ErrorIconButton.Text = "Warning! Out of Range Addresses in list, click to remove them"; - this.ErrorIconButton.Click += new System.EventHandler(this.ErrorIconButton_Click); - // - // MessageLabel - // - this.MessageLabel.Name = "MessageLabel"; - this.MessageLabel.Size = new System.Drawing.Size(31, 17); - this.MessageLabel.Text = " "; - // - // toolStrip1 - // - this.toolStrip1.ClickThrough = true; - this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.statusStrip1.Location = new System.Drawing.Point(0, 356); + this.statusStrip1.Name = "statusStrip1"; + this.statusStrip1.Size = new System.Drawing.Size(364, 22); + this.statusStrip1.TabIndex = 8; + this.statusStrip1.Text = "statusStrip1"; + // + // ErrorIconButton + // + this.ErrorIconButton.BackColor = System.Drawing.Color.NavajoWhite; + this.ErrorIconButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.ErrorIconButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.ExclamationRed; + this.ErrorIconButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.ErrorIconButton.Name = "ErrorIconButton"; + this.ErrorIconButton.Size = new System.Drawing.Size(23, 20); + this.ErrorIconButton.Text = "Warning! Out of Range Addresses in list, click to remove them"; + this.ErrorIconButton.Click += new System.EventHandler(this.ErrorIconButton_Click); + // + // MessageLabel + // + this.MessageLabel.Name = "MessageLabel"; + this.MessageLabel.Size = new System.Drawing.Size(31, 17); + this.MessageLabel.Text = " "; + // + // toolStrip1 + // + this.toolStrip1.ClickThrough = true; + this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.newToolStripButton, this.openToolStripButton, this.saveToolStripButton, @@ -323,189 +349,189 @@ this.moveDownToolStripButton, this.toolStripSeparator5, this.pauseToolStripButton}); - this.toolStrip1.Location = new System.Drawing.Point(0, 24); - this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(364, 25); - this.toolStrip1.TabIndex = 4; - this.toolStrip1.TabStop = true; - this.toolStrip1.Text = "toolStrip1"; - // - // newToolStripButton - // - this.newToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.newToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("newToolStripButton.Image"))); - this.newToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.newToolStripButton.Name = "newToolStripButton"; - this.newToolStripButton.Size = new System.Drawing.Size(23, 22); - this.newToolStripButton.Text = "&New"; - this.newToolStripButton.Click += new System.EventHandler(this.NewListMenuItem_Click); - // - // 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.Click += new System.EventHandler(this.OpenMenuItem_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.Click += new System.EventHandler(this.SaveMenuItem_Click); - // - // toolStripSeparator - // - this.toolStripSeparator.Name = "toolStripSeparator"; - this.toolStripSeparator.Size = new System.Drawing.Size(6, 25); - // - // newWatchToolStripButton - // - this.newWatchToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.newWatchToolStripButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.addWatch; - this.newWatchToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.newWatchToolStripButton.Name = "newWatchToolStripButton"; - this.newWatchToolStripButton.Size = new System.Drawing.Size(23, 22); - this.newWatchToolStripButton.Text = "New Watch"; - this.newWatchToolStripButton.ToolTipText = "New Watch"; - this.newWatchToolStripButton.Click += new System.EventHandler(this.NewWatchMenuItem_Click); - // - // editWatchToolStripButton - // - this.editWatchToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.editWatchToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("editWatchToolStripButton.Image"))); - this.editWatchToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.editWatchToolStripButton.Name = "editWatchToolStripButton"; - this.editWatchToolStripButton.Size = new System.Drawing.Size(23, 22); - this.editWatchToolStripButton.Text = "Edit Watch"; - this.editWatchToolStripButton.Click += new System.EventHandler(this.EditWatchMenuItem_Click); - // - // cutToolStripButton - // - this.cutToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.cutToolStripButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.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 = "Remove Watch"; - this.cutToolStripButton.Click += new System.EventHandler(this.RemoveWatchMenuItem_Click); - // - // clearChangeCountsToolStripButton - // - this.clearChangeCountsToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; - 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.ClearChangeCountsMenuItem_Click); - // - // duplicateWatchToolStripButton - // - this.duplicateWatchToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.duplicateWatchToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("duplicateWatchToolStripButton.Image"))); - this.duplicateWatchToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.duplicateWatchToolStripButton.Name = "duplicateWatchToolStripButton"; - this.duplicateWatchToolStripButton.Size = new System.Drawing.Size(23, 22); - this.duplicateWatchToolStripButton.Text = "Duplicate Watch"; - this.duplicateWatchToolStripButton.Click += new System.EventHandler(this.DuplicateWatchMenuItem_Click); - // - // PokeAddressToolBarItem - // - this.PokeAddressToolBarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.PokeAddressToolBarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.poke; - this.PokeAddressToolBarItem.ImageTransparentColor = System.Drawing.Color.Magenta; - this.PokeAddressToolBarItem.Name = "PokeAddressToolBarItem"; - this.PokeAddressToolBarItem.Size = new System.Drawing.Size(23, 22); - this.PokeAddressToolBarItem.Text = "toolStripButton2"; - this.PokeAddressToolBarItem.ToolTipText = "Poke address"; - this.PokeAddressToolBarItem.Click += new System.EventHandler(this.PokeAddressMenuItem_Click); - // - // FreezeAddressToolBarItem - // - this.FreezeAddressToolBarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.FreezeAddressToolBarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Freeze; - this.FreezeAddressToolBarItem.ImageTransparentColor = System.Drawing.Color.Magenta; - this.FreezeAddressToolBarItem.Name = "FreezeAddressToolBarItem"; - this.FreezeAddressToolBarItem.Size = new System.Drawing.Size(23, 22); - this.FreezeAddressToolBarItem.Text = "Freeze Address"; - this.FreezeAddressToolBarItem.Click += new System.EventHandler(this.FreezeAddressMenuItem_Click); - // - // seperatorToolStripButton - // - this.seperatorToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.seperatorToolStripButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.InsertSeparator; - this.seperatorToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.seperatorToolStripButton.Name = "seperatorToolStripButton"; - this.seperatorToolStripButton.Size = new System.Drawing.Size(23, 22); - this.seperatorToolStripButton.Text = "-"; - this.seperatorToolStripButton.ToolTipText = "Insert Separator"; - 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 - // - this.toolStripSeparator5.Name = "toolStripSeparator5"; - this.toolStripSeparator5.Size = new System.Drawing.Size(6, 25); - // - // pauseToolStripButton - // - this.pauseToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.pauseToolStripButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Pause; - this.pauseToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.pauseToolStripButton.Name = "pauseToolStripButton"; - this.pauseToolStripButton.Size = new System.Drawing.Size(23, 22); - this.pauseToolStripButton.Text = "Pause"; - this.pauseToolStripButton.Click += new System.EventHandler(this.PauseMenuItem_Click); - // - // RamWatchMenu - // - this.RamWatchMenu.ClickThrough = true; - this.RamWatchMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStrip1.Location = new System.Drawing.Point(0, 24); + this.toolStrip1.Name = "toolStrip1"; + this.toolStrip1.Size = new System.Drawing.Size(364, 25); + this.toolStrip1.TabIndex = 4; + this.toolStrip1.TabStop = true; + this.toolStrip1.Text = "toolStrip1"; + // + // newToolStripButton + // + this.newToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.newToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("newToolStripButton.Image"))); + this.newToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.newToolStripButton.Name = "newToolStripButton"; + this.newToolStripButton.Size = new System.Drawing.Size(23, 22); + this.newToolStripButton.Text = "&New"; + this.newToolStripButton.Click += new System.EventHandler(this.NewListMenuItem_Click); + // + // 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.Click += new System.EventHandler(this.OpenMenuItem_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.Click += new System.EventHandler(this.SaveMenuItem_Click); + // + // toolStripSeparator + // + this.toolStripSeparator.Name = "toolStripSeparator"; + this.toolStripSeparator.Size = new System.Drawing.Size(6, 25); + // + // newWatchToolStripButton + // + this.newWatchToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.newWatchToolStripButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.addWatch; + this.newWatchToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.newWatchToolStripButton.Name = "newWatchToolStripButton"; + this.newWatchToolStripButton.Size = new System.Drawing.Size(23, 22); + this.newWatchToolStripButton.Text = "New Watch"; + this.newWatchToolStripButton.ToolTipText = "New Watch"; + this.newWatchToolStripButton.Click += new System.EventHandler(this.NewWatchMenuItem_Click); + // + // editWatchToolStripButton + // + this.editWatchToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.editWatchToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("editWatchToolStripButton.Image"))); + this.editWatchToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.editWatchToolStripButton.Name = "editWatchToolStripButton"; + this.editWatchToolStripButton.Size = new System.Drawing.Size(23, 22); + this.editWatchToolStripButton.Text = "Edit Watch"; + this.editWatchToolStripButton.Click += new System.EventHandler(this.EditWatchMenuItem_Click); + // + // cutToolStripButton + // + this.cutToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.cutToolStripButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.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 = "Remove Watch"; + this.cutToolStripButton.Click += new System.EventHandler(this.RemoveWatchMenuItem_Click); + // + // clearChangeCountsToolStripButton + // + this.clearChangeCountsToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; + 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.ClearChangeCountsMenuItem_Click); + // + // duplicateWatchToolStripButton + // + this.duplicateWatchToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.duplicateWatchToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("duplicateWatchToolStripButton.Image"))); + this.duplicateWatchToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.duplicateWatchToolStripButton.Name = "duplicateWatchToolStripButton"; + this.duplicateWatchToolStripButton.Size = new System.Drawing.Size(23, 22); + this.duplicateWatchToolStripButton.Text = "Duplicate Watch"; + this.duplicateWatchToolStripButton.Click += new System.EventHandler(this.DuplicateWatchMenuItem_Click); + // + // PokeAddressToolBarItem + // + this.PokeAddressToolBarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.PokeAddressToolBarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.poke; + this.PokeAddressToolBarItem.ImageTransparentColor = System.Drawing.Color.Magenta; + this.PokeAddressToolBarItem.Name = "PokeAddressToolBarItem"; + this.PokeAddressToolBarItem.Size = new System.Drawing.Size(23, 22); + this.PokeAddressToolBarItem.Text = "toolStripButton2"; + this.PokeAddressToolBarItem.ToolTipText = "Poke address"; + this.PokeAddressToolBarItem.Click += new System.EventHandler(this.PokeAddressMenuItem_Click); + // + // FreezeAddressToolBarItem + // + this.FreezeAddressToolBarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.FreezeAddressToolBarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Freeze; + this.FreezeAddressToolBarItem.ImageTransparentColor = System.Drawing.Color.Magenta; + this.FreezeAddressToolBarItem.Name = "FreezeAddressToolBarItem"; + this.FreezeAddressToolBarItem.Size = new System.Drawing.Size(23, 22); + this.FreezeAddressToolBarItem.Text = "Freeze Address"; + this.FreezeAddressToolBarItem.Click += new System.EventHandler(this.FreezeAddressMenuItem_Click); + // + // seperatorToolStripButton + // + this.seperatorToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.seperatorToolStripButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.InsertSeparator; + this.seperatorToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.seperatorToolStripButton.Name = "seperatorToolStripButton"; + this.seperatorToolStripButton.Size = new System.Drawing.Size(23, 22); + this.seperatorToolStripButton.Text = "-"; + this.seperatorToolStripButton.ToolTipText = "Insert Separator"; + 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 + // + this.toolStripSeparator5.Name = "toolStripSeparator5"; + this.toolStripSeparator5.Size = new System.Drawing.Size(6, 25); + // + // pauseToolStripButton + // + this.pauseToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.pauseToolStripButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Pause; + this.pauseToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.pauseToolStripButton.Name = "pauseToolStripButton"; + this.pauseToolStripButton.Size = new System.Drawing.Size(23, 22); + this.pauseToolStripButton.Text = "Pause"; + this.pauseToolStripButton.Click += new System.EventHandler(this.PauseMenuItem_Click); + // + // RamWatchMenu + // + this.RamWatchMenu.ClickThrough = true; + this.RamWatchMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.FileSubMenu, this.WatchesSubMenu, this.OptionsSubMenu}); - this.RamWatchMenu.Location = new System.Drawing.Point(0, 0); - this.RamWatchMenu.Name = "RamWatchMenu"; - this.RamWatchMenu.Size = new System.Drawing.Size(364, 24); - this.RamWatchMenu.TabIndex = 3; - this.RamWatchMenu.Text = "menuStrip1"; - // - // FileSubMenu - // - this.FileSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.RamWatchMenu.Location = new System.Drawing.Point(0, 0); + this.RamWatchMenu.Name = "RamWatchMenu"; + this.RamWatchMenu.Size = new System.Drawing.Size(364, 24); + this.RamWatchMenu.TabIndex = 3; + this.RamWatchMenu.Text = "menuStrip1"; + // + // FileSubMenu + // + this.FileSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.NewListMenuItem, this.OpenMenuItem, this.SaveMenuItem, @@ -514,86 +540,86 @@ this.RecentSubMenu, this.toolStripSeparator1, this.ExitMenuItem}); - this.FileSubMenu.Name = "FileSubMenu"; - this.FileSubMenu.Size = new System.Drawing.Size(42, 20); - this.FileSubMenu.Text = "&Files"; - this.FileSubMenu.DropDownOpened += new System.EventHandler(this.FileSubMenu_DropDownOpened); - // - // NewListMenuItem - // - this.NewListMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.NewFile; - this.NewListMenuItem.Name = "NewListMenuItem"; - this.NewListMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N))); - this.NewListMenuItem.Size = new System.Drawing.Size(195, 22); - this.NewListMenuItem.Text = "&New List"; - this.NewListMenuItem.Click += new System.EventHandler(this.NewListMenuItem_Click); - // - // OpenMenuItem - // - this.OpenMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.OpenFile; - this.OpenMenuItem.Name = "OpenMenuItem"; - this.OpenMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); - this.OpenMenuItem.Size = new System.Drawing.Size(195, 22); - this.OpenMenuItem.Text = "&Open..."; - this.OpenMenuItem.Click += new System.EventHandler(this.OpenMenuItem_Click); - // - // SaveMenuItem - // - this.SaveMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.SaveAs; - this.SaveMenuItem.Name = "SaveMenuItem"; - this.SaveMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S))); - this.SaveMenuItem.Size = new System.Drawing.Size(195, 22); - this.SaveMenuItem.Text = "&Save"; - this.SaveMenuItem.Click += new System.EventHandler(this.SaveMenuItem_Click); - // - // SaveAsMenuItem - // - this.SaveAsMenuItem.Name = "SaveAsMenuItem"; - this.SaveAsMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) + this.FileSubMenu.Name = "FileSubMenu"; + this.FileSubMenu.Size = new System.Drawing.Size(42, 20); + this.FileSubMenu.Text = "&Files"; + this.FileSubMenu.DropDownOpened += new System.EventHandler(this.FileSubMenu_DropDownOpened); + // + // NewListMenuItem + // + this.NewListMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.NewFile; + this.NewListMenuItem.Name = "NewListMenuItem"; + this.NewListMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N))); + this.NewListMenuItem.Size = new System.Drawing.Size(195, 22); + this.NewListMenuItem.Text = "&New List"; + this.NewListMenuItem.Click += new System.EventHandler(this.NewListMenuItem_Click); + // + // OpenMenuItem + // + this.OpenMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.OpenFile; + this.OpenMenuItem.Name = "OpenMenuItem"; + this.OpenMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); + this.OpenMenuItem.Size = new System.Drawing.Size(195, 22); + this.OpenMenuItem.Text = "&Open..."; + this.OpenMenuItem.Click += new System.EventHandler(this.OpenMenuItem_Click); + // + // SaveMenuItem + // + this.SaveMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.SaveAs; + this.SaveMenuItem.Name = "SaveMenuItem"; + this.SaveMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S))); + this.SaveMenuItem.Size = new System.Drawing.Size(195, 22); + this.SaveMenuItem.Text = "&Save"; + this.SaveMenuItem.Click += new System.EventHandler(this.SaveMenuItem_Click); + // + // SaveAsMenuItem + // + this.SaveAsMenuItem.Name = "SaveAsMenuItem"; + this.SaveAsMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) | System.Windows.Forms.Keys.S))); - this.SaveAsMenuItem.Size = new System.Drawing.Size(195, 22); - this.SaveAsMenuItem.Text = "Save &As..."; - this.SaveAsMenuItem.Click += new System.EventHandler(this.SaveAsMenuItem_Click); - // - // AppendMenuItem - // - this.AppendMenuItem.Name = "AppendMenuItem"; - this.AppendMenuItem.Size = new System.Drawing.Size(195, 22); - this.AppendMenuItem.Text = "A&ppend File..."; - this.AppendMenuItem.Click += new System.EventHandler(this.OpenMenuItem_Click); - // - // RecentSubMenu - // - this.RecentSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.SaveAsMenuItem.Size = new System.Drawing.Size(195, 22); + this.SaveAsMenuItem.Text = "Save &As..."; + this.SaveAsMenuItem.Click += new System.EventHandler(this.SaveAsMenuItem_Click); + // + // AppendMenuItem + // + this.AppendMenuItem.Name = "AppendMenuItem"; + this.AppendMenuItem.Size = new System.Drawing.Size(195, 22); + this.AppendMenuItem.Text = "A&ppend File..."; + this.AppendMenuItem.Click += new System.EventHandler(this.OpenMenuItem_Click); + // + // RecentSubMenu + // + this.RecentSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.noneToolStripMenuItem}); - this.RecentSubMenu.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent; - this.RecentSubMenu.Name = "RecentSubMenu"; - this.RecentSubMenu.Size = new System.Drawing.Size(195, 22); - this.RecentSubMenu.Text = "Recent"; - this.RecentSubMenu.DropDownOpened += new System.EventHandler(this.RecentSubMenu_DropDownOpened); - // - // noneToolStripMenuItem - // - this.noneToolStripMenuItem.Name = "noneToolStripMenuItem"; - this.noneToolStripMenuItem.Size = new System.Drawing.Size(103, 22); - this.noneToolStripMenuItem.Text = "None"; - // - // toolStripSeparator1 - // - this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(192, 6); - // - // ExitMenuItem - // - this.ExitMenuItem.Name = "ExitMenuItem"; - this.ExitMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4))); - this.ExitMenuItem.Size = new System.Drawing.Size(195, 22); - this.ExitMenuItem.Text = "&Close"; - this.ExitMenuItem.Click += new System.EventHandler(this.ExitMenuItem_Click); - // - // WatchesSubMenu - // - this.WatchesSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.RecentSubMenu.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent; + this.RecentSubMenu.Name = "RecentSubMenu"; + this.RecentSubMenu.Size = new System.Drawing.Size(195, 22); + this.RecentSubMenu.Text = "Recent"; + this.RecentSubMenu.DropDownOpened += new System.EventHandler(this.RecentSubMenu_DropDownOpened); + // + // noneToolStripMenuItem + // + this.noneToolStripMenuItem.Name = "noneToolStripMenuItem"; + this.noneToolStripMenuItem.Size = new System.Drawing.Size(103, 22); + this.noneToolStripMenuItem.Text = "None"; + // + // toolStripSeparator1 + // + this.toolStripSeparator1.Name = "toolStripSeparator1"; + this.toolStripSeparator1.Size = new System.Drawing.Size(192, 6); + // + // ExitMenuItem + // + this.ExitMenuItem.Name = "ExitMenuItem"; + this.ExitMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4))); + this.ExitMenuItem.Size = new System.Drawing.Size(195, 22); + this.ExitMenuItem.Text = "&Close"; + this.ExitMenuItem.Click += new System.EventHandler(this.ExitMenuItem_Click); + // + // WatchesSubMenu + // + this.WatchesSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.MemoryDomainsSubMenu, this.toolStripSeparator8, this.NewWatchMenuItem, @@ -607,151 +633,173 @@ this.toolStripSeparator3, this.MoveUpMenuItem, this.MoveDownMenuItem, + this.MoveTopMenuItem, + this.MoveBottomMenuItem, this.SelectAllMenuItem, this.toolStripSeparator2, this.PauseMenuItem}); - this.WatchesSubMenu.Name = "WatchesSubMenu"; - this.WatchesSubMenu.Size = new System.Drawing.Size(64, 20); - this.WatchesSubMenu.Text = "&Watches"; - this.WatchesSubMenu.DropDownOpened += new System.EventHandler(this.WatchesSubMenu_DropDownOpened); - // - // MemoryDomainsSubMenu - // - this.MemoryDomainsSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.WatchesSubMenu.Name = "WatchesSubMenu"; + this.WatchesSubMenu.Size = new System.Drawing.Size(64, 20); + this.WatchesSubMenu.Text = "&Watches"; + this.WatchesSubMenu.DropDownOpened += new System.EventHandler(this.WatchesSubMenu_DropDownOpened); + // + // MemoryDomainsSubMenu + // + this.MemoryDomainsSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.Separator2}); - this.MemoryDomainsSubMenu.Name = "MemoryDomainsSubMenu"; - this.MemoryDomainsSubMenu.Size = new System.Drawing.Size(224, 22); - this.MemoryDomainsSubMenu.Text = "Default Domain"; - this.MemoryDomainsSubMenu.DropDownOpened += new System.EventHandler(this.MemoryDomainsSubMenu_DropDownOpened); - // - // Separator2 - // - this.Separator2.Name = "Separator2"; - this.Separator2.Size = new System.Drawing.Size(149, 6); - // - // toolStripSeparator8 - // - this.toolStripSeparator8.Name = "toolStripSeparator8"; - this.toolStripSeparator8.Size = new System.Drawing.Size(221, 6); - // - // NewWatchMenuItem - // - this.NewWatchMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.FindHS; - this.NewWatchMenuItem.Name = "NewWatchMenuItem"; - this.NewWatchMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.W))); - this.NewWatchMenuItem.Size = new System.Drawing.Size(224, 22); - this.NewWatchMenuItem.Text = "&New Watch"; - this.NewWatchMenuItem.Click += new System.EventHandler(this.NewWatchMenuItem_Click); - // - // EditWatchMenuItem - // - this.EditWatchMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.CutHS; - this.EditWatchMenuItem.Name = "EditWatchMenuItem"; - this.EditWatchMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.E))); - this.EditWatchMenuItem.Size = new System.Drawing.Size(224, 22); - this.EditWatchMenuItem.Text = "&Edit Watch"; - this.EditWatchMenuItem.Click += new System.EventHandler(this.EditWatchMenuItem_Click); - // - // RemoveWatchMenuItem - // - this.RemoveWatchMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Delete; - this.RemoveWatchMenuItem.Name = "RemoveWatchMenuItem"; - this.RemoveWatchMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.R))); - this.RemoveWatchMenuItem.Size = new System.Drawing.Size(224, 22); - this.RemoveWatchMenuItem.Text = "&Remove Watch"; - this.RemoveWatchMenuItem.Click += new System.EventHandler(this.RemoveWatchMenuItem_Click); - // - // DuplicateWatchMenuItem - // - this.DuplicateWatchMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Duplicate; - this.DuplicateWatchMenuItem.Name = "DuplicateWatchMenuItem"; - this.DuplicateWatchMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.D))); - this.DuplicateWatchMenuItem.Size = new System.Drawing.Size(224, 22); - this.DuplicateWatchMenuItem.Text = "&Duplicate Watch"; - this.DuplicateWatchMenuItem.Click += new System.EventHandler(this.DuplicateWatchMenuItem_Click); - // - // PokeAddressMenuItem - // - this.PokeAddressMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.poke; - this.PokeAddressMenuItem.Name = "PokeAddressMenuItem"; - this.PokeAddressMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.P))); - this.PokeAddressMenuItem.Size = new System.Drawing.Size(224, 22); - this.PokeAddressMenuItem.Text = "Poke Address"; - this.PokeAddressMenuItem.Click += new System.EventHandler(this.PokeAddressMenuItem_Click); - // - // FreezeAddressMenuItem - // - this.FreezeAddressMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Freeze; - this.FreezeAddressMenuItem.Name = "FreezeAddressMenuItem"; - this.FreezeAddressMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.F))); - this.FreezeAddressMenuItem.Size = new System.Drawing.Size(224, 22); - this.FreezeAddressMenuItem.Text = "Freeze Address"; - this.FreezeAddressMenuItem.Click += new System.EventHandler(this.FreezeAddressMenuItem_Click); - // - // InsertSeparatorMenuItem - // - this.InsertSeparatorMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.InsertSeparator; - this.InsertSeparatorMenuItem.Name = "InsertSeparatorMenuItem"; - this.InsertSeparatorMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.I))); - this.InsertSeparatorMenuItem.Size = new System.Drawing.Size(224, 22); - this.InsertSeparatorMenuItem.Text = "Insert Separator"; - this.InsertSeparatorMenuItem.Click += new System.EventHandler(this.InsertSeparatorMenuItem_Click); - // - // ClearChangeCountsMenuItem - // - this.ClearChangeCountsMenuItem.Name = "ClearChangeCountsMenuItem"; - this.ClearChangeCountsMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.C))); - this.ClearChangeCountsMenuItem.Size = new System.Drawing.Size(224, 22); - this.ClearChangeCountsMenuItem.Text = "&Clear Change Counts"; - this.ClearChangeCountsMenuItem.Click += new System.EventHandler(this.ClearChangeCountsMenuItem_Click); - // - // toolStripSeparator3 - // - this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(221, 6); - // - // MoveUpMenuItem - // - this.MoveUpMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveUp; - this.MoveUpMenuItem.Name = "MoveUpMenuItem"; - this.MoveUpMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Up))); - this.MoveUpMenuItem.Size = new System.Drawing.Size(224, 22); - this.MoveUpMenuItem.Text = "Move &Up"; - this.MoveUpMenuItem.Click += new System.EventHandler(this.MoveUpMenuItem_Click); - // - // MoveDownMenuItem - // - this.MoveDownMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveDown; - this.MoveDownMenuItem.Name = "MoveDownMenuItem"; - this.MoveDownMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Down))); - this.MoveDownMenuItem.Size = new System.Drawing.Size(224, 22); - this.MoveDownMenuItem.Text = "Move &Down"; - this.MoveDownMenuItem.Click += new System.EventHandler(this.MoveDownMenuItem_Click); - // - // SelectAllMenuItem - // - this.SelectAllMenuItem.Name = "SelectAllMenuItem"; - this.SelectAllMenuItem.ShortcutKeyDisplayString = "Ctrl+A"; - this.SelectAllMenuItem.Size = new System.Drawing.Size(224, 22); - this.SelectAllMenuItem.Text = "Select &All"; - this.SelectAllMenuItem.Click += new System.EventHandler(this.SelectAllMenuItem_Click); - // - // toolStripSeparator2 - // - this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(221, 6); - // - // PauseMenuItem - // - this.PauseMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Pause; - this.PauseMenuItem.Name = "PauseMenuItem"; - this.PauseMenuItem.Size = new System.Drawing.Size(224, 22); - this.PauseMenuItem.Text = "&Pause"; - this.PauseMenuItem.Click += new System.EventHandler(this.PauseMenuItem_Click); - // - // OptionsSubMenu - // - this.OptionsSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.MemoryDomainsSubMenu.Name = "MemoryDomainsSubMenu"; + this.MemoryDomainsSubMenu.Size = new System.Drawing.Size(244, 22); + this.MemoryDomainsSubMenu.Text = "Default Domain"; + this.MemoryDomainsSubMenu.DropDownOpened += new System.EventHandler(this.MemoryDomainsSubMenu_DropDownOpened); + // + // Separator2 + // + this.Separator2.Name = "Separator2"; + this.Separator2.Size = new System.Drawing.Size(57, 6); + // + // toolStripSeparator8 + // + this.toolStripSeparator8.Name = "toolStripSeparator8"; + this.toolStripSeparator8.Size = new System.Drawing.Size(241, 6); + // + // NewWatchMenuItem + // + this.NewWatchMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.FindHS; + this.NewWatchMenuItem.Name = "NewWatchMenuItem"; + this.NewWatchMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.W))); + this.NewWatchMenuItem.Size = new System.Drawing.Size(244, 22); + this.NewWatchMenuItem.Text = "&New Watch"; + this.NewWatchMenuItem.Click += new System.EventHandler(this.NewWatchMenuItem_Click); + // + // EditWatchMenuItem + // + this.EditWatchMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.CutHS; + this.EditWatchMenuItem.Name = "EditWatchMenuItem"; + this.EditWatchMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.E))); + this.EditWatchMenuItem.Size = new System.Drawing.Size(244, 22); + this.EditWatchMenuItem.Text = "&Edit Watch"; + this.EditWatchMenuItem.Click += new System.EventHandler(this.EditWatchMenuItem_Click); + // + // RemoveWatchMenuItem + // + this.RemoveWatchMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Delete; + this.RemoveWatchMenuItem.Name = "RemoveWatchMenuItem"; + this.RemoveWatchMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.R))); + this.RemoveWatchMenuItem.Size = new System.Drawing.Size(244, 22); + this.RemoveWatchMenuItem.Text = "&Remove Watch"; + this.RemoveWatchMenuItem.Click += new System.EventHandler(this.RemoveWatchMenuItem_Click); + // + // DuplicateWatchMenuItem + // + this.DuplicateWatchMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Duplicate; + this.DuplicateWatchMenuItem.Name = "DuplicateWatchMenuItem"; + this.DuplicateWatchMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.D))); + this.DuplicateWatchMenuItem.Size = new System.Drawing.Size(244, 22); + this.DuplicateWatchMenuItem.Text = "&Duplicate Watch"; + this.DuplicateWatchMenuItem.Click += new System.EventHandler(this.DuplicateWatchMenuItem_Click); + // + // PokeAddressMenuItem + // + this.PokeAddressMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.poke; + this.PokeAddressMenuItem.Name = "PokeAddressMenuItem"; + this.PokeAddressMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.P))); + this.PokeAddressMenuItem.Size = new System.Drawing.Size(244, 22); + this.PokeAddressMenuItem.Text = "Poke Address"; + this.PokeAddressMenuItem.Click += new System.EventHandler(this.PokeAddressMenuItem_Click); + // + // FreezeAddressMenuItem + // + this.FreezeAddressMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Freeze; + this.FreezeAddressMenuItem.Name = "FreezeAddressMenuItem"; + this.FreezeAddressMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.F))); + this.FreezeAddressMenuItem.Size = new System.Drawing.Size(244, 22); + this.FreezeAddressMenuItem.Text = "Freeze Address"; + this.FreezeAddressMenuItem.Click += new System.EventHandler(this.FreezeAddressMenuItem_Click); + // + // InsertSeparatorMenuItem + // + this.InsertSeparatorMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.InsertSeparator; + this.InsertSeparatorMenuItem.Name = "InsertSeparatorMenuItem"; + this.InsertSeparatorMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.I))); + this.InsertSeparatorMenuItem.Size = new System.Drawing.Size(244, 22); + this.InsertSeparatorMenuItem.Text = "Insert Separator"; + this.InsertSeparatorMenuItem.Click += new System.EventHandler(this.InsertSeparatorMenuItem_Click); + // + // ClearChangeCountsMenuItem + // + this.ClearChangeCountsMenuItem.Name = "ClearChangeCountsMenuItem"; + this.ClearChangeCountsMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.C))); + this.ClearChangeCountsMenuItem.Size = new System.Drawing.Size(244, 22); + this.ClearChangeCountsMenuItem.Text = "&Clear Change Counts"; + this.ClearChangeCountsMenuItem.Click += new System.EventHandler(this.ClearChangeCountsMenuItem_Click); + // + // toolStripSeparator3 + // + this.toolStripSeparator3.Name = "toolStripSeparator3"; + this.toolStripSeparator3.Size = new System.Drawing.Size(241, 6); + // + // MoveUpMenuItem + // + this.MoveUpMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveUp; + this.MoveUpMenuItem.Name = "MoveUpMenuItem"; + this.MoveUpMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Up))); + this.MoveUpMenuItem.Size = new System.Drawing.Size(244, 22); + this.MoveUpMenuItem.Text = "Move &Up"; + this.MoveUpMenuItem.Click += new System.EventHandler(this.MoveUpMenuItem_Click); + // + // MoveDownMenuItem + // + this.MoveDownMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveDown; + this.MoveDownMenuItem.Name = "MoveDownMenuItem"; + this.MoveDownMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Down))); + this.MoveDownMenuItem.Size = new System.Drawing.Size(244, 22); + this.MoveDownMenuItem.Text = "Move &Down"; + this.MoveDownMenuItem.Click += new System.EventHandler(this.MoveDownMenuItem_Click); + // + // MoveTopMenuItem + // + this.MoveTopMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("MoveTopMenuItem.Image"))); + this.MoveTopMenuItem.Name = "MoveTopMenuItem"; + this.MoveTopMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) + | System.Windows.Forms.Keys.Up))); + this.MoveTopMenuItem.Size = new System.Drawing.Size(244, 22); + this.MoveTopMenuItem.Text = "Move &Top"; + this.MoveTopMenuItem.Click += new System.EventHandler(this.MoveTopMenuItem_Click); + // + // MoveBottomMenuItem + // + this.MoveBottomMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveBottom; + this.MoveBottomMenuItem.Name = "MoveBottomMenuItem"; + this.MoveBottomMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) + | System.Windows.Forms.Keys.Down))); + this.MoveBottomMenuItem.Size = new System.Drawing.Size(244, 22); + this.MoveBottomMenuItem.Text = "Move &Bottom"; + this.MoveBottomMenuItem.Click += new System.EventHandler(this.MoveBottomMenuItem_Click); + // + // SelectAllMenuItem + // + this.SelectAllMenuItem.Name = "SelectAllMenuItem"; + this.SelectAllMenuItem.ShortcutKeyDisplayString = "Ctrl+A"; + this.SelectAllMenuItem.Size = new System.Drawing.Size(244, 22); + this.SelectAllMenuItem.Text = "Select &All"; + this.SelectAllMenuItem.Click += new System.EventHandler(this.SelectAllMenuItem_Click); + // + // toolStripSeparator2 + // + this.toolStripSeparator2.Name = "toolStripSeparator2"; + this.toolStripSeparator2.Size = new System.Drawing.Size(241, 6); + // + // PauseMenuItem + // + this.PauseMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Pause; + this.PauseMenuItem.Name = "PauseMenuItem"; + this.PauseMenuItem.Size = new System.Drawing.Size(244, 22); + this.PauseMenuItem.Text = "&Pause"; + this.PauseMenuItem.Click += new System.EventHandler(this.PauseMenuItem_Click); + // + // OptionsSubMenu + // + this.OptionsSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.DefinePreviousValueSubMenu, this.WatchesOnScreenMenuItem, this.SaveWindowPositionMenuItem, @@ -759,93 +807,93 @@ this.FloatingWindowMenuItem, this.toolStripSeparator7, this.RestoreWindowSizeMenuItem}); - this.OptionsSubMenu.Name = "OptionsSubMenu"; - this.OptionsSubMenu.Size = new System.Drawing.Size(61, 20); - this.OptionsSubMenu.Text = "&Options"; - this.OptionsSubMenu.DropDownOpened += new System.EventHandler(this.OptionsSubMenu_DropDownOpened); - // - // DefinePreviousValueSubMenu - // - this.DefinePreviousValueSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.OptionsSubMenu.Name = "OptionsSubMenu"; + this.OptionsSubMenu.Size = new System.Drawing.Size(61, 20); + this.OptionsSubMenu.Text = "&Options"; + this.OptionsSubMenu.DropDownOpened += new System.EventHandler(this.OptionsSubMenu_DropDownOpened); + // + // DefinePreviousValueSubMenu + // + this.DefinePreviousValueSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.PreviousFrameMenuItem, this.LastChangeMenuItem, this.OriginalMenuItem}); - this.DefinePreviousValueSubMenu.Name = "DefinePreviousValueSubMenu"; - this.DefinePreviousValueSubMenu.Size = new System.Drawing.Size(217, 22); - this.DefinePreviousValueSubMenu.Text = "Define Previous Value"; - this.DefinePreviousValueSubMenu.DropDownOpened += new System.EventHandler(this.DefinePreviousValueSubMenu_DropDownOpened); - // - // PreviousFrameMenuItem - // - this.PreviousFrameMenuItem.Name = "PreviousFrameMenuItem"; - this.PreviousFrameMenuItem.Size = new System.Drawing.Size(155, 22); - this.PreviousFrameMenuItem.Text = "Previous Frame"; - this.PreviousFrameMenuItem.Click += new System.EventHandler(this.PreviousFrameMenuItem_Click); - // - // LastChangeMenuItem - // - this.LastChangeMenuItem.Name = "LastChangeMenuItem"; - this.LastChangeMenuItem.Size = new System.Drawing.Size(155, 22); - this.LastChangeMenuItem.Text = "Last Change"; - this.LastChangeMenuItem.Click += new System.EventHandler(this.LastChangeMenuItem_Click); - // - // OriginalMenuItem - // - this.OriginalMenuItem.Name = "OriginalMenuItem"; - this.OriginalMenuItem.Size = new System.Drawing.Size(155, 22); - this.OriginalMenuItem.Text = "&Original"; - this.OriginalMenuItem.Click += new System.EventHandler(this.OriginalMenuItem_Click); - // - // WatchesOnScreenMenuItem - // - this.WatchesOnScreenMenuItem.Name = "WatchesOnScreenMenuItem"; - this.WatchesOnScreenMenuItem.Size = new System.Drawing.Size(217, 22); - this.WatchesOnScreenMenuItem.Text = "Display Watches On Screen"; - this.WatchesOnScreenMenuItem.Click += new System.EventHandler(this.WatchesOnScreenMenuItem_Click); - // - // SaveWindowPositionMenuItem - // - this.SaveWindowPositionMenuItem.Name = "SaveWindowPositionMenuItem"; - this.SaveWindowPositionMenuItem.Size = new System.Drawing.Size(217, 22); - this.SaveWindowPositionMenuItem.Text = "Save Window Position"; - this.SaveWindowPositionMenuItem.Click += new System.EventHandler(this.SaveWindowPositionMenuItem_Click); - // - // AlwaysOnTopMenuItem - // - this.AlwaysOnTopMenuItem.Name = "AlwaysOnTopMenuItem"; - this.AlwaysOnTopMenuItem.Size = new System.Drawing.Size(217, 22); - this.AlwaysOnTopMenuItem.Text = "&Always On Top"; - this.AlwaysOnTopMenuItem.Click += new System.EventHandler(this.AlwaysOnTopMenuItem_Click); - // - // FloatingWindowMenuItem - // - this.FloatingWindowMenuItem.Name = "FloatingWindowMenuItem"; - this.FloatingWindowMenuItem.Size = new System.Drawing.Size(217, 22); - this.FloatingWindowMenuItem.Text = "&Floating Window"; - this.FloatingWindowMenuItem.Click += new System.EventHandler(this.FloatingWindowMenuItem_Click); - // - // toolStripSeparator7 - // - this.toolStripSeparator7.Name = "toolStripSeparator7"; - this.toolStripSeparator7.Size = new System.Drawing.Size(214, 6); - // - // RestoreWindowSizeMenuItem - // - this.RestoreWindowSizeMenuItem.Name = "RestoreWindowSizeMenuItem"; - this.RestoreWindowSizeMenuItem.Size = new System.Drawing.Size(217, 22); - this.RestoreWindowSizeMenuItem.Text = "Restore Default Settings"; - this.RestoreWindowSizeMenuItem.Click += new System.EventHandler(this.RestoreDefaultsMenuItem_Click); - // - // WatchListView - // - this.WatchListView.AllowColumnReorder = true; - this.WatchListView.AllowDrop = true; - this.WatchListView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + this.DefinePreviousValueSubMenu.Name = "DefinePreviousValueSubMenu"; + this.DefinePreviousValueSubMenu.Size = new System.Drawing.Size(217, 22); + this.DefinePreviousValueSubMenu.Text = "Define Previous Value"; + this.DefinePreviousValueSubMenu.DropDownOpened += new System.EventHandler(this.DefinePreviousValueSubMenu_DropDownOpened); + // + // PreviousFrameMenuItem + // + this.PreviousFrameMenuItem.Name = "PreviousFrameMenuItem"; + this.PreviousFrameMenuItem.Size = new System.Drawing.Size(155, 22); + this.PreviousFrameMenuItem.Text = "Previous Frame"; + this.PreviousFrameMenuItem.Click += new System.EventHandler(this.PreviousFrameMenuItem_Click); + // + // LastChangeMenuItem + // + this.LastChangeMenuItem.Name = "LastChangeMenuItem"; + this.LastChangeMenuItem.Size = new System.Drawing.Size(155, 22); + this.LastChangeMenuItem.Text = "Last Change"; + this.LastChangeMenuItem.Click += new System.EventHandler(this.LastChangeMenuItem_Click); + // + // OriginalMenuItem + // + this.OriginalMenuItem.Name = "OriginalMenuItem"; + this.OriginalMenuItem.Size = new System.Drawing.Size(155, 22); + this.OriginalMenuItem.Text = "&Original"; + this.OriginalMenuItem.Click += new System.EventHandler(this.OriginalMenuItem_Click); + // + // WatchesOnScreenMenuItem + // + this.WatchesOnScreenMenuItem.Name = "WatchesOnScreenMenuItem"; + this.WatchesOnScreenMenuItem.Size = new System.Drawing.Size(217, 22); + this.WatchesOnScreenMenuItem.Text = "Display Watches On Screen"; + this.WatchesOnScreenMenuItem.Click += new System.EventHandler(this.WatchesOnScreenMenuItem_Click); + // + // SaveWindowPositionMenuItem + // + this.SaveWindowPositionMenuItem.Name = "SaveWindowPositionMenuItem"; + this.SaveWindowPositionMenuItem.Size = new System.Drawing.Size(217, 22); + this.SaveWindowPositionMenuItem.Text = "Save Window Position"; + this.SaveWindowPositionMenuItem.Click += new System.EventHandler(this.SaveWindowPositionMenuItem_Click); + // + // AlwaysOnTopMenuItem + // + this.AlwaysOnTopMenuItem.Name = "AlwaysOnTopMenuItem"; + this.AlwaysOnTopMenuItem.Size = new System.Drawing.Size(217, 22); + this.AlwaysOnTopMenuItem.Text = "&Always On Top"; + this.AlwaysOnTopMenuItem.Click += new System.EventHandler(this.AlwaysOnTopMenuItem_Click); + // + // FloatingWindowMenuItem + // + this.FloatingWindowMenuItem.Name = "FloatingWindowMenuItem"; + this.FloatingWindowMenuItem.Size = new System.Drawing.Size(217, 22); + this.FloatingWindowMenuItem.Text = "&Floating Window"; + this.FloatingWindowMenuItem.Click += new System.EventHandler(this.FloatingWindowMenuItem_Click); + // + // toolStripSeparator7 + // + this.toolStripSeparator7.Name = "toolStripSeparator7"; + this.toolStripSeparator7.Size = new System.Drawing.Size(214, 6); + // + // RestoreWindowSizeMenuItem + // + this.RestoreWindowSizeMenuItem.Name = "RestoreWindowSizeMenuItem"; + this.RestoreWindowSizeMenuItem.Size = new System.Drawing.Size(217, 22); + this.RestoreWindowSizeMenuItem.Text = "Restore Default Settings"; + this.RestoreWindowSizeMenuItem.Click += new System.EventHandler(this.RestoreDefaultsMenuItem_Click); + // + // WatchListView + // + this.WatchListView.AllowColumnReorder = true; + this.WatchListView.AllowDrop = true; + this.WatchListView.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.WatchListView.AutoArrange = false; - this.WatchListView.BlazingFast = false; - this.WatchListView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { + this.WatchListView.AutoArrange = false; + this.WatchListView.BlazingFast = false; + this.WatchListView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { this.AddressColumn, this.ValueColumn, this.PrevColumn, @@ -854,108 +902,108 @@ this.TypeColumn, this.DomainColumn, this.NotesColumn}); - this.WatchListView.ContextMenuStrip = this.ListViewContextMenu; - this.WatchListView.FullRowSelect = true; - this.WatchListView.GridLines = true; - this.WatchListView.HideSelection = false; - this.WatchListView.ItemCount = 0; - this.WatchListView.Location = new System.Drawing.Point(16, 76); - this.WatchListView.Name = "WatchListView"; - this.WatchListView.SelectAllInProgress = false; - this.WatchListView.selectedItem = -1; - this.WatchListView.Size = new System.Drawing.Size(332, 281); - this.WatchListView.TabIndex = 2; - this.WatchListView.UseCompatibleStateImageBehavior = false; - this.WatchListView.UseCustomBackground = true; - this.WatchListView.View = System.Windows.Forms.View.Details; - this.WatchListView.ColumnClick += new System.Windows.Forms.ColumnClickEventHandler(this.WatchListView_ColumnClick); - this.WatchListView.SelectedIndexChanged += new System.EventHandler(this.WatchListView_SelectedIndexChanged); - this.WatchListView.VirtualItemsSelectionRangeChanged += new System.Windows.Forms.ListViewVirtualItemsSelectionRangeChangedEventHandler(this.WatchListView_VirtualItemsSelectionRangeChanged); - this.WatchListView.DragDrop += new System.Windows.Forms.DragEventHandler(this.NewRamWatch_DragDrop); - this.WatchListView.DragEnter += new System.Windows.Forms.DragEventHandler(this.DragEnterWrapper); - this.WatchListView.KeyDown += new System.Windows.Forms.KeyEventHandler(this.WatchListView_KeyDown); - this.WatchListView.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.WatchListView_MouseDoubleClick); - // - // AddressColumn - // - this.AddressColumn.Name = "AddressColumn"; - this.AddressColumn.Text = "Address"; - // - // ValueColumn - // - this.ValueColumn.Name = "ValueColumn"; - this.ValueColumn.Text = "Value"; - this.ValueColumn.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.ValueColumn.Width = 59; - // - // PrevColumn - // - this.PrevColumn.Name = "PrevColumn"; - this.PrevColumn.Text = "Prev"; - this.PrevColumn.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.PrevColumn.Width = 59; - // - // ChangesColumn - // - this.ChangesColumn.Name = "ChangesColumn"; - this.ChangesColumn.Text = "Changes"; - this.ChangesColumn.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.ChangesColumn.Width = 54; - // - // DiffColumn - // - this.DiffColumn.Name = "DiffColumn"; - this.DiffColumn.Text = "Diff"; - this.DiffColumn.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.DiffColumn.Width = 59; - // - // TypeColumn - // - this.TypeColumn.Name = "TypeColumn"; - this.TypeColumn.Text = "Type"; - this.TypeColumn.Width = 55; - // - // DomainColumn - // - this.DomainColumn.Name = "DomainColumn"; - this.DomainColumn.Text = "Domain"; - this.DomainColumn.Width = 55; - // - // NotesColumn - // - this.NotesColumn.Name = "NotesColumn"; - this.NotesColumn.Text = "Notes"; - this.NotesColumn.Width = 128; - // - // RamWatch - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(364, 378); - this.Controls.Add(this.statusStrip1); - this.Controls.Add(this.WatchCountLabel); - this.Controls.Add(this.toolStrip1); - this.Controls.Add(this.RamWatchMenu); - this.Controls.Add(this.WatchListView); - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.Name = "RamWatch"; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = " RAM Watch"; - this.Activated += new System.EventHandler(this.NewRamWatch_Activated); - this.Load += new System.EventHandler(this.NewRamWatch_Load); - this.DragDrop += new System.Windows.Forms.DragEventHandler(this.NewRamWatch_DragDrop); - this.DragEnter += new System.Windows.Forms.DragEventHandler(this.DragEnterWrapper); - this.Enter += new System.EventHandler(this.NewRamWatch_Enter); - this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.WatchListView_KeyDown); - this.ListViewContextMenu.ResumeLayout(false); - this.statusStrip1.ResumeLayout(false); - this.statusStrip1.PerformLayout(); - this.toolStrip1.ResumeLayout(false); - this.toolStrip1.PerformLayout(); - this.RamWatchMenu.ResumeLayout(false); - this.RamWatchMenu.PerformLayout(); - this.ResumeLayout(false); - this.PerformLayout(); + this.WatchListView.ContextMenuStrip = this.ListViewContextMenu; + this.WatchListView.FullRowSelect = true; + this.WatchListView.GridLines = true; + this.WatchListView.HideSelection = false; + this.WatchListView.ItemCount = 0; + this.WatchListView.Location = new System.Drawing.Point(16, 76); + this.WatchListView.Name = "WatchListView"; + this.WatchListView.SelectAllInProgress = false; + this.WatchListView.selectedItem = -1; + this.WatchListView.Size = new System.Drawing.Size(332, 281); + this.WatchListView.TabIndex = 2; + this.WatchListView.UseCompatibleStateImageBehavior = false; + this.WatchListView.UseCustomBackground = true; + this.WatchListView.View = System.Windows.Forms.View.Details; + this.WatchListView.ColumnClick += new System.Windows.Forms.ColumnClickEventHandler(this.WatchListView_ColumnClick); + this.WatchListView.SelectedIndexChanged += new System.EventHandler(this.WatchListView_SelectedIndexChanged); + this.WatchListView.VirtualItemsSelectionRangeChanged += new System.Windows.Forms.ListViewVirtualItemsSelectionRangeChangedEventHandler(this.WatchListView_VirtualItemsSelectionRangeChanged); + this.WatchListView.DragDrop += new System.Windows.Forms.DragEventHandler(this.NewRamWatch_DragDrop); + this.WatchListView.DragEnter += new System.Windows.Forms.DragEventHandler(this.DragEnterWrapper); + this.WatchListView.KeyDown += new System.Windows.Forms.KeyEventHandler(this.WatchListView_KeyDown); + this.WatchListView.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.WatchListView_MouseDoubleClick); + // + // AddressColumn + // + this.AddressColumn.Name = "AddressColumn"; + this.AddressColumn.Text = "Address"; + // + // ValueColumn + // + this.ValueColumn.Name = "ValueColumn"; + this.ValueColumn.Text = "Value"; + this.ValueColumn.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.ValueColumn.Width = 59; + // + // PrevColumn + // + this.PrevColumn.Name = "PrevColumn"; + this.PrevColumn.Text = "Prev"; + this.PrevColumn.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.PrevColumn.Width = 59; + // + // ChangesColumn + // + this.ChangesColumn.Name = "ChangesColumn"; + this.ChangesColumn.Text = "Changes"; + this.ChangesColumn.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.ChangesColumn.Width = 54; + // + // DiffColumn + // + this.DiffColumn.Name = "DiffColumn"; + this.DiffColumn.Text = "Diff"; + this.DiffColumn.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.DiffColumn.Width = 59; + // + // TypeColumn + // + this.TypeColumn.Name = "TypeColumn"; + this.TypeColumn.Text = "Type"; + this.TypeColumn.Width = 55; + // + // DomainColumn + // + this.DomainColumn.Name = "DomainColumn"; + this.DomainColumn.Text = "Domain"; + this.DomainColumn.Width = 55; + // + // NotesColumn + // + this.NotesColumn.Name = "NotesColumn"; + this.NotesColumn.Text = "Notes"; + this.NotesColumn.Width = 128; + // + // RamWatch + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(364, 378); + this.Controls.Add(this.statusStrip1); + this.Controls.Add(this.WatchCountLabel); + this.Controls.Add(this.toolStrip1); + this.Controls.Add(this.RamWatchMenu); + this.Controls.Add(this.WatchListView); + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.Name = "RamWatch"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; + this.Text = " RAM Watch"; + this.Activated += new System.EventHandler(this.NewRamWatch_Activated); + this.Load += new System.EventHandler(this.NewRamWatch_Load); + this.DragDrop += new System.Windows.Forms.DragEventHandler(this.NewRamWatch_DragDrop); + this.DragEnter += new System.Windows.Forms.DragEventHandler(this.DragEnterWrapper); + this.Enter += new System.EventHandler(this.NewRamWatch_Enter); + this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.WatchListView_KeyDown); + this.ListViewContextMenu.ResumeLayout(false); + this.statusStrip1.ResumeLayout(false); + this.statusStrip1.PerformLayout(); + this.toolStrip1.ResumeLayout(false); + this.toolStrip1.PerformLayout(); + this.RamWatchMenu.ResumeLayout(false); + this.RamWatchMenu.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); } @@ -1048,5 +1096,9 @@ private System.Windows.Forms.ToolStripMenuItem ReadBreakpointContextMenuItem; private System.Windows.Forms.ToolStripMenuItem WriteBreakpointContextMenuItem; private System.Windows.Forms.ToolStripMenuItem newToolStripMenuItem; - } + private System.Windows.Forms.ToolStripMenuItem MoveTopMenuItem; + private System.Windows.Forms.ToolStripMenuItem MoveBottomMenuItem; + private System.Windows.Forms.ToolStripMenuItem MoveTopContextMenuItem; + private System.Windows.Forms.ToolStripMenuItem MoveBottomContextMenuItem; + } } diff --git a/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs b/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs index f480085983..ed0498a83e 100644 --- a/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs +++ b/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs @@ -94,6 +94,14 @@ namespace BizHawk.Client.EmuHawk get { return SelectedItems.Where(x => !x.IsSeparator); } } + private IEnumerable SelectedSeparators + { + get + { + return SelectedItems.Where(x => x.IsSeparator); + } + } + public IEnumerable Watches { get @@ -427,6 +435,32 @@ namespace BizHawk.Client.EmuHawk UpdateValues(); } + else if (SelectedSeparators.Any() && !duplicate) + { + var inputPrompt = new InputPrompt + { + Text = "Edit Separator", + StartLocation = this.ChildPointToScreen(WatchListView), + Message = "Separator Text:", + TextInputType = InputPrompt.InputType.Text + }; + + var result = inputPrompt.ShowHawkDialog(); + + if (result == DialogResult.OK) + { + Changes(); + + for (int i = 0; i < SelectedSeparators.Count(); i++) + { + var sep = SelectedSeparators.ToList()[i]; + sep.Notes = inputPrompt.PromptText; + _watches[indexes[i]] = sep; + } + } + + UpdateValues(); + } } private string ComputeDisplayType(Watch w) @@ -627,11 +661,21 @@ namespace BizHawk.Client.EmuHawk { text = ""; - if (index >= _watches.Count || _watches[index].IsSeparator) + if (index >= _watches.Count) { return; } + if (_watches[index].IsSeparator) + { + if (WatchListView.Columns[column].Name == WatchList.ADDRESS) + { + text = _watches[index].Notes; + } + + return; + } + var columnName = WatchListView.Columns[column].Name; switch (columnName) @@ -733,6 +777,8 @@ namespace BizHawk.Client.EmuHawk RemoveWatchMenuItem.Enabled = MoveUpMenuItem.Enabled = MoveDownMenuItem.Enabled = + MoveTopMenuItem.Enabled = + MoveBottomMenuItem.Enabled = SelectedIndices.Any(); PokeAddressMenuItem.Enabled = @@ -913,7 +959,67 @@ namespace BizHawk.Client.EmuHawk WatchListView.ItemCount = _watches.Count; } - private void SelectAllMenuItem_Click(object sender, EventArgs e) + private void MoveTopMenuItem_Click(object sender, EventArgs e) + { + var indexes = SelectedIndices.ToList(); + if (!indexes.Any()) + { + return; + } + + for (int i = 0; i < indexes.Count; i++) + { + var watch = _watches[indexes[i]]; + _watches.RemoveAt(indexes[i]); + _watches.Insert(i, watch); + indexes[i] = i; + } + + Changes(); + + WatchListView.SelectedIndices.Clear(); + foreach (var t in indexes) + { + WatchListView.SelectItem(t, true); + } + + WatchListView.ItemCount = _watches.Count; + } + + private void MoveBottomMenuItem_Click(object sender, EventArgs e) + { + var indices = SelectedIndices.ToList(); + if (indices.Count == 0) // || indices.Last() == _watches.Count - 1) + { + return; + } + + for (var i = 0; i < indices.Count; i++) + { + var watch = _watches[indices[i] - i]; + _watches.RemoveAt(indices[i] - i); + _watches.Insert(_watches.Count, watch); + //_watches.Add(watch); + //indices[i] = (_watches.Count - 1 - indices.Count) + i; + } + + var newInd = new List(); + for (int i = 0, x = _watches.Count - indices.Count; i < indices.Count; i++, x++) + { + newInd.Add(x); + } + + WatchListView.SelectedIndices.Clear(); + foreach (var t in newInd) + { + WatchListView.SelectItem(t, true); + } + + Changes(); + WatchListView.ItemCount = _watches.Count; + } + + private void SelectAllMenuItem_Click(object sender, EventArgs e) { WatchListView.SelectAll(); } @@ -1066,6 +1172,8 @@ namespace BizHawk.Client.EmuHawk InsertSeperatorContextMenuItem.Visible = MoveUpContextMenuItem.Visible = MoveDownContextMenuItem.Visible = + MoveTopContextMenuItem.Visible = + MoveBottomContextMenuItem.Visible = indexes.Count > 0; ReadBreakpointContextMenuItem.Visible = @@ -1231,5 +1339,5 @@ namespace BizHawk.Client.EmuHawk { base.GenericDragEnter(sender, e); } - } + } } diff --git a/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.resx b/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.resx index 3f2b49413f..92ce557e9a 100644 --- a/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.resx +++ b/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.resx @@ -120,13 +120,66 @@ 264, 17 + + + + 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 + AAAAAElFTkSuQmCC + + 434, 17 159, 17 - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -215,6 +268,59 @@ 17, 17 + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH + DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp + bGUAAEjHnZZ3VFTXFofPvXd6oc0wAlKG3rvAANJ7k15FYZgZYCgDDjM0sSGiAhFFRJoiSFDEgNFQJFZE + sRAUVLAHJAgoMRhFVCxvRtaLrqy89/Ly++Osb+2z97n77L3PWhcAkqcvl5cGSwGQyhPwgzyc6RGRUXTs + AIABHmCAKQBMVka6X7B7CBDJy82FniFyAl8EAfB6WLwCcNPQM4BOB/+fpFnpfIHomAARm7M5GSwRF4g4 + JUuQLrbPipgalyxmGCVmvihBEcuJOWGRDT77LLKjmNmpPLaIxTmns1PZYu4V8bZMIUfEiK+ICzO5nCwR + 3xKxRoowlSviN+LYVA4zAwAUSWwXcFiJIjYRMYkfEuQi4uUA4EgJX3HcVyzgZAvEl3JJS8/hcxMSBXQd + li7d1NqaQffkZKVwBALDACYrmcln013SUtOZvBwAFu/8WTLi2tJFRbY0tba0NDQzMv2qUP91829K3NtF + ehn4uWcQrf+L7a/80hoAYMyJarPziy2uCoDOLQDI3fti0zgAgKSobx3Xv7oPTTwviQJBuo2xcVZWlhGX + wzISF/QP/U+Hv6GvvmckPu6P8tBdOfFMYYqALq4bKy0lTcinZ6QzWRy64Z+H+B8H/nUeBkGceA6fwxNF + hImmjMtLELWbx+YKuGk8Opf3n5r4D8P+pMW5FonS+BFQY4yA1HUqQH7tBygKESDR+8Vd/6NvvvgwIH55 + 4SqTi3P/7zf9Z8Gl4iWDm/A5ziUohM4S8jMX98TPEqABAUgCKpAHykAd6ABDYAasgC1wBG7AG/iDEBAJ + VgMWSASpgA+yQB7YBApBMdgJ9oBqUAcaQTNoBcdBJzgFzoNL4Bq4AW6D+2AUTIBnYBa8BgsQBGEhMkSB + 5CEVSBPSh8wgBmQPuUG+UBAUCcVCCRAPEkJ50GaoGCqDqqF6qBn6HjoJnYeuQIPQXWgMmoZ+h97BCEyC + qbASrAUbwwzYCfaBQ+BVcAK8Bs6FC+AdcCXcAB+FO+Dz8DX4NjwKP4PnEIAQERqiihgiDMQF8UeikHiE + j6xHipAKpAFpRbqRPuQmMorMIG9RGBQFRUcZomxRnqhQFAu1BrUeVYKqRh1GdaB6UTdRY6hZ1Ec0Ga2I + 1kfboL3QEegEdBa6EF2BbkK3oy+ib6Mn0K8xGAwNo42xwnhiIjFJmLWYEsw+TBvmHGYQM46Zw2Kx8lh9 + rB3WH8vECrCF2CrsUexZ7BB2AvsGR8Sp4Mxw7rgoHA+Xj6vAHcGdwQ3hJnELeCm8Jt4G749n43PwpfhG + fDf+On4Cv0CQJmgT7AghhCTCJkIloZVwkfCA8JJIJKoRrYmBRC5xI7GSeIx4mThGfEuSIemRXEjRJCFp + B+kQ6RzpLuklmUzWIjuSo8gC8g5yM/kC+RH5jQRFwkjCS4ItsUGiRqJDYkjiuSReUlPSSXK1ZK5kheQJ + yeuSM1J4KS0pFymm1HqpGqmTUiNSc9IUaVNpf+lU6RLpI9JXpKdksDJaMm4ybJkCmYMyF2TGKQhFneJC + YVE2UxopFykTVAxVm+pFTaIWU7+jDlBnZWVkl8mGyWbL1sielh2lITQtmhcthVZKO04bpr1borTEaQln + yfYlrUuGlszLLZVzlOPIFcm1yd2WeydPl3eTT5bfJd8p/1ABpaCnEKiQpbBf4aLCzFLqUtulrKVFS48v + vacIK+opBimuVTyo2K84p6Ss5KGUrlSldEFpRpmm7KicpFyufEZ5WoWiYq/CVSlXOavylC5Ld6Kn0Cvp + vfRZVUVVT1Whar3qgOqCmrZaqFq+WpvaQ3WCOkM9Xr1cvUd9VkNFw08jT6NF454mXpOhmai5V7NPc15L + Wytca6tWp9aUtpy2l3audov2Ax2yjoPOGp0GnVu6GF2GbrLuPt0berCehV6iXo3edX1Y31Kfq79Pf9AA + bWBtwDNoMBgxJBk6GWYathiOGdGMfI3yjTqNnhtrGEcZ7zLuM/5oYmGSYtJoct9UxtTbNN+02/R3Mz0z + llmN2S1zsrm7+QbzLvMXy/SXcZbtX3bHgmLhZ7HVosfig6WVJd+y1XLaSsMq1qrWaoRBZQQwShiXrdHW + ztYbrE9Zv7WxtBHYHLf5zdbQNtn2iO3Ucu3lnOWNy8ft1OyYdvV2o/Z0+1j7A/ajDqoOTIcGh8eO6o5s + xybHSSddpySno07PnU2c+c7tzvMuNi7rXM65Iq4erkWuA24ybqFu1W6P3NXcE9xb3Gc9LDzWepzzRHv6 + eO7yHPFS8mJ5NXvNelt5r/Pu9SH5BPtU+zz21fPl+3b7wX7efrv9HqzQXMFb0ekP/L38d/s/DNAOWBPw + YyAmMCCwJvBJkGlQXlBfMCU4JvhI8OsQ55DSkPuhOqHC0J4wybDosOaw+XDX8LLw0QjjiHUR1yIVIrmR + XVHYqLCopqi5lW4r96yciLaILoweXqW9KnvVldUKq1NWn46RjGHGnIhFx4bHHol9z/RnNjDn4rziauNm + WS6svaxnbEd2OXuaY8cp40zG28WXxU8l2CXsTphOdEisSJzhunCruS+SPJPqkuaT/ZMPJX9KCU9pS8Wl + xqae5Mnwknm9acpp2WmD6frphemja2zW7Fkzy/fhN2VAGasyugRU0c9Uv1BHuEU4lmmfWZP5Jiss60S2 + dDYvuz9HL2d7zmSue+63a1FrWWt78lTzNuWNrXNaV78eWh+3vmeD+oaCDRMbPTYe3kTYlLzpp3yT/LL8 + V5vDN3cXKBVsLBjf4rGlpVCikF84stV2a9021DbutoHt5turtn8sYhddLTYprih+X8IqufqN6TeV33za + Eb9joNSydP9OzE7ezuFdDrsOl0mX5ZaN7/bb3VFOLy8qf7UnZs+VimUVdXsJe4V7Ryt9K7uqNKp2Vr2v + Tqy+XeNc01arWLu9dn4fe9/Qfsf9rXVKdcV17w5wD9yp96jvaNBqqDiIOZh58EljWGPft4xvm5sUmoqb + PhziHRo9HHS4t9mqufmI4pHSFrhF2DJ9NProje9cv+tqNWytb6O1FR8Dx4THnn4f+/3wcZ/jPScYJ1p/ + 0Pyhtp3SXtQBdeR0zHYmdo52RXYNnvQ+2dNt293+o9GPh06pnqo5LXu69AzhTMGZT2dzz86dSz83cz7h + /HhPTM/9CxEXbvUG9g5c9Ll4+ZL7pQt9Tn1nL9tdPnXF5srJq4yrndcsr3X0W/S3/2TxU/uA5UDHdavr + XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS + fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+ + tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/ + 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALDQAACw0B7QfALAAAAH1JREFUOE/NkVEKwCAM + Q73/qbzJjtIZaEqrkU32s8JjNkvih83MPlGW3vtQ2iPwMVMKQkwzzJcfY4o3LyH6ePiaS4o3LxmG4ccX + u/ItApjCRJaUBWzCZCnZhVVJ6LmkFGS8LArmm8kikN8UsOTsGQlCRP0HUjxBiidI8T3WbqWyfy/jHSM0 + AAAAAElFTkSuQmCC + + AAABAAEAEBAAAAEACABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAQAEAAAAAAAAAAAAAAAEAAAAA