Cheat Window/Ram Search/Ram Watch - switch key up events to key down, add Ctrl+A select all to cheat window & ram watch

BizHawk.MultiClient/tools/Cheats.Designer.cs

@@ -675,7 +675,7 @@
 			this.CheatListView.SelectedIndexChanged += new System.EventHandler(this.CheatListView_SelectedIndexChanged);
 			this.CheatListView.Click += new System.EventHandler(this.CheatListView_Click);
 			this.CheatListView.DoubleClick += new System.EventHandler(this.CheatListView_DoubleClick);
-			this.CheatListView.KeyUp += new System.Windows.Forms.KeyEventHandler(this.CheatListView_KeyUp);
+			this.CheatListView.KeyDown += new System.Windows.Forms.KeyEventHandler(this.CheatListView_KeyDown);
 			// 
 			// CheatName
 			// 

BizHawk.MultiClient/tools/Cheats.cs

@@ -976,18 +976,25 @@ namespace BizHawk.MultiClient
 			}
 		}
 
-		private void CheatListView_KeyUp(object sender, KeyEventArgs e)
-		{
-			if (e.KeyCode == Keys.Delete && !e.Control && !e.Alt && !e.Shift)
-			{
-				RemoveCheat();
-			}
-		}
-
 		private void selectAllToolStripMenuItem_Click(object sender, EventArgs e)
 		{
 			for (int x = 0; x < Global.CheatList.cheatList.Count; x++)
 				CheatListView.SelectItem(x, true);
 		}
+
+		private void CheatListView_KeyDown(object sender, KeyEventArgs e)
+		{
+			if (e.KeyCode == Keys.Delete && !e.Control && !e.Alt && !e.Shift)
+			{
+				RemoveCheat();
+			}
+			else if (e.KeyCode == Keys.A && e.Control && !e.Alt && !e.Shift) //Select All
+			{
+				for (int x = 0; x < Global.CheatList.cheatList.Count; x++)
+				{
+					CheatListView.SelectItem(x, true);
+				}
+			}
+		}
 	}
 }

BizHawk.MultiClient/tools/RamSearch.Designer.cs

@@ -302,7 +302,7 @@
 			this.SearchListView.ColumnClick += new System.Windows.Forms.ColumnClickEventHandler(this.SearchListView_ColumnClick);
 			this.SearchListView.ColumnReordered += new System.Windows.Forms.ColumnReorderedEventHandler(this.SearchListView_ColumnReordered);
 			this.SearchListView.Enter += new System.EventHandler(this.SearchListView_Enter);
-			this.SearchListView.KeyUp += new System.Windows.Forms.KeyEventHandler(this.SearchListView_KeyUp);
+			this.SearchListView.KeyDown += new System.Windows.Forms.KeyEventHandler(this.SearchListView_KeyDown);
 			this.SearchListView.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.SearchListView_MouseDoubleClick);
 			// 
 			// Address

BizHawk.MultiClient/tools/RamSearch.cs

@@ -2120,21 +2120,6 @@ namespace BizHawk.MultiClient
 			DoSearch();
 		}
 
-		private void SearchListView_KeyUp(object sender, KeyEventArgs e)
-		{
-			if (e.KeyCode == Keys.Delete && !e.Control && !e.Alt && !e.Shift)
-			{
-				RemoveAddresses();
-			}
-			else if (e.KeyCode == Keys.A && e.Control && !e.Alt && !e.Shift) //Select All
-			{
-				for (int x = 0; x < searchList.Count; x++)
-				{
-					SearchListView.SelectItem(x, true);
-				}
-			}
-		}
-
 		private void RedotoolStripButton2_Click(object sender, EventArgs e)
 		{
 			DoRedo();
@@ -2154,5 +2139,20 @@ namespace BizHawk.MultiClient
 		{
 			SearchListView.Refresh();
 		}
+
+		private void SearchListView_KeyDown(object sender, KeyEventArgs e)
+		{
+			if (e.KeyCode == Keys.Delete && !e.Control && !e.Alt && !e.Shift)
+			{
+				RemoveAddresses();
+			}
+			else if (e.KeyCode == Keys.A && e.Control && !e.Alt && !e.Shift) //Select All
+			{
+				for (int x = 0; x < searchList.Count; x++)
+				{
+					SearchListView.SelectItem(x, true);
+				}
+			}
+		}
 	}
 }

BizHawk.MultiClient/tools/RamWatch.Designer.cs

