From 8062faf40b9696cebc31700ca4c293db493345b2 Mon Sep 17 00:00:00 2001 From: adelikat Date: Mon, 22 May 2017 09:04:47 -0500 Subject: [PATCH] organize mainform menu item event methods --- BizHawk.Client.EmuHawk/MainForm.Designer.cs | 14 +- BizHawk.Client.EmuHawk/MainForm.Events.cs | 200 ++++++++++---------- BizHawk.Client.EmuHawk/MainForm.cs | 85 ++++----- 3 files changed, 150 insertions(+), 149 deletions(-) diff --git a/BizHawk.Client.EmuHawk/MainForm.Designer.cs b/BizHawk.Client.EmuHawk/MainForm.Designer.cs index ece99ae2ab..69959bfae8 100644 --- a/BizHawk.Client.EmuHawk/MainForm.Designer.cs +++ b/BizHawk.Client.EmuHawk/MainForm.Designer.cs @@ -1613,7 +1613,7 @@ this.miUnthrottled.Name = "miUnthrottled"; this.miUnthrottled.Size = new System.Drawing.Size(202, 22); this.miUnthrottled.Text = "Unthrottled"; - this.miUnthrottled.Click += new System.EventHandler(this.miUnthrottled_Click); + this.miUnthrottled.Click += new System.EventHandler(this.UnthrottledMenuItem_Click); // // MinimizeSkippingMenuItem // @@ -1875,7 +1875,7 @@ this.allowGameDBCoreOverridesToolStripMenuItem.Name = "allowGameDBCoreOverridesToolStripMenuItem"; this.allowGameDBCoreOverridesToolStripMenuItem.Size = new System.Drawing.Size(239, 22); this.allowGameDBCoreOverridesToolStripMenuItem.Text = "Follow GameDB Core Overrides"; - this.allowGameDBCoreOverridesToolStripMenuItem.Click += new System.EventHandler(this.allowGameDBCoreOverridesToolStripMenuItem_Click); + this.allowGameDBCoreOverridesToolStripMenuItem.Click += new System.EventHandler(this.AllowGameDBCoreOverridesToolStripMenuItem_Click); // // toolStripSeparator8 // @@ -1895,7 +1895,7 @@ this.setLibretroCoreToolStripMenuItem.Name = "setLibretroCoreToolStripMenuItem"; this.setLibretroCoreToolStripMenuItem.Size = new System.Drawing.Size(239, 22); this.setLibretroCoreToolStripMenuItem.Text = "Set Libretro Core"; - this.setLibretroCoreToolStripMenuItem.Click += new System.EventHandler(this.setLibretroCoreToolStripMenuItem_Click); + this.setLibretroCoreToolStripMenuItem.Click += new System.EventHandler(this.SetLibretroCoreMenuItem_Click); // // toolStripSeparator10 // @@ -2079,7 +2079,7 @@ this.gameSharkConverterToolStripMenuItem.Name = "gameSharkConverterToolStripMenuItem"; this.gameSharkConverterToolStripMenuItem.Size = new System.Drawing.Size(191, 22); this.gameSharkConverterToolStripMenuItem.Text = "Cheat Code Converter"; - this.gameSharkConverterToolStripMenuItem.Click += new System.EventHandler(this.gameSharkConverterToolStripMenuItem_Click); + this.gameSharkConverterToolStripMenuItem.Click += new System.EventHandler(this.CheatCodeConverterMenuItem_Click); // // toolStripSeparator29 // @@ -2092,7 +2092,7 @@ this.MultiDiskBundlerFileMenuItem.Name = "MultiDiskBundlerFileMenuItem"; this.MultiDiskBundlerFileMenuItem.Size = new System.Drawing.Size(191, 22); this.MultiDiskBundlerFileMenuItem.Text = "Multi-disk Bundler"; - this.MultiDiskBundlerFileMenuItem.Click += new System.EventHandler(this.CreateMultigameFileMenuItem_Click); + this.MultiDiskBundlerFileMenuItem.Click += new System.EventHandler(this.MultidiskBundlerMenuItem_Click); // // externalToolToolStripMenuItem // @@ -2115,7 +2115,7 @@ this.batchRunnerToolStripMenuItem.Size = new System.Drawing.Size(191, 22); this.batchRunnerToolStripMenuItem.Text = "Batch Runner"; this.batchRunnerToolStripMenuItem.Visible = false; - this.batchRunnerToolStripMenuItem.Click += new System.EventHandler(this.batchRunnerToolStripMenuItem_Click); + this.batchRunnerToolStripMenuItem.Click += new System.EventHandler(this.BatchRunnerToolStripMenuItem_Click); // // ExperimentalToolsSubMenu // @@ -2172,7 +2172,7 @@ this.coreToolStripMenuItem.Name = "coreToolStripMenuItem"; this.coreToolStripMenuItem.Size = new System.Drawing.Size(233, 22); this.coreToolStripMenuItem.Text = "&Core"; - this.coreToolStripMenuItem.DropDownOpened += new System.EventHandler(this.coreToolStripMenuItem_DropDownOpened); + this.coreToolStripMenuItem.DropDownOpened += new System.EventHandler(this.CoreToolStripMenuItem_DropDownOpened); // // quickNESToolStripMenuItem // diff --git a/BizHawk.Client.EmuHawk/MainForm.Events.cs b/BizHawk.Client.EmuHawk/MainForm.Events.cs index c19c74d10b..ef48c584fc 100644 --- a/BizHawk.Client.EmuHawk/MainForm.Events.cs +++ b/BizHawk.Client.EmuHawk/MainForm.Events.cs @@ -234,6 +234,11 @@ namespace BizHawk.Client.EmuHawk } } + private void FlushSaveRAMSubMenu_DropDownOpened(object sender, EventArgs e) + { + FlushSaveRAMMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Flush SRAM"].Bindings; + } + private void MovieSubMenu_DropDownOpened(object sender, EventArgs e) { FullMovieLoadstatesMenuItem.Enabled = !Global.MovieSession.MultiTrack.IsActive; @@ -445,6 +450,11 @@ namespace BizHawk.Client.EmuHawk LoadQuickSave("QuickSave" + Global.Config.SaveSlot); } + private void FlushSaveRAMMenuItem_Click(object sender, EventArgs e) + { + FlushSaveRAM(); + } + private void ReadonlyMenuItem_Click(object sender, EventArgs e) { ToggleReadOnly(); @@ -848,14 +858,9 @@ namespace BizHawk.Client.EmuHawk SetStatusBar(); } - private void SetStatusBar() + private void DisplayMessagesMenuItem_Click(object sender, EventArgs e) { - if (!_inFullscreen) - { - MainStatusBar.Visible = Global.Config.DispChrome_StatusBarWindowed; - PerformLayout(); - FrameBufferResized(); - } + Global.Config.DisplayMessages ^= true; } private void DisplayLogWindowMenuItem_Click(object sender, EventArgs e) @@ -950,6 +955,12 @@ namespace BizHawk.Client.EmuHawk } } + private void CoreToolStripMenuItem_DropDownOpened(object sender, EventArgs e) + { + quickNESToolStripMenuItem.Checked = Global.Config.NES_InQuickNES; + nesHawkToolStripMenuItem.Checked = !Global.Config.NES_InQuickNES; + } + private void ControllersMenuItem_Click(object sender, EventArgs e) { var controller = new ControllerConfig(Emulator.ControllerDefinition); @@ -1112,6 +1123,12 @@ namespace BizHawk.Client.EmuHawk VsyncMessage(); } + private void UnthrottledMenuItem_Click(object sender, EventArgs e) + { + _unthrottled ^= true; + ThrottleMessage(); + } + private void MinimizeSkippingMenuItem_Click(object sender, EventArgs e) { Global.Config.AutoMinimizeSkipping ^= true; @@ -1244,11 +1261,21 @@ namespace BizHawk.Client.EmuHawk } } + private void AllowGameDBCoreOverridesToolStripMenuItem_Click(object sender, EventArgs e) + { + Global.Config.CoreForcingViaGameDB ^= true; + } + private void N64VideoPluginSettingsMenuItem_Click(object sender, EventArgs e) { N64PluginSettingsMenuItem_Click(sender, e); } + private void SetLibretroCoreMenuItem_Click(object sender, EventArgs e) + { + RunLibretroCoreChooser(); + } + private void SaveConfigMenuItem_Click(object sender, EventArgs e) { SaveConfig(); @@ -1299,46 +1326,6 @@ namespace BizHawk.Client.EmuHawk } } - private void miUnthrottled_Click(object sender, EventArgs e) - { - _unthrottled ^= true; - ThrottleMessage(); - } - - public bool RunLibretroCoreChooser() - { - var ofd = new OpenFileDialog(); - - if (Global.Config.LibretroCore != null) - { - ofd.FileName = Path.GetFileName(Global.Config.LibretroCore); - ofd.InitialDirectory = Path.GetDirectoryName(Global.Config.LibretroCore); - } - else - { - ofd.InitialDirectory = PathManager.GetPathType("Libretro", "Cores"); - if (!Directory.Exists(ofd.InitialDirectory)) - { - Directory.CreateDirectory(ofd.InitialDirectory); - } - } - - ofd.RestoreDirectory = true; - ofd.Filter = "Libretro Cores (*.dll)|*.dll"; - - if (ofd.ShowDialog() == DialogResult.Cancel) - return false; - - Global.Config.LibretroCore = ofd.FileName; - - return true; - } - - private void setLibretroCoreToolStripMenuItem_Click(object sender, EventArgs e) - { - RunLibretroCoreChooser(); - } - #endregion #region Tools @@ -1407,11 +1394,6 @@ namespace BizHawk.Client.EmuHawk NewHexEditorMenuItem.Enabled = GlobalWin.Tools.IsAvailable(); } - private void AutoHawkMenuItem_Click(object sender, EventArgs e) - { - GlobalWin.Tools.Load(); - } - private void ToolBoxMenuItem_Click(object sender, EventArgs e) { GlobalWin.Tools.Load(); @@ -1427,6 +1409,22 @@ namespace BizHawk.Client.EmuHawk GlobalWin.Tools.Load(); } + private void LuaConsoleMenuItem_Click(object sender, EventArgs e) + { + OpenLuaConsole(); + } + + private void TAStudioMenuItem_Click(object sender, EventArgs e) + { + if (!Emulator.CanPollInput()) + { + MessageBox.Show("Current core does not support input polling. TAStudio can't be used."); + return; + } + + GlobalWin.Tools.Load(); + } + private void HexEditorMenuItem_Click(object sender, EventArgs e) { GlobalWin.Tools.Load(); @@ -1442,14 +1440,9 @@ namespace BizHawk.Client.EmuHawk GlobalWin.Tools.Load(); } - private void TAStudioMenuItem_Click(object sender, EventArgs e) + private void CodeDataLoggerMenuItem_Click(object sender, EventArgs e) { - if (!Emulator.CanPollInput()) - { - MessageBox.Show("Current core does not support input polling. TAStudio can't be used."); - return; - } - GlobalWin.Tools.Load(); + GlobalWin.Tools.Load(); } private void MacroToolMenuItem_Click(object sender, EventArgs e) @@ -1462,21 +1455,36 @@ namespace BizHawk.Client.EmuHawk GlobalWin.Tools.Load(); } + private void BasicBotMenuItem_Click(object sender, EventArgs e) + { + GlobalWin.Tools.Load(); + } + private void CheatsMenuItem_Click(object sender, EventArgs e) { GlobalWin.Tools.Load(); } - private void LuaConsoleMenuItem_Click(object sender, EventArgs e) + private void CheatCodeConverterMenuItem_Click(object sender, EventArgs e) { - OpenLuaConsole(); + GlobalWin.Tools.Load(); } - private void batchRunnerToolStripMenuItem_Click(object sender, EventArgs e) + private void MultidiskBundlerMenuItem_Click(object sender, EventArgs e) + { + GlobalWin.Tools.Load(); + } + + private void BatchRunnerToolStripMenuItem_Click(object sender, EventArgs e) { new BatchRun().ShowDialog(); } + private void AutoHawkMenuItem_Click(object sender, EventArgs e) + { + GlobalWin.Tools.Load(); + } + private void NewHexEditorMenuItem_Click(object sender, EventArgs e) { GlobalWin.Tools.Load(); @@ -1688,11 +1696,6 @@ namespace BizHawk.Client.EmuHawk GlobalWin.Tools.Load(); } - private void CodeDataLoggerMenuItem_Click(object sender, EventArgs e) - { - GlobalWin.Tools.Load(); - } - private void PCEAlwaysPerformSpriteLimitMenuItem_Click(object sender, EventArgs e) { var s = ((PCEngine)Emulator).GetSettings(); @@ -2048,11 +2051,6 @@ namespace BizHawk.Client.EmuHawk #region PSX - private void PSXHashDiscsToolStripMenuItem_Click(object sender, EventArgs e) - { - new PSXHashDiscs().ShowDialog(); - } - private void PSXSubMenu_DropDownOpened(object sender, EventArgs e) { PSXControllerSettingsMenuItem.Enabled = !Global.MovieSession.Movie.IsActive; @@ -2063,6 +2061,25 @@ namespace BizHawk.Client.EmuHawk new PSXControllerConfigNew().ShowDialog(); } + private void PSXOptionsMenuItem_Click(object sender, EventArgs e) + { + var result = PSXOptions.DoSettingsDialog(this); + if (result == DialogResult.OK) + { + FrameBufferResized(); + } + } + + private void PSXDiscControlsMenuItem_Click(object sender, EventArgs e) + { + GlobalWin.Tools.Load().ScrollToPadSchema("Console"); + } + + private void PSXHashDiscsToolStripMenuItem_Click(object sender, EventArgs e) + { + new PSXHashDiscs().ShowDialog(); + } + #endregion #region SNES @@ -2145,6 +2162,11 @@ namespace BizHawk.Client.EmuHawk SNES_ToggleOBJ4(); } + private void SNESControllerConfigurationMenuItem_Click(object sender, EventArgs e) + { + new SNESControllerSettings().ShowDialog(); + } + private void SnesGfxDebuggerMenuItem_Click(object sender, EventArgs e) { GlobalWin.Tools.Load(); @@ -2166,30 +2188,6 @@ namespace BizHawk.Client.EmuHawk SNESOptions.DoSettingsDialog(this); } - private void PSXOptionsMenuItem_Click(object sender, EventArgs e) - { - var result = PSXOptions.DoSettingsDialog(this); - if (result == DialogResult.OK) - { - FrameBufferResized(); - } - } - - private void PSXDiscControlsMenuItem_Click(object sender, EventArgs e) - { - GlobalWin.Tools.Load().ScrollToPadSchema("Console"); - } - - private void FlushSaveRAMMenuItem_Click(object sender, EventArgs e) - { - FlushSaveRAM(); - } - - private void FlushSaveRAMSubMenu_DropDownOpened(object sender, EventArgs e) - { - this.FlushSaveRAMMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Flush SRAM"].Bindings; - } - #endregion #region Coleco @@ -2442,6 +2440,11 @@ namespace BizHawk.Client.EmuHawk #region Help + private void HelpSubMenu_DropDownOpened(object sender, EventArgs e) + { + FeaturesMenuItem.Visible = VersionInfo.DeveloperBuild; + } + private void OnlineHelpMenuItem_Click(object sender, EventArgs e) { System.Diagnostics.Process.Start("http://tasvideos.org/BizHawk.html"); @@ -2452,6 +2455,11 @@ namespace BizHawk.Client.EmuHawk System.Diagnostics.Process.Start("http://tasvideos.org/forum/viewforum.php?f=64"); } + private void FeaturesMenuItem_Click(object sender, EventArgs e) + { + GlobalWin.Tools.Load(); + } + private void AboutMenuItem_Click(object sender, EventArgs e) { if (VersionInfo.DeveloperBuild) diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs index 97a3a1772a..f7d677c842 100644 --- a/BizHawk.Client.EmuHawk/MainForm.cs +++ b/BizHawk.Client.EmuHawk/MainForm.cs @@ -1348,6 +1348,35 @@ namespace BizHawk.Client.EmuHawk GlobalWin.OSD.AddMessage(s.ShowOBJ_3 ? "OBJ 4 Layer On" : "OBJ 4 Layer Off"); } + public bool RunLibretroCoreChooser() + { + var ofd = new OpenFileDialog(); + + if (Global.Config.LibretroCore != null) + { + ofd.FileName = Path.GetFileName(Global.Config.LibretroCore); + ofd.InitialDirectory = Path.GetDirectoryName(Global.Config.LibretroCore); + } + else + { + ofd.InitialDirectory = PathManager.GetPathType("Libretro", "Cores"); + if (!Directory.Exists(ofd.InitialDirectory)) + { + Directory.CreateDirectory(ofd.InitialDirectory); + } + } + + ofd.RestoreDirectory = true; + ofd.Filter = "Libretro Cores (*.dll)|*.dll"; + + if (ofd.ShowDialog() == DialogResult.Cancel) + return false; + + Global.Config.LibretroCore = ofd.FileName; + + return true; + } + #endregion #region Private variables @@ -1422,6 +1451,16 @@ namespace BizHawk.Client.EmuHawk #region Private methods + private void SetStatusBar() + { + if (!_inFullscreen) + { + MainStatusBar.Visible = Global.Config.DispChrome_StatusBarWindowed; + PerformLayout(); + FrameBufferResized(); + } + } + private void SetWindowText() { string str = ""; @@ -4241,51 +4280,5 @@ namespace BizHawk.Client.EmuHawk } #endregion - - private void FeaturesMenuItem_Click(object sender, EventArgs e) - { - GlobalWin.Tools.Load(); - } - - private void BasicBotMenuItem_Click(object sender, EventArgs e) - { - GlobalWin.Tools.Load(); - } - - private void DisplayMessagesMenuItem_Click(object sender, EventArgs e) - { - Global.Config.DisplayMessages ^= true; - } - - private void gameSharkConverterToolStripMenuItem_Click(object sender, EventArgs e) - { - GlobalWin.Tools.Load(); - } - - private void HelpSubMenu_DropDownOpened(object sender, EventArgs e) - { - FeaturesMenuItem.Visible = VersionInfo.DeveloperBuild; - } - - private void SNESControllerConfigurationMenuItem_Click(object sender, EventArgs e) - { - new SNESControllerSettings().ShowDialog(); - } - - private void CreateMultigameFileMenuItem_Click(object sender, EventArgs e) - { - GlobalWin.Tools.Load(); - } - - private void coreToolStripMenuItem_DropDownOpened(object sender, EventArgs e) - { - quickNESToolStripMenuItem.Checked = Global.Config.NES_InQuickNES; - nesHawkToolStripMenuItem.Checked = !Global.Config.NES_InQuickNES; - } - - private void allowGameDBCoreOverridesToolStripMenuItem_Click(object sender, EventArgs e) - { - Global.Config.CoreForcingViaGameDB ^= true; - } } }