ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ram Search - small dialog cleanups, start a context menu

This commit is contained in:
andres.delikat 2011-02-23 05:32:52 +00:00
parent 31941a6c56
commit c7553397d7
3 changed files with 125 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

152
BizHawk.MultiClient/tools/RamSearch.Designer.cs generated
View File

@ -28,16 +28,18 @@
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RamSearch));
this.SearchtoolStrip1 = new System.Windows.Forms.ToolStrip();
this.openToolStripButton = new System.Windows.Forms.ToolStripButton();
this.saveToolStripButton = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator = new System.Windows.Forms.ToolStripSeparator();
this.cutToolStripButton = new System.Windows.Forms.ToolStripButton();
this.WatchtoolStripButton1 = new System.Windows.Forms.ToolStripButton();
this.PoketoolStripButton1 = new System.Windows.Forms.ToolStripButton();
this.TruncateFromFiletoolStripButton2 = new System.Windows.Forms.ToolStripButton();
this.ExcludeRamWatchtoolStripButton2 = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
this.WatchtoolStripButton1 = new System.Windows.Forms.ToolStripButton();
this.PoketoolStripButton1 = new System.Windows.Forms.ToolStripButton();
this.TotalSearchLabel = new System.Windows.Forms.Label();
this.SearchListView = new BizHawk.VirtualListView();
this.Address = new System.Windows.Forms.ColumnHeader();
@ -62,8 +64,9 @@
this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.searchToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.searchToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.clearChangeCountsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.undoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.copyValueToPrevToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.clearChangeCountsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.removeSelectedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.exludeRamWatchListToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
@ -81,7 +84,9 @@
this.toolStripContainer1 = new System.Windows.Forms.ToolStripContainer();
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
this.NewSearchtoolStripButton = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
this.SetCurrToPrevtoolStripButton2 = new System.Windows.Forms.ToolStripButton();
this.ClearChangeCountstoolStripButton = new System.Windows.Forms.ToolStripButton();
this.UndotoolStripButton = new System.Windows.Forms.ToolStripButton();
@ -120,7 +125,10 @@
this.AutoSearchCheckBox = new System.Windows.Forms.CheckBox();
this.MemDomainLabel = new System.Windows.Forms.Label();
this.OutputLabel = new System.Windows.Forms.Label();
this.copyValueToPrevToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
this.startNewSearchToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
this.searchToolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem();
this.SearchtoolStrip1.SuspendLayout();
this.menuStrip1.SuspendLayout();
this.toolStripContainer1.TopToolStripPanel.SuspendLayout();
@ -129,6 +137,7 @@
this.toolStrip2.SuspendLayout();
this.CompareToBox.SuspendLayout();
this.ComparisonBox.SuspendLayout();
this.contextMenuStrip1.SuspendLayout();
this.SuspendLayout();
//
// SearchtoolStrip1
@ -139,13 +148,14 @@
this.saveToolStripButton,
this.toolStripSeparator,
this.cutToolStripButton,
this.WatchtoolStripButton1,
this.PoketoolStripButton1,
this.TruncateFromFiletoolStripButton2,
this.ExcludeRamWatchtoolStripButton2});
this.SearchtoolStrip1.Location = new System.Drawing.Point(3, 0);
this.ExcludeRamWatchtoolStripButton2,
this.toolStripSeparator8,
this.WatchtoolStripButton1,
this.PoketoolStripButton1});
this.SearchtoolStrip1.Location = new System.Drawing.Point(3, 25);
this.SearchtoolStrip1.Name = "SearchtoolStrip1";
this.SearchtoolStrip1.Size = new System.Drawing.Size(177, 25);
this.SearchtoolStrip1.Size = new System.Drawing.Size(183, 25);
this.SearchtoolStrip1.TabIndex = 0;
this.SearchtoolStrip1.Text = "Search";
//
@ -187,6 +197,31 @@
this.cutToolStripButton.ToolTipText = "Eliminate Selected Items";
this.cutToolStripButton.Click += new System.EventHandler(this.cutToolStripButton_Click);
//
// TruncateFromFiletoolStripButton2
//
this.TruncateFromFiletoolStripButton2.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.TruncateFromFiletoolStripButton2.Image = global::BizHawk.MultiClient.Properties.Resources.TruncateFromFile;
this.TruncateFromFiletoolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta;
this.TruncateFromFiletoolStripButton2.Name = "TruncateFromFiletoolStripButton2";
this.TruncateFromFiletoolStripButton2.Size = new System.Drawing.Size(23, 22);
this.TruncateFromFiletoolStripButton2.Text = "Eliminate from File";
this.TruncateFromFiletoolStripButton2.Click += new System.EventHandler(this.TruncateFromFiletoolStripButton2_Click);
//
// ExcludeRamWatchtoolStripButton2
//
this.ExcludeRamWatchtoolStripButton2.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.ExcludeRamWatchtoolStripButton2.Image = global::BizHawk.MultiClient.Properties.Resources.TruncateFromRW;
this.ExcludeRamWatchtoolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta;
this.ExcludeRamWatchtoolStripButton2.Name = "ExcludeRamWatchtoolStripButton2";
this.ExcludeRamWatchtoolStripButton2.Size = new System.Drawing.Size(23, 22);
this.ExcludeRamWatchtoolStripButton2.Text = "Elmininate Ram Watch list";
this.ExcludeRamWatchtoolStripButton2.Click += new System.EventHandler(this.ExcludeRamWatchtoolStripButton2_Click);
//
// toolStripSeparator8
//
this.toolStripSeparator8.Name = "toolStripSeparator8";
this.toolStripSeparator8.Size = new System.Drawing.Size(6, 25);
//
// WatchtoolStripButton1
//
this.WatchtoolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
@ -207,26 +242,6 @@
this.PoketoolStripButton1.Text = "Poke";
this.PoketoolStripButton1.Click += new System.EventHandler(this.PoketoolStripButton1_Click);
//
// TruncateFromFiletoolStripButton2
//
this.TruncateFromFiletoolStripButton2.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.TruncateFromFiletoolStripButton2.Image = global::BizHawk.MultiClient.Properties.Resources.TruncateFromFile;
this.TruncateFromFiletoolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta;
this.TruncateFromFiletoolStripButton2.Name = "TruncateFromFiletoolStripButton2";
this.TruncateFromFiletoolStripButton2.Size = new System.Drawing.Size(23, 22);
this.TruncateFromFiletoolStripButton2.Text = "Truncate from File";
this.TruncateFromFiletoolStripButton2.Click += new System.EventHandler(this.TruncateFromFiletoolStripButton2_Click);
//
// ExcludeRamWatchtoolStripButton2
//
this.ExcludeRamWatchtoolStripButton2.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.ExcludeRamWatchtoolStripButton2.Image = global::BizHawk.MultiClient.Properties.Resources.TruncateFromRW;
this.ExcludeRamWatchtoolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta;
this.ExcludeRamWatchtoolStripButton2.Name = "ExcludeRamWatchtoolStripButton2";
this.ExcludeRamWatchtoolStripButton2.Size = new System.Drawing.Size(23, 22);
this.ExcludeRamWatchtoolStripButton2.Text = "Exclude Ram Watch list";
this.ExcludeRamWatchtoolStripButton2.Click += new System.EventHandler(this.ExcludeRamWatchtoolStripButton2_Click);
//
// TotalSearchLabel
//
this.TotalSearchLabel.AutoSize = true;
@ -247,6 +262,7 @@
this.Value,
this.Previous,
this.Changes});
this.SearchListView.ContextMenuStrip = this.contextMenuStrip1;
this.SearchListView.GridLines = true;
this.SearchListView.ItemCount = 0;
this.SearchListView.LabelEdit = true;
@ -436,13 +452,6 @@
this.searchToolStripMenuItem1.Text = "&Search";
this.searchToolStripMenuItem1.Click += new System.EventHandler(this.searchToolStripMenuItem1_Click);
//
// clearChangeCountsToolStripMenuItem
//
this.clearChangeCountsToolStripMenuItem.Name = "clearChangeCountsToolStripMenuItem";
this.clearChangeCountsToolStripMenuItem.Size = new System.Drawing.Size(218, 22);
this.clearChangeCountsToolStripMenuItem.Text = "&Clear Change Counts";
this.clearChangeCountsToolStripMenuItem.Click += new System.EventHandler(this.clearChangeCountsToolStripMenuItem_Click);
//
// undoToolStripMenuItem
//
this.undoToolStripMenuItem.Name = "undoToolStripMenuItem";
@ -450,6 +459,20 @@
this.undoToolStripMenuItem.Text = "&Undo";
this.undoToolStripMenuItem.Click += new System.EventHandler(this.undoToolStripMenuItem_Click_1);
//
// copyValueToPrevToolStripMenuItem
//
this.copyValueToPrevToolStripMenuItem.Name = "copyValueToPrevToolStripMenuItem";
this.copyValueToPrevToolStripMenuItem.Size = new System.Drawing.Size(218, 22);
this.copyValueToPrevToolStripMenuItem.Text = "Copy Value to Prev";
this.copyValueToPrevToolStripMenuItem.Click += new System.EventHandler(this.copyValueToPrevToolStripMenuItem_Click);
//
// clearChangeCountsToolStripMenuItem
//
this.clearChangeCountsToolStripMenuItem.Name = "clearChangeCountsToolStripMenuItem";
this.clearChangeCountsToolStripMenuItem.Size = new System.Drawing.Size(218, 22);
this.clearChangeCountsToolStripMenuItem.Text = "&Clear Change Counts";
this.clearChangeCountsToolStripMenuItem.Click += new System.EventHandler(this.clearChangeCountsToolStripMenuItem_Click);
//
// removeSelectedToolStripMenuItem
//
this.removeSelectedToolStripMenuItem.Name = "removeSelectedToolStripMenuItem";
@ -571,8 +594,8 @@
//
// toolStripContainer1.TopToolStripPanel
//
this.toolStripContainer1.TopToolStripPanel.Controls.Add(this.SearchtoolStrip1);
this.toolStripContainer1.TopToolStripPanel.Controls.Add(this.toolStrip1);
this.toolStripContainer1.TopToolStripPanel.Controls.Add(this.SearchtoolStrip1);
this.toolStripContainer1.TopToolStripPanel.Controls.Add(this.toolStrip2);
//
// toolStrip1
@ -580,13 +603,15 @@
this.toolStrip1.Dock = System.Windows.Forms.DockStyle.None;
this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.NewSearchtoolStripButton,
this.toolStripSeparator6,
this.toolStripButton1,
this.toolStripSeparator7,
this.SetCurrToPrevtoolStripButton2,
this.ClearChangeCountstoolStripButton,
this.UndotoolStripButton});
this.toolStrip1.Location = new System.Drawing.Point(3, 25);
this.toolStrip1.Location = new System.Drawing.Point(3, 0);
this.toolStrip1.Name = "toolStrip1";
this.toolStrip1.Size = new System.Drawing.Size(125, 25);
this.toolStrip1.Size = new System.Drawing.Size(137, 25);
this.toolStrip1.TabIndex = 1;
//
// NewSearchtoolStripButton
@ -599,6 +624,11 @@
this.NewSearchtoolStripButton.Text = "New Search";
this.NewSearchtoolStripButton.Click += new System.EventHandler(this.NewSearchtoolStripButton_Click);
//
// toolStripSeparator6
//
this.toolStripSeparator6.Name = "toolStripSeparator6";
this.toolStripSeparator6.Size = new System.Drawing.Size(6, 25);
//
// toolStripButton1
//
this.toolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
@ -609,6 +639,11 @@
this.toolStripButton1.Text = "Search";
this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click);
//
// toolStripSeparator7
//
this.toolStripSeparator7.Name = "toolStripSeparator7";
this.toolStripSeparator7.Size = new System.Drawing.Size(6, 25);
//
// SetCurrToPrevtoolStripButton2
//
this.SetCurrToPrevtoolStripButton2.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
@ -1017,12 +1052,33 @@
this.OutputLabel.TabIndex = 9;
this.OutputLabel.Text = " ";
//
// copyValueToPrevToolStripMenuItem
// contextMenuStrip1
//
this.copyValueToPrevToolStripMenuItem.Name = "copyValueToPrevToolStripMenuItem";
this.copyValueToPrevToolStripMenuItem.Size = new System.Drawing.Size(218, 22);
this.copyValueToPrevToolStripMenuItem.Text = "Copy Value to Prev";
this.copyValueToPrevToolStripMenuItem.Click += new System.EventHandler(this.copyValueToPrevToolStripMenuItem_Click);
this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.startNewSearchToolStripMenuItem,
this.toolStripSeparator9,
this.searchToolStripMenuItem2});
this.contextMenuStrip1.Name = "contextMenuStrip1";
this.contextMenuStrip1.Size = new System.Drawing.Size(170, 54);
//
// startNewSearchToolStripMenuItem
//
this.startNewSearchToolStripMenuItem.Name = "startNewSearchToolStripMenuItem";
this.startNewSearchToolStripMenuItem.Size = new System.Drawing.Size(169, 22);
this.startNewSearchToolStripMenuItem.Text = "&Start New Search";
this.startNewSearchToolStripMenuItem.Click += new System.EventHandler(this.startNewSearchToolStripMenuItem_Click);
//
// toolStripSeparator9
//
this.toolStripSeparator9.Name = "toolStripSeparator9";
this.toolStripSeparator9.Size = new System.Drawing.Size(166, 6);
//
// searchToolStripMenuItem2
//
this.searchToolStripMenuItem2.Name = "searchToolStripMenuItem2";
this.searchToolStripMenuItem2.Size = new System.Drawing.Size(169, 22);
this.searchToolStripMenuItem2.Text = "&Search";
this.searchToolStripMenuItem2.Click += new System.EventHandler(this.searchToolStripMenuItem2_Click);
//
// RamSearch
//
@ -1061,6 +1117,7 @@
this.CompareToBox.PerformLayout();
this.ComparisonBox.ResumeLayout(false);
this.ComparisonBox.PerformLayout();
this.contextMenuStrip1.ResumeLayout(false);
this.ResumeLayout(false);
this.PerformLayout();
@ -1160,5 +1217,12 @@
private System.Windows.Forms.ToolStripMenuItem alwaysExludeRamSearchListToolStripMenuItem;
private System.Windows.Forms.ToolStripButton SetCurrToPrevtoolStripButton2;
private System.Windows.Forms.ToolStripMenuItem copyValueToPrevToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator8;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator6;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator7;
private System.Windows.Forms.ContextMenuStrip contextMenuStrip1;
private System.Windows.Forms.ToolStripMenuItem startNewSearchToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator9;
private System.Windows.Forms.ToolStripMenuItem searchToolStripMenuItem2;
}
}