@@ -63,6 +63,7 @@
 			this.showChangeCountsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.showPreviousValueToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.prevValueShowsChangeAmountToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.displayWatchesOnScreenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
 			this.saveWindowPositionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.restoreWindowSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -106,7 +107,6 @@
 			this.WatchCountLabel = new System.Windows.Forms.Label();
 			this.MessageLabel = new System.Windows.Forms.Label();
 			this.MemDomainLabel = new System.Windows.Forms.Label();
-			this.displayWatchesOnScreenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.menuStrip1.SuspendLayout();
 			this.contextMenuStrip1.SuspendLayout();
 			this.toolStrip1.SuspendLayout();
@@ -406,6 +406,13 @@
 			this.prevValueShowsChangeAmountToolStripMenuItem.Text = "Prev Value  as change";
 			this.prevValueShowsChangeAmountToolStripMenuItem.Click += new System.EventHandler(this.prevValueShowsChangeAmountToolStripMenuItem_Click);
 			// 
+			// displayWatchesOnScreenToolStripMenuItem
+			// 
+			this.displayWatchesOnScreenToolStripMenuItem.Name = "displayWatchesOnScreenToolStripMenuItem";
+			this.displayWatchesOnScreenToolStripMenuItem.Size = new System.Drawing.Size(217, 22);
+			this.displayWatchesOnScreenToolStripMenuItem.Text = "Display Watches On Screen";
+			this.displayWatchesOnScreenToolStripMenuItem.Click += new System.EventHandler(this.displayWatchesOnScreenToolStripMenuItem_Click);
+			// 
 			// toolStripSeparator7
 			// 
 			this.toolStripSeparator7.Name = "toolStripSeparator7";
@@ -454,7 +461,7 @@
 			this.WatchListView.AfterLabelEdit += new System.Windows.Forms.LabelEditEventHandler(this.WatchListView_AfterLabelEdit);
 			this.WatchListView.ColumnClick += new System.Windows.Forms.ColumnClickEventHandler(this.WatchListView_ColumnClick);
 			this.WatchListView.ColumnReordered += new System.Windows.Forms.ColumnReorderedEventHandler(this.ColumnReorder);
-			this.WatchListView.KeyUp += new System.Windows.Forms.KeyEventHandler(this.WatchListView_KeyUp);
+			this.WatchListView.KeyDown += new System.Windows.Forms.KeyEventHandler(this.WatchListView_KeyDown);
 			this.WatchListView.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.WatchListView_MouseDoubleClick);
 			// 
 			// Address
@@ -806,13 +813,6 @@
 			this.MemDomainLabel.Size = new System.Drawing.Size(0, 13);
 			this.MemDomainLabel.TabIndex = 6;
 			// 
-			// displayWatchesOnScreenToolStripMenuItem
-			// 
-			this.displayWatchesOnScreenToolStripMenuItem.Name = "displayWatchesOnScreenToolStripMenuItem";
-			this.displayWatchesOnScreenToolStripMenuItem.Size = new System.Drawing.Size(217, 22);
-			this.displayWatchesOnScreenToolStripMenuItem.Text = "Display Watches On Screen";
-			this.displayWatchesOnScreenToolStripMenuItem.Click += new System.EventHandler(this.displayWatchesOnScreenToolStripMenuItem_Click);
-			// 
 			// RamWatch
 			// 
 			this.AllowDrop = true;

BizHawk.MultiClient/tools/RamWatch.cs

@@ -1457,14 +1457,6 @@ namespace BizHawk.MultiClient
 			WatchListView.Focus();
 		}
 
-		private void WatchListView_KeyUp(object sender, KeyEventArgs e)
-		{
-			if (e.KeyCode == Keys.Delete && !e.Control && !e.Alt && !e.Shift)
-			{
-				RemoveWatch();
-			}
-		}
-
 		private void selectAllToolStripMenuItem_Click(object sender, EventArgs e)
 		{
 			SelectAll();
@@ -1490,5 +1482,20 @@ namespace BizHawk.MultiClient
 			else
 				UpdateValues();
 		}
+
+		private void WatchListView_KeyDown(object sender, KeyEventArgs e)
+		{
+			if (e.KeyCode == Keys.Delete && !e.Control && !e.Alt && !e.Shift)
+			{
+				RemoveWatch();
+			}
+			else if (e.KeyCode == Keys.A && e.Control && !e.Alt && !e.Shift) //Select All
+			{
+				for (int x = 0; x < watchList.Count; x++)
+				{
+					WatchListView.SelectItem(x, true);
+				}
+			}
+		}
 	}
 }