Added comparison type column. Tied to debug issue where the column disappears from settings before being added to UI, couldn't figure it out without removing the [ConfigPersist] attribute from the Settings variable

This commit is contained in:
Adam Sturge 2016-02-03 21:37:08 -08:00
parent 9959d61949
commit c9dd10e8c0
3 changed files with 98 additions and 75 deletions

View File

@ -34,6 +34,7 @@
this.CheatName = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.CheatName = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.Address = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.Address = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.Value = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.Value = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.ComparisonType = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.Compare = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.Compare = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.On = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.On = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.Domain = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.Domain = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
@ -111,6 +112,7 @@
this.CheatName, this.CheatName,
this.Address, this.Address,
this.Value, this.Value,
this.ComparisonType,
this.Compare, this.Compare,
this.On, this.On,
this.Domain}); this.Domain});
@ -119,11 +121,12 @@
this.CheatListView.GridLines = true; this.CheatListView.GridLines = true;
this.CheatListView.HideSelection = false; this.CheatListView.HideSelection = false;
this.CheatListView.ItemCount = 0; this.CheatListView.ItemCount = 0;
this.CheatListView.Location = new System.Drawing.Point(12, 72); this.CheatListView.Location = new System.Drawing.Point(24, 138);
this.CheatListView.Margin = new System.Windows.Forms.Padding(6);
this.CheatListView.Name = "CheatListView"; this.CheatListView.Name = "CheatListView";
this.CheatListView.SelectAllInProgress = false; this.CheatListView.SelectAllInProgress = false;
this.CheatListView.selectedItem = -1; this.CheatListView.selectedItem = -1;
this.CheatListView.Size = new System.Drawing.Size(414, 315); this.CheatListView.Size = new System.Drawing.Size(824, 602);
this.CheatListView.TabIndex = 1; this.CheatListView.TabIndex = 1;
this.CheatListView.UseCompatibleStateImageBehavior = false; this.CheatListView.UseCompatibleStateImageBehavior = false;
this.CheatListView.UseCustomBackground = true; this.CheatListView.UseCustomBackground = true;
@ -151,6 +154,11 @@
this.Value.Text = "Value"; this.Value.Text = "Value";
this.Value.Width = 40; this.Value.Width = 40;
// //
// ComparisonType
//
this.ComparisonType.Text = "Comparison Type";
this.ComparisonType.Width = 194;
//
// Compare // Compare
// //
this.Compare.Text = "Compare"; this.Compare.Text = "Compare";
@ -168,13 +176,14 @@
// //
// CheatsContextMenu // CheatsContextMenu
// //
this.CheatsContextMenu.ImageScalingSize = new System.Drawing.Size(32, 32);
this.CheatsContextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.CheatsContextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.ToggleContextMenuItem, this.ToggleContextMenuItem,
this.RemoveContextMenuItem, this.RemoveContextMenuItem,
this.DisableAllContextMenuItem, this.DisableAllContextMenuItem,
this.ViewInHexEditorContextMenuItem}); this.ViewInHexEditorContextMenuItem});
this.CheatsContextMenu.Name = "contextMenuStrip1"; this.CheatsContextMenu.Name = "contextMenuStrip1";
this.CheatsContextMenu.Size = new System.Drawing.Size(170, 92); this.CheatsContextMenu.Size = new System.Drawing.Size(311, 156);
this.CheatsContextMenu.Opening += new System.ComponentModel.CancelEventHandler(this.CheatsContextMenu_Opening); this.CheatsContextMenu.Opening += new System.ComponentModel.CancelEventHandler(this.CheatsContextMenu_Opening);
// //
// ToggleContextMenuItem // ToggleContextMenuItem
@ -182,7 +191,7 @@
this.ToggleContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Refresh1; this.ToggleContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Refresh1;
this.ToggleContextMenuItem.Name = "ToggleContextMenuItem"; this.ToggleContextMenuItem.Name = "ToggleContextMenuItem";
this.ToggleContextMenuItem.ShortcutKeyDisplayString = "Enter"; this.ToggleContextMenuItem.ShortcutKeyDisplayString = "Enter";
this.ToggleContextMenuItem.Size = new System.Drawing.Size(169, 22); this.ToggleContextMenuItem.Size = new System.Drawing.Size(310, 38);
this.ToggleContextMenuItem.Text = "&Toggle"; this.ToggleContextMenuItem.Text = "&Toggle";
this.ToggleContextMenuItem.Click += new System.EventHandler(this.ToggleMenuItem_Click); this.ToggleContextMenuItem.Click += new System.EventHandler(this.ToggleMenuItem_Click);
// //
@ -191,7 +200,7 @@
this.RemoveContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Delete; this.RemoveContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Delete;
this.RemoveContextMenuItem.Name = "RemoveContextMenuItem"; this.RemoveContextMenuItem.Name = "RemoveContextMenuItem";
this.RemoveContextMenuItem.ShortcutKeyDisplayString = "Delete"; this.RemoveContextMenuItem.ShortcutKeyDisplayString = "Delete";
this.RemoveContextMenuItem.Size = new System.Drawing.Size(169, 22); this.RemoveContextMenuItem.Size = new System.Drawing.Size(310, 38);
this.RemoveContextMenuItem.Text = "&Remove"; this.RemoveContextMenuItem.Text = "&Remove";
this.RemoveContextMenuItem.Click += new System.EventHandler(this.RemoveCheatMenuItem_Click); this.RemoveContextMenuItem.Click += new System.EventHandler(this.RemoveCheatMenuItem_Click);
// //
@ -199,27 +208,29 @@
// //
this.DisableAllContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop; this.DisableAllContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop;
this.DisableAllContextMenuItem.Name = "DisableAllContextMenuItem"; this.DisableAllContextMenuItem.Name = "DisableAllContextMenuItem";
this.DisableAllContextMenuItem.Size = new System.Drawing.Size(169, 22); this.DisableAllContextMenuItem.Size = new System.Drawing.Size(310, 38);
this.DisableAllContextMenuItem.Text = "&Disable All"; this.DisableAllContextMenuItem.Text = "&Disable All";
this.DisableAllContextMenuItem.Click += new System.EventHandler(this.DisableAllCheatsMenuItem_Click); this.DisableAllContextMenuItem.Click += new System.EventHandler(this.DisableAllCheatsMenuItem_Click);
// //
// ViewInHexEditorContextMenuItem // ViewInHexEditorContextMenuItem
// //
this.ViewInHexEditorContextMenuItem.Name = "ViewInHexEditorContextMenuItem"; this.ViewInHexEditorContextMenuItem.Name = "ViewInHexEditorContextMenuItem";
this.ViewInHexEditorContextMenuItem.Size = new System.Drawing.Size(169, 22); this.ViewInHexEditorContextMenuItem.Size = new System.Drawing.Size(310, 38);
this.ViewInHexEditorContextMenuItem.Text = "View in Hex Editor"; this.ViewInHexEditorContextMenuItem.Text = "View in Hex Editor";
this.ViewInHexEditorContextMenuItem.Click += new System.EventHandler(this.ViewInHexEditorContextMenuItem_Click); this.ViewInHexEditorContextMenuItem.Click += new System.EventHandler(this.ViewInHexEditorContextMenuItem_Click);
// //
// CheatsMenu // CheatsMenu
// //
this.CheatsMenu.ClickThrough = true; this.CheatsMenu.ClickThrough = true;
this.CheatsMenu.ImageScalingSize = new System.Drawing.Size(32, 32);
this.CheatsMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.CheatsMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.FileSubMenu, this.FileSubMenu,
this.CheatsSubMenu, this.CheatsSubMenu,
this.OptionsSubMenu}); this.OptionsSubMenu});
this.CheatsMenu.Location = new System.Drawing.Point(0, 0); this.CheatsMenu.Location = new System.Drawing.Point(0, 0);
this.CheatsMenu.Name = "CheatsMenu"; this.CheatsMenu.Name = "CheatsMenu";
this.CheatsMenu.Size = new System.Drawing.Size(646, 24); this.CheatsMenu.Padding = new System.Windows.Forms.Padding(12, 4, 0, 4);
this.CheatsMenu.Size = new System.Drawing.Size(1292, 46);
this.CheatsMenu.TabIndex = 2; this.CheatsMenu.TabIndex = 2;
this.CheatsMenu.Text = "menuStrip1"; this.CheatsMenu.Text = "menuStrip1";
// //
@ -235,7 +246,7 @@
this.toolStripSeparator1, this.toolStripSeparator1,
this.ExitMenuItem}); this.ExitMenuItem});
this.FileSubMenu.Name = "FileSubMenu"; this.FileSubMenu.Name = "FileSubMenu";
this.FileSubMenu.Size = new System.Drawing.Size(37, 20); this.FileSubMenu.Size = new System.Drawing.Size(64, 38);
this.FileSubMenu.Text = "&File"; this.FileSubMenu.Text = "&File";
this.FileSubMenu.DropDownOpened += new System.EventHandler(this.FileSubMenu_DropDownOpened); this.FileSubMenu.DropDownOpened += new System.EventHandler(this.FileSubMenu_DropDownOpened);
// //
@ -244,7 +255,7 @@
this.NewMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.NewFile; this.NewMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.NewFile;
this.NewMenuItem.Name = "NewMenuItem"; this.NewMenuItem.Name = "NewMenuItem";
this.NewMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N))); this.NewMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N)));
this.NewMenuItem.Size = new System.Drawing.Size(195, 22); this.NewMenuItem.Size = new System.Drawing.Size(358, 38);
this.NewMenuItem.Text = "&New"; this.NewMenuItem.Text = "&New";
this.NewMenuItem.Click += new System.EventHandler(this.NewMenuItem_Click); this.NewMenuItem.Click += new System.EventHandler(this.NewMenuItem_Click);
// //
@ -253,7 +264,7 @@
this.OpenMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.OpenFile; this.OpenMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.OpenFile;
this.OpenMenuItem.Name = "OpenMenuItem"; this.OpenMenuItem.Name = "OpenMenuItem";
this.OpenMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); 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.Size = new System.Drawing.Size(358, 38);
this.OpenMenuItem.Text = "&Open..."; this.OpenMenuItem.Text = "&Open...";
this.OpenMenuItem.Click += new System.EventHandler(this.OpenMenuItem_Click); this.OpenMenuItem.Click += new System.EventHandler(this.OpenMenuItem_Click);
// //
@ -262,7 +273,7 @@
this.SaveMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.SaveAs; this.SaveMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.SaveAs;
this.SaveMenuItem.Name = "SaveMenuItem"; this.SaveMenuItem.Name = "SaveMenuItem";
this.SaveMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S))); 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.Size = new System.Drawing.Size(358, 38);
this.SaveMenuItem.Text = "&Save"; this.SaveMenuItem.Text = "&Save";
this.SaveMenuItem.Click += new System.EventHandler(this.SaveMenuItem_Click); this.SaveMenuItem.Click += new System.EventHandler(this.SaveMenuItem_Click);
// //
@ -271,14 +282,14 @@
this.SaveAsMenuItem.Name = "SaveAsMenuItem"; this.SaveAsMenuItem.Name = "SaveAsMenuItem";
this.SaveAsMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) this.SaveAsMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)
| System.Windows.Forms.Keys.S))); | System.Windows.Forms.Keys.S)));
this.SaveAsMenuItem.Size = new System.Drawing.Size(195, 22); this.SaveAsMenuItem.Size = new System.Drawing.Size(358, 38);
this.SaveAsMenuItem.Text = "Save &As..."; this.SaveAsMenuItem.Text = "Save &As...";
this.SaveAsMenuItem.Click += new System.EventHandler(this.SaveAsMenuItem_Click); this.SaveAsMenuItem.Click += new System.EventHandler(this.SaveAsMenuItem_Click);
// //
// AppendMenuItem // AppendMenuItem
// //
this.AppendMenuItem.Name = "AppendMenuItem"; this.AppendMenuItem.Name = "AppendMenuItem";
this.AppendMenuItem.Size = new System.Drawing.Size(195, 22); this.AppendMenuItem.Size = new System.Drawing.Size(358, 38);
this.AppendMenuItem.Text = "Append File"; this.AppendMenuItem.Text = "Append File";
// //
// RecentSubMenu // RecentSubMenu
@ -287,25 +298,25 @@
this.toolStripSeparator4}); this.toolStripSeparator4});
this.RecentSubMenu.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent; this.RecentSubMenu.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent;
this.RecentSubMenu.Name = "RecentSubMenu"; this.RecentSubMenu.Name = "RecentSubMenu";
this.RecentSubMenu.Size = new System.Drawing.Size(195, 22); this.RecentSubMenu.Size = new System.Drawing.Size(358, 38);
this.RecentSubMenu.Text = "Recent"; this.RecentSubMenu.Text = "Recent";
this.RecentSubMenu.DropDownOpened += new System.EventHandler(this.RecentSubMenu_DropDownOpened); this.RecentSubMenu.DropDownOpened += new System.EventHandler(this.RecentSubMenu_DropDownOpened);
// //
// toolStripSeparator4 // toolStripSeparator4
// //
this.toolStripSeparator4.Name = "toolStripSeparator4"; this.toolStripSeparator4.Name = "toolStripSeparator4";
this.toolStripSeparator4.Size = new System.Drawing.Size(57, 6); this.toolStripSeparator4.Size = new System.Drawing.Size(82, 6);
// //
// toolStripSeparator1 // toolStripSeparator1
// //
this.toolStripSeparator1.Name = "toolStripSeparator1"; this.toolStripSeparator1.Name = "toolStripSeparator1";
this.toolStripSeparator1.Size = new System.Drawing.Size(192, 6); this.toolStripSeparator1.Size = new System.Drawing.Size(355, 6);
// //
// ExitMenuItem // ExitMenuItem
// //
this.ExitMenuItem.Name = "ExitMenuItem"; this.ExitMenuItem.Name = "ExitMenuItem";
this.ExitMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4))); 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.Size = new System.Drawing.Size(358, 38);
this.ExitMenuItem.Text = "E&xit"; this.ExitMenuItem.Text = "E&xit";
this.ExitMenuItem.Click += new System.EventHandler(this.ExitMenuItem_Click); this.ExitMenuItem.Click += new System.EventHandler(this.ExitMenuItem_Click);
// //
@ -324,7 +335,7 @@
this.GameGenieSeparator, this.GameGenieSeparator,
this.OpenGameGenieEncoderDecoderMenuItem}); this.OpenGameGenieEncoderDecoderMenuItem});
this.CheatsSubMenu.Name = "CheatsSubMenu"; this.CheatsSubMenu.Name = "CheatsSubMenu";
this.CheatsSubMenu.Size = new System.Drawing.Size(55, 20); this.CheatsSubMenu.Size = new System.Drawing.Size(99, 38);
this.CheatsSubMenu.Text = "&Cheats"; this.CheatsSubMenu.Text = "&Cheats";
this.CheatsSubMenu.DropDownOpened += new System.EventHandler(this.CheatsSubMenu_DropDownOpened); this.CheatsSubMenu.DropDownOpened += new System.EventHandler(this.CheatsSubMenu_DropDownOpened);
// //
@ -333,7 +344,7 @@
this.RemoveCheatMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Delete; this.RemoveCheatMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Delete;
this.RemoveCheatMenuItem.Name = "RemoveCheatMenuItem"; this.RemoveCheatMenuItem.Name = "RemoveCheatMenuItem";
this.RemoveCheatMenuItem.ShortcutKeyDisplayString = "Delete"; this.RemoveCheatMenuItem.ShortcutKeyDisplayString = "Delete";
this.RemoveCheatMenuItem.Size = new System.Drawing.Size(233, 22); this.RemoveCheatMenuItem.Size = new System.Drawing.Size(438, 38);
this.RemoveCheatMenuItem.Text = "&Remove Cheat"; this.RemoveCheatMenuItem.Text = "&Remove Cheat";
this.RemoveCheatMenuItem.Click += new System.EventHandler(this.RemoveCheatMenuItem_Click); this.RemoveCheatMenuItem.Click += new System.EventHandler(this.RemoveCheatMenuItem_Click);
// //
@ -342,21 +353,21 @@
this.InsertSeparatorMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.InsertSeparator; this.InsertSeparatorMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.InsertSeparator;
this.InsertSeparatorMenuItem.Name = "InsertSeparatorMenuItem"; this.InsertSeparatorMenuItem.Name = "InsertSeparatorMenuItem";
this.InsertSeparatorMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.I))); this.InsertSeparatorMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.I)));
this.InsertSeparatorMenuItem.Size = new System.Drawing.Size(233, 22); this.InsertSeparatorMenuItem.Size = new System.Drawing.Size(438, 38);
this.InsertSeparatorMenuItem.Text = "Insert Separator"; this.InsertSeparatorMenuItem.Text = "Insert Separator";
this.InsertSeparatorMenuItem.Click += new System.EventHandler(this.InsertSeparatorMenuItem_Click); this.InsertSeparatorMenuItem.Click += new System.EventHandler(this.InsertSeparatorMenuItem_Click);
// //
// toolStripSeparator3 // toolStripSeparator3
// //
this.toolStripSeparator3.Name = "toolStripSeparator3"; this.toolStripSeparator3.Name = "toolStripSeparator3";
this.toolStripSeparator3.Size = new System.Drawing.Size(230, 6); this.toolStripSeparator3.Size = new System.Drawing.Size(435, 6);
// //
// MoveUpMenuItem // MoveUpMenuItem
// //
this.MoveUpMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveUp; this.MoveUpMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveUp;
this.MoveUpMenuItem.Name = "MoveUpMenuItem"; this.MoveUpMenuItem.Name = "MoveUpMenuItem";
this.MoveUpMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.U))); this.MoveUpMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.U)));
this.MoveUpMenuItem.Size = new System.Drawing.Size(233, 22); this.MoveUpMenuItem.Size = new System.Drawing.Size(438, 38);
this.MoveUpMenuItem.Text = "Move &Up"; this.MoveUpMenuItem.Text = "Move &Up";
this.MoveUpMenuItem.Click += new System.EventHandler(this.MoveUpMenuItem_Click); this.MoveUpMenuItem.Click += new System.EventHandler(this.MoveUpMenuItem_Click);
// //
@ -365,7 +376,7 @@
this.MoveDownMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveDown; this.MoveDownMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveDown;
this.MoveDownMenuItem.Name = "MoveDownMenuItem"; this.MoveDownMenuItem.Name = "MoveDownMenuItem";
this.MoveDownMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.D))); this.MoveDownMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.D)));
this.MoveDownMenuItem.Size = new System.Drawing.Size(233, 22); this.MoveDownMenuItem.Size = new System.Drawing.Size(438, 38);
this.MoveDownMenuItem.Text = "Move &Down"; this.MoveDownMenuItem.Text = "Move &Down";
this.MoveDownMenuItem.Click += new System.EventHandler(this.MoveDownMenuItem_Click); this.MoveDownMenuItem.Click += new System.EventHandler(this.MoveDownMenuItem_Click);
// //
@ -373,21 +384,21 @@
// //
this.SelectAllMenuItem.Name = "SelectAllMenuItem"; this.SelectAllMenuItem.Name = "SelectAllMenuItem";
this.SelectAllMenuItem.ShortcutKeyDisplayString = "Ctrl+A"; this.SelectAllMenuItem.ShortcutKeyDisplayString = "Ctrl+A";
this.SelectAllMenuItem.Size = new System.Drawing.Size(233, 22); this.SelectAllMenuItem.Size = new System.Drawing.Size(438, 38);
this.SelectAllMenuItem.Text = "Select &All"; this.SelectAllMenuItem.Text = "Select &All";
this.SelectAllMenuItem.Click += new System.EventHandler(this.SelectAllMenuItem_Click); this.SelectAllMenuItem.Click += new System.EventHandler(this.SelectAllMenuItem_Click);
// //
// toolStripSeparator6 // toolStripSeparator6
// //
this.toolStripSeparator6.Name = "toolStripSeparator6"; this.toolStripSeparator6.Name = "toolStripSeparator6";
this.toolStripSeparator6.Size = new System.Drawing.Size(230, 6); this.toolStripSeparator6.Size = new System.Drawing.Size(435, 6);
// //
// ToggleMenuItem // ToggleMenuItem
// //
this.ToggleMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Refresh1; this.ToggleMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Refresh1;
this.ToggleMenuItem.Name = "ToggleMenuItem"; this.ToggleMenuItem.Name = "ToggleMenuItem";
this.ToggleMenuItem.ShortcutKeyDisplayString = "Enter"; this.ToggleMenuItem.ShortcutKeyDisplayString = "Enter";
this.ToggleMenuItem.Size = new System.Drawing.Size(233, 22); this.ToggleMenuItem.Size = new System.Drawing.Size(438, 38);
this.ToggleMenuItem.Text = "&Toggle"; this.ToggleMenuItem.Text = "&Toggle";
this.ToggleMenuItem.Click += new System.EventHandler(this.ToggleMenuItem_Click); this.ToggleMenuItem.Click += new System.EventHandler(this.ToggleMenuItem_Click);
// //
@ -395,19 +406,19 @@
// //
this.DisableAllCheatsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop; this.DisableAllCheatsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop;
this.DisableAllCheatsMenuItem.Name = "DisableAllCheatsMenuItem"; this.DisableAllCheatsMenuItem.Name = "DisableAllCheatsMenuItem";
this.DisableAllCheatsMenuItem.Size = new System.Drawing.Size(233, 22); this.DisableAllCheatsMenuItem.Size = new System.Drawing.Size(438, 38);
this.DisableAllCheatsMenuItem.Text = "Disable all"; this.DisableAllCheatsMenuItem.Text = "Disable all";
this.DisableAllCheatsMenuItem.Click += new System.EventHandler(this.DisableAllCheatsMenuItem_Click); this.DisableAllCheatsMenuItem.Click += new System.EventHandler(this.DisableAllCheatsMenuItem_Click);
// //
// GameGenieSeparator // GameGenieSeparator
// //
this.GameGenieSeparator.Name = "GameGenieSeparator"; this.GameGenieSeparator.Name = "GameGenieSeparator";
this.GameGenieSeparator.Size = new System.Drawing.Size(230, 6); this.GameGenieSeparator.Size = new System.Drawing.Size(435, 6);
// //
// OpenGameGenieEncoderDecoderMenuItem // OpenGameGenieEncoderDecoderMenuItem
// //
this.OpenGameGenieEncoderDecoderMenuItem.Name = "OpenGameGenieEncoderDecoderMenuItem"; this.OpenGameGenieEncoderDecoderMenuItem.Name = "OpenGameGenieEncoderDecoderMenuItem";
this.OpenGameGenieEncoderDecoderMenuItem.Size = new System.Drawing.Size(233, 22); this.OpenGameGenieEncoderDecoderMenuItem.Size = new System.Drawing.Size(438, 38);
this.OpenGameGenieEncoderDecoderMenuItem.Text = "Game Genie Encoder/Decoder"; this.OpenGameGenieEncoderDecoderMenuItem.Text = "Game Genie Encoder/Decoder";
this.OpenGameGenieEncoderDecoderMenuItem.Click += new System.EventHandler(this.OpenGameGenieEncoderDecoderMenuItem_Click); this.OpenGameGenieEncoderDecoderMenuItem.Click += new System.EventHandler(this.OpenGameGenieEncoderDecoderMenuItem_Click);
// //
@ -425,79 +436,80 @@
this.toolStripSeparator5, this.toolStripSeparator5,
this.RestoreWindowSizeMenuItem}); this.RestoreWindowSizeMenuItem});
this.OptionsSubMenu.Name = "OptionsSubMenu"; this.OptionsSubMenu.Name = "OptionsSubMenu";
this.OptionsSubMenu.Size = new System.Drawing.Size(61, 20); this.OptionsSubMenu.Size = new System.Drawing.Size(111, 38);
this.OptionsSubMenu.Text = "&Options"; this.OptionsSubMenu.Text = "&Options";
this.OptionsSubMenu.DropDownOpened += new System.EventHandler(this.OptionsSubMenu_DropDownOpened); this.OptionsSubMenu.DropDownOpened += new System.EventHandler(this.OptionsSubMenu_DropDownOpened);
// //
// AlwaysLoadCheatsMenuItem // AlwaysLoadCheatsMenuItem
// //
this.AlwaysLoadCheatsMenuItem.Name = "AlwaysLoadCheatsMenuItem"; this.AlwaysLoadCheatsMenuItem.Name = "AlwaysLoadCheatsMenuItem";
this.AlwaysLoadCheatsMenuItem.Size = new System.Drawing.Size(199, 22); this.AlwaysLoadCheatsMenuItem.Size = new System.Drawing.Size(372, 38);
this.AlwaysLoadCheatsMenuItem.Text = "Always load cheats"; this.AlwaysLoadCheatsMenuItem.Text = "Always load cheats";
this.AlwaysLoadCheatsMenuItem.Click += new System.EventHandler(this.AlwaysLoadCheatsMenuItem_Click); this.AlwaysLoadCheatsMenuItem.Click += new System.EventHandler(this.AlwaysLoadCheatsMenuItem_Click);
// //
// AutoSaveCheatsMenuItem // AutoSaveCheatsMenuItem
// //
this.AutoSaveCheatsMenuItem.Name = "AutoSaveCheatsMenuItem"; this.AutoSaveCheatsMenuItem.Name = "AutoSaveCheatsMenuItem";
this.AutoSaveCheatsMenuItem.Size = new System.Drawing.Size(199, 22); this.AutoSaveCheatsMenuItem.Size = new System.Drawing.Size(372, 38);
this.AutoSaveCheatsMenuItem.Text = "Autosave cheats"; this.AutoSaveCheatsMenuItem.Text = "Autosave cheats";
this.AutoSaveCheatsMenuItem.Click += new System.EventHandler(this.AutoSaveCheatsMenuItem_Click); this.AutoSaveCheatsMenuItem.Click += new System.EventHandler(this.AutoSaveCheatsMenuItem_Click);
// //
// DisableCheatsOnLoadMenuItem // DisableCheatsOnLoadMenuItem
// //
this.DisableCheatsOnLoadMenuItem.Name = "DisableCheatsOnLoadMenuItem"; this.DisableCheatsOnLoadMenuItem.Name = "DisableCheatsOnLoadMenuItem";
this.DisableCheatsOnLoadMenuItem.Size = new System.Drawing.Size(199, 22); this.DisableCheatsOnLoadMenuItem.Size = new System.Drawing.Size(372, 38);
this.DisableCheatsOnLoadMenuItem.Text = "Disable Cheats on Load"; this.DisableCheatsOnLoadMenuItem.Text = "Disable Cheats on Load";
this.DisableCheatsOnLoadMenuItem.Click += new System.EventHandler(this.CheatsOnOffLoadMenuItem_Click); this.DisableCheatsOnLoadMenuItem.Click += new System.EventHandler(this.CheatsOnOffLoadMenuItem_Click);
// //
// toolStripSeparator7 // toolStripSeparator7
// //
this.toolStripSeparator7.Name = "toolStripSeparator7"; this.toolStripSeparator7.Name = "toolStripSeparator7";
this.toolStripSeparator7.Size = new System.Drawing.Size(196, 6); this.toolStripSeparator7.Size = new System.Drawing.Size(369, 6);
// //
// AutoloadMenuItem // AutoloadMenuItem
// //
this.AutoloadMenuItem.Name = "AutoloadMenuItem"; this.AutoloadMenuItem.Name = "AutoloadMenuItem";
this.AutoloadMenuItem.Size = new System.Drawing.Size(199, 22); this.AutoloadMenuItem.Size = new System.Drawing.Size(372, 38);
this.AutoloadMenuItem.Text = "Autoload"; this.AutoloadMenuItem.Text = "Autoload";
this.AutoloadMenuItem.Click += new System.EventHandler(this.AutoloadMenuItem_Click); this.AutoloadMenuItem.Click += new System.EventHandler(this.AutoloadMenuItem_Click);
// //
// SaveWindowPositionMenuItem // SaveWindowPositionMenuItem
// //
this.SaveWindowPositionMenuItem.Name = "SaveWindowPositionMenuItem"; this.SaveWindowPositionMenuItem.Name = "SaveWindowPositionMenuItem";
this.SaveWindowPositionMenuItem.Size = new System.Drawing.Size(199, 22); this.SaveWindowPositionMenuItem.Size = new System.Drawing.Size(372, 38);
this.SaveWindowPositionMenuItem.Text = "Save Window Position"; this.SaveWindowPositionMenuItem.Text = "Save Window Position";
this.SaveWindowPositionMenuItem.Click += new System.EventHandler(this.SaveWindowPositionMenuItem_Click); this.SaveWindowPositionMenuItem.Click += new System.EventHandler(this.SaveWindowPositionMenuItem_Click);
// //
// AlwaysOnTopMenuItem // AlwaysOnTopMenuItem
// //
this.AlwaysOnTopMenuItem.Name = "AlwaysOnTopMenuItem"; this.AlwaysOnTopMenuItem.Name = "AlwaysOnTopMenuItem";
this.AlwaysOnTopMenuItem.Size = new System.Drawing.Size(199, 22); this.AlwaysOnTopMenuItem.Size = new System.Drawing.Size(372, 38);
this.AlwaysOnTopMenuItem.Text = "Always on &Top"; this.AlwaysOnTopMenuItem.Text = "Always on &Top";
this.AlwaysOnTopMenuItem.Click += new System.EventHandler(this.AlwaysOnTopMenuItem_Click); this.AlwaysOnTopMenuItem.Click += new System.EventHandler(this.AlwaysOnTopMenuItem_Click);
// //
// FloatingWindowMenuItem // FloatingWindowMenuItem
// //
this.FloatingWindowMenuItem.Name = "FloatingWindowMenuItem"; this.FloatingWindowMenuItem.Name = "FloatingWindowMenuItem";
this.FloatingWindowMenuItem.Size = new System.Drawing.Size(199, 22); this.FloatingWindowMenuItem.Size = new System.Drawing.Size(372, 38);
this.FloatingWindowMenuItem.Text = "Floating Window"; this.FloatingWindowMenuItem.Text = "Floating Window";
this.FloatingWindowMenuItem.Click += new System.EventHandler(this.FloatingWindowMenuItem_Click); this.FloatingWindowMenuItem.Click += new System.EventHandler(this.FloatingWindowMenuItem_Click);
// //
// toolStripSeparator5 // toolStripSeparator5
// //
this.toolStripSeparator5.Name = "toolStripSeparator5"; this.toolStripSeparator5.Name = "toolStripSeparator5";
this.toolStripSeparator5.Size = new System.Drawing.Size(196, 6); this.toolStripSeparator5.Size = new System.Drawing.Size(369, 6);
// //
// RestoreWindowSizeMenuItem // RestoreWindowSizeMenuItem
// //
this.RestoreWindowSizeMenuItem.Name = "RestoreWindowSizeMenuItem"; this.RestoreWindowSizeMenuItem.Name = "RestoreWindowSizeMenuItem";
this.RestoreWindowSizeMenuItem.Size = new System.Drawing.Size(199, 22); this.RestoreWindowSizeMenuItem.Size = new System.Drawing.Size(372, 38);
this.RestoreWindowSizeMenuItem.Text = "Restore Default Settings"; this.RestoreWindowSizeMenuItem.Text = "Restore Default Settings";
this.RestoreWindowSizeMenuItem.Click += new System.EventHandler(this.RestoreDefaultsMenuItem_Click); this.RestoreWindowSizeMenuItem.Click += new System.EventHandler(this.RestoreDefaultsMenuItem_Click);
// //
// toolStrip1 // toolStrip1
// //
this.toolStrip1.ClickThrough = true; this.toolStrip1.ClickThrough = true;
this.toolStrip1.ImageScalingSize = new System.Drawing.Size(32, 32);
this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.NewToolBarItem, this.NewToolBarItem,
this.OpenToolBarItem, this.OpenToolBarItem,
@ -510,9 +522,10 @@
this.MoveDownToolbarItem, this.MoveDownToolbarItem,
this.GameGenieToolbarSeparator, this.GameGenieToolbarSeparator,
this.LoadGameGenieToolbarItem}); this.LoadGameGenieToolbarItem});
this.toolStrip1.Location = new System.Drawing.Point(0, 24); this.toolStrip1.Location = new System.Drawing.Point(0, 46);
this.toolStrip1.Name = "toolStrip1"; this.toolStrip1.Name = "toolStrip1";
this.toolStrip1.Size = new System.Drawing.Size(646, 25); this.toolStrip1.Padding = new System.Windows.Forms.Padding(0, 0, 2, 0);
this.toolStrip1.Size = new System.Drawing.Size(1292, 39);
this.toolStrip1.TabIndex = 3; this.toolStrip1.TabIndex = 3;
this.toolStrip1.Text = "toolStrip1"; this.toolStrip1.Text = "toolStrip1";
// //
@ -522,7 +535,7 @@
this.NewToolBarItem.Image = ((System.Drawing.Image)(resources.GetObject("NewToolBarItem.Image"))); this.NewToolBarItem.Image = ((System.Drawing.Image)(resources.GetObject("NewToolBarItem.Image")));
this.NewToolBarItem.ImageTransparentColor = System.Drawing.Color.Magenta; this.NewToolBarItem.ImageTransparentColor = System.Drawing.Color.Magenta;
this.NewToolBarItem.Name = "NewToolBarItem"; this.NewToolBarItem.Name = "NewToolBarItem";
this.NewToolBarItem.Size = new System.Drawing.Size(23, 22); this.NewToolBarItem.Size = new System.Drawing.Size(36, 36);
this.NewToolBarItem.Text = "&New"; this.NewToolBarItem.Text = "&New";
this.NewToolBarItem.Click += new System.EventHandler(this.NewMenuItem_Click); this.NewToolBarItem.Click += new System.EventHandler(this.NewMenuItem_Click);
// //
@ -532,7 +545,7 @@
this.OpenToolBarItem.Image = ((System.Drawing.Image)(resources.GetObject("OpenToolBarItem.Image"))); this.OpenToolBarItem.Image = ((System.Drawing.Image)(resources.GetObject("OpenToolBarItem.Image")));
this.OpenToolBarItem.ImageTransparentColor = System.Drawing.Color.Magenta; this.OpenToolBarItem.ImageTransparentColor = System.Drawing.Color.Magenta;
this.OpenToolBarItem.Name = "OpenToolBarItem"; this.OpenToolBarItem.Name = "OpenToolBarItem";
this.OpenToolBarItem.Size = new System.Drawing.Size(23, 22); this.OpenToolBarItem.Size = new System.Drawing.Size(36, 36);
this.OpenToolBarItem.Text = "&Open"; this.OpenToolBarItem.Text = "&Open";
this.OpenToolBarItem.Click += new System.EventHandler(this.OpenMenuItem_Click); this.OpenToolBarItem.Click += new System.EventHandler(this.OpenMenuItem_Click);
// //
@ -542,14 +555,14 @@
this.SaveToolBarItem.Image = ((System.Drawing.Image)(resources.GetObject("SaveToolBarItem.Image"))); this.SaveToolBarItem.Image = ((System.Drawing.Image)(resources.GetObject("SaveToolBarItem.Image")));
this.SaveToolBarItem.ImageTransparentColor = System.Drawing.Color.Magenta; this.SaveToolBarItem.ImageTransparentColor = System.Drawing.Color.Magenta;
this.SaveToolBarItem.Name = "SaveToolBarItem"; this.SaveToolBarItem.Name = "SaveToolBarItem";
this.SaveToolBarItem.Size = new System.Drawing.Size(23, 22); this.SaveToolBarItem.Size = new System.Drawing.Size(36, 36);
this.SaveToolBarItem.Text = "&Save"; this.SaveToolBarItem.Text = "&Save";
this.SaveToolBarItem.Click += new System.EventHandler(this.SaveMenuItem_Click); this.SaveToolBarItem.Click += new System.EventHandler(this.SaveMenuItem_Click);
// //
// toolStripSeparator // toolStripSeparator
// //
this.toolStripSeparator.Name = "toolStripSeparator"; this.toolStripSeparator.Name = "toolStripSeparator";
this.toolStripSeparator.Size = new System.Drawing.Size(6, 25); this.toolStripSeparator.Size = new System.Drawing.Size(6, 39);
// //
// RemoveToolbarItem // RemoveToolbarItem
// //
@ -557,7 +570,7 @@
this.RemoveToolbarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Delete; this.RemoveToolbarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Delete;
this.RemoveToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta; this.RemoveToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta;
this.RemoveToolbarItem.Name = "RemoveToolbarItem"; this.RemoveToolbarItem.Name = "RemoveToolbarItem";
this.RemoveToolbarItem.Size = new System.Drawing.Size(23, 22); this.RemoveToolbarItem.Size = new System.Drawing.Size(36, 36);
this.RemoveToolbarItem.Text = "&Remove"; this.RemoveToolbarItem.Text = "&Remove";
this.RemoveToolbarItem.Click += new System.EventHandler(this.RemoveCheatMenuItem_Click); this.RemoveToolbarItem.Click += new System.EventHandler(this.RemoveCheatMenuItem_Click);
// //
@ -567,14 +580,14 @@
this.SeparatorToolbarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.InsertSeparator; this.SeparatorToolbarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.InsertSeparator;
this.SeparatorToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta; this.SeparatorToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta;
this.SeparatorToolbarItem.Name = "SeparatorToolbarItem"; this.SeparatorToolbarItem.Name = "SeparatorToolbarItem";
this.SeparatorToolbarItem.Size = new System.Drawing.Size(23, 22); this.SeparatorToolbarItem.Size = new System.Drawing.Size(36, 36);
this.SeparatorToolbarItem.Text = "Insert Separator"; this.SeparatorToolbarItem.Text = "Insert Separator";
this.SeparatorToolbarItem.Click += new System.EventHandler(this.InsertSeparatorMenuItem_Click); this.SeparatorToolbarItem.Click += new System.EventHandler(this.InsertSeparatorMenuItem_Click);
// //
// toolStripSeparator2 // toolStripSeparator2
// //
this.toolStripSeparator2.Name = "toolStripSeparator2"; this.toolStripSeparator2.Name = "toolStripSeparator2";
this.toolStripSeparator2.Size = new System.Drawing.Size(6, 25); this.toolStripSeparator2.Size = new System.Drawing.Size(6, 39);
// //
// MoveUpToolbarItem // MoveUpToolbarItem
// //
@ -582,7 +595,7 @@
this.MoveUpToolbarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveUp; this.MoveUpToolbarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveUp;
this.MoveUpToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta; this.MoveUpToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta;
this.MoveUpToolbarItem.Name = "MoveUpToolbarItem"; this.MoveUpToolbarItem.Name = "MoveUpToolbarItem";
this.MoveUpToolbarItem.Size = new System.Drawing.Size(23, 22); this.MoveUpToolbarItem.Size = new System.Drawing.Size(36, 36);
this.MoveUpToolbarItem.Text = "Move Up"; this.MoveUpToolbarItem.Text = "Move Up";
this.MoveUpToolbarItem.Click += new System.EventHandler(this.MoveUpMenuItem_Click); this.MoveUpToolbarItem.Click += new System.EventHandler(this.MoveUpMenuItem_Click);
// //
@ -592,14 +605,14 @@
this.MoveDownToolbarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveDown; this.MoveDownToolbarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveDown;
this.MoveDownToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta; this.MoveDownToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta;
this.MoveDownToolbarItem.Name = "MoveDownToolbarItem"; this.MoveDownToolbarItem.Name = "MoveDownToolbarItem";
this.MoveDownToolbarItem.Size = new System.Drawing.Size(23, 22); this.MoveDownToolbarItem.Size = new System.Drawing.Size(36, 36);
this.MoveDownToolbarItem.Text = "Move Down"; this.MoveDownToolbarItem.Text = "Move Down";
this.MoveDownToolbarItem.Click += new System.EventHandler(this.MoveDownMenuItem_Click); this.MoveDownToolbarItem.Click += new System.EventHandler(this.MoveDownMenuItem_Click);
// //
// GameGenieToolbarSeparator // GameGenieToolbarSeparator
// //
this.GameGenieToolbarSeparator.Name = "GameGenieToolbarSeparator"; this.GameGenieToolbarSeparator.Name = "GameGenieToolbarSeparator";
this.GameGenieToolbarSeparator.Size = new System.Drawing.Size(6, 25); this.GameGenieToolbarSeparator.Size = new System.Drawing.Size(6, 39);
// //
// LoadGameGenieToolbarItem // LoadGameGenieToolbarItem
// //
@ -607,7 +620,7 @@
this.LoadGameGenieToolbarItem.Image = ((System.Drawing.Image)(resources.GetObject("LoadGameGenieToolbarItem.Image"))); this.LoadGameGenieToolbarItem.Image = ((System.Drawing.Image)(resources.GetObject("LoadGameGenieToolbarItem.Image")));
this.LoadGameGenieToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta; this.LoadGameGenieToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta;
this.LoadGameGenieToolbarItem.Name = "LoadGameGenieToolbarItem"; this.LoadGameGenieToolbarItem.Name = "LoadGameGenieToolbarItem";
this.LoadGameGenieToolbarItem.Size = new System.Drawing.Size(75, 22); this.LoadGameGenieToolbarItem.Size = new System.Drawing.Size(150, 36);
this.LoadGameGenieToolbarItem.Text = "Game Genie"; this.LoadGameGenieToolbarItem.Text = "Game Genie";
this.LoadGameGenieToolbarItem.ToolTipText = "Open the Game Genie Encoder/Decoder"; this.LoadGameGenieToolbarItem.ToolTipText = "Open the Game Genie Encoder/Decoder";
this.LoadGameGenieToolbarItem.Click += new System.EventHandler(this.OpenGameGenieEncoderDecoderMenuItem_Click); this.LoadGameGenieToolbarItem.Click += new System.EventHandler(this.OpenGameGenieEncoderDecoderMenuItem_Click);
@ -615,9 +628,10 @@
// TotalLabel // TotalLabel
// //
this.TotalLabel.AutoSize = true; this.TotalLabel.AutoSize = true;
this.TotalLabel.Location = new System.Drawing.Point(9, 52); this.TotalLabel.Location = new System.Drawing.Point(18, 100);
this.TotalLabel.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.TotalLabel.Name = "TotalLabel"; this.TotalLabel.Name = "TotalLabel";
this.TotalLabel.Size = new System.Drawing.Size(49, 13); this.TotalLabel.Size = new System.Drawing.Size(98, 25);
this.TotalLabel.TabIndex = 6; this.TotalLabel.TabIndex = 6;
this.TotalLabel.Text = "0 Cheats"; this.TotalLabel.Text = "0 Cheats";
// //
@ -625,9 +639,10 @@
// //
this.MessageLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.MessageLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.MessageLabel.AutoSize = true; this.MessageLabel.AutoSize = true;
this.MessageLabel.Location = new System.Drawing.Point(13, 391); this.MessageLabel.Location = new System.Drawing.Point(26, 752);
this.MessageLabel.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.MessageLabel.Name = "MessageLabel"; this.MessageLabel.Name = "MessageLabel";
this.MessageLabel.Size = new System.Drawing.Size(31, 13); this.MessageLabel.Size = new System.Drawing.Size(60, 25);
this.MessageLabel.TabIndex = 7; this.MessageLabel.TabIndex = 7;
this.MessageLabel.Text = " "; this.MessageLabel.Text = " ";
// //
@ -636,9 +651,11 @@
this.CheatGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.CheatGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.CheatGroupBox.Controls.Add(this.CheatEditor); this.CheatGroupBox.Controls.Add(this.CheatEditor);
this.CheatGroupBox.Location = new System.Drawing.Point(432, 66); this.CheatGroupBox.Location = new System.Drawing.Point(864, 127);
this.CheatGroupBox.Margin = new System.Windows.Forms.Padding(6);
this.CheatGroupBox.Name = "CheatGroupBox"; this.CheatGroupBox.Name = "CheatGroupBox";
this.CheatGroupBox.Size = new System.Drawing.Size(202, 321); this.CheatGroupBox.Padding = new System.Windows.Forms.Padding(6);
this.CheatGroupBox.Size = new System.Drawing.Size(404, 617);
this.CheatGroupBox.TabIndex = 8; this.CheatGroupBox.TabIndex = 8;
this.CheatGroupBox.TabStop = false; this.CheatGroupBox.TabStop = false;
this.CheatGroupBox.Text = "New Cheat"; this.CheatGroupBox.Text = "New Cheat";
@ -648,17 +665,18 @@
this.CheatEditor.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 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.Left)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.CheatEditor.Location = new System.Drawing.Point(6, 14); this.CheatEditor.Location = new System.Drawing.Point(12, 27);
this.CheatEditor.Margin = new System.Windows.Forms.Padding(6);
this.CheatEditor.MemoryDomains = null; this.CheatEditor.MemoryDomains = null;
this.CheatEditor.Name = "CheatEditor"; this.CheatEditor.Name = "CheatEditor";
this.CheatEditor.Size = new System.Drawing.Size(190, 301); this.CheatEditor.Size = new System.Drawing.Size(380, 579);
this.CheatEditor.TabIndex = 0; this.CheatEditor.TabIndex = 0;
// //
// Cheats // Cheats
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 25F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(646, 407); this.ClientSize = new System.Drawing.Size(1292, 783);
this.Controls.Add(this.CheatGroupBox); this.Controls.Add(this.CheatGroupBox);
this.Controls.Add(this.MessageLabel); this.Controls.Add(this.MessageLabel);
this.Controls.Add(this.TotalLabel); this.Controls.Add(this.TotalLabel);
@ -666,7 +684,8 @@
this.Controls.Add(this.CheatsMenu); this.Controls.Add(this.CheatsMenu);
this.Controls.Add(this.CheatListView); this.Controls.Add(this.CheatListView);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MinimumSize = new System.Drawing.Size(285, 384); this.Margin = new System.Windows.Forms.Padding(6);
this.MinimumSize = new System.Drawing.Size(544, 673);
this.Name = "Cheats"; this.Name = "Cheats";
this.Text = "Cheats"; this.Text = "Cheats";
this.Load += new System.EventHandler(this.Cheats_Load); this.Load += new System.EventHandler(this.Cheats_Load);
@ -689,6 +708,7 @@
private System.Windows.Forms.ColumnHeader CheatName; private System.Windows.Forms.ColumnHeader CheatName;
private System.Windows.Forms.ColumnHeader Address; private System.Windows.Forms.ColumnHeader Address;
private System.Windows.Forms.ColumnHeader Value; private System.Windows.Forms.ColumnHeader Value;
private System.Windows.Forms.ColumnHeader ComparisonType;
private System.Windows.Forms.ColumnHeader Compare; private System.Windows.Forms.ColumnHeader Compare;
private System.Windows.Forms.ColumnHeader On; private System.Windows.Forms.ColumnHeader On;
private System.Windows.Forms.ColumnHeader Domain; private System.Windows.Forms.ColumnHeader Domain;

