diff --git a/BizHawk.MultiClient/config/AutofireConfig.Designer.cs b/BizHawk.MultiClient/config/AutofireConfig.Designer.cs index 2c4ed6ff30..fb091e7c5d 100644 --- a/BizHawk.MultiClient/config/AutofireConfig.Designer.cs +++ b/BizHawk.MultiClient/config/AutofireConfig.Designer.cs @@ -44,10 +44,10 @@ // Ok // this.Ok.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.Ok.Location = new System.Drawing.Point(45, 117); + this.Ok.Location = new System.Drawing.Point(42, 117); this.Ok.Name = "Ok"; this.Ok.Size = new System.Drawing.Size(75, 23); - this.Ok.TabIndex = 0; + this.Ok.TabIndex = 5; this.Ok.Text = "&Ok"; this.Ok.UseVisualStyleBackColor = true; this.Ok.Click += new System.EventHandler(this.Ok_Click); @@ -56,10 +56,10 @@ // this.Cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.Cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.Cancel.Location = new System.Drawing.Point(126, 117); + this.Cancel.Location = new System.Drawing.Point(123, 117); this.Cancel.Name = "Cancel"; this.Cancel.Size = new System.Drawing.Size(75, 23); - this.Cancel.TabIndex = 1; + this.Cancel.TabIndex = 7; this.Cancel.Text = "&Cancel"; this.Cancel.UseVisualStyleBackColor = true; this.Cancel.Click += new System.EventHandler(this.Cancel_Click); @@ -132,7 +132,7 @@ this.groupBox1.Controls.Add(this.label2); this.groupBox1.Controls.Add(this.OnNumeric); this.groupBox1.Controls.Add(this.OffNumeric); - this.groupBox1.Location = new System.Drawing.Point(12, 12); + this.groupBox1.Location = new System.Drawing.Point(13, 12); this.groupBox1.Name = "groupBox1"; this.groupBox1.Size = new System.Drawing.Size(184, 70); this.groupBox1.TabIndex = 6; @@ -145,11 +145,14 @@ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.CancelButton = this.Cancel; - this.ClientSize = new System.Drawing.Size(213, 152); + this.ClientSize = new System.Drawing.Size(210, 152); this.Controls.Add(this.groupBox1); this.Controls.Add(this.Cancel); this.Controls.Add(this.Ok); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.MaximizeBox = false; + this.MaximumSize = new System.Drawing.Size(512, 512); + this.MinimumSize = new System.Drawing.Size(218, 179); this.Name = "AutofireConfig"; this.Text = "Autofire Configuration"; this.Load += new System.EventHandler(this.AutofireConfig_Load); diff --git a/BizHawk.MultiClient/tools/RamSearch.Designer.cs b/BizHawk.MultiClient/tools/RamSearch.Designer.cs index 60902843fd..985964c1e7 100644 --- a/BizHawk.MultiClient/tools/RamSearch.Designer.cs +++ b/BizHawk.MultiClient/tools/RamSearch.Designer.cs @@ -38,6 +38,7 @@ 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.FreezeAddressToolStrip = new System.Windows.Forms.ToolStripButton(); this.TotalSearchLabel = new System.Windows.Forms.Label(); @@ -92,13 +93,14 @@ this.previewModeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.alwaysExludeRamSearchListToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStrip1 = new ToolStripEx(); - 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.NewSearchtoolStripButton = new System.Windows.Forms.ToolStripButton(); + this.toolStripSeparator6 = 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(); + this.RedotoolStripButton2 = new System.Windows.Forms.ToolStripButton(); this.toolStrip2 = new ToolStripEx(); this.DataSizetoolStripSplitButton1 = new System.Windows.Forms.ToolStripSplitButton(); this.byteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -135,7 +137,7 @@ this.MemDomainLabel = new System.Windows.Forms.Label(); this.OutputLabel = new System.Windows.Forms.Label(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); - this.WatchtoolStripButton1 = new System.Windows.Forms.ToolStripButton(); + this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator(); this.SearchtoolStrip1.SuspendLayout(); this.contextMenuStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout(); @@ -230,6 +232,15 @@ this.toolStripSeparator8.Name = "toolStripSeparator8"; this.toolStripSeparator8.Size = new System.Drawing.Size(6, 25); // + // WatchtoolStripButton1 + // + this.WatchtoolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.WatchtoolStripButton1.Image = global::BizHawk.MultiClient.Properties.Resources.FindHS; + this.WatchtoolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; + this.WatchtoolStripButton1.Name = "WatchtoolStripButton1"; + this.WatchtoolStripButton1.Size = new System.Drawing.Size(23, 22); + this.WatchtoolStripButton1.Text = "Watch"; + // // PoketoolStripButton1 // this.PoketoolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; @@ -280,7 +291,7 @@ this.SearchListView.Name = "SearchListView"; this.SearchListView.selectedItem = -1; this.SearchListView.Size = new System.Drawing.Size(221, 363); - this.SearchListView.TabIndex = 3; + this.SearchListView.TabIndex = 1; this.SearchListView.UseCompatibleStateImageBehavior = false; this.SearchListView.View = System.Windows.Forms.View.Details; this.SearchListView.VirtualMode = true; @@ -703,13 +714,30 @@ this.toolStripSeparator6, this.SetCurrToPrevtoolStripButton2, this.ClearChangeCountstoolStripButton, - this.UndotoolStripButton}); + this.toolStripSeparator10, + this.UndotoolStripButton, + this.RedotoolStripButton2}); this.toolStrip1.Location = new System.Drawing.Point(248, 33); this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(174, 25); + this.toolStrip1.Size = new System.Drawing.Size(237, 25); this.toolStrip1.TabIndex = 5; this.toolStrip1.TabStop = true; // + // toolStripButton1 + // + 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(63, 22); + this.toolStripButton1.Text = "Search "; + this.toolStripButton1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.toolStripButton1_MouseDown); + this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); + // + // toolStripSeparator7 + // + this.toolStripSeparator7.Name = "toolStripSeparator7"; + this.toolStripSeparator7.Size = new System.Drawing.Size(6, 25); + // // NewSearchtoolStripButton // this.NewSearchtoolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; @@ -725,21 +753,6 @@ this.toolStripSeparator6.Name = "toolStripSeparator6"; this.toolStripSeparator6.Size = new System.Drawing.Size(6, 25); // - // toolStripButton1 - // - 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(60, 22); - this.toolStripButton1.Text = "Search"; - this.toolStripButton1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.toolStripButton1_MouseDown); - 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; @@ -772,6 +785,17 @@ this.UndotoolStripButton.Text = "Undo Search"; this.UndotoolStripButton.Click += new System.EventHandler(this.UndotoolStripButton_Click_1); // + // RedotoolStripButton2 + // + this.RedotoolStripButton2.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.RedotoolStripButton2.Enabled = false; + this.RedotoolStripButton2.Image = global::BizHawk.MultiClient.Properties.Resources.redo; + this.RedotoolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta; + this.RedotoolStripButton2.Name = "RedotoolStripButton2"; + this.RedotoolStripButton2.Size = new System.Drawing.Size(23, 22); + this.RedotoolStripButton2.Text = "Redo"; + this.RedotoolStripButton2.Click += new System.EventHandler(this.RedotoolStripButton2_Click); + // // toolStrip2 // this.toolStrip2.ClickThrough = true; @@ -1153,14 +1177,10 @@ this.OutputLabel.TabIndex = 9; this.OutputLabel.Text = " "; // - // WatchtoolStripButton1 + // toolStripSeparator10 // - this.WatchtoolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.WatchtoolStripButton1.Image = global::BizHawk.MultiClient.Properties.Resources.FindHS; - this.WatchtoolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; - this.WatchtoolStripButton1.Name = "WatchtoolStripButton1"; - this.WatchtoolStripButton1.Size = new System.Drawing.Size(23, 22); - this.WatchtoolStripButton1.Text = "Watch"; + this.toolStripSeparator10.Name = "toolStripSeparator10"; + this.toolStripSeparator10.Size = new System.Drawing.Size(6, 25); // // RamSearch // @@ -1312,5 +1332,7 @@ private ToolStripEx toolStrip2; private System.Windows.Forms.ToolTip toolTip1; private System.Windows.Forms.ToolStripButton WatchtoolStripButton1; + private System.Windows.Forms.ToolStripButton RedotoolStripButton2; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator10; } } \ No newline at end of file diff --git a/BizHawk.MultiClient/tools/RamSearch.cs b/BizHawk.MultiClient/tools/RamSearch.cs index a593702d13..547afc2ce8 100644 --- a/BizHawk.MultiClient/tools/RamSearch.cs +++ b/BizHawk.MultiClient/tools/RamSearch.cs @@ -14,6 +14,7 @@ namespace BizHawk.MultiClient //TODO: //Sorting by Prev only does "Since prev frame", find a way to integrate the various prev options //In DoUndo, prevList is set to searchList, instead how about a UndoPrev, so that undo restores both the current and previous values + //Redo button /// /// A winform designed to search through ram values @@ -519,6 +520,11 @@ namespace BizHawk.MultiClient } } + private void DoRedo() + { + //TODO + } + private void UndotoolStripButton_Click(object sender, EventArgs e) { DoUndo(); @@ -2126,5 +2132,10 @@ namespace BizHawk.MultiClient RemoveAddresses(); } } + + private void RedotoolStripButton2_Click(object sender, EventArgs e) + { + DoRedo(); + } } } diff --git a/BizHawk.MultiClient/tools/RamSearch.resx b/BizHawk.MultiClient/tools/RamSearch.resx index bc8e28ab66..3f38f86518 100644 --- a/BizHawk.MultiClient/tools/RamSearch.resx +++ b/BizHawk.MultiClient/tools/RamSearch.resx @@ -245,6 +245,9 @@ 602, 17 + + 602, 17 + AAABAAwAMDAQAAAAAABoBgAAxgAAACAgEAAAAAAA6AIAAC4HAAAYGBAAAAAAAOgBAAAWCgAAEBAQAAAA