From 0d42459be8f314396cebd206c1e2ca7676858724 Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Sun, 29 May 2022 03:04:07 +1000 Subject: [PATCH] Remove redundant `AmstradCpcPokeMemory` tool see 6cb44e0e8 --- .../BizHawk.Client.EmuHawk.csproj | 3 - .../MainForm.Designer.cs | 8 - src/BizHawk.Client.EmuHawk/MainForm.Events.cs | 9 -- .../AmstradCPCPokeMemory.Designer.cs | 151 ------------------ .../config/AmstradCPC/AmstradCPCPokeMemory.cs | 36 ----- .../AmstradCPC/AmstradCPCPokeMemory.resx | 120 -------------- 6 files changed, 327 deletions(-) delete mode 100644 src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCPokeMemory.Designer.cs delete mode 100644 src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCPokeMemory.cs delete mode 100644 src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCPokeMemory.resx diff --git a/src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj index 86ce5afcb5..48b1713e16 100755 --- a/src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj +++ b/src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj @@ -86,9 +86,6 @@ - - - diff --git a/src/BizHawk.Client.EmuHawk/MainForm.Designer.cs b/src/BizHawk.Client.EmuHawk/MainForm.Designer.cs index b507dffffa..a704c23c1c 100644 --- a/src/BizHawk.Client.EmuHawk/MainForm.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/MainForm.Designer.cs @@ -294,7 +294,6 @@ namespace BizHawk.Client.EmuHawk this.amstradCPCCoreEmulationSettingsToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.AmstradCPCAudioSettingsToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.AmstradCPCNonSyncSettingsToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); - this.AmstradCPCPokeMemoryToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.AmstradCPCMediaToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.AmstradCPCTapesSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.cpct1ToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); @@ -1885,7 +1884,6 @@ namespace BizHawk.Client.EmuHawk this.amstradCPCCoreEmulationSettingsToolStripMenuItem, this.AmstradCPCAudioSettingsToolStripMenuItem, this.AmstradCPCNonSyncSettingsToolStripMenuItem, - this.AmstradCPCPokeMemoryToolStripMenuItem, this.AmstradCPCMediaToolStripMenuItem}); this.amstradCPCToolStripMenuItem.Text = "Amstrad CPC"; // @@ -1904,11 +1902,6 @@ namespace BizHawk.Client.EmuHawk this.AmstradCPCNonSyncSettingsToolStripMenuItem.Text = "Non-Sync Settings"; this.AmstradCPCNonSyncSettingsToolStripMenuItem.Click += new System.EventHandler(this.AmstradCpcNonSyncSettingsMenuItem_Click); // - // AmstradCPCPokeMemoryToolStripMenuItem - // - this.AmstradCPCPokeMemoryToolStripMenuItem.Text = "POKE Memory"; - this.AmstradCPCPokeMemoryToolStripMenuItem.Click += new System.EventHandler(this.AmstradCpcPokeMemoryMenuItem_Click); - // // AmstradCPCMediaToolStripMenuItem // this.AmstradCPCMediaToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -2755,7 +2748,6 @@ namespace BizHawk.Client.EmuHawk private BizHawk.WinForms.Controls.ToolStripMenuItemEx amstradCPCToolStripMenuItem; private BizHawk.WinForms.Controls.ToolStripMenuItemEx amstradCPCCoreEmulationSettingsToolStripMenuItem; private BizHawk.WinForms.Controls.ToolStripMenuItemEx AmstradCPCAudioSettingsToolStripMenuItem; - private BizHawk.WinForms.Controls.ToolStripMenuItemEx AmstradCPCPokeMemoryToolStripMenuItem; private BizHawk.WinForms.Controls.ToolStripMenuItemEx AmstradCPCMediaToolStripMenuItem; private BizHawk.WinForms.Controls.ToolStripMenuItemEx AmstradCPCTapesSubMenu; private BizHawk.WinForms.Controls.ToolStripMenuItemEx cpct1ToolStripMenuItem; diff --git a/src/BizHawk.Client.EmuHawk/MainForm.Events.cs b/src/BizHawk.Client.EmuHawk/MainForm.Events.cs index 8fcdf65c33..958f4f2185 100644 --- a/src/BizHawk.Client.EmuHawk/MainForm.Events.cs +++ b/src/BizHawk.Client.EmuHawk/MainForm.Events.cs @@ -2014,15 +2014,6 @@ namespace BizHawk.Client.EmuHawk } } - private void AmstradCpcPokeMemoryMenuItem_Click(object sender, EventArgs e) - { - if (Emulator is AmstradCPC cpc) - { - using var form = new AmstradCpcPokeMemory(cpc); - form.ShowDialog(); - } - } - private void AmstradCpcMediaMenuItem_DropDownOpened(object sender, EventArgs e) { if (Emulator is AmstradCPC cpc) diff --git a/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCPokeMemory.Designer.cs b/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCPokeMemory.Designer.cs deleted file mode 100644 index 1642e95447..0000000000 --- a/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCPokeMemory.Designer.cs +++ /dev/null @@ -1,151 +0,0 @@ -namespace BizHawk.Client.EmuHawk -{ - partial class AmstradCpcPokeMemory - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.OkBtn = new System.Windows.Forms.Button(); - this.CancelBtn = new System.Windows.Forms.Button(); - this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); - this.label4 = new BizHawk.WinForms.Controls.LocLabelEx(); - this.label2 = new BizHawk.WinForms.Controls.LocLabelEx(); - this.numericUpDownAddress = new System.Windows.Forms.NumericUpDown(); - this.label3 = new BizHawk.WinForms.Controls.LocLabelEx(); - this.numericUpDownByte = new System.Windows.Forms.NumericUpDown(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDownAddress)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDownByte)).BeginInit(); - this.SuspendLayout(); - // - // OkBtn - // - this.OkBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.OkBtn.Location = new System.Drawing.Point(150, 109); - this.OkBtn.Name = "OkBtn"; - this.OkBtn.Size = new System.Drawing.Size(60, 23); - this.OkBtn.TabIndex = 3; - this.OkBtn.Text = "&OK"; - this.OkBtn.UseVisualStyleBackColor = true; - this.OkBtn.Click += new System.EventHandler(this.OkBtn_Click); - // - // CancelBtn - // - this.CancelBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.CancelBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.CancelBtn.Location = new System.Drawing.Point(216, 109); - this.CancelBtn.Name = "CancelBtn"; - this.CancelBtn.Size = new System.Drawing.Size(60, 23); - this.CancelBtn.TabIndex = 4; - this.CancelBtn.Text = "&Cancel"; - this.CancelBtn.UseVisualStyleBackColor = true; - this.CancelBtn.Click += new System.EventHandler(this.CancelBtn_Click); - // - // label1 - // - this.label1.Location = new System.Drawing.Point(12, 14); - this.label1.Name = "label1"; - this.label1.Text = "Enter an address to POKE along with a single byte value"; - // - // label4 - // - this.label4.Location = new System.Drawing.Point(12, 52); - this.label4.Name = "label4"; - this.label4.Text = "Address (0-65535)"; - // - // label2 - // - this.label2.Location = new System.Drawing.Point(12, 27); - this.label2.Name = "label2"; - this.label2.Text = "(This will always target the 64K RAM address space)"; - // - // numericUpDownAddress - // - this.numericUpDownAddress.Location = new System.Drawing.Point(15, 69); - this.numericUpDownAddress.Maximum = new decimal(new int[] { - 65535, - 0, - 0, - 0}); - this.numericUpDownAddress.Name = "numericUpDownAddress"; - this.numericUpDownAddress.Size = new System.Drawing.Size(90, 20); - this.numericUpDownAddress.TabIndex = 30; - // - // label3 - // - this.label3.Location = new System.Drawing.Point(123, 52); - this.label3.Name = "label3"; - this.label3.Text = "Value (0-255)"; - // - // numericUpDownByte - // - this.numericUpDownByte.Location = new System.Drawing.Point(126, 68); - this.numericUpDownByte.Maximum = new decimal(new int[] { - 255, - 0, - 0, - 0}); - this.numericUpDownByte.Name = "numericUpDownByte"; - this.numericUpDownByte.Size = new System.Drawing.Size(67, 20); - this.numericUpDownByte.TabIndex = 32; - // - // AmstradCPCPokeMemory - // - this.AcceptButton = this.OkBtn; - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.CancelButton = this.CancelBtn; - this.ClientSize = new System.Drawing.Size(288, 144); - this.Controls.Add(this.numericUpDownByte); - this.Controls.Add(this.label3); - this.Controls.Add(this.numericUpDownAddress); - this.Controls.Add(this.label2); - this.Controls.Add(this.label4); - this.Controls.Add(this.label1); - this.Controls.Add(this.CancelBtn); - this.Controls.Add(this.OkBtn); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; - this.Name = "AmstradCpcPokeMemory"; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = "Poke Memory"; - ((System.ComponentModel.ISupportInitialize)(this.numericUpDownAddress)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDownByte)).EndInit(); - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - - private System.Windows.Forms.Button OkBtn; - private System.Windows.Forms.Button CancelBtn; - private BizHawk.WinForms.Controls.LocLabelEx label1; - private BizHawk.WinForms.Controls.LocLabelEx label4; - private BizHawk.WinForms.Controls.LocLabelEx label2; - private System.Windows.Forms.NumericUpDown numericUpDownAddress; - private BizHawk.WinForms.Controls.LocLabelEx label3; - private System.Windows.Forms.NumericUpDown numericUpDownByte; - } -} \ No newline at end of file diff --git a/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCPokeMemory.cs b/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCPokeMemory.cs deleted file mode 100644 index 668399f192..0000000000 --- a/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCPokeMemory.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System; -using System.Windows.Forms; - -using BizHawk.Emulation.Cores.Computers.AmstradCPC; - -namespace BizHawk.Client.EmuHawk -{ - public partial class AmstradCpcPokeMemory : Form - { - private readonly AmstradCPC _cpc; - - public AmstradCpcPokeMemory(AmstradCPC cpc) - { - _cpc = cpc; - InitializeComponent(); - Icon = Properties.Resources.GameControllerIcon; - } - - private void OkBtn_Click(object sender, EventArgs e) - { - var addr = (ushort)numericUpDownAddress.Value; - var val = (byte)numericUpDownByte.Value; - - _cpc.PokeMemory(addr, val); - - DialogResult = DialogResult.OK; - Close(); - } - - private void CancelBtn_Click(object sender, EventArgs e) - { - DialogResult = DialogResult.Cancel; - Close(); - } - } -} diff --git a/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCPokeMemory.resx b/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCPokeMemory.resx deleted file mode 100644 index 1af7de150c..0000000000 --- a/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCPokeMemory.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file