Ram Search - display systemID & memory domain

This commit is contained in:
andres.delikat 2011-02-19 13:17:11 +00:00
parent bb2b17f92d
commit 5281526ec6
3 changed files with 93 additions and 54 deletions

View File

@ -45,10 +45,16 @@
this.Changes = new System.Windows.Forms.ColumnHeader();
this.menuStrip1 = new System.Windows.Forms.MenuStrip();
this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.newSearchToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
this.openToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.saveAsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.optionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.hackyAutoLoadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.restoreOriginalWindowSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.saveWindowPositionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripContainer1 = new System.Windows.Forms.ToolStripContainer();
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
this.NewSearchtoolStripButton = new System.Windows.Forms.ToolStripButton();
@ -88,12 +94,8 @@
this.GreaterThanRadio = new System.Windows.Forms.RadioButton();
this.LessThanRadio = new System.Windows.Forms.RadioButton();
this.AutoSearchCheckBox = new System.Windows.Forms.CheckBox();
this.optionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.saveWindowPositionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.restoreOriginalWindowSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.hackyAutoLoadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.newSearchToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
this.MemDomainLabel = new System.Windows.Forms.Label();
this.panel1 = new System.Windows.Forms.Panel();
this.SearchtoolStrip1.SuspendLayout();
this.menuStrip1.SuspendLayout();
this.toolStripContainer1.TopToolStripPanel.SuspendLayout();
@ -102,6 +104,7 @@
this.toolStrip2.SuspendLayout();
this.CompareToBox.SuspendLayout();
this.ComparisonBox.SuspendLayout();
this.panel1.SuspendLayout();
this.SuspendLayout();
//
// SearchtoolStrip1
@ -189,7 +192,7 @@
// TotalSearchLabel
//
this.TotalSearchLabel.AutoSize = true;
this.TotalSearchLabel.Location = new System.Drawing.Point(13, 33);
this.TotalSearchLabel.Location = new System.Drawing.Point(116, 5);
this.TotalSearchLabel.Name = "TotalSearchLabel";
this.TotalSearchLabel.Size = new System.Drawing.Size(64, 13);
this.TotalSearchLabel.TabIndex = 2;
@ -259,6 +262,18 @@
this.fileToolStripMenuItem.Size = new System.Drawing.Size(35, 20);
this.fileToolStripMenuItem.Text = "&File";
//
// newSearchToolStripMenuItem
//
this.newSearchToolStripMenuItem.Name = "newSearchToolStripMenuItem";
this.newSearchToolStripMenuItem.Size = new System.Drawing.Size(204, 22);
this.newSearchToolStripMenuItem.Text = "&New Search";
this.newSearchToolStripMenuItem.Click += new System.EventHandler(this.newSearchToolStripMenuItem_Click);
//
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
this.toolStripSeparator1.Size = new System.Drawing.Size(201, 6);
//
// openToolStripMenuItem
//
this.openToolStripMenuItem.Name = "openToolStripMenuItem";
@ -291,6 +306,34 @@
this.exitToolStripMenuItem.Text = "E&xit";
this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click);
//
// optionsToolStripMenuItem
//
this.optionsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.hackyAutoLoadToolStripMenuItem,
this.restoreOriginalWindowSizeToolStripMenuItem,
this.saveWindowPositionToolStripMenuItem});
this.optionsToolStripMenuItem.Name = "optionsToolStripMenuItem";
this.optionsToolStripMenuItem.Size = new System.Drawing.Size(56, 20);
this.optionsToolStripMenuItem.Text = "&Options";
//
// hackyAutoLoadToolStripMenuItem
//
this.hackyAutoLoadToolStripMenuItem.Name = "hackyAutoLoadToolStripMenuItem";
this.hackyAutoLoadToolStripMenuItem.Size = new System.Drawing.Size(190, 22);
this.hackyAutoLoadToolStripMenuItem.Text = "HackyAutoLoad";
//
// restoreOriginalWindowSizeToolStripMenuItem
//
this.restoreOriginalWindowSizeToolStripMenuItem.Name = "restoreOriginalWindowSizeToolStripMenuItem";
this.restoreOriginalWindowSizeToolStripMenuItem.Size = new System.Drawing.Size(190, 22);
this.restoreOriginalWindowSizeToolStripMenuItem.Text = "Restore Window Size";
//
// saveWindowPositionToolStripMenuItem
//
this.saveWindowPositionToolStripMenuItem.Name = "saveWindowPositionToolStripMenuItem";
this.saveWindowPositionToolStripMenuItem.Size = new System.Drawing.Size(190, 22);
this.saveWindowPositionToolStripMenuItem.Text = "Save Window Position";
//
// toolStripContainer1
//
this.toolStripContainer1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
@ -299,7 +342,7 @@
// toolStripContainer1.ContentPanel
//
this.toolStripContainer1.ContentPanel.Size = new System.Drawing.Size(241, 2);
this.toolStripContainer1.Location = new System.Drawing.Point(243, 33);
this.toolStripContainer1.Location = new System.Drawing.Point(243, 32);
this.toolStripContainer1.Name = "toolStripContainer1";
this.toolStripContainer1.Size = new System.Drawing.Size(241, 77);
this.toolStripContainer1.TabIndex = 5;
@ -458,13 +501,13 @@
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";
//
// 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";
//
// CompareToBox
@ -696,57 +739,38 @@
this.AutoSearchCheckBox.Text = "Auto Search";
this.AutoSearchCheckBox.UseVisualStyleBackColor = true;
//
// optionsToolStripMenuItem
// MemDomainLabel
//
this.optionsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.hackyAutoLoadToolStripMenuItem,
this.restoreOriginalWindowSizeToolStripMenuItem,
this.saveWindowPositionToolStripMenuItem});
this.optionsToolStripMenuItem.Name = "optionsToolStripMenuItem";
this.optionsToolStripMenuItem.Size = new System.Drawing.Size(56, 20);
this.optionsToolStripMenuItem.Text = "&Options";
this.MemDomainLabel.AutoSize = true;
this.MemDomainLabel.Location = new System.Drawing.Point(3, 5);
this.MemDomainLabel.Name = "MemDomainLabel";
this.MemDomainLabel.Size = new System.Drawing.Size(70, 13);
this.MemDomainLabel.TabIndex = 8;
this.MemDomainLabel.Text = "Main Memory";
//
// saveWindowPositionToolStripMenuItem
// panel1
//
this.saveWindowPositionToolStripMenuItem.Name = "saveWindowPositionToolStripMenuItem";
this.saveWindowPositionToolStripMenuItem.Size = new System.Drawing.Size(190, 22);
this.saveWindowPositionToolStripMenuItem.Text = "Save Window Position";
//
// restoreOriginalWindowSizeToolStripMenuItem
//
this.restoreOriginalWindowSizeToolStripMenuItem.Name = "restoreOriginalWindowSizeToolStripMenuItem";
this.restoreOriginalWindowSizeToolStripMenuItem.Size = new System.Drawing.Size(190, 22);
this.restoreOriginalWindowSizeToolStripMenuItem.Text = "Restore Window Size";
//
// hackyAutoLoadToolStripMenuItem
//
this.hackyAutoLoadToolStripMenuItem.Name = "hackyAutoLoadToolStripMenuItem";
this.hackyAutoLoadToolStripMenuItem.Size = new System.Drawing.Size(190, 22);
this.hackyAutoLoadToolStripMenuItem.Text = "HackyAutoLoad";
//
// newSearchToolStripMenuItem
//
this.newSearchToolStripMenuItem.Name = "newSearchToolStripMenuItem";
this.newSearchToolStripMenuItem.Size = new System.Drawing.Size(204, 22);
this.newSearchToolStripMenuItem.Text = "&New Search";
this.newSearchToolStripMenuItem.Click += new System.EventHandler(this.newSearchToolStripMenuItem_Click);
//
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
this.toolStripSeparator1.Size = new System.Drawing.Size(201, 6);
this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
this.panel1.Controls.Add(this.TotalSearchLabel);
this.panel1.Controls.Add(this.MemDomainLabel);
this.panel1.Location = new System.Drawing.Point(16, 31);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(221, 25);
this.panel1.TabIndex = 9;
//
// RamSearch
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(496, 461);
this.Controls.Add(this.panel1);
this.Controls.Add(this.AutoSearchCheckBox);
this.Controls.Add(this.ComparisonBox);
this.Controls.Add(this.CompareToBox);
this.Controls.Add(this.toolStripContainer1);
this.Controls.Add(this.SearchListView);
this.Controls.Add(this.TotalSearchLabel);
this.Controls.Add(this.menuStrip1);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MainMenuStrip = this.menuStrip1;
@ -771,6 +795,8 @@
this.CompareToBox.PerformLayout();
this.ComparisonBox.ResumeLayout(false);
this.ComparisonBox.PerformLayout();
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
@ -843,5 +869,7 @@
private System.Windows.Forms.ToolStripMenuItem restoreOriginalWindowSizeToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem saveWindowPositionToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
private System.Windows.Forms.Label MemDomainLabel;
private System.Windows.Forms.Panel panel1;
}
}

View File

@ -15,12 +15,15 @@ namespace BizHawk.MultiClient
public partial class RamSearch : Form
{
//TODO:
//Save window position & Size
//Menu Bar
//Window position gets saved but doesn't load properly
string systemID = "NULL";
//Reset window position item
int defaultWidth; //For saving the default size of the dialog, so the user can restore if desired
int defaultHeight;
List<Watch> searchList = new List<Watch>();
public RamSearch()
@ -214,6 +217,7 @@ namespace BizHawk.MultiClient
private void StartNewSearch()
{
GetMemoryDomain();
int startaddress = 0;
if (Global.Emulator.SystemId == "PCE")
startaddress = 0x1F0000; //For now, until Emulator core functionality can better handle a prefix
@ -242,5 +246,12 @@ namespace BizHawk.MultiClient
{
StartNewSearch();
}
private void GetMemoryDomain()
{
string memoryDomain = "Main memory"; //TODO: multiple memory domains
systemID = Global.Emulator.SystemId;
MemDomainLabel.Text = systemID + " " + memoryDomain;
}
}
}

View File

@ -178,16 +178,16 @@
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAjpJREFUOE+Nkl9I
U2EYxl0RQuFQI7oIuqno30U3XXoRVCAJXbibWkTgRRd2MZoZHSazXKOl0tIiiKDakm3Z0mlCWySTWdqg
U2EYxl0RQuFQI7oIuqno30U3XXoRVCAJXbibWkTgRRd2MZoZHSazXKOl0tIiiKDajG3Z0mlCWySTWdqg
tdbF1qYyxVYi6TbHMl319JyzU2bN6oMf34Hv/J73fb9zFEV/WTqdU1u2a5Nm1erizaWl5UXZ2ZnMZCR2
t9lw1EAtRXIr6lfavJaxRBpTOSDwGXg6CwxlgI5gFqeFzjDF7aS4YIDZPFDjiyUhrul5wPsRcMYB1yTQ
nwIcbzKoqtI8lkP+zLhlDw0GPgGROcBDyZsGfFlgeAF4xsAhnp1p7svQPFaoA4XNm4Cfguc9W2cjAXYS
ISPkLQl9Aa45X4JyU8GAe/35gM6xfOUwpQThJPhAouRmrxTQXjDg6u0Xfh/b7nnHdtm2WFmUeZ/gBIgR
t9lw1EAtRXIr6lfavJaxRBpTOSDwGXg6CwxlgHvBLE4LnWGK20lxwQCzeaDGF0tCXNPzgPcj4IwDrkmg
PwU43mRQVaV5LIf8mXHLHhoMfAIic4CHkjcN+LLA8ALwjIFDPDvT3JeheaxQBwqbNwE/Bc97ts5GAuwk
QkbIWxL6AlxzvgTlpoIBHf35gM6xfOUwpQThJPhAouRmrxTQXjDg6u0Xfh/b7nnHdtm2WFmUeZ/gBIgR
o7l7fsWAhgbrBZs/iQHegTiz2PYU4ceQVmwmg4qK4yMFR8h1HWp61G1/Ymp5gPvBNJ5zhNDXfBejZDyZ
haauZZqyhaiXjbD4sNL6za1CsPUIBK12Qq2uj55v9WRvuF6ha3gcdzpe56pVmlFKVlJLtv0MWHQclOSw
4QDsgoBTtaY4D9vIOXJRnvc6d6P8+UQ5/yOJbcOjQtS4X5IbG21zJSXrnTw6SXaTLWQH2Um2kg1kjSQv
uA7XwF29TFYqy3t5JJA9chUF919ZGr2v/cRg3LQPjrN1UmVZ1vGNvWStLC4Jvz/p9Xr35XpRtqSUyrIe
nv+Q1/1TlsM2ypdyibtWrvzf8nesK4IUDprkkgAAAABJRU5ErkJggg==
nv+Q1/1TlsM2ypdyibtWrvzf8neqkoITZiFcTwAAAABJRU5ErkJggg==
</value>
</data>
<data name="ClearChangeCountstoolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">