diff --git a/BizHawk.MultiClient/tools/RamWatch.Designer.cs b/BizHawk.MultiClient/tools/RamWatch.Designer.cs index 29abda4e23..4c6f2e2729 100644 --- a/BizHawk.MultiClient/tools/RamWatch.Designer.cs +++ b/BizHawk.MultiClient/tools/RamWatch.Designer.cs @@ -86,6 +86,8 @@ this.MoveDownStripButton1 = new System.Windows.Forms.ToolStripButton(); this.WatchCountLabel = new System.Windows.Forms.Label(); this.MessageLabel = new System.Windows.Forms.Label(); + this.ClearChangeCountstoolStripButton = new System.Windows.Forms.ToolStripButton(); + this.clearChangeCountsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.menuStrip1.SuspendLayout(); this.contextMenuStrip1.SuspendLayout(); this.toolStrip1.SuspendLayout(); @@ -229,6 +231,7 @@ this.duplicateWatchToolStripMenuItem, this.insertSeparatorToolStripMenuItem, this.pokeAddressToolStripMenuItem, + this.clearChangeCountsToolStripMenuItem, this.toolStripSeparator3, this.moveUpToolStripMenuItem, this.moveDownToolStripMenuItem}); @@ -432,6 +435,7 @@ this.NewWatchStripButton1, this.EditWatchToolStripButton1, this.cutToolStripButton, + this.ClearChangeCountstoolStripButton, this.DuplicateWatchToolStripButton, this.PoketoolStripButton2, this.toolStripButton1, @@ -587,6 +591,26 @@ this.MessageLabel.TabIndex = 5; this.MessageLabel.Text = " "; // + // ClearChangeCountstoolStripButton + // + this.ClearChangeCountstoolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; + this.ClearChangeCountstoolStripButton.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.ClearChangeCountstoolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("ClearChangeCountstoolStripButton.Image"))); + this.ClearChangeCountstoolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.ClearChangeCountstoolStripButton.Name = "ClearChangeCountstoolStripButton"; + this.ClearChangeCountstoolStripButton.Size = new System.Drawing.Size(23, 22); + this.ClearChangeCountstoolStripButton.Text = "C"; + this.ClearChangeCountstoolStripButton.ToolTipText = "Clear Change Counts"; + this.ClearChangeCountstoolStripButton.Click += new System.EventHandler(this.ClearChangeCountstoolStripButton_Click); + // + // clearChangeCountsToolStripMenuItem + // + this.clearChangeCountsToolStripMenuItem.Name = "clearChangeCountsToolStripMenuItem"; + this.clearChangeCountsToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.C))); + this.clearChangeCountsToolStripMenuItem.Size = new System.Drawing.Size(222, 22); + this.clearChangeCountsToolStripMenuItem.Text = "&Clear Change Counts"; + this.clearChangeCountsToolStripMenuItem.Click += new System.EventHandler(this.clearChangeCountsToolStripMenuItem_Click); + // // RamWatch // this.AllowDrop = true; @@ -676,5 +700,7 @@ private System.Windows.Forms.ToolStripMenuItem insertSeperatorToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem moveUpToolStripMenuItem1; private System.Windows.Forms.ToolStripMenuItem moveDownToolStripMenuItem1; + private System.Windows.Forms.ToolStripButton ClearChangeCountstoolStripButton; + private System.Windows.Forms.ToolStripMenuItem clearChangeCountsToolStripMenuItem; } } \ No newline at end of file diff --git a/BizHawk.MultiClient/tools/RamWatch.cs b/BizHawk.MultiClient/tools/RamWatch.cs index 336736b57b..926e8b7a75 100644 --- a/BizHawk.MultiClient/tools/RamWatch.cs +++ b/BizHawk.MultiClient/tools/RamWatch.cs @@ -20,8 +20,7 @@ namespace BizHawk.MultiClient //On Movie UP/Down set highlighted items to be what the user had selected (in their new position) //DisplayWatches needs to do value display properly like updatevalues, or just run update values //Ability to watch in different memory domains - //Reset Changecounts function - //Option to high change counts? + //Option to hide change counts? //IDEAS: //Option to show previous value //Option to show change from previous value @@ -879,5 +878,23 @@ namespace BizHawk.MultiClient { e.Effect = e.Data.GetDataPresent(DataFormats.FileDrop) ? DragDropEffects.Copy : DragDropEffects.None;string[] filePaths = (string[]) e.Data.GetData(DataFormats.FileDrop); } + + private void ClearChangeCounts() + { + for (int x = 0; x < watchList.Count; x++) + watchList[x].changecount = 0; + DisplayWatchList(); + MessageLabel.Text = "Change counts cleared"; + } + + private void ClearChangeCountstoolStripButton_Click(object sender, EventArgs e) + { + ClearChangeCounts(); + } + + private void clearChangeCountsToolStripMenuItem_Click(object sender, EventArgs e) + { + ClearChangeCounts(); + } } } \ No newline at end of file diff --git a/BizHawk.MultiClient/tools/RamWatch.resx b/BizHawk.MultiClient/tools/RamWatch.resx index e8ed4a3d48..5f99e8a1ad 100644 --- a/BizHawk.MultiClient/tools/RamWatch.resx +++ b/BizHawk.MultiClient/tools/RamWatch.resx @@ -197,6 +197,21 @@ 6auUqlU/KwBZJV4skWUuvMmYV8b+Ls6jQQ81DfryO3KtfUoA/p3810G37T3VJ3TlARdvukhldjANeemx z2B8MS0mq80GyySHj98rD2jQOpXbtgrVNprRnO2h5lQX1Sc7leYODh27W3nN9/WZDnroDx0A5wwhdtmt AAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAgxJREFUOE+lkvtL + U2EYx+0PEbtpFwnBKPGKiJImGP0gYhIYs1E5GF5gIxkpA00JRSmMEF0ohMh+GaRWYlqabMVcNdS2QpaI + VqiDIYhk397vA6fXhCjyhYdzeM/5fp7vczkAdeL2cwho7v/wWzT1zcN+Pwhr51uY2/y41PQaF+wzKKiZ + QvaN58g0jyLd5KEUcQbg+84P/Cm2tncQjW3j68YWIqubCC3FcOJc478BAuGoZM6zvoRnakXEruEIjhc4 + /g5gZop9c+voGAyLbQIfeBZxLL9BA1jzXvuGbWamuKh+GmmVbswE19A59FEBbmoAG7YbsLtm2mZmiml9 + cvabNDwpz6YB7LYBoMXCumkJr7LOmnnHzBQ/9X2Bo2cOibm1GsBREbAQiYmw/8lnuCeWkVzcgnZlnw1j + 3HV/wuNXK6i/9x5Hc6wawDlTXHbLJ+LZUBQPRyKwdQdxutwl1h+NLXHh5Ht1ewBHsiwawCW57HyDAfWR + dvl0uhZQ1eqX8aVc7EKLqrum651ATLf9OJx5XQM4KmY0xPzZ0hFAiQJnXB0WwME0E3IsL5B17ZlADqWb + NYDrOepdlcysmTWWOrxqbceRWtaLk0VO1XW72D5Vckd2gMBfq8zdpmUG62NJvKM4+XyziDk24xmfWoGE + s1c0gHPmbrPTpHNJKOCo2G1mZs20zcwUJ5yp1AB5+8/zEwgF5GMVDxh4AAAAAElFTkSuQmCC