diff --git a/BizHawk.MultiClient/Config.cs b/BizHawk.MultiClient/Config.cs index 5fa38b630f..bb9c2c3b61 100644 --- a/BizHawk.MultiClient/Config.cs +++ b/BizHawk.MultiClient/Config.cs @@ -33,6 +33,10 @@ // RamSearch Settings public bool AutoLoadRamSearch = false; + public int RamSearchWndx = -1; //Negative numbers will be ignored even with save window position set + public int RamSearchWndy = -1; + public int RamSearchWidth = -1; //Negative numbers will be ignored + public int RamSearchHeight = -1; //Movie Settings public RecentFiles RecentMovies = new RecentFiles(8); diff --git a/BizHawk.MultiClient/tools/RamSearch.Designer.cs b/BizHawk.MultiClient/tools/RamSearch.Designer.cs index a3ed0810e1..22821e5cb0 100644 --- a/BizHawk.MultiClient/tools/RamSearch.Designer.cs +++ b/BizHawk.MultiClient/tools/RamSearch.Designer.cs @@ -89,6 +89,7 @@ this.GreaterThanRadio = new System.Windows.Forms.RadioButton(); this.LessThanRadio = new System.Windows.Forms.RadioButton(); this.AutoSearchCheckBox = new System.Windows.Forms.CheckBox(); + this.restoreOriginalWindowSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.SearchtoolStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout(); this.toolStripContainer1.TopToolStripPanel.SuspendLayout(); @@ -112,7 +113,7 @@ this.PoketoolStripButton1}); this.SearchtoolStrip1.Location = new System.Drawing.Point(3, 0); this.SearchtoolStrip1.Name = "SearchtoolStrip1"; - this.SearchtoolStrip1.Size = new System.Drawing.Size(185, 25); + this.SearchtoolStrip1.Size = new System.Drawing.Size(154, 25); this.SearchtoolStrip1.TabIndex = 0; this.SearchtoolStrip1.Text = "Search"; // @@ -192,8 +193,9 @@ // // listView1 // - this.listView1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left))); + 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.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { this.Address, this.Value, @@ -243,6 +245,7 @@ this.openToolStripMenuItem, this.saveAsToolStripMenuItem, this.saveToolStripMenuItem, + this.restoreOriginalWindowSizeToolStripMenuItem, this.hackyAutoLoadToolStripMenuItem, this.exitToolStripMenuItem}); this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; @@ -290,7 +293,7 @@ // // toolStripContainer1 // - this.toolStripContainer1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + this.toolStripContainer1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Right))); // // toolStripContainer1.ContentPanel @@ -465,6 +468,7 @@ // // CompareToBox // + this.CompareToBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.CompareToBox.Controls.Add(this.NumberOfChangesBox); this.CompareToBox.Controls.Add(this.SpecificAddressBox); this.CompareToBox.Controls.Add(this.SpecificValueBox); @@ -551,6 +555,7 @@ // // ComparisonBox // + this.ComparisonBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.ComparisonBox.Controls.Add(this.label1); this.ComparisonBox.Controls.Add(this.DifferentByBox); this.ComparisonBox.Controls.Add(this.ModuloBox); @@ -681,6 +686,7 @@ // // AutoSearchCheckBox // + this.AutoSearchCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.AutoSearchCheckBox.AutoSize = true; this.AutoSearchCheckBox.Location = new System.Drawing.Point(250, 432); this.AutoSearchCheckBox.Name = "AutoSearchCheckBox"; @@ -689,6 +695,13 @@ this.AutoSearchCheckBox.Text = "Auto Search"; this.AutoSearchCheckBox.UseVisualStyleBackColor = true; // + // restoreOriginalWindowSizeToolStripMenuItem + // + this.restoreOriginalWindowSizeToolStripMenuItem.Name = "restoreOriginalWindowSizeToolStripMenuItem"; + this.restoreOriginalWindowSizeToolStripMenuItem.Size = new System.Drawing.Size(204, 22); + this.restoreOriginalWindowSizeToolStripMenuItem.Text = "Restore Window Size"; + this.restoreOriginalWindowSizeToolStripMenuItem.Click += new System.EventHandler(this.restoreOriginalWindowSizeToolStripMenuItem_Click); + // // RamSearch // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -706,6 +719,8 @@ this.Name = "RamSearch"; this.Text = "Ram Search"; this.Load += new System.EventHandler(this.RamSearch_Load); + this.Resize += new System.EventHandler(this.RamSearch_Resize); + this.LocationChanged += new System.EventHandler(this.RamSearch_LocationChanged); this.SearchtoolStrip1.ResumeLayout(false); this.SearchtoolStrip1.PerformLayout(); this.menuStrip1.ResumeLayout(false); @@ -789,5 +804,6 @@ private System.Windows.Forms.ToolStripMenuItem saveAsToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem saveToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem exitToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem restoreOriginalWindowSizeToolStripMenuItem; } } \ No newline at end of file diff --git a/BizHawk.MultiClient/tools/RamSearch.cs b/BizHawk.MultiClient/tools/RamSearch.cs index b2c36b5530..0ea0905f6d 100644 --- a/BizHawk.MultiClient/tools/RamSearch.cs +++ b/BizHawk.MultiClient/tools/RamSearch.cs @@ -18,7 +18,8 @@ namespace BizHawk.MultiClient //Save window position & Size //Menu Bar //Reset window position item - + int defaultWidth; //For saving the default size of the dialog, so the user can restore if desired + int defaultHeight; List searchList = new List(); @@ -29,12 +30,23 @@ namespace BizHawk.MultiClient private void RamSearch_Load(object sender, EventArgs e) { + defaultWidth = this.Size.Width; //Save these first so that the user can restore to its original size + defaultHeight = this.Size.Height; + SetTotal(); for (int x = 0; x < Global.Emulator.MainMemory.Size; x++) { } + + if (Global.Config.RamSearchWndx >= 0 && Global.Config.RamSearchWndy >= 0) + this.Location = new Point(Global.Config.RamSearchWndx, Global.Config.RamSearchWndy); + + if (Global.Config.RamSearchWidth >= 0 && Global.Config.RamSearchHeight >= 0) + { + this.Size = new System.Drawing.Size(Global.Config.RamSearchWidth, Global.Config.RamSearchHeight); + } } private void SetTotal() @@ -151,7 +163,6 @@ namespace BizHawk.MultiClient private void WatchtoolStripButton1_Click(object sender, EventArgs e) { //TODO: get listview watch object and feed to ram watch - //Global.MainForm.RamWatch1 = new RamWatch(); if (!Global.MainForm.RamWatch1.IsDisposed) Global.MainForm.RamWatch1.Focus(); @@ -161,5 +172,22 @@ namespace BizHawk.MultiClient Global.MainForm.RamWatch1.Show(); } } + + private void RamSearch_LocationChanged(object sender, EventArgs e) + { + Global.Config.RamSearchWndx = this.Location.X; + Global.Config.RamSearchWndy = this.Location.Y; + } + + private void RamSearch_Resize(object sender, EventArgs e) + { + Global.Config.RamSearchWidth = this.Right - this.Left; + Global.Config.RamSearchHeight = this.Bottom - this.Top; + } + + private void restoreOriginalWindowSizeToolStripMenuItem_Click(object sender, EventArgs e) + { + this.Size = new System.Drawing.Size(defaultWidth, defaultHeight); + } } } diff --git a/BizHawk.MultiClient/tools/RamSearch.resx b/BizHawk.MultiClient/tools/RamSearch.resx index fdbe107037..c5d67d2275 100644 --- a/BizHawk.MultiClient/tools/RamSearch.resx +++ b/BizHawk.MultiClient/tools/RamSearch.resx @@ -171,20 +171,23 @@ 259, 17 + + 358, 17 + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAjpJREFUOE+Nkl9I - U2EYxl0RQuFQI7oIuqno30U3XXoRVCAJXbibWkTgRRd2MZoZjcks13CptLQIIqi2Ylu2dJrQFslkljZo - rXmxtanMsJVIus1xMl319JyzU2bN6oMf34Hv/J73fb9zFEV/WXq9S1u2a5Nm1erizaWl5UXC7Ex2Mhq/ - 02I8aqSWJrkV9cvtPut4MoOpHBD8DDydBYaywL2QgNO6zgjF7aS4YIDFMlDjj6cgrul5wPcRcCUA9yTQ - nwacI1lUVWkeyyF/Ztx0hAeDn4DoHOCl5MsAfgEYXgCeMXCIZ2da+rI0jxXqQGH3JRGg4H3P1tlIkJ1E - ySh5Q8JfgKuul6DcVDDgbn8+oHM8XzlCKUk4CT6QGLnRKwV0FAy4cutFwM+2e96xXbYtVhZl3ic4AeLE - ZOmeXzGgocF2wR5IYYB3IM4stj1F+DGkFZ/JoqLi+GjBEXJdh5oedTuemFsf4H4og+ccIfw138UYmUgJ - 0NS1TlO2EvWyERYfVtq+eVQItR2BTqt9q1bXx863eYXr7lfoGp7AbfvrXLVKM0bJRmrJtp8Bi86Dkhwx - HoBDp8OpWnOCh+3kHLkoz3uNu0n+fKKc/5HEtuFVIWbaL8mNjfa5kpL1Lh6dJLvJFrKD7CRbyQayRpIX - 3Idr4KleJiuV5b080pE9chUF919ZGr2v48RgwrwPzrN1UmVZ1vONvWStLC4Jvz8ZDAbPpXpRtqaVyrIe - nv+Q1/1TlsM2ypfSzF0rV/5v+TuvXYIWQgoMnAAAAABJRU5ErkJggg== + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAjtJREFUOE+Nkl9I + U2EYxl0RQuFQI7wIuqno30U3XXoRlBAJXbibWkTgRRd2MZoZjcks12iptLQIIqi2alu2dJrQFslkljZo + rXWxtanMsJVIus2xTFc9PefslFnH6oMf34Hv/J73fb9zFEV/WXq9S1u2fb1mxcriDaWl5UW5mensRDR+ + q8V4yEgtTfLL6hfbfdaxZAaTeSD4GXgyAwxlgTuhHE7oOiMUt5Bi2QCLZaDWH09BWFNzgO8j4EoA7gmg + Pw04X2dRXa15JIX8mXHdER4MfgKis4CXki8D+HPA8DzwlIFDPDvZ0peleViuA4Xdl0SAgvc9W2cjQXYS + JSPkDQl/AS67XoBys2zA7f5CQOdYoXKEUpJwEnwgMXKtVwzokA24dON5wM+2e96xXbYtVBZk3ic4AeLE + ZOmeWzagsdF21h5IYYB3IMwstD1J+DHEFZ/OorLyyIjsCPmu/c0Pux2Pza33cS+UwTOOEP5a6GKUjKdy + 0NS3TlG2EvWSERYe7LN986gQajsInVb7Vq1uiJ1p8+auul+ia3gcN+++yteoNKOUbKSObP4ZsOCsEuWI + cS8cOh2O15kTPGwnp8k5ad4r3E3S5xPkwo8ktA2vCjHTHlFuarLPlpSsdfHoGNlBNpKtZBvZRNaRVaI8 + 7z5QC0/NElmpLO/lkY7slKoouP/K4uh9HUcHE+bdcJ6qFytLsp5v7CKrJXFR+P3JYDB4LjQIsjWtVJb1 + 8PyHvOafshRWIV3Kee5aqfJ/y98BrcSCFWcIYBgAAAAASUVORK5CYII= @@ -202,9 +205,6 @@ s1c0gHPmbrPTpHNJKOCo2G1mZs20zcwUJ5yp1AB5+8/zEwgF5GMVDxh4AAAAAElFTkSuQmCC - - 358, 17 - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8