13
BizHawk.MultiClient/tools/RamSearch.cs
View File

@ -17,11 +17,10 @@ namespace BizHawk.MultiClient
public partial class RamSearch : Form
{
//TODO:
//DoSearch() - if already previewed, don't generate the list again, perhaps a bool?
//Window position gets saved but doesn't load properly
//Multiple memory domains
//**Limit number of digits in specific value based on data type
//Search equal to previous value, eveyrthing will be pink afterward
//Context Menu - if highlighted items - show Highlight dependent functions
string systemID = "NULL";
List<Watch> searchList = new List<Watch>();
@ -1640,6 +1639,16 @@ namespace BizHawk.MultiClient
CopyValueToPrev();
}
private void startNewSearchToolStripMenuItem_Click(object sender, EventArgs e)
{
StartNewSearch();
}
private void searchToolStripMenuItem2_Click(object sender, EventArgs e)
{
DoSearch();
}
}

9
BizHawk.MultiClient/tools/RamSearch.resx
View File

@ -154,15 +154,15 @@
Cv71r/4OTrQ4xWMwWlcAAAAASUVORK5CYII=
</value>
</data>
<metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>457, 17</value>
</metadata>
<metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>150, 17</value>
</metadata>
<metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>259, 17</value>
</metadata>
<metadata name="toolStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>358, 17</value>
</metadata>
<data name="toolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@ -194,6 +194,9 @@
s1c0gHPmbrPTpHNJKOCo2G1mZs20zcwUJ5yp1AB5+8/zEwgF5GMVDxh4AAAAAElFTkSuQmCC
</value>
</data>
<metadata name="toolStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>358, 17</value>
</metadata>
<data name="DataSizetoolStripSplitButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8