View File

@ -24,6 +24,7 @@ namespace BizHawk.Client.EmuHawk
private const string SIZE = "SizeColumn"; private const string SIZE = "SizeColumn";
private const string ENDIAN = "EndianColumn"; private const string ENDIAN = "EndianColumn";
private const string TYPE = "DisplayTypeColumn"; private const string TYPE = "DisplayTypeColumn";
private const string COMPARISONTYPE = "ComparisonTypeColumn";
private int _defaultWidth; private int _defaultWidth;
private int _defaultHeight; private int _defaultHeight;
@ -51,7 +52,8 @@ namespace BizHawk.Client.EmuHawk
[RequiredService] [RequiredService]
private IMemoryDomains Core { get; set; } private IMemoryDomains Core { get; set; }
[ConfigPersist] // Adam Sturge : I commented this out because it was causing me issues by removing the comparison type column
//[ConfigPersist]
public CheatsSettings Settings { get; set; } public CheatsSettings Settings { get; set; }
public bool UpdateBefore { get { return false; } } public bool UpdateBefore { get { return false; } }
@ -699,11 +701,12 @@ namespace BizHawk.Client.EmuHawk
new Column { Name = ADDRESS, Visible = true, Index = 1, Width = 60 }, new Column { Name = ADDRESS, Visible = true, Index = 1, Width = 60 },
new Column { Name = VALUE, Visible = true, Index = 2, Width = 59 }, new Column { Name = VALUE, Visible = true, Index = 2, Width = 59 },
new Column { Name = COMPARE, Visible = true, Index = 3, Width = 59 }, new Column { Name = COMPARE, Visible = true, Index = 3, Width = 59 },
new Column { Name = ON, Visible = false, Index = 4, Width = 28 }, new Column { Name = COMPARISONTYPE, Visible = true, Index = 4, Width = 60 },
new Column { Name = DOMAIN, Visible = true, Index = 5, Width = 55 }, new Column { Name = ON, Visible = false, Index = 5, Width = 28 },
new Column { Name = SIZE, Visible = true, Index = 6, Width = 55 }, new Column { Name = DOMAIN, Visible = true, Index = 6, Width = 55 },
new Column { Name = ENDIAN, Visible = false, Index = 7, Width = 55 }, new Column { Name = SIZE, Visible = true, Index = 7, Width = 55 },
new Column { Name = TYPE, Visible = false, Index = 8, Width = 55 } new Column { Name = ENDIAN, Visible = false, Index = 8, Width = 55 },
new Column { Name = TYPE, Visible = false, Index = 9, Width = 55 }
}; };
} }

