From db78d7b4629e57d5e4656119c992a24bb53aca5c Mon Sep 17 00:00:00 2001 From: "andres.delikat" Date: Sun, 20 Mar 2011 20:35:16 +0000 Subject: [PATCH] Cheats window - Disable All Cheats feature, start context menu --- BizHawk.MultiClient/tools/Cheats.Designer.cs | 42 +++++++++++++++++++- BizHawk.MultiClient/tools/Cheats.cs | 22 +++++++++- BizHawk.MultiClient/tools/Cheats.resx | 3 ++ 3 files changed, 65 insertions(+), 2 deletions(-) diff --git a/BizHawk.MultiClient/tools/Cheats.Designer.cs b/BizHawk.MultiClient/tools/Cheats.Designer.cs index 2fd81d6cc5..06edacb59b 100644 --- a/BizHawk.MultiClient/tools/Cheats.Designer.cs +++ b/BizHawk.MultiClient/tools/Cheats.Designer.cs @@ -28,6 +28,7 @@ /// private void InitializeComponent() { + this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Cheats)); this.CheatsMenu = new System.Windows.Forms.MenuStrip(); this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -89,9 +90,14 @@ this.Value = new System.Windows.Forms.ColumnHeader(); this.Domain = new System.Windows.Forms.ColumnHeader(); this.On = new System.Windows.Forms.ColumnHeader(); + this.disableAllCheatsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator(); + this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); + this.disableAllCheatsToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.CheatsMenu.SuspendLayout(); this.toolStrip1.SuspendLayout(); this.AddCheatGroup.SuspendLayout(); + this.contextMenuStrip1.SuspendLayout(); this.SuspendLayout(); // // CheatsMenu @@ -219,7 +225,9 @@ this.insertSeparatorToolStripMenuItem, this.toolStripSeparator3, this.moveUpToolStripMenuItem, - this.moveDownToolStripMenuItem}); + this.moveDownToolStripMenuItem, + this.toolStripSeparator6, + this.disableAllCheatsToolStripMenuItem}); this.cheatsToolStripMenuItem.Name = "cheatsToolStripMenuItem"; this.cheatsToolStripMenuItem.Size = new System.Drawing.Size(53, 20); this.cheatsToolStripMenuItem.Text = "&Cheats"; @@ -598,6 +606,7 @@ this.Value, this.Domain, this.On}); + this.CheatListView.ContextMenuStrip = this.contextMenuStrip1; this.CheatListView.FullRowSelect = true; this.CheatListView.GridLines = true; this.CheatListView.ItemCount = 0; @@ -639,6 +648,32 @@ this.On.Text = "On"; this.On.Width = 40; // + // disableAllCheatsToolStripMenuItem + // + this.disableAllCheatsToolStripMenuItem.Name = "disableAllCheatsToolStripMenuItem"; + this.disableAllCheatsToolStripMenuItem.Size = new System.Drawing.Size(201, 22); + this.disableAllCheatsToolStripMenuItem.Text = "Disable all Cheats"; + this.disableAllCheatsToolStripMenuItem.Click += new System.EventHandler(this.disableAllCheatsToolStripMenuItem_Click); + // + // toolStripSeparator6 + // + this.toolStripSeparator6.Name = "toolStripSeparator6"; + this.toolStripSeparator6.Size = new System.Drawing.Size(198, 6); + // + // contextMenuStrip1 + // + this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.disableAllCheatsToolStripMenuItem1}); + this.contextMenuStrip1.Name = "contextMenuStrip1"; + this.contextMenuStrip1.Size = new System.Drawing.Size(171, 48); + // + // disableAllCheatsToolStripMenuItem1 + // + this.disableAllCheatsToolStripMenuItem1.Name = "disableAllCheatsToolStripMenuItem1"; + this.disableAllCheatsToolStripMenuItem1.Size = new System.Drawing.Size(170, 22); + this.disableAllCheatsToolStripMenuItem1.Text = "Disable All Cheats"; + this.disableAllCheatsToolStripMenuItem1.Click += new System.EventHandler(this.disableAllCheatsToolStripMenuItem1_Click); + // // Cheats // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -661,6 +696,7 @@ this.toolStrip1.PerformLayout(); this.AddCheatGroup.ResumeLayout(false); this.AddCheatGroup.PerformLayout(); + this.contextMenuStrip1.ResumeLayout(false); this.ResumeLayout(false); this.PerformLayout(); @@ -728,5 +764,9 @@ private System.Windows.Forms.Button EditButton; private System.Windows.Forms.ToolStripMenuItem restoreWindowSizeToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator5; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator6; + private System.Windows.Forms.ToolStripMenuItem disableAllCheatsToolStripMenuItem; + private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; + private System.Windows.Forms.ToolStripMenuItem disableAllCheatsToolStripMenuItem1; } } \ No newline at end of file diff --git a/BizHawk.MultiClient/tools/Cheats.cs b/BizHawk.MultiClient/tools/Cheats.cs index 9d990be706..0bb75b3cc9 100644 --- a/BizHawk.MultiClient/tools/Cheats.cs +++ b/BizHawk.MultiClient/tools/Cheats.cs @@ -17,6 +17,9 @@ namespace BizHawk.MultiClient //Implement Freeze functions in all memory domains //Restore Window Size should restore column order as well //Disable all cheats menu & context menu item + //Double click should toggle all selected cheats not just one + //TODO: use currently selected memory domain! - line 50 + //Populate context menu int defaultWidth; //For saving the default size of the dialog, so the user can restore if desired int defaultHeight; @@ -46,7 +49,6 @@ namespace BizHawk.MultiClient ValueBox.Text = ""; PopulateMemoryDomainComboBox(); //AddressBox.MaxLength = GetNumDigits(Global.Emulator.MainMemory.Size - 1); - //TODO: use currently selected memory domain! } public void Restart() @@ -882,5 +884,23 @@ namespace BizHawk.MultiClient { Global.Config.DisableCheatsOnLoad ^= true; } + + private void DisableAllCheats() + { + for (int x = 0; x < cheatList.Count; x++) + cheatList[x].Disable(); + CheatListView.Refresh(); + UpdateNumberOfCheats(); + } + + private void disableAllCheatsToolStripMenuItem_Click(object sender, EventArgs e) + { + DisableAllCheats(); + } + + private void disableAllCheatsToolStripMenuItem1_Click(object sender, EventArgs e) + { + DisableAllCheats(); + } } } diff --git a/BizHawk.MultiClient/tools/Cheats.resx b/BizHawk.MultiClient/tools/Cheats.resx index adcc971702..8354236fa1 100644 --- a/BizHawk.MultiClient/tools/Cheats.resx +++ b/BizHawk.MultiClient/tools/Cheats.resx @@ -183,6 +183,9 @@ AAAAAElFTkSuQmCC + + 228, 17 + AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAMQOAADEDgAAAAAAAAAA