From af78507bc747e5eab13f7152dc46f71af24c422d Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Sat, 5 Feb 2022 19:31:54 +1000 Subject: [PATCH] Remove redundant `Config.Ti83AutoloadKeyPad` --- src/BizHawk.Client.Common/config/Config.cs | 3 --- src/BizHawk.Client.EmuHawk/MainForm.Designer.cs | 11 ----------- src/BizHawk.Client.EmuHawk/MainForm.Events.cs | 15 --------------- 3 files changed, 29 deletions(-) diff --git a/src/BizHawk.Client.Common/config/Config.cs b/src/BizHawk.Client.Common/config/Config.cs index 6304619169..983611bbb6 100644 --- a/src/BizHawk.Client.Common/config/Config.cs +++ b/src/BizHawk.Client.Common/config/Config.cs @@ -296,9 +296,6 @@ namespace BizHawk.Client.Common public bool PlayMovieIncludeSubDir { get; set; } public bool PlayMovieMatchHash { get; set; } = true; - // TI83 - public bool Ti83AutoloadKeyPad { get; set; } = true; - public BindingCollection HotkeyBindings { get; set; } = new BindingCollection(); // Analog Hotkey values diff --git a/src/BizHawk.Client.EmuHawk/MainForm.Designer.cs b/src/BizHawk.Client.EmuHawk/MainForm.Designer.cs index 60012fa172..a43bebbf9b 100644 --- a/src/BizHawk.Client.EmuHawk/MainForm.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/MainForm.Designer.cs @@ -234,7 +234,6 @@ namespace BizHawk.Client.EmuHawk this.KeypadMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.LoadTIFileMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.toolStripSeparator13 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx(); - this.AutoloadKeypadMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.paletteToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.A7800SubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.A7800ControllerSettingsMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); @@ -1564,10 +1563,8 @@ namespace BizHawk.Client.EmuHawk this.KeypadMenuItem, this.LoadTIFileMenuItem, this.toolStripSeparator13, - this.AutoloadKeypadMenuItem, this.paletteToolStripMenuItem}); this.TI83SubMenu.Text = "TI83"; - this.TI83SubMenu.DropDownOpened += new System.EventHandler(this.Ti83SubMenu_DropDownOpened); // // KeypadMenuItem // @@ -1579,13 +1576,6 @@ namespace BizHawk.Client.EmuHawk this.LoadTIFileMenuItem.Text = "Load TI-83 File..."; this.LoadTIFileMenuItem.Click += new System.EventHandler(this.Ti83LoadTIFileMenuItem_Click); // - // AutoloadKeypadMenuItem - // - this.AutoloadKeypadMenuItem.Checked = true; - this.AutoloadKeypadMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; - this.AutoloadKeypadMenuItem.Text = "Autoload Keypad"; - this.AutoloadKeypadMenuItem.Click += new System.EventHandler(this.AutoloadKeypadMenuItem_Click); - // // paletteToolStripMenuItem // this.paletteToolStripMenuItem.Text = "Palette..."; @@ -2534,7 +2524,6 @@ namespace BizHawk.Client.EmuHawk private BizHawk.WinForms.Controls.StatusLabelEx EmuStatus; private BizHawk.WinForms.Controls.ToolStripMenuItemEx MessagesMenuItem; private BizHawk.WinForms.Controls.ToolStripMenuItemEx TI83SubMenu; - private BizHawk.WinForms.Controls.ToolStripMenuItemEx AutoloadKeypadMenuItem; private BizHawk.WinForms.Controls.ToolStripMenuItemEx KeypadMenuItem; private BizHawk.WinForms.Controls.ToolStripSeparatorEx toolStripSeparator13; private BizHawk.WinForms.Controls.ToolStripMenuItemEx PathsMenuItem; diff --git a/src/BizHawk.Client.EmuHawk/MainForm.Events.cs b/src/BizHawk.Client.EmuHawk/MainForm.Events.cs index 84e24ed671..15eaa93400 100644 --- a/src/BizHawk.Client.EmuHawk/MainForm.Events.cs +++ b/src/BizHawk.Client.EmuHawk/MainForm.Events.cs @@ -1464,21 +1464,11 @@ namespace BizHawk.Client.EmuHawk Tools.Load(); } - private void Ti83SubMenu_DropDownOpened(object sender, EventArgs e) - { - AutoloadKeypadMenuItem.Checked = Config.Ti83AutoloadKeyPad; - } - private void Ti83KeypadMenuItem_Click(object sender, EventArgs e) { Tools.Load(); } - private void AutoloadKeypadMenuItem_Click(object sender, EventArgs e) - { - Config.Ti83AutoloadKeyPad ^= true; - } - private void Ti83LoadTIFileMenuItem_Click(object sender, EventArgs e) { if (Emulator is TI83 ti83) @@ -2477,11 +2467,6 @@ namespace BizHawk.Client.EmuHawk private void MainForm_Shown(object sender, EventArgs e) { - if (Emulator is TI83Common && Config.Ti83AutoloadKeyPad) - { - Tools.Load(); - } - if (Config.RecentWatches.AutoLoad) { Tools.LoadRamWatch(!Config.DisplayRamWatch);