From 9959d619495a85fd2325dc1c9ad85dcb03b533e6 Mon Sep 17 00:00:00 2001 From: Adam Sturge Date: Tue, 2 Feb 2016 20:32:46 -0800 Subject: [PATCH] Added comparison type dropdown. Updated Cheat model to contain reference to comparison type --- BizHawk.Client.Common/tools/Cheat.cs | 25 +++++- .../tools/Cheats/CheatEdit.Designer.cs | 58 ++++++++++--- .../tools/Cheats/CheatEdit.cs | 37 ++++++-- .../tools/Cheats/Cheats.Designer.cs | 86 +++++++++---------- 4 files changed, 145 insertions(+), 61 deletions(-) diff --git a/BizHawk.Client.Common/tools/Cheat.cs b/BizHawk.Client.Common/tools/Cheat.cs index 2b5c4a971d..8540667d02 100644 --- a/BizHawk.Client.Common/tools/Cheat.cs +++ b/BizHawk.Client.Common/tools/Cheat.cs @@ -6,10 +6,14 @@ namespace BizHawk.Client.Common { public class Cheat { + public enum ComparisonType { EQUAL, GREATER_THAN, GREATER_THAN_OR_EQUAL, LESS_THAN, LESS_THAN_OR_EQUAL, NOT_EQUAL}; + private readonly Watch _watch; private int? _compare; private int _val; private bool _enabled; + private ComparisonType _comparisonType; + public Cheat(Watch watch, int value, int? compare = null, bool enabled = true) { @@ -21,6 +25,25 @@ namespace BizHawk.Client.Common Pulse(); } + /// + /// Adding second constructor for comparison type because I fear updating the method signiture for something in the Common namespace + /// + /// + /// + /// + /// + /// + public Cheat(Watch watch, int value, ComparisonType comparisonType, int compare, bool enabled = true) + { + _enabled = enabled; + _watch = watch; + _compare = compare; + _val = value; + _comparisonType = comparisonType; + + Pulse(); + } + public Cheat(Cheat cheat) { if (cheat.IsSeparator) @@ -217,7 +240,7 @@ namespace BizHawk.Client.Common { if (_compare.HasValue) { - if (_compare.Value == _watch.ValueNoFreeze) + if (_compare.Value == _watch.ValueNoFreeze) // NOTE : THIS IS THE PLACE TO ADD DIFFERENT COMPARISON TYPES { _watch.Poke(GetStringForPulse(_val)); } diff --git a/BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.Designer.cs b/BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.Designer.cs index dbc4872689..9feacf2848 100644 --- a/BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.Designer.cs +++ b/BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.Designer.cs @@ -48,6 +48,8 @@ this.EditButton = new System.Windows.Forms.Button(); this.CompareBox = new BizHawk.Client.EmuHawk.WatchValueBox(); this.ValueBox = new BizHawk.Client.EmuHawk.WatchValueBox(); + this.CompareTypeDropDown = new System.Windows.Forms.ComboBox(); + this.CompareTypeLabel = new System.Windows.Forms.Label(); this.SuspendLayout(); // // NameBox @@ -124,7 +126,7 @@ // CompareLabel // this.CompareLabel.AutoSize = true; - this.CompareLabel.Location = new System.Drawing.Point(18, 95); + this.CompareLabel.Location = new System.Drawing.Point(24, 95); this.CompareLabel.Name = "CompareLabel"; this.CompareLabel.Size = new System.Drawing.Size(49, 13); this.CompareLabel.TabIndex = 13; @@ -133,7 +135,7 @@ // DomainLabel // this.DomainLabel.AutoSize = true; - this.DomainLabel.Location = new System.Drawing.Point(24, 124); + this.DomainLabel.Location = new System.Drawing.Point(24, 158); this.DomainLabel.Name = "DomainLabel"; this.DomainLabel.Size = new System.Drawing.Size(43, 13); this.DomainLabel.TabIndex = 16; @@ -143,7 +145,7 @@ // this.DomainDropDown.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.DomainDropDown.FormattingEnabled = true; - this.DomainDropDown.Location = new System.Drawing.Point(78, 118); + this.DomainDropDown.Location = new System.Drawing.Point(78, 154); this.DomainDropDown.Name = "DomainDropDown"; this.DomainDropDown.Size = new System.Drawing.Size(100, 21); this.DomainDropDown.TabIndex = 17; @@ -152,7 +154,7 @@ // SizeLabel // this.SizeLabel.AutoSize = true; - this.SizeLabel.Location = new System.Drawing.Point(40, 150); + this.SizeLabel.Location = new System.Drawing.Point(40, 190); this.SizeLabel.Name = "SizeLabel"; this.SizeLabel.Size = new System.Drawing.Size(27, 13); this.SizeLabel.TabIndex = 18; @@ -166,7 +168,7 @@ "1 Byte", "2 Byte", "4 Byte"}); - this.SizeDropDown.Location = new System.Drawing.Point(78, 144); + this.SizeDropDown.Location = new System.Drawing.Point(78, 184); this.SizeDropDown.Name = "SizeDropDown"; this.SizeDropDown.Size = new System.Drawing.Size(100, 21); this.SizeDropDown.TabIndex = 19; @@ -175,7 +177,7 @@ // DisplayTypeLael // this.DisplayTypeLael.AutoSize = true; - this.DisplayTypeLael.Location = new System.Drawing.Point(11, 176); + this.DisplayTypeLael.Location = new System.Drawing.Point(11, 219); this.DisplayTypeLael.Name = "DisplayTypeLael"; this.DisplayTypeLael.Size = new System.Drawing.Size(56, 13); this.DisplayTypeLael.TabIndex = 20; @@ -189,7 +191,7 @@ "1 Byte", "2 Byte", "4 Byte"}); - this.DisplayTypeDropDown.Location = new System.Drawing.Point(78, 170); + this.DisplayTypeDropDown.Location = new System.Drawing.Point(78, 213); this.DisplayTypeDropDown.Name = "DisplayTypeDropDown"; this.DisplayTypeDropDown.Size = new System.Drawing.Size(100, 21); this.DisplayTypeDropDown.TabIndex = 21; @@ -198,7 +200,7 @@ // BigEndianCheckBox // this.BigEndianCheckBox.AutoSize = true; - this.BigEndianCheckBox.Location = new System.Drawing.Point(101, 196); + this.BigEndianCheckBox.Location = new System.Drawing.Point(101, 242); this.BigEndianCheckBox.Name = "BigEndianCheckBox"; this.BigEndianCheckBox.Size = new System.Drawing.Size(77, 17); this.BigEndianCheckBox.TabIndex = 22; @@ -209,7 +211,7 @@ // this.AddButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.AddButton.Enabled = false; - this.AddButton.Location = new System.Drawing.Point(7, 220); + this.AddButton.Location = new System.Drawing.Point(7, 265); this.AddButton.Name = "AddButton"; this.AddButton.Size = new System.Drawing.Size(65, 23); this.AddButton.TabIndex = 23; @@ -221,7 +223,7 @@ // this.EditButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.EditButton.Enabled = false; - this.EditButton.Location = new System.Drawing.Point(113, 220); + this.EditButton.Location = new System.Drawing.Point(113, 265); this.EditButton.Name = "EditButton"; this.EditButton.Size = new System.Drawing.Size(65, 23); this.EditButton.TabIndex = 24; @@ -254,9 +256,41 @@ this.ValueBox.Text = "00"; this.ValueBox.Type = BizHawk.Client.Common.DisplayType.Hex; // + // CompareTypeDropDown + // + this.CompareTypeDropDown.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.CompareTypeDropDown.FormattingEnabled = true; + this.CompareTypeDropDown.Location = new System.Drawing.Point(113, 122); + this.CompareTypeDropDown.Name = "CompareTypeDropDown"; + this.CompareTypeDropDown.Size = new System.Drawing.Size(65, 21); + this.CompareTypeDropDown.TabIndex = 26; + this.CompareTypeDropDown.Items.AddRange( + new object[] { + "=", + ">", + ">=", + "<", + "<=", + "!=" + } + ); + this.CompareTypeDropDown.SelectedIndex = 0; + // + // CompareTypeLabel + // + this.CompareTypeLabel.AutoSize = true; + this.CompareTypeLabel.Location = new System.Drawing.Point(24, 125); + this.CompareTypeLabel.Name = "CompareTypeLabel"; + this.CompareTypeLabel.Size = new System.Drawing.Size(76, 13); + this.CompareTypeLabel.TabIndex = 25; + this.CompareTypeLabel.Text = "Compare Type"; + this.CompareTypeLabel.TextAlign = System.Drawing.ContentAlignment.BottomLeft; + // // CheatEdit // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; + this.Controls.Add(this.CompareTypeDropDown); + this.Controls.Add(this.CompareTypeLabel); this.Controls.Add(this.EditButton); this.Controls.Add(this.AddButton); this.Controls.Add(this.BigEndianCheckBox); @@ -278,7 +312,7 @@ this.Controls.Add(this.NameBox); this.Controls.Add(this.NameLabel); this.Name = "CheatEdit"; - this.Size = new System.Drawing.Size(191, 253); + this.Size = new System.Drawing.Size(191, 298); this.Load += new System.EventHandler(this.CheatEdit_Load); this.ResumeLayout(false); this.PerformLayout(); @@ -307,5 +341,7 @@ private System.Windows.Forms.CheckBox BigEndianCheckBox; private System.Windows.Forms.Button AddButton; private System.Windows.Forms.Button EditButton; + private System.Windows.Forms.ComboBox CompareTypeDropDown; + private System.Windows.Forms.Label CompareTypeLabel; } } diff --git a/BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.cs b/BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.cs index 9cc5351bfa..d4b903ef2c 100644 --- a/BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.cs +++ b/BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.cs @@ -303,8 +303,9 @@ namespace BizHawk.Client.EmuHawk { get { + Cheat.ComparisonType comparisonType = Cheat.ComparisonType.EQUAL; var domain = MemoryDomains[DomainDropDown.SelectedItem.ToString()]; - var address = AddressBox.ToRawInt().Value; + var address = AddressBox.ToRawInt().Value; if (address < domain.Size) { var watch = Watch.GenerateWatch( @@ -316,11 +317,35 @@ namespace BizHawk.Client.EmuHawk NameBox.Text ); - return new Cheat( - watch, - ValueBox.ToRawInt().Value, - CompareBox.ToRawInt() - ); + if(CompareBox.ToRawInt() == null) + { + return new Cheat( + watch, + ValueBox.ToRawInt().Value + ); + } + else + { + switch (CompareTypeDropDown.SelectedText) + { + case "=" : comparisonType = Cheat.ComparisonType.EQUAL; break; + case ">" : comparisonType = Cheat.ComparisonType.GREATER_THAN; break; + case ">=" : comparisonType = Cheat.ComparisonType.GREATER_THAN_OR_EQUAL; break; + case "<" : comparisonType = Cheat.ComparisonType.LESS_THAN; break; + case "<=" : comparisonType = Cheat.ComparisonType.LESS_THAN_OR_EQUAL; break; + case "!=" : comparisonType = Cheat.ComparisonType.NOT_EQUAL; break; + default : comparisonType = Cheat.ComparisonType.EQUAL; break; + } + + return new Cheat( + watch, + ValueBox.ToRawInt().Value, + comparisonType, + CompareBox.ToRawInt().Value + ); + } + + } else { diff --git a/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.Designer.cs b/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.Designer.cs index de352c16eb..e025aa331b 100644 --- a/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.Designer.cs +++ b/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.Designer.cs @@ -123,7 +123,7 @@ this.CheatListView.Name = "CheatListView"; this.CheatListView.SelectAllInProgress = false; this.CheatListView.selectedItem = -1; - this.CheatListView.Size = new System.Drawing.Size(414, 278); + this.CheatListView.Size = new System.Drawing.Size(414, 315); this.CheatListView.TabIndex = 1; this.CheatListView.UseCompatibleStateImageBehavior = false; this.CheatListView.UseCustomBackground = true; @@ -174,7 +174,7 @@ this.DisableAllContextMenuItem, this.ViewInHexEditorContextMenuItem}); this.CheatsContextMenu.Name = "contextMenuStrip1"; - this.CheatsContextMenu.Size = new System.Drawing.Size(161, 92); + this.CheatsContextMenu.Size = new System.Drawing.Size(170, 92); this.CheatsContextMenu.Opening += new System.ComponentModel.CancelEventHandler(this.CheatsContextMenu_Opening); // // ToggleContextMenuItem @@ -182,7 +182,7 @@ this.ToggleContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Refresh1; this.ToggleContextMenuItem.Name = "ToggleContextMenuItem"; this.ToggleContextMenuItem.ShortcutKeyDisplayString = "Enter"; - this.ToggleContextMenuItem.Size = new System.Drawing.Size(160, 22); + this.ToggleContextMenuItem.Size = new System.Drawing.Size(169, 22); this.ToggleContextMenuItem.Text = "&Toggle"; this.ToggleContextMenuItem.Click += new System.EventHandler(this.ToggleMenuItem_Click); // @@ -191,7 +191,7 @@ this.RemoveContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Delete; this.RemoveContextMenuItem.Name = "RemoveContextMenuItem"; this.RemoveContextMenuItem.ShortcutKeyDisplayString = "Delete"; - this.RemoveContextMenuItem.Size = new System.Drawing.Size(160, 22); + this.RemoveContextMenuItem.Size = new System.Drawing.Size(169, 22); this.RemoveContextMenuItem.Text = "&Remove"; this.RemoveContextMenuItem.Click += new System.EventHandler(this.RemoveCheatMenuItem_Click); // @@ -199,14 +199,14 @@ // this.DisableAllContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop; this.DisableAllContextMenuItem.Name = "DisableAllContextMenuItem"; - this.DisableAllContextMenuItem.Size = new System.Drawing.Size(160, 22); + this.DisableAllContextMenuItem.Size = new System.Drawing.Size(169, 22); this.DisableAllContextMenuItem.Text = "&Disable All"; this.DisableAllContextMenuItem.Click += new System.EventHandler(this.DisableAllCheatsMenuItem_Click); // // ViewInHexEditorContextMenuItem // this.ViewInHexEditorContextMenuItem.Name = "ViewInHexEditorContextMenuItem"; - this.ViewInHexEditorContextMenuItem.Size = new System.Drawing.Size(160, 22); + this.ViewInHexEditorContextMenuItem.Size = new System.Drawing.Size(169, 22); this.ViewInHexEditorContextMenuItem.Text = "View in Hex Editor"; this.ViewInHexEditorContextMenuItem.Click += new System.EventHandler(this.ViewInHexEditorContextMenuItem_Click); // @@ -235,7 +235,7 @@ this.toolStripSeparator1, this.ExitMenuItem}); this.FileSubMenu.Name = "FileSubMenu"; - this.FileSubMenu.Size = new System.Drawing.Size(35, 20); + this.FileSubMenu.Size = new System.Drawing.Size(37, 20); this.FileSubMenu.Text = "&File"; this.FileSubMenu.DropDownOpened += new System.EventHandler(this.FileSubMenu_DropDownOpened); // @@ -244,7 +244,7 @@ this.NewMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.NewFile; this.NewMenuItem.Name = "NewMenuItem"; this.NewMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N))); - this.NewMenuItem.Size = new System.Drawing.Size(193, 22); + this.NewMenuItem.Size = new System.Drawing.Size(195, 22); this.NewMenuItem.Text = "&New"; this.NewMenuItem.Click += new System.EventHandler(this.NewMenuItem_Click); // @@ -253,7 +253,7 @@ 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(193, 22); + this.OpenMenuItem.Size = new System.Drawing.Size(195, 22); this.OpenMenuItem.Text = "&Open..."; this.OpenMenuItem.Click += new System.EventHandler(this.OpenMenuItem_Click); // @@ -262,7 +262,7 @@ 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(193, 22); + this.SaveMenuItem.Size = new System.Drawing.Size(195, 22); this.SaveMenuItem.Text = "&Save"; this.SaveMenuItem.Click += new System.EventHandler(this.SaveMenuItem_Click); // @@ -271,14 +271,14 @@ 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(193, 22); + 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(193, 22); + this.AppendMenuItem.Size = new System.Drawing.Size(195, 22); this.AppendMenuItem.Text = "Append File"; // // RecentSubMenu @@ -287,7 +287,7 @@ this.toolStripSeparator4}); this.RecentSubMenu.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent; this.RecentSubMenu.Name = "RecentSubMenu"; - this.RecentSubMenu.Size = new System.Drawing.Size(193, 22); + this.RecentSubMenu.Size = new System.Drawing.Size(195, 22); this.RecentSubMenu.Text = "Recent"; this.RecentSubMenu.DropDownOpened += new System.EventHandler(this.RecentSubMenu_DropDownOpened); // @@ -299,13 +299,13 @@ // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(190, 6); + 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(193, 22); + this.ExitMenuItem.Size = new System.Drawing.Size(195, 22); this.ExitMenuItem.Text = "E&xit"; this.ExitMenuItem.Click += new System.EventHandler(this.ExitMenuItem_Click); // @@ -324,7 +324,7 @@ this.GameGenieSeparator, this.OpenGameGenieEncoderDecoderMenuItem}); this.CheatsSubMenu.Name = "CheatsSubMenu"; - this.CheatsSubMenu.Size = new System.Drawing.Size(53, 20); + this.CheatsSubMenu.Size = new System.Drawing.Size(55, 20); this.CheatsSubMenu.Text = "&Cheats"; this.CheatsSubMenu.DropDownOpened += new System.EventHandler(this.CheatsSubMenu_DropDownOpened); // @@ -333,7 +333,7 @@ this.RemoveCheatMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Delete; this.RemoveCheatMenuItem.Name = "RemoveCheatMenuItem"; this.RemoveCheatMenuItem.ShortcutKeyDisplayString = "Delete"; - this.RemoveCheatMenuItem.Size = new System.Drawing.Size(217, 22); + this.RemoveCheatMenuItem.Size = new System.Drawing.Size(233, 22); this.RemoveCheatMenuItem.Text = "&Remove Cheat"; this.RemoveCheatMenuItem.Click += new System.EventHandler(this.RemoveCheatMenuItem_Click); // @@ -342,21 +342,21 @@ 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(217, 22); + this.InsertSeparatorMenuItem.Size = new System.Drawing.Size(233, 22); this.InsertSeparatorMenuItem.Text = "Insert Separator"; this.InsertSeparatorMenuItem.Click += new System.EventHandler(this.InsertSeparatorMenuItem_Click); // // toolStripSeparator3 // this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(214, 6); + this.toolStripSeparator3.Size = new System.Drawing.Size(230, 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.U))); - this.MoveUpMenuItem.Size = new System.Drawing.Size(217, 22); + this.MoveUpMenuItem.Size = new System.Drawing.Size(233, 22); this.MoveUpMenuItem.Text = "Move &Up"; this.MoveUpMenuItem.Click += new System.EventHandler(this.MoveUpMenuItem_Click); // @@ -365,7 +365,7 @@ 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.D))); - this.MoveDownMenuItem.Size = new System.Drawing.Size(217, 22); + this.MoveDownMenuItem.Size = new System.Drawing.Size(233, 22); this.MoveDownMenuItem.Text = "Move &Down"; this.MoveDownMenuItem.Click += new System.EventHandler(this.MoveDownMenuItem_Click); // @@ -373,21 +373,21 @@ // this.SelectAllMenuItem.Name = "SelectAllMenuItem"; this.SelectAllMenuItem.ShortcutKeyDisplayString = "Ctrl+A"; - this.SelectAllMenuItem.Size = new System.Drawing.Size(217, 22); + this.SelectAllMenuItem.Size = new System.Drawing.Size(233, 22); this.SelectAllMenuItem.Text = "Select &All"; this.SelectAllMenuItem.Click += new System.EventHandler(this.SelectAllMenuItem_Click); // // toolStripSeparator6 // this.toolStripSeparator6.Name = "toolStripSeparator6"; - this.toolStripSeparator6.Size = new System.Drawing.Size(214, 6); + this.toolStripSeparator6.Size = new System.Drawing.Size(230, 6); // // ToggleMenuItem // this.ToggleMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Refresh1; this.ToggleMenuItem.Name = "ToggleMenuItem"; this.ToggleMenuItem.ShortcutKeyDisplayString = "Enter"; - this.ToggleMenuItem.Size = new System.Drawing.Size(217, 22); + this.ToggleMenuItem.Size = new System.Drawing.Size(233, 22); this.ToggleMenuItem.Text = "&Toggle"; this.ToggleMenuItem.Click += new System.EventHandler(this.ToggleMenuItem_Click); // @@ -395,19 +395,19 @@ // this.DisableAllCheatsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop; this.DisableAllCheatsMenuItem.Name = "DisableAllCheatsMenuItem"; - this.DisableAllCheatsMenuItem.Size = new System.Drawing.Size(217, 22); + this.DisableAllCheatsMenuItem.Size = new System.Drawing.Size(233, 22); this.DisableAllCheatsMenuItem.Text = "Disable all"; this.DisableAllCheatsMenuItem.Click += new System.EventHandler(this.DisableAllCheatsMenuItem_Click); // // GameGenieSeparator // this.GameGenieSeparator.Name = "GameGenieSeparator"; - this.GameGenieSeparator.Size = new System.Drawing.Size(214, 6); + this.GameGenieSeparator.Size = new System.Drawing.Size(230, 6); // // OpenGameGenieEncoderDecoderMenuItem // this.OpenGameGenieEncoderDecoderMenuItem.Name = "OpenGameGenieEncoderDecoderMenuItem"; - this.OpenGameGenieEncoderDecoderMenuItem.Size = new System.Drawing.Size(217, 22); + this.OpenGameGenieEncoderDecoderMenuItem.Size = new System.Drawing.Size(233, 22); this.OpenGameGenieEncoderDecoderMenuItem.Text = "Game Genie Encoder/Decoder"; this.OpenGameGenieEncoderDecoderMenuItem.Click += new System.EventHandler(this.OpenGameGenieEncoderDecoderMenuItem_Click); // @@ -425,73 +425,73 @@ this.toolStripSeparator5, this.RestoreWindowSizeMenuItem}); this.OptionsSubMenu.Name = "OptionsSubMenu"; - this.OptionsSubMenu.Size = new System.Drawing.Size(56, 20); + this.OptionsSubMenu.Size = new System.Drawing.Size(61, 20); this.OptionsSubMenu.Text = "&Options"; this.OptionsSubMenu.DropDownOpened += new System.EventHandler(this.OptionsSubMenu_DropDownOpened); // // AlwaysLoadCheatsMenuItem // this.AlwaysLoadCheatsMenuItem.Name = "AlwaysLoadCheatsMenuItem"; - this.AlwaysLoadCheatsMenuItem.Size = new System.Drawing.Size(192, 22); + this.AlwaysLoadCheatsMenuItem.Size = new System.Drawing.Size(199, 22); this.AlwaysLoadCheatsMenuItem.Text = "Always load cheats"; this.AlwaysLoadCheatsMenuItem.Click += new System.EventHandler(this.AlwaysLoadCheatsMenuItem_Click); // // AutoSaveCheatsMenuItem // this.AutoSaveCheatsMenuItem.Name = "AutoSaveCheatsMenuItem"; - this.AutoSaveCheatsMenuItem.Size = new System.Drawing.Size(192, 22); + this.AutoSaveCheatsMenuItem.Size = new System.Drawing.Size(199, 22); this.AutoSaveCheatsMenuItem.Text = "Autosave cheats"; this.AutoSaveCheatsMenuItem.Click += new System.EventHandler(this.AutoSaveCheatsMenuItem_Click); // // DisableCheatsOnLoadMenuItem // this.DisableCheatsOnLoadMenuItem.Name = "DisableCheatsOnLoadMenuItem"; - this.DisableCheatsOnLoadMenuItem.Size = new System.Drawing.Size(192, 22); + this.DisableCheatsOnLoadMenuItem.Size = new System.Drawing.Size(199, 22); this.DisableCheatsOnLoadMenuItem.Text = "Disable Cheats on Load"; this.DisableCheatsOnLoadMenuItem.Click += new System.EventHandler(this.CheatsOnOffLoadMenuItem_Click); // // toolStripSeparator7 // this.toolStripSeparator7.Name = "toolStripSeparator7"; - this.toolStripSeparator7.Size = new System.Drawing.Size(189, 6); + this.toolStripSeparator7.Size = new System.Drawing.Size(196, 6); // // AutoloadMenuItem // this.AutoloadMenuItem.Name = "AutoloadMenuItem"; - this.AutoloadMenuItem.Size = new System.Drawing.Size(192, 22); + this.AutoloadMenuItem.Size = new System.Drawing.Size(199, 22); this.AutoloadMenuItem.Text = "Autoload"; this.AutoloadMenuItem.Click += new System.EventHandler(this.AutoloadMenuItem_Click); // // SaveWindowPositionMenuItem // this.SaveWindowPositionMenuItem.Name = "SaveWindowPositionMenuItem"; - this.SaveWindowPositionMenuItem.Size = new System.Drawing.Size(192, 22); + this.SaveWindowPositionMenuItem.Size = new System.Drawing.Size(199, 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(192, 22); + this.AlwaysOnTopMenuItem.Size = new System.Drawing.Size(199, 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(192, 22); + this.FloatingWindowMenuItem.Size = new System.Drawing.Size(199, 22); this.FloatingWindowMenuItem.Text = "Floating Window"; this.FloatingWindowMenuItem.Click += new System.EventHandler(this.FloatingWindowMenuItem_Click); // // toolStripSeparator5 // this.toolStripSeparator5.Name = "toolStripSeparator5"; - this.toolStripSeparator5.Size = new System.Drawing.Size(189, 6); + this.toolStripSeparator5.Size = new System.Drawing.Size(196, 6); // // RestoreWindowSizeMenuItem // this.RestoreWindowSizeMenuItem.Name = "RestoreWindowSizeMenuItem"; - this.RestoreWindowSizeMenuItem.Size = new System.Drawing.Size(192, 22); + this.RestoreWindowSizeMenuItem.Size = new System.Drawing.Size(199, 22); this.RestoreWindowSizeMenuItem.Text = "Restore Default Settings"; this.RestoreWindowSizeMenuItem.Click += new System.EventHandler(this.RestoreDefaultsMenuItem_Click); // @@ -607,7 +607,7 @@ this.LoadGameGenieToolbarItem.Image = ((System.Drawing.Image)(resources.GetObject("LoadGameGenieToolbarItem.Image"))); this.LoadGameGenieToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta; this.LoadGameGenieToolbarItem.Name = "LoadGameGenieToolbarItem"; - this.LoadGameGenieToolbarItem.Size = new System.Drawing.Size(68, 22); + this.LoadGameGenieToolbarItem.Size = new System.Drawing.Size(75, 22); this.LoadGameGenieToolbarItem.Text = "Game Genie"; this.LoadGameGenieToolbarItem.ToolTipText = "Open the Game Genie Encoder/Decoder"; this.LoadGameGenieToolbarItem.Click += new System.EventHandler(this.OpenGameGenieEncoderDecoderMenuItem_Click); @@ -625,7 +625,7 @@ // this.MessageLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.MessageLabel.AutoSize = true; - this.MessageLabel.Location = new System.Drawing.Point(13, 354); + this.MessageLabel.Location = new System.Drawing.Point(13, 391); this.MessageLabel.Name = "MessageLabel"; this.MessageLabel.Size = new System.Drawing.Size(31, 13); this.MessageLabel.TabIndex = 7; @@ -638,7 +638,7 @@ this.CheatGroupBox.Controls.Add(this.CheatEditor); this.CheatGroupBox.Location = new System.Drawing.Point(432, 66); this.CheatGroupBox.Name = "CheatGroupBox"; - this.CheatGroupBox.Size = new System.Drawing.Size(202, 284); + this.CheatGroupBox.Size = new System.Drawing.Size(202, 321); this.CheatGroupBox.TabIndex = 8; this.CheatGroupBox.TabStop = false; this.CheatGroupBox.Text = "New Cheat"; @@ -651,14 +651,14 @@ this.CheatEditor.Location = new System.Drawing.Point(6, 14); this.CheatEditor.MemoryDomains = null; this.CheatEditor.Name = "CheatEditor"; - this.CheatEditor.Size = new System.Drawing.Size(190, 264); + this.CheatEditor.Size = new System.Drawing.Size(190, 301); this.CheatEditor.TabIndex = 0; // // Cheats // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(646, 370); + this.ClientSize = new System.Drawing.Size(646, 407); this.Controls.Add(this.CheatGroupBox); this.Controls.Add(this.MessageLabel); this.Controls.Add(this.TotalLabel);