From 22ba0d5c25288defc39254f62e9885043d8edcd3 Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Sat, 17 Dec 2022 14:52:49 +1000 Subject: [PATCH] Dedup click handlers for `File` > `Save State` and `Load State` `File` > `Save Slot` already did this --- .../MainForm.Designer.cs | 40 +++++++++---------- src/BizHawk.Client.EmuHawk/MainForm.Events.cs | 24 ++--------- 2 files changed, 24 insertions(+), 40 deletions(-) diff --git a/src/BizHawk.Client.EmuHawk/MainForm.Designer.cs b/src/BizHawk.Client.EmuHawk/MainForm.Designer.cs index da4803b643..c747dbe15a 100644 --- a/src/BizHawk.Client.EmuHawk/MainForm.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/MainForm.Designer.cs @@ -479,52 +479,52 @@ namespace BizHawk.Client.EmuHawk // SaveState1MenuItem // this.SaveState1MenuItem.Text = "1"; - this.SaveState1MenuItem.Click += new System.EventHandler(this.Savestate1MenuItem_Click); + this.SaveState1MenuItem.Click += new System.EventHandler(this.QuickSavestateMenuItem_Click); // // SaveState2MenuItem // this.SaveState2MenuItem.Text = "2"; - this.SaveState2MenuItem.Click += new System.EventHandler(this.Savestate2MenuItem_Click); + this.SaveState2MenuItem.Click += new System.EventHandler(this.QuickSavestateMenuItem_Click); // // SaveState3MenuItem // this.SaveState3MenuItem.Text = "3"; - this.SaveState3MenuItem.Click += new System.EventHandler(this.Savestate3MenuItem_Click); + this.SaveState3MenuItem.Click += new System.EventHandler(this.QuickSavestateMenuItem_Click); // // SaveState4MenuItem // this.SaveState4MenuItem.Text = "4"; - this.SaveState4MenuItem.Click += new System.EventHandler(this.Savestate4MenuItem_Click); + this.SaveState4MenuItem.Click += new System.EventHandler(this.QuickSavestateMenuItem_Click); // // SaveState5MenuItem // this.SaveState5MenuItem.Text = "5"; - this.SaveState5MenuItem.Click += new System.EventHandler(this.Savestate5MenuItem_Click); + this.SaveState5MenuItem.Click += new System.EventHandler(this.QuickSavestateMenuItem_Click); // // SaveState6MenuItem // this.SaveState6MenuItem.Text = "6"; - this.SaveState6MenuItem.Click += new System.EventHandler(this.Savestate6MenuItem_Click); + this.SaveState6MenuItem.Click += new System.EventHandler(this.QuickSavestateMenuItem_Click); // // SaveState7MenuItem // this.SaveState7MenuItem.Text = "7"; - this.SaveState7MenuItem.Click += new System.EventHandler(this.Savestate7MenuItem_Click); + this.SaveState7MenuItem.Click += new System.EventHandler(this.QuickSavestateMenuItem_Click); // // SaveState8MenuItem // this.SaveState8MenuItem.Text = "8"; - this.SaveState8MenuItem.Click += new System.EventHandler(this.Savestate8MenuItem_Click); + this.SaveState8MenuItem.Click += new System.EventHandler(this.QuickSavestateMenuItem_Click); // // SaveState9MenuItem // this.SaveState9MenuItem.Text = "9"; - this.SaveState9MenuItem.Click += new System.EventHandler(this.Savestate9MenuItem_Click); + this.SaveState9MenuItem.Click += new System.EventHandler(this.QuickSavestateMenuItem_Click); // // SaveState0MenuItem // this.SaveState0MenuItem.Text = "0"; - this.SaveState0MenuItem.Click += new System.EventHandler(this.Savestate0MenuItem_Click); + this.SaveState0MenuItem.Click += new System.EventHandler(this.QuickSavestateMenuItem_Click); // // SaveNamedStateMenuItem // @@ -560,52 +560,52 @@ namespace BizHawk.Client.EmuHawk // LoadState1MenuItem // this.LoadState1MenuItem.Text = "1"; - this.LoadState1MenuItem.Click += new System.EventHandler(this.Loadstate1MenuItem_Click); + this.LoadState1MenuItem.Click += new System.EventHandler(this.QuickLoadstateMenuItem_Click); // // LoadState2MenuItem // this.LoadState2MenuItem.Text = "2"; - this.LoadState2MenuItem.Click += new System.EventHandler(this.Loadstate2MenuItem_Click); + this.LoadState2MenuItem.Click += new System.EventHandler(this.QuickLoadstateMenuItem_Click); // // LoadState3MenuItem // this.LoadState3MenuItem.Text = "3"; - this.LoadState3MenuItem.Click += new System.EventHandler(this.Loadstate3MenuItem_Click); + this.LoadState3MenuItem.Click += new System.EventHandler(this.QuickLoadstateMenuItem_Click); // // LoadState4MenuItem // this.LoadState4MenuItem.Text = "4"; - this.LoadState4MenuItem.Click += new System.EventHandler(this.Loadstate4MenuItem_Click); + this.LoadState4MenuItem.Click += new System.EventHandler(this.QuickLoadstateMenuItem_Click); // // LoadState5MenuItem // this.LoadState5MenuItem.Text = "5"; - this.LoadState5MenuItem.Click += new System.EventHandler(this.Loadstate5MenuItem_Click); + this.LoadState5MenuItem.Click += new System.EventHandler(this.QuickLoadstateMenuItem_Click); // // LoadState6MenuItem // this.LoadState6MenuItem.Text = "6"; - this.LoadState6MenuItem.Click += new System.EventHandler(this.Loadstate6MenuItem_Click); + this.LoadState6MenuItem.Click += new System.EventHandler(this.QuickLoadstateMenuItem_Click); // // LoadState7MenuItem // this.LoadState7MenuItem.Text = "7"; - this.LoadState7MenuItem.Click += new System.EventHandler(this.Loadstate7MenuItem_Click); + this.LoadState7MenuItem.Click += new System.EventHandler(this.QuickLoadstateMenuItem_Click); // // LoadState8MenuItem // this.LoadState8MenuItem.Text = "8"; - this.LoadState8MenuItem.Click += new System.EventHandler(this.Loadstate8MenuItem_Click); + this.LoadState8MenuItem.Click += new System.EventHandler(this.QuickLoadstateMenuItem_Click); // // LoadState9MenuItem // this.LoadState9MenuItem.Text = "9"; - this.LoadState9MenuItem.Click += new System.EventHandler(this.Loadstate9MenuItem_Click); + this.LoadState9MenuItem.Click += new System.EventHandler(this.QuickLoadstateMenuItem_Click); // // LoadState0MenuItem // this.LoadState0MenuItem.Text = "0"; - this.LoadState0MenuItem.Click += new System.EventHandler(this.Loadstate0MenuItem_Click); + this.LoadState0MenuItem.Click += new System.EventHandler(this.QuickLoadstateMenuItem_Click); // // LoadNamedStateMenuItem // diff --git a/src/BizHawk.Client.EmuHawk/MainForm.Events.cs b/src/BizHawk.Client.EmuHawk/MainForm.Events.cs index 02186e11d4..7d08441544 100644 --- a/src/BizHawk.Client.EmuHawk/MainForm.Events.cs +++ b/src/BizHawk.Client.EmuHawk/MainForm.Events.cs @@ -351,29 +351,13 @@ namespace BizHawk.Client.EmuHawk Console.WriteLine($"Closing rom clicked DONE Frame: {Emulator.Frame} Emulator: {Emulator.GetType().Name}"); } - private void Savestate1MenuItem_Click(object sender, EventArgs e) => SaveQuickSave("QuickSave1"); - private void Savestate2MenuItem_Click(object sender, EventArgs e) => SaveQuickSave("QuickSave2"); - private void Savestate3MenuItem_Click(object sender, EventArgs e) => SaveQuickSave("QuickSave3"); - private void Savestate4MenuItem_Click(object sender, EventArgs e) => SaveQuickSave("QuickSave4"); - private void Savestate5MenuItem_Click(object sender, EventArgs e) => SaveQuickSave("QuickSave5"); - private void Savestate6MenuItem_Click(object sender, EventArgs e) => SaveQuickSave("QuickSave6"); - private void Savestate7MenuItem_Click(object sender, EventArgs e) => SaveQuickSave("QuickSave7"); - private void Savestate8MenuItem_Click(object sender, EventArgs e) => SaveQuickSave("QuickSave8"); - private void Savestate9MenuItem_Click(object sender, EventArgs e) => SaveQuickSave("QuickSave9"); - private void Savestate0MenuItem_Click(object sender, EventArgs e) => SaveQuickSave("QuickSave0"); + private void QuickSavestateMenuItem_Click(object sender, EventArgs e) + => SaveQuickSave($"QuickSave{((MenuItem) sender).Text}"); private void SaveNamedStateMenuItem_Click(object sender, EventArgs e) => SaveStateAs(); - private void Loadstate1MenuItem_Click(object sender, EventArgs e) => LoadQuickSave("QuickSave1"); - private void Loadstate2MenuItem_Click(object sender, EventArgs e) => LoadQuickSave("QuickSave2"); - private void Loadstate3MenuItem_Click(object sender, EventArgs e) => LoadQuickSave("QuickSave3"); - private void Loadstate4MenuItem_Click(object sender, EventArgs e) => LoadQuickSave("QuickSave4"); - private void Loadstate5MenuItem_Click(object sender, EventArgs e) => LoadQuickSave("QuickSave5"); - private void Loadstate6MenuItem_Click(object sender, EventArgs e) => LoadQuickSave("QuickSave6"); - private void Loadstate7MenuItem_Click(object sender, EventArgs e) => LoadQuickSave("QuickSave7"); - private void Loadstate8MenuItem_Click(object sender, EventArgs e) => LoadQuickSave("QuickSave8"); - private void Loadstate9MenuItem_Click(object sender, EventArgs e) => LoadQuickSave("QuickSave9"); - private void Loadstate0MenuItem_Click(object sender, EventArgs e) => LoadQuickSave("QuickSave0"); + private void QuickLoadstateMenuItem_Click(object sender, EventArgs e) + => LoadQuickSave($"QuickSave{((MenuItem) sender).Text}"); private void LoadNamedStateMenuItem_Click(object sender, EventArgs e) => LoadStateAs();