From 713a0167048aff943b3e372740dcb6b11be08a19 Mon Sep 17 00:00:00 2001
From: brandman211 <brandman211@gmail.com>
Date: Thu, 14 Jun 2012 00:00:53 +0000
Subject: [PATCH] "Previous Value" and "Change Counts" options moved to a new
 View submenu for Ram Watch.

---
 .../tools/RamWatch.Designer.cs                | 58 +++++++++++--------
 BizHawk.MultiClient/tools/RamWatch.cs         | 12 ++++
 2 files changed, 46 insertions(+), 24 deletions(-)

diff --git a/BizHawk.MultiClient/tools/RamWatch.Designer.cs b/BizHawk.MultiClient/tools/RamWatch.Designer.cs
index 767bd04660..a6c715e0e0 100644
--- a/BizHawk.MultiClient/tools/RamWatch.Designer.cs
+++ b/BizHawk.MultiClient/tools/RamWatch.Designer.cs
@@ -59,9 +59,10 @@
 			this.moveUpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.moveDownToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.selectAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.optionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.showChangeCountsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.viewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.showPreviousValueToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.showChangeCountsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.optionsToolStripMenuItem = 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();
@@ -117,6 +118,7 @@
 			this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.filesToolStripMenuItem,
             this.watchesToolStripMenuItem,
+            this.viewToolStripMenuItem,
             this.optionsToolStripMenuItem});
 			this.menuStrip1.Location = new System.Drawing.Point(0, 0);
 			this.menuStrip1.Name = "menuStrip1";
@@ -368,11 +370,34 @@
 			this.selectAllToolStripMenuItem.Text = "Select &All";
 			this.selectAllToolStripMenuItem.Click += new System.EventHandler(this.selectAllToolStripMenuItem_Click);
 			// 
+			// viewToolStripMenuItem
+			// 
+			this.viewToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.showPreviousValueToolStripMenuItem,
+            this.showChangeCountsToolStripMenuItem});
+			this.viewToolStripMenuItem.Name = "viewToolStripMenuItem";
+			this.viewToolStripMenuItem.Size = new System.Drawing.Size(44, 20);
+			this.viewToolStripMenuItem.Text = "&View";
+			// 
+			// showPreviousValueToolStripMenuItem
+			// 
+			this.showPreviousValueToolStripMenuItem.Name = "showPreviousValueToolStripMenuItem";
+			this.showPreviousValueToolStripMenuItem.Size = new System.Drawing.Size(156, 22);
+			this.showPreviousValueToolStripMenuItem.Text = "Previous Value";
+			this.showPreviousValueToolStripMenuItem.Click += new System.EventHandler(this.showPreviousValueToolStripMenuItem_Click_1);
+			// 
+			// showChangeCountsToolStripMenuItem
+			// 
+			this.showChangeCountsToolStripMenuItem.Checked = true;
+			this.showChangeCountsToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;
+			this.showChangeCountsToolStripMenuItem.Name = "showChangeCountsToolStripMenuItem";
+			this.showChangeCountsToolStripMenuItem.Size = new System.Drawing.Size(156, 22);
+			this.showChangeCountsToolStripMenuItem.Text = "Change Counts";
+			this.showChangeCountsToolStripMenuItem.Click += new System.EventHandler(this.showChangeCountsToolStripMenuItem_Click_1);
+			// 
 			// optionsToolStripMenuItem
 			// 
 			this.optionsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.showChangeCountsToolStripMenuItem,
-            this.showPreviousValueToolStripMenuItem,
             this.prevValueShowsChangeAmountToolStripMenuItem,
             this.displayWatchesOnScreenToolStripMenuItem,
             this.toolStripSeparator7,
@@ -383,22 +408,6 @@
 			this.optionsToolStripMenuItem.Text = "&Options";
 			this.optionsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.optionsToolStripMenuItem_DropDownOpened);
 			// 
-			// showChangeCountsToolStripMenuItem
-			// 
-			this.showChangeCountsToolStripMenuItem.Checked = true;
-			this.showChangeCountsToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;
-			this.showChangeCountsToolStripMenuItem.Name = "showChangeCountsToolStripMenuItem";
-			this.showChangeCountsToolStripMenuItem.Size = new System.Drawing.Size(217, 22);
-			this.showChangeCountsToolStripMenuItem.Text = "Change Counts";
-			this.showChangeCountsToolStripMenuItem.Click += new System.EventHandler(this.showChangeCountsToolStripMenuItem_Click);
-			// 
-			// showPreviousValueToolStripMenuItem
-			// 
-			this.showPreviousValueToolStripMenuItem.Name = "showPreviousValueToolStripMenuItem";
-			this.showPreviousValueToolStripMenuItem.Size = new System.Drawing.Size(217, 22);
-			this.showPreviousValueToolStripMenuItem.Text = "Previous Value";
-			this.showPreviousValueToolStripMenuItem.Click += new System.EventHandler(this.showPreviousValueToolStripMenuItem_Click);
-			// 
 			// prevValueShowsChangeAmountToolStripMenuItem
 			// 
 			this.prevValueShowsChangeAmountToolStripMenuItem.Name = "prevValueShowsChangeAmountToolStripMenuItem";
@@ -905,10 +914,8 @@
         private System.Windows.Forms.ToolStripMenuItem moveDownToolStripMenuItem1;
         private System.Windows.Forms.ToolStripButton ClearChangeCountstoolStripButton;
         private System.Windows.Forms.ToolStripMenuItem clearChangeCountsToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem optionsToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem showChangeCountsToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem restoreWindowSizeToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem showPreviousValueToolStripMenuItem;
+		private System.Windows.Forms.ToolStripMenuItem optionsToolStripMenuItem;
+		private System.Windows.Forms.ToolStripMenuItem restoreWindowSizeToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem prevValueShowsChangeAmountToolStripMenuItem;
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
         private System.Windows.Forms.ToolStripMenuItem showChangeCountsToolStripMenuItem1;
@@ -925,5 +932,8 @@
 		private System.Windows.Forms.ToolStripMenuItem saveWindowPositionToolStripMenuItem;
 		private System.Windows.Forms.ToolStripMenuItem selectAllToolStripMenuItem;
 		private System.Windows.Forms.ToolStripMenuItem displayWatchesOnScreenToolStripMenuItem;
+		private System.Windows.Forms.ToolStripMenuItem viewToolStripMenuItem;
+		private System.Windows.Forms.ToolStripMenuItem showPreviousValueToolStripMenuItem;
+		private System.Windows.Forms.ToolStripMenuItem showChangeCountsToolStripMenuItem;
     }
 }
\ No newline at end of file
diff --git a/BizHawk.MultiClient/tools/RamWatch.cs b/BizHawk.MultiClient/tools/RamWatch.cs
index da0340328c..f806eaacb8 100644
--- a/BizHawk.MultiClient/tools/RamWatch.cs
+++ b/BizHawk.MultiClient/tools/RamWatch.cs
@@ -1412,5 +1412,17 @@ namespace BizHawk.MultiClient
 				}
 			}
 		}
+
+		private void showPreviousValueToolStripMenuItem_Click_1(object sender, EventArgs e)
+		{
+			Global.Config.RamWatchShowPrevColumn ^= true;
+			SetPrevColumn(Global.Config.RamWatchShowPrevColumn);
+		}
+
+		private void showChangeCountsToolStripMenuItem_Click_1(object sender, EventArgs e)
+		{
+			Global.Config.RamWatchShowChangeColumn ^= true;
+			SetChangesColumn(Global.Config.RamWatchShowChangeColumn);
+		}
 	}
 }
\ No newline at end of file