diff --git a/BizHawk.MultiClient/tools/RamSearch.Designer.cs b/BizHawk.MultiClient/tools/RamSearch.Designer.cs
index 3e2a8afdd1..fdfdc79283 100644
--- a/BizHawk.MultiClient/tools/RamSearch.Designer.cs
+++ b/BizHawk.MultiClient/tools/RamSearch.Designer.cs
@@ -38,25 +38,31 @@
this.WatchtoolStripButton1 = new System.Windows.Forms.ToolStripButton();
this.PoketoolStripButton1 = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
- this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
- this.UndotoolStripButton = new System.Windows.Forms.ToolStripButton();
- this.NewSearchtoolStripButton = new System.Windows.Forms.ToolStripButton();
this.TotalSearchLabel = new System.Windows.Forms.Label();
this.listView1 = new System.Windows.Forms.ListView();
this.Address = new System.Windows.Forms.ColumnHeader();
this.Value = new System.Windows.Forms.ColumnHeader();
this.Previous = new System.Windows.Forms.ColumnHeader();
this.Changes = new System.Windows.Forms.ColumnHeader();
- this.ClearChangeCountstoolStripButton = new System.Windows.Forms.ToolStripButton();
this.menuStrip1 = new System.Windows.Forms.MenuStrip();
this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.hackyAutoLoadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.toolStripContainer1 = new System.Windows.Forms.ToolStripContainer();
+ this.toolStrip1 = new System.Windows.Forms.ToolStrip();
+ this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
+ this.UndotoolStripButton = new System.Windows.Forms.ToolStripButton();
+ this.NewSearchtoolStripButton = new System.Windows.Forms.ToolStripButton();
+ this.ClearChangeCountstoolStripButton = new System.Windows.Forms.ToolStripButton();
this.SearchtoolStrip1.SuspendLayout();
this.menuStrip1.SuspendLayout();
+ this.toolStripContainer1.TopToolStripPanel.SuspendLayout();
+ this.toolStripContainer1.SuspendLayout();
+ this.toolStrip1.SuspendLayout();
this.SuspendLayout();
//
// SearchtoolStrip1
//
+ this.SearchtoolStrip1.Dock = System.Windows.Forms.DockStyle.None;
this.SearchtoolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.newToolStripButton,
this.openToolStripButton,
@@ -65,14 +71,10 @@
this.cutToolStripButton,
this.WatchtoolStripButton1,
this.PoketoolStripButton1,
- this.toolStripSeparator1,
- this.toolStripButton1,
- this.UndotoolStripButton,
- this.NewSearchtoolStripButton,
- this.ClearChangeCountstoolStripButton});
- this.SearchtoolStrip1.Location = new System.Drawing.Point(0, 24);
+ this.toolStripSeparator1});
+ this.SearchtoolStrip1.Location = new System.Drawing.Point(3, 0);
this.SearchtoolStrip1.Name = "SearchtoolStrip1";
- this.SearchtoolStrip1.Size = new System.Drawing.Size(378, 25);
+ this.SearchtoolStrip1.Size = new System.Drawing.Size(160, 25);
this.SearchtoolStrip1.TabIndex = 0;
this.SearchtoolStrip1.Text = "Search";
//
@@ -144,33 +146,6 @@
this.toolStripSeparator1.Name = "toolStripSeparator1";
this.toolStripSeparator1.Size = new System.Drawing.Size(6, 25);
//
- // toolStripButton1
- //
- this.toolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
- this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image")));
- this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.toolStripButton1.Name = "toolStripButton1";
- this.toolStripButton1.Size = new System.Drawing.Size(23, 22);
- this.toolStripButton1.Text = "toolStripButton1";
- //
- // UndotoolStripButton
- //
- this.UndotoolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
- this.UndotoolStripButton.Image = global::BizHawk.MultiClient.Properties.Resources.undo;
- this.UndotoolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.UndotoolStripButton.Name = "UndotoolStripButton";
- this.UndotoolStripButton.Size = new System.Drawing.Size(23, 22);
- this.UndotoolStripButton.Text = "Undo Search";
- //
- // NewSearchtoolStripButton
- //
- this.NewSearchtoolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
- this.NewSearchtoolStripButton.Image = global::BizHawk.MultiClient.Properties.Resources.restart;
- this.NewSearchtoolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.NewSearchtoolStripButton.Name = "NewSearchtoolStripButton";
- this.NewSearchtoolStripButton.Size = new System.Drawing.Size(23, 22);
- this.NewSearchtoolStripButton.Text = "New Search";
- //
// TotalSearchLabel
//
this.TotalSearchLabel.AutoSize = true;
@@ -182,9 +157,8 @@
//
// listView1
//
- this.listView1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
- | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
+ this.listView1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ | System.Windows.Forms.AnchorStyles.Left)));
this.listView1.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
this.Address,
this.Value,
@@ -218,24 +192,13 @@
this.Changes.Text = "Changes";
this.Changes.Width = 55;
//
- // ClearChangeCountstoolStripButton
- //
- this.ClearChangeCountstoolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
- this.ClearChangeCountstoolStripButton.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.ClearChangeCountstoolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("ClearChangeCountstoolStripButton.Image")));
- this.ClearChangeCountstoolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.ClearChangeCountstoolStripButton.Name = "ClearChangeCountstoolStripButton";
- this.ClearChangeCountstoolStripButton.Size = new System.Drawing.Size(23, 22);
- this.ClearChangeCountstoolStripButton.Text = "C";
- this.ClearChangeCountstoolStripButton.ToolTipText = "Clear Change Counts";
- //
// menuStrip1
//
this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.fileToolStripMenuItem});
this.menuStrip1.Location = new System.Drawing.Point(0, 0);
this.menuStrip1.Name = "menuStrip1";
- this.menuStrip1.Size = new System.Drawing.Size(378, 24);
+ this.menuStrip1.Size = new System.Drawing.Size(449, 24);
this.menuStrip1.TabIndex = 4;
this.menuStrip1.Text = "menuStrip1";
//
@@ -254,14 +217,84 @@
this.hackyAutoLoadToolStripMenuItem.Text = "HackyAutoLoad";
this.hackyAutoLoadToolStripMenuItem.Click += new System.EventHandler(this.hackyAutoLoadToolStripMenuItem_Click);
//
+ // toolStripContainer1
+ //
+ this.toolStripContainer1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ //
+ // toolStripContainer1.ContentPanel
+ //
+ this.toolStripContainer1.ContentPanel.Size = new System.Drawing.Size(206, 125);
+ this.toolStripContainer1.Location = new System.Drawing.Point(243, 58);
+ this.toolStripContainer1.Name = "toolStripContainer1";
+ this.toolStripContainer1.Size = new System.Drawing.Size(206, 175);
+ this.toolStripContainer1.TabIndex = 5;
+ this.toolStripContainer1.Text = "toolStripContainer1";
+ //
+ // toolStripContainer1.TopToolStripPanel
+ //
+ this.toolStripContainer1.TopToolStripPanel.Controls.Add(this.SearchtoolStrip1);
+ this.toolStripContainer1.TopToolStripPanel.Controls.Add(this.toolStrip1);
+ //
+ // toolStrip1
+ //
+ this.toolStrip1.Dock = System.Windows.Forms.DockStyle.None;
+ this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.NewSearchtoolStripButton,
+ this.toolStripButton1,
+ this.ClearChangeCountstoolStripButton,
+ 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.TabIndex = 1;
+ //
+ // toolStripButton1
+ //
+ this.toolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+ this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image")));
+ this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.toolStripButton1.Name = "toolStripButton1";
+ this.toolStripButton1.Size = new System.Drawing.Size(23, 22);
+ this.toolStripButton1.Text = "toolStripButton1";
+ //
+ // UndotoolStripButton
+ //
+ this.UndotoolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+ this.UndotoolStripButton.Image = global::BizHawk.MultiClient.Properties.Resources.undo;
+ this.UndotoolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.UndotoolStripButton.Name = "UndotoolStripButton";
+ this.UndotoolStripButton.Size = new System.Drawing.Size(23, 22);
+ this.UndotoolStripButton.Text = "Undo Search";
+ //
+ // NewSearchtoolStripButton
+ //
+ this.NewSearchtoolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+ this.NewSearchtoolStripButton.Image = global::BizHawk.MultiClient.Properties.Resources.restart;
+ this.NewSearchtoolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.NewSearchtoolStripButton.Name = "NewSearchtoolStripButton";
+ this.NewSearchtoolStripButton.Size = new System.Drawing.Size(23, 22);
+ this.NewSearchtoolStripButton.Text = "New Search";
+ //
+ // ClearChangeCountstoolStripButton
+ //
+ this.ClearChangeCountstoolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+ this.ClearChangeCountstoolStripButton.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.ClearChangeCountstoolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("ClearChangeCountstoolStripButton.Image")));
+ this.ClearChangeCountstoolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.ClearChangeCountstoolStripButton.Name = "ClearChangeCountstoolStripButton";
+ this.ClearChangeCountstoolStripButton.Size = new System.Drawing.Size(23, 22);
+ this.ClearChangeCountstoolStripButton.Text = "C";
+ this.ClearChangeCountstoolStripButton.ToolTipText = "Clear Change Counts";
+ //
// RamSearch
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(378, 461);
+ this.ClientSize = new System.Drawing.Size(449, 461);
+ this.Controls.Add(this.toolStripContainer1);
this.Controls.Add(this.listView1);
this.Controls.Add(this.TotalSearchLabel);
- this.Controls.Add(this.SearchtoolStrip1);
this.Controls.Add(this.menuStrip1);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MainMenuStrip = this.menuStrip1;
@@ -272,6 +305,12 @@
this.SearchtoolStrip1.PerformLayout();
this.menuStrip1.ResumeLayout(false);
this.menuStrip1.PerformLayout();
+ this.toolStripContainer1.TopToolStripPanel.ResumeLayout(false);
+ this.toolStripContainer1.TopToolStripPanel.PerformLayout();
+ this.toolStripContainer1.ResumeLayout(false);
+ this.toolStripContainer1.PerformLayout();
+ this.toolStrip1.ResumeLayout(false);
+ this.toolStrip1.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
@@ -294,12 +333,14 @@
private System.Windows.Forms.ColumnHeader Value;
private System.Windows.Forms.ColumnHeader Previous;
private System.Windows.Forms.ColumnHeader Changes;
- private System.Windows.Forms.ToolStripButton toolStripButton1;
- private System.Windows.Forms.ToolStripButton UndotoolStripButton;
- private System.Windows.Forms.ToolStripButton NewSearchtoolStripButton;
- private System.Windows.Forms.ToolStripButton ClearChangeCountstoolStripButton;
private System.Windows.Forms.MenuStrip menuStrip1;
private System.Windows.Forms.ToolStripMenuItem fileToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem hackyAutoLoadToolStripMenuItem;
+ private System.Windows.Forms.ToolStripContainer toolStripContainer1;
+ private System.Windows.Forms.ToolStrip toolStrip1;
+ private System.Windows.Forms.ToolStripButton NewSearchtoolStripButton;
+ private System.Windows.Forms.ToolStripButton toolStripButton1;
+ private System.Windows.Forms.ToolStripButton ClearChangeCountstoolStripButton;
+ private System.Windows.Forms.ToolStripButton UndotoolStripButton;
}
}
\ No newline at end of file
diff --git a/BizHawk.MultiClient/tools/RamSearch.resx b/BizHawk.MultiClient/tools/RamSearch.resx
index 902366befa..12126d7aec 100644
--- a/BizHawk.MultiClient/tools/RamSearch.resx
+++ b/BizHawk.MultiClient/tools/RamSearch.resx
@@ -165,20 +165,26 @@
Cv71r/4OTrQ4xWMwWlcAAAAASUVORK5CYII=
+
+ 150, 17
+
+
+ 259, 17
+
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAjxJREFUOE+Nkl1I
- U2EYx10RQuFQI7oIuqno66KbLr0IKpCELtxNLSLwogu7GG1Yjcn8WKPVoqVGEEG1FduyqdOEtkgms7RB
- ay1otqlMsZVItS+W6ap//3N2yqxZvfDjPfCe3/95nvccWclflk7nUlfs2KBasbJ0Y3l5ZUkumclOR17d
- umA4bKCWIvll9UttPutEIo2ZPBD8DDz6CAxngTuhHE5qOyMUt5LSogEWy2CdP5aEsGbnAN97wBUH3NPA
- QApwvsyipkb1QAr5M+O6IzwU/ASMZgAvJV8a8OeAkXngMQOHeXba3J+leaRYBzK7L4EABe9bts5Gguxk
- lIyR1yT8BehwPQPl1qIBtwcKAZ0ThcoRSgnCSfCORMm1PjGgvWjA5RtPA3623fuG7bJtobIg8z7BCRAj
- xo6euWUDGhttLfZAEoO8A2Fmoe0Zwo8hrtiHLKqqjo4VHSHffaD1fo/jocl8D3dDaTzhCOGvhS7GyWQy
- B5XGPEvZSpRLRljoqrZ98ygQungIWrV6SqlsiDZbvLmr7ufoHpnEza4X+VqFapySjdSTLT8DFpz7RTli
- 2AeHVosT9aY4D9vIGXJWmvcKd6P0+QS58CMJbcOrQNS4V5Sbm+yZsrK1Lh4dJzvJJrKNbCebyTqySpTn
- 3Qfr4KldIsvllX080pJdUhUZ919ZHL2//dhQ3LQHzlMasbIk6/jGbrJaEheF35/0er3nfIMGLU3WlFxe
- 0cvzH/Kaf8pS2HrpUs5xV0uV/1v+Dtjtgi2QXPDjAAAAAElFTkSuQmCC
+ YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAjxJREFUOE+Nkl9I
+ U2EYxl0RQuFQI7wIuqno30U3XXoRVBAJXbibWkTgRRd2MdpQGpPNXMOlobkiiKDaim3Z0mlCWySTWdqg
+ tebF1qYyw1Yi5TbHMl319JyzU2bN6oMf34Hv/J73fb9zZCV/WTqdS12xe7NqzdrSLeXllSW5uUx2Ohq5
+ 3WY8bqSWJvlV9Y4un3UymcFMHgh+Bp7MASNZ4G4oh7Pa7gjFHaS0aEBn51CdP56CsGYXAN8HwJUA3NPA
+ YBpwjmVRU6N6JIX8mXHDER4OfgKi84CXki8D+HPA6CLwlIEjPGtsG8jSPFGsA5ndl0SAgvcdW2cjQXYS
+ JePkNQl/Aa64XoByS9GAO4OFgO7JQuUIpSThJHhPYuR6vxhgKRpw+ebzgJ9t971lu2xbqCzIvE9wAsSJ
+ ydK7sGpAU5PtvD2QwhDvQJhZaHuG8GOIK/4xi+rqk+NFR8j3HGl52Ot4bG6/j3uhDJ5xhPDXQhcTZCqV
+ g0rTPkvZSpQrRlh6cNj2zaNA6NIxaNXqN0plQ6y5w5u75n6JntEp3HK9ytcqVBOUbKSebP8ZsOQ8JMoR
+ 40E4tFqcqTcneNhFzpEL0rxXuZukzyfIhR9JaBteBWKmA6JsMNjny8o2unh0muwhW8lOsotsI5vIOlFe
+ dB+tg6d2hSyXV/bzSEv2SlVk3H9lefQBy6nhhHk/nI0asbIk6/jGPrJeEpeF35/0er3nYoMGzQZrWi6v
+ 6OP5D3nDP2UprEq6lFbuaqnyf8vfAcnegiSx4q7cAAAAAElFTkSuQmCC
@@ -196,9 +202,6 @@
s1c0gHPmbrPTpHNJKOCo2G1mZs20zcwUJ5yp1AB5+8/zEwgF5GMVDxh4AAAAAElFTkSuQmCC
-
- 150, 17
-
AAABAAwAMDAQAAAAAABoBgAAxgAAACAgEAAAAAAA6AIAAC4HAAAYGBAAAAAAAOgBAAAWCgAAEBAQAAAA