View File

@ -130,7 +130,7 @@
<data name="NewToolBarItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="NewToolBarItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAERSURBVDhPrZDbSgJRGIXnpewd6jXsjSQvIrwoI0RQMChU YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAERSURBVDhPrZDbSgJRGIXnpewd6jXsjSQvIrwoI0RQMChU
0iiDPCGiE3ZCRkvR8VzTeBhnyR5/ccaZNnPhB4t9sdf6Ln5hb8QeathNJFVFKF5C8DqL4ksDVHWGDf7j 0iiDPCGiE3ZCRkvR8VzTeBhnyR5/ccaZNnPhB4t9sdf6Ln5hb8QeathNJFVFKF5C8DqL4ksDVHWGDf7j
LHyPg6NjviSaFqlu5yQYR+KpupaIkrMknCxT3Y7v/NYYb0ITK1c3BarbWWhLQ7IR0cTKReyZ6lZ0XYei LHyPg6NjviSaFqlu5yQYR+KpupaIkrMknCxT3Y7v/NYYb0ITK1c3BarbWWhLQ7IR0cTKReyZ6lZ0XYei
ztHpK4bAc+h1FgQijzSxMptrGIxVSO0xX3AaStFki7bUMVFmaMm/eJMGfIH/MkGzLep0AXn4h/r3CJV3 ztHpK4bAc+h1FgQijzSxMptrGIxVSO0xX3AaStFki7bUMVFmaMm/eJMGfIH/MkGzLep0AXn4h/r3CJV3
@ -141,7 +141,7 @@
<data name="OpenToolBarItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="OpenToolBarItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJHSURBVDhPxZBdSNNhFMb/F110ZZEVhVBgeeHNICiiuggp YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAJHSURBVDhPxZBdSNNhFMb/F110ZZEVhVBgeeHNICiiuggp
olAUyyxI0oSaH1QYC3N+tKnp5ubm1JUua5uuqdNKMwr7kApFItTUkWZqVhSVYmao5Nevvy7UoYR3HXh4 olAUyyxI0oSaH1QYC3N+tKnp5ubm1JUua5uuqdNKMwr7kApFItTUkWZqVhSVYmao5Nevvy7UoYR3HXh4
4XCe33nOKyy3lAY7l9RWMo0O/raWXxEyo5spVYTNvOGyfIRPfW+ptOkXqaPl6T83hcRmExSdgzAz3NVm 4XCe33nOKyy3lAY7l9RWMo0O/raWXxEyo5spVYTNvOGyfIRPfW+ptOkXqaPl6T83hcRmExSdgzAz3NVm
YWyoYla/B+1M9JtxWLPpaH22JORIjI6gKAMB0jyEimIdo4OlbuaprwVMOOMovammpDADc34qppwUrmnl YWyoYla/B+1M9JtxWLPpaH22JORIjI6gKAMB0jyEimIdo4OlbuaprwVMOOMovammpDADc34qppwUrmnl
@ -157,7 +157,7 @@
<data name="SaveToolBarItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="SaveToolBarItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIySURBVDhPrZLfS5NRGMfff6H7boIuuq2pMZyL1eAt11CW YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAIySURBVDhPrZLfS5NRGMfff6H7boIuuq2pMZyL1eAt11CW
DcOKsB9vpFmaLtNExco0av6CbIVLJ61Wk3BSkT/AFCkRZSpZmrmiJQ41xSaCwdfznL15XEUX0Reem5f3 DcOKsB9vpFmaLtNExco0av6CbIVLJ61Wk3BSkT/AFCkRZSpZmrmiJQ41xSaCwdfznL15XEUX0Reem5f3
8znnec4j/Zc8fxYGla91CS3eRTx0z6OpMYS7jmnU1X6B/VYA18snUVoyjsKCt8jLHcH5c36ouCQR2NUJ 8znnec4j/Zc8fxYGla91CS3eRTx0z6OpMYS7jmnU1X6B/VYA18snUVoyjsKCt8jLHcH5c36ouCQR2NUJ
1Nas4G9ZXlmFKbULh1Kf8lJxSfI+WeCCyopv6q+/h+DQ/DJ2WV5Ao1FgPegRAveDOS4oLfmq/h6dn/DH 1Nas4G9ZXlmFKbULh1Kf8lJxSfI+WeCCyopv6q+/h+DQ/DJ2WV5Ao1FgPegRAveDOS4oLfmq/h6dn/DH
@ -173,7 +173,7 @@
<data name="LoadGameGenieToolbarItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="LoadGameGenieToolbarItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc