Ram Search - refix some things that got reverted in the virtualListView commit

This commit is contained in:
andres.delikat 2011-02-20 03:14:48 +00:00
parent bb10d36b73
commit 2b4fd12d0a
3 changed files with 731 additions and 719 deletions

View File

@ -94,6 +94,7 @@
this.GreaterThanRadio = new System.Windows.Forms.RadioButton(); this.GreaterThanRadio = new System.Windows.Forms.RadioButton();
this.LessThanRadio = new System.Windows.Forms.RadioButton(); this.LessThanRadio = new System.Windows.Forms.RadioButton();
this.AutoSearchCheckBox = new System.Windows.Forms.CheckBox(); this.AutoSearchCheckBox = new System.Windows.Forms.CheckBox();
this.MemDomainLabel = new System.Windows.Forms.Label();
this.SearchtoolStrip1.SuspendLayout(); this.SearchtoolStrip1.SuspendLayout();
this.menuStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout();
this.toolStripContainer1.TopToolStripPanel.SuspendLayout(); this.toolStripContainer1.TopToolStripPanel.SuspendLayout();
@ -209,10 +210,10 @@
this.SearchListView.GridLines = true; this.SearchListView.GridLines = true;
this.SearchListView.ItemCount = 0; this.SearchListView.ItemCount = 0;
this.SearchListView.LabelEdit = true; this.SearchListView.LabelEdit = true;
this.SearchListView.Location = new System.Drawing.Point(16, 58); this.SearchListView.Location = new System.Drawing.Point(9, 58);
this.SearchListView.Name = "SearchListView"; this.SearchListView.Name = "SearchListView";
this.SearchListView.selectedItem = -1; this.SearchListView.selectedItem = -1;
this.SearchListView.Size = new System.Drawing.Size(221, 391); this.SearchListView.Size = new System.Drawing.Size(223, 391);
this.SearchListView.TabIndex = 3; this.SearchListView.TabIndex = 3;
this.SearchListView.UseCompatibleStateImageBehavior = false; this.SearchListView.UseCompatibleStateImageBehavior = false;
this.SearchListView.View = System.Windows.Forms.View.Details; this.SearchListView.View = System.Windows.Forms.View.Details;
@ -249,7 +250,7 @@
this.optionsToolStripMenuItem}); this.optionsToolStripMenuItem});
this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Location = new System.Drawing.Point(0, 0);
this.menuStrip1.Name = "menuStrip1"; this.menuStrip1.Name = "menuStrip1";
this.menuStrip1.Size = new System.Drawing.Size(496, 24); this.menuStrip1.Size = new System.Drawing.Size(472, 24);
this.menuStrip1.TabIndex = 4; this.menuStrip1.TabIndex = 4;
this.menuStrip1.Text = "menuStrip1"; this.menuStrip1.Text = "menuStrip1";
// //
@ -345,10 +346,10 @@
// //
// toolStripContainer1.ContentPanel // toolStripContainer1.ContentPanel
// //
this.toolStripContainer1.ContentPanel.Size = new System.Drawing.Size(241, 2); this.toolStripContainer1.ContentPanel.Size = new System.Drawing.Size(211, 2);
this.toolStripContainer1.Location = new System.Drawing.Point(243, 33); this.toolStripContainer1.Location = new System.Drawing.Point(250, 33);
this.toolStripContainer1.Name = "toolStripContainer1"; this.toolStripContainer1.Name = "toolStripContainer1";
this.toolStripContainer1.Size = new System.Drawing.Size(241, 77); this.toolStripContainer1.Size = new System.Drawing.Size(211, 77);
this.toolStripContainer1.TabIndex = 5; this.toolStripContainer1.TabIndex = 5;
this.toolStripContainer1.Text = "toolStripContainer1"; this.toolStripContainer1.Text = "toolStripContainer1";
// //
@ -524,9 +525,9 @@
this.CompareToBox.Controls.Add(this.SpecificAddressRadio); this.CompareToBox.Controls.Add(this.SpecificAddressRadio);
this.CompareToBox.Controls.Add(this.SpecificValueRadio); this.CompareToBox.Controls.Add(this.SpecificValueRadio);
this.CompareToBox.Controls.Add(this.PreviousValueRadio); this.CompareToBox.Controls.Add(this.PreviousValueRadio);
this.CompareToBox.Location = new System.Drawing.Point(243, 116); this.CompareToBox.Location = new System.Drawing.Point(250, 116);
this.CompareToBox.Name = "CompareToBox"; this.CompareToBox.Name = "CompareToBox";
this.CompareToBox.Size = new System.Drawing.Size(241, 111); this.CompareToBox.Size = new System.Drawing.Size(211, 111);
this.CompareToBox.TabIndex = 0; this.CompareToBox.TabIndex = 0;
this.CompareToBox.TabStop = false; this.CompareToBox.TabStop = false;
this.CompareToBox.Text = "Compare To / By"; this.CompareToBox.Text = "Compare To / By";
@ -536,7 +537,7 @@
this.NumberOfChangesBox.Enabled = false; this.NumberOfChangesBox.Enabled = false;
this.NumberOfChangesBox.Location = new System.Drawing.Point(135, 84); this.NumberOfChangesBox.Location = new System.Drawing.Point(135, 84);
this.NumberOfChangesBox.Name = "NumberOfChangesBox"; this.NumberOfChangesBox.Name = "NumberOfChangesBox";
this.NumberOfChangesBox.Size = new System.Drawing.Size(100, 20); this.NumberOfChangesBox.Size = new System.Drawing.Size(65, 20);
this.NumberOfChangesBox.TabIndex = 6; this.NumberOfChangesBox.TabIndex = 6;
// //
// SpecificAddressBox // SpecificAddressBox
@ -544,7 +545,7 @@
this.SpecificAddressBox.Enabled = false; this.SpecificAddressBox.Enabled = false;
this.SpecificAddressBox.Location = new System.Drawing.Point(135, 62); this.SpecificAddressBox.Location = new System.Drawing.Point(135, 62);
this.SpecificAddressBox.Name = "SpecificAddressBox"; this.SpecificAddressBox.Name = "SpecificAddressBox";
this.SpecificAddressBox.Size = new System.Drawing.Size(100, 20); this.SpecificAddressBox.Size = new System.Drawing.Size(65, 20);
this.SpecificAddressBox.TabIndex = 5; this.SpecificAddressBox.TabIndex = 5;
// //
// SpecificValueBox // SpecificValueBox
@ -552,7 +553,7 @@
this.SpecificValueBox.Enabled = false; this.SpecificValueBox.Enabled = false;
this.SpecificValueBox.Location = new System.Drawing.Point(135, 41); this.SpecificValueBox.Location = new System.Drawing.Point(135, 41);
this.SpecificValueBox.Name = "SpecificValueBox"; this.SpecificValueBox.Name = "SpecificValueBox";
this.SpecificValueBox.Size = new System.Drawing.Size(100, 20); this.SpecificValueBox.Size = new System.Drawing.Size(65, 20);
this.SpecificValueBox.TabIndex = 4; this.SpecificValueBox.TabIndex = 4;
// //
// NumberOfChangesRadio // NumberOfChangesRadio
@ -615,9 +616,9 @@
this.ComparisonBox.Controls.Add(this.LessThanOrEqualToRadio); this.ComparisonBox.Controls.Add(this.LessThanOrEqualToRadio);
this.ComparisonBox.Controls.Add(this.GreaterThanRadio); this.ComparisonBox.Controls.Add(this.GreaterThanRadio);
this.ComparisonBox.Controls.Add(this.LessThanRadio); this.ComparisonBox.Controls.Add(this.LessThanRadio);
this.ComparisonBox.Location = new System.Drawing.Point(243, 233); this.ComparisonBox.Location = new System.Drawing.Point(250, 233);
this.ComparisonBox.Name = "ComparisonBox"; this.ComparisonBox.Name = "ComparisonBox";
this.ComparisonBox.Size = new System.Drawing.Size(241, 190); this.ComparisonBox.Size = new System.Drawing.Size(211, 190);
this.ComparisonBox.TabIndex = 6; this.ComparisonBox.TabIndex = 6;
this.ComparisonBox.TabStop = false; this.ComparisonBox.TabStop = false;
this.ComparisonBox.Text = "Comparison Operator"; this.ComparisonBox.Text = "Comparison Operator";
@ -736,18 +737,28 @@
// //
this.AutoSearchCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.AutoSearchCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.AutoSearchCheckBox.AutoSize = true; this.AutoSearchCheckBox.AutoSize = true;
this.AutoSearchCheckBox.Location = new System.Drawing.Point(250, 432); this.AutoSearchCheckBox.Location = new System.Drawing.Point(257, 432);
this.AutoSearchCheckBox.Name = "AutoSearchCheckBox"; this.AutoSearchCheckBox.Name = "AutoSearchCheckBox";
this.AutoSearchCheckBox.Size = new System.Drawing.Size(85, 17); this.AutoSearchCheckBox.Size = new System.Drawing.Size(85, 17);
this.AutoSearchCheckBox.TabIndex = 7; this.AutoSearchCheckBox.TabIndex = 7;
this.AutoSearchCheckBox.Text = "Auto Search"; this.AutoSearchCheckBox.Text = "Auto Search";
this.AutoSearchCheckBox.UseVisualStyleBackColor = true; this.AutoSearchCheckBox.UseVisualStyleBackColor = true;
// //
// MemDomainLabel
//
this.MemDomainLabel.AutoSize = true;
this.MemDomainLabel.Location = new System.Drawing.Point(129, 33);
this.MemDomainLabel.Name = "MemDomainLabel";
this.MemDomainLabel.Size = new System.Drawing.Size(70, 13);
this.MemDomainLabel.TabIndex = 8;
this.MemDomainLabel.Text = "Main Memory";
//
// RamSearch // RamSearch
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(496, 461); this.ClientSize = new System.Drawing.Size(472, 461);
this.Controls.Add(this.MemDomainLabel);
this.Controls.Add(this.AutoSearchCheckBox); this.Controls.Add(this.AutoSearchCheckBox);
this.Controls.Add(this.ComparisonBox); this.Controls.Add(this.ComparisonBox);
this.Controls.Add(this.CompareToBox); this.Controls.Add(this.CompareToBox);
@ -850,5 +861,6 @@
private System.Windows.Forms.ToolStripMenuItem restoreOriginalWindowSizeToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem restoreOriginalWindowSizeToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem saveWindowPositionToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem saveWindowPositionToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
private System.Windows.Forms.Label MemDomainLabel;
} }
} }

View File

@ -263,7 +263,7 @@ namespace BizHawk.MultiClient
{ {
string memoryDomain = "Main memory"; //TODO: multiple memory domains string memoryDomain = "Main memory"; //TODO: multiple memory domains
systemID = Global.Emulator.SystemId; systemID = Global.Emulator.SystemId;
//MemDomainLabel.Text = systemID + " " + memoryDomain; MemDomainLabel.Text = systemID + " " + memoryDomain;
} }
private Point GetPromptPoint() private Point GetPromptPoint()

View File

@ -171,6 +171,9 @@
<metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>259, 17</value> <value>259, 17</value>
</metadata> </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"> <data name="toolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@ -202,9 +205,6 @@
s1c0gHPmbrPTpHNJKOCo2G1mZs20zcwUJ5yp1AB5+8/zEwgF5GMVDxh4AAAAAElFTkSuQmCC s1c0gHPmbrPTpHNJKOCo2G1mZs20zcwUJ5yp1AB5+8/zEwgF5GMVDxh4AAAAAElFTkSuQmCC
</value> </value>
</data> </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"> <data name="DataSizetoolStripSplitButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8