diff --git a/BizHawk.MultiClient/tools/RamSearch.Designer.cs b/BizHawk.MultiClient/tools/RamSearch.Designer.cs index 90ecbb88ee..e6737d21b9 100644 --- a/BizHawk.MultiClient/tools/RamSearch.Designer.cs +++ b/BizHawk.MultiClient/tools/RamSearch.Designer.cs @@ -120,7 +120,7 @@ this.PoketoolStripButton1}); this.SearchtoolStrip1.Location = new System.Drawing.Point(3, 0); this.SearchtoolStrip1.Name = "SearchtoolStrip1"; - this.SearchtoolStrip1.Size = new System.Drawing.Size(154, 25); + this.SearchtoolStrip1.Size = new System.Drawing.Size(187, 25); this.SearchtoolStrip1.TabIndex = 0; this.SearchtoolStrip1.Text = "Search"; // @@ -169,6 +169,7 @@ this.cutToolStripButton.Size = new System.Drawing.Size(23, 22); this.cutToolStripButton.Text = "C&ut"; this.cutToolStripButton.ToolTipText = "Eliminate Selected Items"; + this.cutToolStripButton.Click += new System.EventHandler(this.cutToolStripButton_Click); // // WatchtoolStripButton1 // @@ -365,7 +366,7 @@ this.UndotoolStripButton}); this.toolStrip1.Location = new System.Drawing.Point(3, 25); this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(102, 25); + this.toolStrip1.Size = new System.Drawing.Size(104, 25); this.toolStrip1.TabIndex = 1; // // NewSearchtoolStripButton @@ -416,7 +417,7 @@ this.EndiantoolSplitButton}); this.toolStrip2.Location = new System.Drawing.Point(3, 50); this.toolStrip2.Name = "toolStrip2"; - this.toolStrip2.Size = new System.Drawing.Size(206, 25); + this.toolStrip2.Size = new System.Drawing.Size(208, 25); this.toolStrip2.TabIndex = 2; // // DataSizetoolStripSplitButton1 diff --git a/BizHawk.MultiClient/tools/RamSearch.cs b/BizHawk.MultiClient/tools/RamSearch.cs index 5ca1cf7b67..325e71e054 100644 --- a/BizHawk.MultiClient/tools/RamSearch.cs +++ b/BizHawk.MultiClient/tools/RamSearch.cs @@ -19,6 +19,7 @@ namespace BizHawk.MultiClient string systemID = "NULL"; List searchList = new List(); + List undoList = new List(); //Reset window position item int defaultWidth; //For saving the default size of the dialog, so the user can restore if desired @@ -193,7 +194,8 @@ namespace BizHawk.MultiClient Global.MainForm.RamWatch1 = new RamWatch(); Global.MainForm.RamWatch1.Show(); } - Global.MainForm.RamWatch1.AddWatch(searchList[indexes[0]]); + for (int x = 0; x < indexes.Count; x++) + Global.MainForm.RamWatch1.AddWatch(searchList[indexes[x]]); } } @@ -288,5 +290,23 @@ namespace BizHawk.MultiClient { PokeAddress(); } + + private void RemoveAddresses() + { + ListView.SelectedIndexCollection indexes = SearchListView.SelectedIndices; + if (indexes.Count > 0) + { + for (int x = 0; x < indexes.Count; x++) + { + searchList.Remove(searchList[indexes[x]]); + } + DisplaySearchList(); + } + } + + private void cutToolStripButton_Click(object sender, EventArgs e) + { + RemoveAddresses(); + } } } diff --git a/BizHawk.MultiClient/tools/RamSearch.resx b/BizHawk.MultiClient/tools/RamSearch.resx index c66437d8c4..41f86db1e8 100644 --- a/BizHawk.MultiClient/tools/RamSearch.resx +++ b/BizHawk.MultiClient/tools/RamSearch.resx @@ -171,23 +171,20 @@ 259, 17 - - 358, 17 - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAjpJREFUOE+Nkl9I - U2EYxl0RQuFQI7oIuqno30U3XXoRVCAJXbibWkTgRRd2MZoZHSazXKOl0tIiiKDajG3Z0mlCWySTWdqg - tdbF1qYyxVYi6TbHMl319JyzU2bN6oMf34Hv/J73fb9zFEV/WTqdU1u2a5Nm1erizaWl5UXZ2ZnMZCR2 - t9lw1EAtRXIr6lfavJaxRBpTOSDwGXg6CwxlgHvBLE4LnWGK20lxwQCzeaDGF0tCXNPzgPcj4IwDrkmg - PwU43mRQVaV5LIf8mXHLHhoMfAIic4CHkjcN+LLA8ALwjIFDPDvT3JeheaxQBwqbNwE/Bc97ts5GAuwk - QkbIWxL6AlxzvgTlpoIBHf35gM6xfOUwpQThJPhAouRmrxTQXjDg6u0Xfh/b7nnHdtm2WFmUeZ/gBIgR - o7l7fsWAhgbrBZs/iQHegTiz2PYU4ceQVmwmg4qK4yMFR8h1HWp61G1/Ymp5gPvBNJ5zhNDXfBejZDyZ - haauZZqyhaiXjbD4sNL6za1CsPUIBK12Qq2uj55v9WRvuF6ha3gcdzpe56pVmlFKVlJLtv0MWHQclOSw - 4QDsgoBTtaY4D9vIOXJRnvc6d6P8+UQ5/yOJbcOjQtS4X5IbG21zJSXrnTw6SXaTLWQH2Um2kg1kjSQv - uA7XwF29TFYqy3t5JJA9chUF919ZGr2v/cRg3LQPjrN1UmVZ1vGNvWStLC4Jvz/p9Xr35XpRtqSUyrIe - nv+Q1/1TlsM2ypdyibtWrvzf8neqkoITZiFcTwAAAABJRU5ErkJggg== + U2EYxl0RQuFQI7oIuqno30U3XXoRVCAJXbibWkTgRRd2MZoZjcks13CptLQIIqi2Ylu2dJrQFslkljZo + rXmxtanMsJVIus1xMl319JyzU2bN6oMf34Hv/J73fb9zFEV/WXq9S1u2a5Nm1erizaWl5UXC7Ex2Mhq/ + 02I8aqSWJrkV9cvtPut4MoOpHBD8DDydBYaywL2QgNO6zgjF7aS4YIDFMlDjj6cgrul5wPcRcCUA9yTQ + nwacI1lUVWkeyyF/Ztx0hAeDn4DoHOCl5MsAfgEYXgCeMXCIZ2da+rI0jxXqQGH3JRGg4H3P1tlIkJ1E + ySh5Q8JfgKuul6DcVDDgbn8+oHM8XzlCKUk4CT6QGLnRKwV0FAy4cutFwM+2e96xXbYtVhZl3ic4AeLE + ZOmeXzGgocF2wR5IYYB3IM4stj1F+DGkFZ/JoqLi+GjBEXJdh5oedTuemFsf4H4og+ccIfw138UYmUgJ + 0NS1TlO2EvWyERYfVtq+eVQItR2BTqt9q1bXx863eYXr7lfoGp7AbdvrXLVKM0bJRmrJtp8Bi86Dkhwx + HoBDp8OpWnOCh+3kHLkoz3uNu0n+fKKc/5HEtuFVIWbaL8mNjfa5kpL1Lh6dJLvJFrKD7CRbyQayRpIX + 3Idr4KleJiuV5b080pE9chUF919ZGr2v48RgwrwPzrN1UmVZ1vONvWStLC4Jvz8ZDAbPpXpRtqaVyrIe + nv+Q1/1TlsM2ypfSzF0rV/5v+Tuo+YISgo8SYgAAAABJRU5ErkJggg== @@ -205,6 +202,9 @@ s1c0gHPmbrPTpHNJKOCo2G1mZs20zcwUJ5yp1AB5+8/zEwgF5GMVDxh4AAAAAElFTkSuQmCC + + 358, 17 + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8