diff --git a/BizHawk.Client.Common/tools/Cheat.cs b/BizHawk.Client.Common/tools/Cheat.cs index 8540667d02..f73e9b4afe 100644 --- a/BizHawk.Client.Common/tools/Cheat.cs +++ b/BizHawk.Client.Common/tools/Cheat.cs @@ -6,13 +6,13 @@ 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}; + 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; + private COMPARISONTYPE _comparisonType; public Cheat(Watch watch, int value, int? compare = null, bool enabled = true) @@ -33,7 +33,7 @@ namespace BizHawk.Client.Common /// /// /// - public Cheat(Watch watch, int value, ComparisonType comparisonType, int compare, bool enabled = true) + public Cheat(Watch watch, int value, COMPARISONTYPE comparisonType, int compare, bool enabled = true) { _enabled = enabled; _watch = watch; @@ -186,6 +186,11 @@ namespace BizHawk.Client.Common } } + public COMPARISONTYPE ComparisonType + { + get { return _comparisonType; } + } + public void Enable(bool handleChange = true) { if (!IsSeparator) diff --git a/BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.cs b/BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.cs index d4b903ef2c..56c0907099 100644 --- a/BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.cs +++ b/BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.cs @@ -303,7 +303,7 @@ namespace BizHawk.Client.EmuHawk { get { - Cheat.ComparisonType comparisonType = Cheat.ComparisonType.EQUAL; + Cheat.COMPARISONTYPE comparisonType = Cheat.COMPARISONTYPE.EQUAL; var domain = MemoryDomains[DomainDropDown.SelectedItem.ToString()]; var address = AddressBox.ToRawInt().Value; if (address < domain.Size) @@ -328,13 +328,13 @@ namespace BizHawk.Client.EmuHawk { 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; + 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( diff --git a/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.Designer.cs b/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.Designer.cs index 604395e6d8..8170360f19 100644 --- a/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.Designer.cs +++ b/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.Designer.cs @@ -121,12 +121,11 @@ this.CheatListView.GridLines = true; this.CheatListView.HideSelection = false; this.CheatListView.ItemCount = 0; - this.CheatListView.Location = new System.Drawing.Point(24, 138); - this.CheatListView.Margin = new System.Windows.Forms.Padding(6); + this.CheatListView.Location = new System.Drawing.Point(12, 72); this.CheatListView.Name = "CheatListView"; this.CheatListView.SelectAllInProgress = false; this.CheatListView.selectedItem = -1; - this.CheatListView.Size = new System.Drawing.Size(824, 602); + this.CheatListView.Size = new System.Drawing.Size(414, 315); this.CheatListView.TabIndex = 1; this.CheatListView.UseCompatibleStateImageBehavior = false; this.CheatListView.UseCustomBackground = true; @@ -183,7 +182,7 @@ this.DisableAllContextMenuItem, this.ViewInHexEditorContextMenuItem}); this.CheatsContextMenu.Name = "contextMenuStrip1"; - this.CheatsContextMenu.Size = new System.Drawing.Size(311, 156); + this.CheatsContextMenu.Size = new System.Drawing.Size(186, 156); this.CheatsContextMenu.Opening += new System.ComponentModel.CancelEventHandler(this.CheatsContextMenu_Opening); // // ToggleContextMenuItem @@ -191,7 +190,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(310, 38); + this.ToggleContextMenuItem.Size = new System.Drawing.Size(185, 38); this.ToggleContextMenuItem.Text = "&Toggle"; this.ToggleContextMenuItem.Click += new System.EventHandler(this.ToggleMenuItem_Click); // @@ -200,7 +199,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(310, 38); + this.RemoveContextMenuItem.Size = new System.Drawing.Size(185, 38); this.RemoveContextMenuItem.Text = "&Remove"; this.RemoveContextMenuItem.Click += new System.EventHandler(this.RemoveCheatMenuItem_Click); // @@ -208,14 +207,14 @@ // this.DisableAllContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop; this.DisableAllContextMenuItem.Name = "DisableAllContextMenuItem"; - this.DisableAllContextMenuItem.Size = new System.Drawing.Size(310, 38); + this.DisableAllContextMenuItem.Size = new System.Drawing.Size(185, 38); 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(310, 38); + this.ViewInHexEditorContextMenuItem.Size = new System.Drawing.Size(185, 38); this.ViewInHexEditorContextMenuItem.Text = "View in Hex Editor"; this.ViewInHexEditorContextMenuItem.Click += new System.EventHandler(this.ViewInHexEditorContextMenuItem_Click); // @@ -229,8 +228,7 @@ this.OptionsSubMenu}); this.CheatsMenu.Location = new System.Drawing.Point(0, 0); this.CheatsMenu.Name = "CheatsMenu"; - this.CheatsMenu.Padding = new System.Windows.Forms.Padding(12, 4, 0, 4); - this.CheatsMenu.Size = new System.Drawing.Size(1292, 46); + this.CheatsMenu.Size = new System.Drawing.Size(646, 24); this.CheatsMenu.TabIndex = 2; this.CheatsMenu.Text = "menuStrip1"; // @@ -246,7 +244,7 @@ this.toolStripSeparator1, this.ExitMenuItem}); this.FileSubMenu.Name = "FileSubMenu"; - this.FileSubMenu.Size = new System.Drawing.Size(64, 38); + this.FileSubMenu.Size = new System.Drawing.Size(37, 20); this.FileSubMenu.Text = "&File"; this.FileSubMenu.DropDownOpened += new System.EventHandler(this.FileSubMenu_DropDownOpened); // @@ -255,7 +253,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(358, 38); + this.NewMenuItem.Size = new System.Drawing.Size(195, 22); this.NewMenuItem.Text = "&New"; this.NewMenuItem.Click += new System.EventHandler(this.NewMenuItem_Click); // @@ -264,7 +262,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(358, 38); + this.OpenMenuItem.Size = new System.Drawing.Size(195, 22); this.OpenMenuItem.Text = "&Open..."; this.OpenMenuItem.Click += new System.EventHandler(this.OpenMenuItem_Click); // @@ -273,7 +271,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(358, 38); + this.SaveMenuItem.Size = new System.Drawing.Size(195, 22); this.SaveMenuItem.Text = "&Save"; this.SaveMenuItem.Click += new System.EventHandler(this.SaveMenuItem_Click); // @@ -282,14 +280,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(358, 38); + 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(358, 38); + this.AppendMenuItem.Size = new System.Drawing.Size(195, 22); this.AppendMenuItem.Text = "Append File"; // // RecentSubMenu @@ -298,25 +296,25 @@ this.toolStripSeparator4}); this.RecentSubMenu.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent; this.RecentSubMenu.Name = "RecentSubMenu"; - this.RecentSubMenu.Size = new System.Drawing.Size(358, 38); + this.RecentSubMenu.Size = new System.Drawing.Size(195, 22); this.RecentSubMenu.Text = "Recent"; this.RecentSubMenu.DropDownOpened += new System.EventHandler(this.RecentSubMenu_DropDownOpened); // // toolStripSeparator4 // this.toolStripSeparator4.Name = "toolStripSeparator4"; - this.toolStripSeparator4.Size = new System.Drawing.Size(82, 6); + this.toolStripSeparator4.Size = new System.Drawing.Size(57, 6); // // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(355, 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(358, 38); + this.ExitMenuItem.Size = new System.Drawing.Size(195, 22); this.ExitMenuItem.Text = "E&xit"; this.ExitMenuItem.Click += new System.EventHandler(this.ExitMenuItem_Click); // @@ -335,7 +333,7 @@ this.GameGenieSeparator, this.OpenGameGenieEncoderDecoderMenuItem}); this.CheatsSubMenu.Name = "CheatsSubMenu"; - this.CheatsSubMenu.Size = new System.Drawing.Size(99, 38); + this.CheatsSubMenu.Size = new System.Drawing.Size(55, 20); this.CheatsSubMenu.Text = "&Cheats"; this.CheatsSubMenu.DropDownOpened += new System.EventHandler(this.CheatsSubMenu_DropDownOpened); // @@ -344,7 +342,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(438, 38); + this.RemoveCheatMenuItem.Size = new System.Drawing.Size(233, 22); this.RemoveCheatMenuItem.Text = "&Remove Cheat"; this.RemoveCheatMenuItem.Click += new System.EventHandler(this.RemoveCheatMenuItem_Click); // @@ -353,21 +351,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(438, 38); + 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(435, 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(438, 38); + this.MoveUpMenuItem.Size = new System.Drawing.Size(233, 22); this.MoveUpMenuItem.Text = "Move &Up"; this.MoveUpMenuItem.Click += new System.EventHandler(this.MoveUpMenuItem_Click); // @@ -376,7 +374,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(438, 38); + this.MoveDownMenuItem.Size = new System.Drawing.Size(233, 22); this.MoveDownMenuItem.Text = "Move &Down"; this.MoveDownMenuItem.Click += new System.EventHandler(this.MoveDownMenuItem_Click); // @@ -384,21 +382,21 @@ // this.SelectAllMenuItem.Name = "SelectAllMenuItem"; this.SelectAllMenuItem.ShortcutKeyDisplayString = "Ctrl+A"; - this.SelectAllMenuItem.Size = new System.Drawing.Size(438, 38); + 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(435, 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(438, 38); + this.ToggleMenuItem.Size = new System.Drawing.Size(233, 22); this.ToggleMenuItem.Text = "&Toggle"; this.ToggleMenuItem.Click += new System.EventHandler(this.ToggleMenuItem_Click); // @@ -406,19 +404,19 @@ // this.DisableAllCheatsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop; this.DisableAllCheatsMenuItem.Name = "DisableAllCheatsMenuItem"; - this.DisableAllCheatsMenuItem.Size = new System.Drawing.Size(438, 38); + 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(435, 6); + this.GameGenieSeparator.Size = new System.Drawing.Size(230, 6); // // OpenGameGenieEncoderDecoderMenuItem // this.OpenGameGenieEncoderDecoderMenuItem.Name = "OpenGameGenieEncoderDecoderMenuItem"; - this.OpenGameGenieEncoderDecoderMenuItem.Size = new System.Drawing.Size(438, 38); + 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); // @@ -436,73 +434,73 @@ this.toolStripSeparator5, this.RestoreWindowSizeMenuItem}); this.OptionsSubMenu.Name = "OptionsSubMenu"; - this.OptionsSubMenu.Size = new System.Drawing.Size(111, 38); + 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(372, 38); + 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(372, 38); + 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(372, 38); + 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(369, 6); + this.toolStripSeparator7.Size = new System.Drawing.Size(196, 6); // // AutoloadMenuItem // this.AutoloadMenuItem.Name = "AutoloadMenuItem"; - this.AutoloadMenuItem.Size = new System.Drawing.Size(372, 38); + 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(372, 38); + 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(372, 38); + 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(372, 38); + 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(369, 6); + this.toolStripSeparator5.Size = new System.Drawing.Size(196, 6); // // RestoreWindowSizeMenuItem // this.RestoreWindowSizeMenuItem.Name = "RestoreWindowSizeMenuItem"; - this.RestoreWindowSizeMenuItem.Size = new System.Drawing.Size(372, 38); + this.RestoreWindowSizeMenuItem.Size = new System.Drawing.Size(199, 22); this.RestoreWindowSizeMenuItem.Text = "Restore Default Settings"; this.RestoreWindowSizeMenuItem.Click += new System.EventHandler(this.RestoreDefaultsMenuItem_Click); // @@ -522,10 +520,9 @@ this.MoveDownToolbarItem, this.GameGenieToolbarSeparator, this.LoadGameGenieToolbarItem}); - this.toolStrip1.Location = new System.Drawing.Point(0, 46); + this.toolStrip1.Location = new System.Drawing.Point(0, 24); this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Padding = new System.Windows.Forms.Padding(0, 0, 2, 0); - this.toolStrip1.Size = new System.Drawing.Size(1292, 39); + this.toolStrip1.Size = new System.Drawing.Size(646, 39); this.toolStrip1.TabIndex = 3; this.toolStrip1.Text = "toolStrip1"; // @@ -620,7 +617,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(150, 36); + this.LoadGameGenieToolbarItem.Size = new System.Drawing.Size(75, 36); this.LoadGameGenieToolbarItem.Text = "Game Genie"; this.LoadGameGenieToolbarItem.ToolTipText = "Open the Game Genie Encoder/Decoder"; this.LoadGameGenieToolbarItem.Click += new System.EventHandler(this.OpenGameGenieEncoderDecoderMenuItem_Click); @@ -628,10 +625,9 @@ // TotalLabel // this.TotalLabel.AutoSize = true; - this.TotalLabel.Location = new System.Drawing.Point(18, 100); - this.TotalLabel.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.TotalLabel.Location = new System.Drawing.Point(9, 52); this.TotalLabel.Name = "TotalLabel"; - this.TotalLabel.Size = new System.Drawing.Size(98, 25); + this.TotalLabel.Size = new System.Drawing.Size(49, 13); this.TotalLabel.TabIndex = 6; this.TotalLabel.Text = "0 Cheats"; // @@ -639,10 +635,9 @@ // 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(26, 752); - this.MessageLabel.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.MessageLabel.Location = new System.Drawing.Point(13, 391); this.MessageLabel.Name = "MessageLabel"; - this.MessageLabel.Size = new System.Drawing.Size(60, 25); + this.MessageLabel.Size = new System.Drawing.Size(31, 13); this.MessageLabel.TabIndex = 7; this.MessageLabel.Text = " "; // @@ -651,11 +646,9 @@ this.CheatGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Right))); this.CheatGroupBox.Controls.Add(this.CheatEditor); - this.CheatGroupBox.Location = new System.Drawing.Point(864, 127); - this.CheatGroupBox.Margin = new System.Windows.Forms.Padding(6); + this.CheatGroupBox.Location = new System.Drawing.Point(432, 66); this.CheatGroupBox.Name = "CheatGroupBox"; - this.CheatGroupBox.Padding = new System.Windows.Forms.Padding(6); - this.CheatGroupBox.Size = new System.Drawing.Size(404, 617); + this.CheatGroupBox.Size = new System.Drawing.Size(202, 321); this.CheatGroupBox.TabIndex = 8; this.CheatGroupBox.TabStop = false; this.CheatGroupBox.Text = "New Cheat"; @@ -665,18 +658,17 @@ this.CheatEditor.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.CheatEditor.Location = new System.Drawing.Point(12, 27); - this.CheatEditor.Margin = new System.Windows.Forms.Padding(6); + this.CheatEditor.Location = new System.Drawing.Point(6, 14); this.CheatEditor.MemoryDomains = null; this.CheatEditor.Name = "CheatEditor"; - this.CheatEditor.Size = new System.Drawing.Size(380, 579); + this.CheatEditor.Size = new System.Drawing.Size(190, 307); this.CheatEditor.TabIndex = 0; // // Cheats // - this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 25F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1292, 783); + this.ClientSize = new System.Drawing.Size(646, 407); this.Controls.Add(this.CheatGroupBox); this.Controls.Add(this.MessageLabel); this.Controls.Add(this.TotalLabel); @@ -684,8 +676,7 @@ this.Controls.Add(this.CheatsMenu); this.Controls.Add(this.CheatListView); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.Margin = new System.Windows.Forms.Padding(6); - this.MinimumSize = new System.Drawing.Size(544, 673); + this.MinimumSize = new System.Drawing.Size(280, 369); this.Name = "Cheats"; this.Text = "Cheats"; this.Load += new System.EventHandler(this.Cheats_Load); diff --git a/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs b/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs index a4cc3db78c..f123017f24 100644 --- a/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs +++ b/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs @@ -52,8 +52,7 @@ namespace BizHawk.Client.EmuHawk [RequiredService] private IMemoryDomains Core { get; set; } - // Adam Sturge : I commented this out because it was causing me issues by removing the comparison type column - //[ConfigPersist] + [ConfigPersist] public CheatsSettings Settings { get; set; } public bool UpdateBefore { get { return false; } } @@ -264,6 +263,9 @@ namespace BizHawk.Client.EmuHawk case TYPE: text = Watch.DisplayTypeToString(Global.CheatList[index].Type); break; + case COMPARISONTYPE: + text = Global.CheatList[index].ComparisonType.ToString(); + break; } } diff --git a/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.resx b/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.resx index b76cd42ef3..1631505e05 100644 --- a/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.resx +++ b/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.resx @@ -130,7 +130,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAERSURBVDhPrZDbSgJRGIXnpewd6jXsjSQvIrwoI0RQMChU + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAERSURBVDhPrZDbSgJRGIXnpewd6jXsjSQvIrwoI0RQMChU 0iiDPCGiE3ZCRkvR8VzTeBhnyR5/ccaZNnPhB4t9sdf6Ln5hb8QeathNJFVFKF5C8DqL4ksDVHWGDf7j LHyPg6NjviSaFqlu5yQYR+KpupaIkrMknCxT3Y7v/NYYb0ITK1c3BarbWWhLQ7IR0cTKReyZ6lZ0XYei ztHpK4bAc+h1FgQijzSxMptrGIxVSO0xX3AaStFki7bUMVFmaMm/eJMGfIH/MkGzLep0AXn4h/r3CJV3 @@ -141,7 +141,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAJHSURBVDhPxZBdSNNhFMb/F110ZZEVhVBgeeHNICiiuggp + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJHSURBVDhPxZBdSNNhFMb/F110ZZEVhVBgeeHNICiiuggp olAUyyxI0oSaH1QYC3N+tKnp5ubm1JUua5uuqdNKMwr7kApFItTUkWZqVhSVYmao5Nevvy7UoYR3HXh4 4XCe33nOKyy3lAY7l9RWMo0O/raWXxEyo5spVYTNvOGyfIRPfW+ptOkXqaPl6T83hcRmExSdgzAz3NVm YWyoYla/B+1M9JtxWLPpaH22JORIjI6gKAMB0jyEimIdo4OlbuaprwVMOOMovammpDADc34qppwUrmnl @@ -157,7 +157,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAIySURBVDhPrZLfS5NRGMfff6H7boIuuq2pMZyL1eAt11CW + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIySURBVDhPrZLfS5NRGMfff6H7boIuuq2pMZyL1eAt11CW DcOKsB9vpFmaLtNExco0av6CbIVLJ61Wk3BSkT/AFCkRZSpZmrmiJQ41xSaCwdfznL15XEUX0Reem5f3 8znnec4j/Zc8fxYGla91CS3eRTx0z6OpMYS7jmnU1X6B/VYA18snUVoyjsKCt8jLHcH5c36ouCQR2NUJ 1Nas4G9ZXlmFKbULh1Kf8lJxSfI+WeCCyopv6q+/h+DQ/DJ2WV5Ao1FgPegRAveDOS4oLfmq/h6dn/DH @@ -173,7 +173,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc