diff --git a/BizHawk.MultiClient/tools/RamSearch.Designer.cs b/BizHawk.MultiClient/tools/RamSearch.Designer.cs index 52712fd0d6..e1b9ebe609 100644 --- a/BizHawk.MultiClient/tools/RamSearch.Designer.cs +++ b/BizHawk.MultiClient/tools/RamSearch.Designer.cs @@ -82,10 +82,7 @@ this.SpecificValueRadio = new System.Windows.Forms.RadioButton(); this.PreviousValueRadio = new System.Windows.Forms.RadioButton(); this.ComparisonBox = new System.Windows.Forms.GroupBox(); - this.label1 = new System.Windows.Forms.Label(); this.DifferentByBox = new System.Windows.Forms.TextBox(); - this.ModuloBox = new System.Windows.Forms.TextBox(); - this.ModuloRadio = new System.Windows.Forms.RadioButton(); this.DifferentByRadio = new System.Windows.Forms.RadioButton(); this.NotEqualToRadio = new System.Windows.Forms.RadioButton(); this.EqualToRadio = new System.Windows.Forms.RadioButton(); @@ -426,7 +423,7 @@ this.EndiantoolSplitButton}); this.toolStrip2.Location = new System.Drawing.Point(3, 50); this.toolStrip2.Name = "toolStrip2"; - this.toolStrip2.Size = new System.Drawing.Size(208, 25); + this.toolStrip2.Size = new System.Drawing.Size(206, 25); this.toolStrip2.TabIndex = 2; // // DataSizetoolStripSplitButton1 @@ -510,7 +507,7 @@ this.EndiantoolSplitButton.Image = ((System.Drawing.Image)(resources.GetObject("EndiantoolSplitButton.Image"))); this.EndiantoolSplitButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.EndiantoolSplitButton.Name = "EndiantoolSplitButton"; - this.EndiantoolSplitButton.Size = new System.Drawing.Size(55, 17); + this.EndiantoolSplitButton.Size = new System.Drawing.Size(55, 22); this.EndiantoolSplitButton.Text = "Endian"; // // bigEndianToolStripMenuItem @@ -518,14 +515,14 @@ this.bigEndianToolStripMenuItem.Checked = true; this.bigEndianToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; this.bigEndianToolStripMenuItem.Name = "bigEndianToolStripMenuItem"; - this.bigEndianToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.bigEndianToolStripMenuItem.Size = new System.Drawing.Size(143, 22); this.bigEndianToolStripMenuItem.Text = "Big Endian"; this.bigEndianToolStripMenuItem.Click += new System.EventHandler(this.bigEndianToolStripMenuItem_Click); // // littleEndianToolStripMenuItem // this.littleEndianToolStripMenuItem.Name = "littleEndianToolStripMenuItem"; - this.littleEndianToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.littleEndianToolStripMenuItem.Size = new System.Drawing.Size(143, 22); this.littleEndianToolStripMenuItem.Text = "Little Endian"; this.littleEndianToolStripMenuItem.Click += new System.EventHandler(this.littleEndianToolStripMenuItem_Click); // @@ -619,10 +616,7 @@ // ComparisonBox // this.ComparisonBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.ComparisonBox.Controls.Add(this.label1); this.ComparisonBox.Controls.Add(this.DifferentByBox); - this.ComparisonBox.Controls.Add(this.ModuloBox); - this.ComparisonBox.Controls.Add(this.ModuloRadio); this.ComparisonBox.Controls.Add(this.DifferentByRadio); this.ComparisonBox.Controls.Add(this.NotEqualToRadio); this.ComparisonBox.Controls.Add(this.EqualToRadio); @@ -632,20 +626,11 @@ this.ComparisonBox.Controls.Add(this.LessThanRadio); this.ComparisonBox.Location = new System.Drawing.Point(250, 233); this.ComparisonBox.Name = "ComparisonBox"; - this.ComparisonBox.Size = new System.Drawing.Size(211, 190); + this.ComparisonBox.Size = new System.Drawing.Size(211, 159); this.ComparisonBox.TabIndex = 6; this.ComparisonBox.TabStop = false; this.ComparisonBox.Text = "Comparison Operator"; // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(115, 156); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(15, 13); - this.label1.TabIndex = 10; - this.label1.Text = "Is"; - // // DifferentByBox // this.DifferentByBox.Enabled = false; @@ -654,27 +639,6 @@ this.DifferentByBox.Size = new System.Drawing.Size(40, 20); this.DifferentByBox.TabIndex = 9; // - // ModuloBox - // - this.ModuloBox.Enabled = false; - this.ModuloBox.Location = new System.Drawing.Point(71, 151); - this.ModuloBox.Name = "ModuloBox"; - this.ModuloBox.Size = new System.Drawing.Size(40, 20); - this.ModuloBox.TabIndex = 8; - // - // ModuloRadio - // - this.ModuloRadio.AutoSize = true; - this.ModuloRadio.Enabled = false; - this.ModuloRadio.Location = new System.Drawing.Point(7, 153); - this.ModuloRadio.Name = "ModuloRadio"; - this.ModuloRadio.Size = new System.Drawing.Size(60, 17); - this.ModuloRadio.TabIndex = 7; - this.ModuloRadio.TabStop = true; - this.ModuloRadio.Text = "Modulo"; - this.ModuloRadio.UseVisualStyleBackColor = true; - this.ModuloRadio.CheckedChanged += new System.EventHandler(this.ModuloRadio_CheckedChanged); - // // DifferentByRadio // this.DifferentByRadio.AutoSize = true; @@ -751,13 +715,15 @@ // AutoSearchCheckBox // this.AutoSearchCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.AutoSearchCheckBox.Appearance = System.Windows.Forms.Appearance.Button; this.AutoSearchCheckBox.AutoSize = true; - this.AutoSearchCheckBox.Location = new System.Drawing.Point(257, 432); + this.AutoSearchCheckBox.Location = new System.Drawing.Point(250, 400); this.AutoSearchCheckBox.Name = "AutoSearchCheckBox"; - this.AutoSearchCheckBox.Size = new System.Drawing.Size(85, 17); + this.AutoSearchCheckBox.Size = new System.Drawing.Size(76, 23); this.AutoSearchCheckBox.TabIndex = 7; this.AutoSearchCheckBox.Text = "Auto Search"; this.AutoSearchCheckBox.UseVisualStyleBackColor = true; + this.AutoSearchCheckBox.CheckedChanged += new System.EventHandler(this.AutoSearchCheckBox_CheckedChanged); // // MemDomainLabel // @@ -871,10 +837,7 @@ private System.Windows.Forms.RadioButton LessThanOrEqualToRadio; private System.Windows.Forms.RadioButton GreaterThanRadio; private System.Windows.Forms.RadioButton LessThanRadio; - private System.Windows.Forms.RadioButton ModuloRadio; - private System.Windows.Forms.Label label1; private System.Windows.Forms.TextBox DifferentByBox; - private System.Windows.Forms.TextBox ModuloBox; private System.Windows.Forms.CheckBox AutoSearchCheckBox; private System.Windows.Forms.ToolStripMenuItem openToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem saveAsToolStripMenuItem; diff --git a/BizHawk.MultiClient/tools/RamSearch.cs b/BizHawk.MultiClient/tools/RamSearch.cs index 9d72d5348b..9b97ba4d32 100644 --- a/BizHawk.MultiClient/tools/RamSearch.cs +++ b/BizHawk.MultiClient/tools/RamSearch.cs @@ -24,7 +24,6 @@ namespace BizHawk.MultiClient //Implement Auto-Search //Impelment File handling //Implement Preview search - //Remove Modulo string systemID = "NULL"; List searchList = new List(); @@ -32,7 +31,7 @@ namespace BizHawk.MultiClient List weededList = new List(); //When addresses are weeded out, the new list goes here, before going into searchList public enum SCompareTo { PREV, VALUE, ADDRESS, CHANGES }; - public enum SOperator { LESS, GREATER, LESSEQUAL, GREATEREQUAL, EQUAL, NOTEQUAL, DIFFBY, MODULUS }; + public enum SOperator { LESS, GREATER, LESSEQUAL, GREATEREQUAL, EQUAL, NOTEQUAL, DIFFBY }; public enum SSigned { SIGNED, UNSIGNED, HEX }; //Reset window position item @@ -176,14 +175,6 @@ namespace BizHawk.MultiClient DifferentByBox.Enabled = false; } - private void ModuloRadio_CheckedChanged(object sender, EventArgs e) - { - if (ModuloRadio.Checked) - ModuloBox.Enabled = true; - else - ModuloBox.Enabled = false; - } - private void AddToRamWatch() { ListView.SelectedIndexCollection indexes = SearchListView.SelectedIndices; @@ -529,8 +520,6 @@ namespace BizHawk.MultiClient return SOperator.NOTEQUAL; if (DifferentByRadio.Checked) return SOperator.DIFFBY; - if (ModuloRadio.Checked) - return SOperator.MODULUS; return SOperator.LESS; //Just in case } @@ -555,8 +544,14 @@ namespace BizHawk.MultiClient } } + private int GetPreviousValue() + { + return 0; + } + private bool DoPreviousValue() { + int previous = GetPreviousValue(); switch (GetOperator()) { case SOperator.LESS: @@ -573,8 +568,6 @@ namespace BizHawk.MultiClient break; case SOperator.DIFFBY: break; - case SOperator.MODULUS: - break; } return false; } @@ -648,8 +641,6 @@ namespace BizHawk.MultiClient weededList.Add(searchList[x]); } break; - case SOperator.MODULUS: - break; } return true; } @@ -749,9 +740,6 @@ namespace BizHawk.MultiClient } } break; - case SOperator.MODULUS: - //TODO - break; } return true; } @@ -833,8 +821,6 @@ namespace BizHawk.MultiClient weededList.Add(searchList[x]); } break; - case SOperator.MODULUS: - break; } return true; } @@ -927,5 +913,13 @@ namespace BizHawk.MultiClient bigEndianToolStripMenuItem.Checked = false; littleEndianToolStripMenuItem.Checked = true; } + + private void AutoSearchCheckBox_CheckedChanged(object sender, EventArgs e) + { + if (AutoSearchCheckBox.Checked) + AutoSearchCheckBox.BackColor = Color.Pink; + else + AutoSearchCheckBox.BackColor = this.BackColor; + } } } diff --git a/BizHawk.MultiClient/tools/RamSearch.resx b/BizHawk.MultiClient/tools/RamSearch.resx index aa0b7271b9..70c8b2fa77 100644 --- a/BizHawk.MultiClient/tools/RamSearch.resx +++ b/BizHawk.MultiClient/tools/RamSearch.resx @@ -171,6 +171,37 @@ 259, 17 + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAjpJREFUOE+Nkl9I + U2EYxl0RQuFQI7oIuqno30U3XXoRVCAJXbibWkTgRRd2MZoZjcks12iptLQIIsi2Ylu2dJrQFslkljZo + rXWxtalMsZVIus2xTFc9PefslFnH6oMf34Hv/J73fb9zFEV/WXq9S1u2a5Nm1erizaWl5UW52ZnsZDR+ + p9l41EgtTfIr6lfafNaxZAZTeSD4GXg6CwxlgXuhHE7rOiMUt5Ni2QCLZaDGH09BWNPzgO8j4EoA7kmg + Pw0432RRVaV5LIX8mXHLER4MfgKic4CXki8D+HPA8ALwjIFDPDvT3JeleUyuA4Xdl0SAgvc9W2cjQXYS + JSPkLQl/Aa65XoJyk2zA3f5CQOdYoXKEUpJwEnwgMXKzVwxolw24evtFwM+2e96xXbYtVBZk3ic4AeLE + ZOmeXzGgocF2wR5IYYB3IMwstD1F+DHEFZ/JoqLi+IjsCPmuQ02Puh1PzC0PcD+UwXOOEP5a6GKUjKdy + 0NS1TFO2EvWyERYfVtq+eVQItR6BTqudUKvrY+dbvbkb7lfoGh5HR8frfLVKM0rJRmrJtp8Bi86Dohwx + HoBDp8OpWnOCh23kHLkozXudu0n6fIJc+JGEtuFVIWbaL8qNjfa5kpL1Lh6dJLvJFrKD7CRbyQayRpQX + 3Idr4KleJiuV5b080pE9UhUF919ZGr2v/cRgwrwPzrN1YmVJ1vONvWStJC4Jvz8ZDAbP5XpBtqaVyrIe + nv+Q1/1TlsI2SpdyibtWqvzf8nekLoIPBKj+ywAAAABJRU5ErkJggg== + + + + + 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 + + 358, 17 @@ -217,37 +248,6 @@ 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