ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reduce indentation in system-specific helpers in `MainForm`

This commit is contained in:
YoshiRulz 2024-07-14 05:21:14 +10:00
parent 2321bc55e6
commit 65979e61ec
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
1 changed files with 113 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
src/BizHawk.Client.EmuHawk/MainForm.Events.cs
View File

@ -1348,48 +1348,31 @@ namespace BizHawk.Client.EmuHawk
private void FdsEjectDiskMenuItem_Click(object sender, EventArgs e) private void FdsEjectDiskMenuItem_Click(object sender, EventArgs e)
{ {
if (!MovieSession.Movie.IsPlaying()) if (MovieSession.Movie.IsPlaying()) return;
{
InputManager.ClickyVirtualPadController.Click("FDS Eject"); InputManager.ClickyVirtualPadController.Click("FDS Eject");
AddOnScreenMessage("FDS disk ejected."); AddOnScreenMessage("FDS disk ejected.");
} }
}
private void VsInsertCoinP1MenuItem_Click(object sender, EventArgs e) private void VsInsertCoinP1MenuItem_Click(object sender, EventArgs e)
{ {
if (LoadedCoreIsNesHawkInVSMode) if (MovieSession.Movie.IsPlaying() || !LoadedCoreIsNesHawkInVSMode) return;
{
if (!MovieSession.Movie.IsPlaying())
{
InputManager.ClickyVirtualPadController.Click("Insert Coin P1"); InputManager.ClickyVirtualPadController.Click("Insert Coin P1");
AddOnScreenMessage("P1 Coin Inserted"); AddOnScreenMessage("P1 Coin Inserted");
} }
}
}
private void VsInsertCoinP2MenuItem_Click(object sender, EventArgs e) private void VsInsertCoinP2MenuItem_Click(object sender, EventArgs e)
{ {
if (LoadedCoreIsNesHawkInVSMode) if (MovieSession.Movie.IsPlaying() || !LoadedCoreIsNesHawkInVSMode) return;
{
if (!MovieSession.Movie.IsPlaying())
{
InputManager.ClickyVirtualPadController.Click("Insert Coin P2"); InputManager.ClickyVirtualPadController.Click("Insert Coin P2");
AddOnScreenMessage("P2 Coin Inserted"); AddOnScreenMessage("P2 Coin Inserted");
} }
}
}
private void VsServiceSwitchMenuItem_Click(object sender, EventArgs e) private void VsServiceSwitchMenuItem_Click(object sender, EventArgs e)
{ {
if (LoadedCoreIsNesHawkInVSMode) if (MovieSession.Movie.IsPlaying() || !LoadedCoreIsNesHawkInVSMode) return;
{
if (!MovieSession.Movie.IsPlaying())
{
InputManager.ClickyVirtualPadController.Click("Service Switch"); InputManager.ClickyVirtualPadController.Click("Service Switch");
AddOnScreenMessage("Service Switch Pressed"); AddOnScreenMessage("Service Switch Pressed");
} }
}
}
private DialogResult OpenNesHawkGamepadSettingsDialog(ISettingsAdapter settable) private DialogResult OpenNesHawkGamepadSettingsDialog(ISettingsAdapter settable)
{ {
@ -1665,14 +1648,12 @@ namespace BizHawk.Client.EmuHawk
private void ColecoSubMenu_DropDownOpened(object sender, EventArgs e) private void ColecoSubMenu_DropDownOpened(object sender, EventArgs e)
{ {
if (Emulator is ColecoVision coleco) if (Emulator is not ColecoVision coleco) return;
{
var ss = coleco.GetSyncSettings(); var ss = coleco.GetSyncSettings();
ColecoSkipBiosMenuItem.Checked = ss.SkipBiosIntro; ColecoSkipBiosMenuItem.Checked = ss.SkipBiosIntro;
ColecoUseSGMMenuItem.Checked = ss.UseSGM; ColecoUseSGMMenuItem.Checked = ss.UseSGM;
ColecoControllerSettingsMenuItem.Enabled = MovieSession.Movie.NotActive(); ColecoControllerSettingsMenuItem.Enabled = MovieSession.Movie.NotActive();
} }
}
private void ColecoHawkSetSkipBIOSIntro(bool newValue, ISettingsAdapter settable) private void ColecoHawkSetSkipBIOSIntro(bool newValue, ISettingsAdapter settable)
{ {
@ -1781,12 +1762,10 @@ namespace BizHawk.Client.EmuHawk
private void N64ExpansionSlotMenuItem_Click(object sender, EventArgs e) private void N64ExpansionSlotMenuItem_Click(object sender, EventArgs e)
{ {
if (Emulator is N64) if (Emulator is not N64) return;
{
Mupen64PlusSetUseExpansionSlot(!((ToolStripMenuItem) sender).Checked, GetSettingsAdapterForLoadedCore<N64>()); Mupen64PlusSetUseExpansionSlot(!((ToolStripMenuItem) sender).Checked, GetSettingsAdapterForLoadedCore<N64>());
FlagNeedsReboot(); FlagNeedsReboot();
} }
}
private void Ares64SubMenu_DropDownOpened(object sender, EventArgs e) private void Ares64SubMenu_DropDownOpened(object sender, EventArgs e)
=> Ares64CircularAnalogRangeMenuItem.Checked = Config.N64UseCircularAnalogConstraint; => Ares64CircularAnalogRangeMenuItem.Checked = Config.N64UseCircularAnalogConstraint;
@ -1830,18 +1809,14 @@ namespace BizHawk.Client.EmuHawk
private void AppleSubMenu_DropDownOpened(object sender, EventArgs e) private void AppleSubMenu_DropDownOpened(object sender, EventArgs e)
{ {
if (Emulator is AppleII a) if (Emulator is not AppleII a) return;
{
AppleDisksSubMenu.Enabled = a.DiskCount > 1; AppleDisksSubMenu.Enabled = a.DiskCount > 1;
} }
}
private void AppleDisksSubMenu_DropDownOpened(object sender, EventArgs e) private void AppleDisksSubMenu_DropDownOpened(object sender, EventArgs e)
{ {
AppleDisksSubMenu.DropDownItems.Clear(); AppleDisksSubMenu.DropDownItems.Clear();
if (Emulator is not AppleII appleII) return;
if (Emulator is AppleII appleII)
{
for (int i = 0; i < appleII.DiskCount; i++) for (int i = 0; i < appleII.DiskCount; i++)
{ {
var menuItem = new ToolStripMenuItem var menuItem = new ToolStripMenuItem
@ -1860,22 +1835,17 @@ namespace BizHawk.Client.EmuHawk
AppleDisksSubMenu.DropDownItems.Add(menuItem); AppleDisksSubMenu.DropDownItems.Add(menuItem);
} }
} }
}
private void C64SubMenu_DropDownOpened(object sender, EventArgs e) private void C64SubMenu_DropDownOpened(object sender, EventArgs e)
{ {
if (Emulator is C64 c64) if (Emulator is not C64 c64) return;
{
C64DisksSubMenu.Enabled = c64.DiskCount > 1; C64DisksSubMenu.Enabled = c64.DiskCount > 1;
} }
}
private void C64DisksSubMenu_DropDownOpened(object sender, EventArgs e) private void C64DisksSubMenu_DropDownOpened(object sender, EventArgs e)
{ {
C64DisksSubMenu.DropDownItems.Clear(); C64DisksSubMenu.DropDownItems.Clear();
if (Emulator is not C64 c64) return;
if (Emulator is C64 c64)
{
for (int i = 0; i < c64.DiskCount; i++) for (int i = 0; i < c64.DiskCount; i++)
{ {
var menuItem = new ToolStripMenuItem var menuItem = new ToolStripMenuItem
@ -1894,7 +1864,6 @@ namespace BizHawk.Client.EmuHawk
C64DisksSubMenu.DropDownItems.Add(menuItem); C64DisksSubMenu.DropDownItems.Add(menuItem);
} }
} }
}
private DialogResult OpenC64HawkSettingsDialog() private DialogResult OpenC64HawkSettingsDialog()
=> OpenGenericCoreConfigFor<C64>(CoreNames.C64Hawk + " Settings"); => OpenGenericCoreConfigFor<C64>(CoreNames.C64Hawk + " Settings");
@ -1990,21 +1959,16 @@ namespace BizHawk.Client.EmuHawk
private void ZXSpectrumMediaMenuItem_DropDownOpened(object sender, EventArgs e) private void ZXSpectrumMediaMenuItem_DropDownOpened(object sender, EventArgs e)
{ {
if (Emulator is ZXSpectrum speccy) if (Emulator is not ZXSpectrum speccy) return;
{
ZXSpectrumTapesSubMenu.Enabled = speccy._tapeInfo.Count > 0; ZXSpectrumTapesSubMenu.Enabled = speccy._tapeInfo.Count > 0;
ZXSpectrumDisksSubMenu.Enabled = speccy._diskInfo.Count > 0; ZXSpectrumDisksSubMenu.Enabled = speccy._diskInfo.Count > 0;
} }
}
private void ZXSpectrumTapesSubMenu_DropDownOpened(object sender, EventArgs e) private void ZXSpectrumTapesSubMenu_DropDownOpened(object sender, EventArgs e)
{ {
ZXSpectrumTapesSubMenu.DropDownItems.Clear(); ZXSpectrumTapesSubMenu.DropDownItems.Clear();
if (Emulator is not ZXSpectrum speccy) return;
List<ToolStripItem> items = new(); List<ToolStripItem> items = new();
if (Emulator is ZXSpectrum speccy)
{
var tapeMediaIndex = speccy._machine.TapeMediaIndex; var tapeMediaIndex = speccy._machine.TapeMediaIndex;
for (int i = 0; i < speccy._tapeInfo.Count; i++) for (int i = 0; i < speccy._tapeInfo.Count; i++)
@ -2026,19 +1990,14 @@ namespace BizHawk.Client.EmuHawk
items.Add(menuItem); items.Add(menuItem);
} }
}
ZXSpectrumTapesSubMenu.DropDownItems.AddRange(items.ToArray()); ZXSpectrumTapesSubMenu.DropDownItems.AddRange(items.ToArray());
} }
private void ZXSpectrumDisksSubMenu_DropDownOpened(object sender, EventArgs e) private void ZXSpectrumDisksSubMenu_DropDownOpened(object sender, EventArgs e)
{ {
ZXSpectrumDisksSubMenu.DropDownItems.Clear(); ZXSpectrumDisksSubMenu.DropDownItems.Clear();
if (Emulator is not ZXSpectrum speccy) return;
List<ToolStripItem> items = new(); List<ToolStripItem> items = new();
if (Emulator is ZXSpectrum speccy)
{
var diskMediaIndex = speccy._machine.DiskMediaIndex; var diskMediaIndex = speccy._machine.DiskMediaIndex;
for (int i = 0; i < speccy._diskInfo.Count; i++) for (int i = 0; i < speccy._diskInfo.Count; i++)
@ -2060,8 +2019,6 @@ namespace BizHawk.Client.EmuHawk
items.Add(menuItem); items.Add(menuItem);
} }
}
ZXSpectrumDisksSubMenu.DropDownItems.AddRange(items.ToArray()); ZXSpectrumDisksSubMenu.DropDownItems.AddRange(items.ToArray());
} }
@ -2129,11 +2086,8 @@ namespace BizHawk.Client.EmuHawk
private void AmstradCpcTapesSubMenu_DropDownOpened(object sender, EventArgs e) private void AmstradCpcTapesSubMenu_DropDownOpened(object sender, EventArgs e)
{ {
AmstradCPCTapesSubMenu.DropDownItems.Clear(); AmstradCPCTapesSubMenu.DropDownItems.Clear();
if (Emulator is not AmstradCPC ams) return;
List<ToolStripItem> items = new(); List<ToolStripItem> items = new();
if (Emulator is AmstradCPC ams)
{
var tapeMediaIndex = ams._machine.TapeMediaIndex; var tapeMediaIndex = ams._machine.TapeMediaIndex;
for (int i = 0; i < ams._tapeInfo.Count; i++) for (int i = 0; i < ams._tapeInfo.Count; i++)
@ -2155,19 +2109,14 @@ namespace BizHawk.Client.EmuHawk
items.Add(menuItem); items.Add(menuItem);
} }
}
AmstradCPCTapesSubMenu.DropDownItems.AddRange(items.ToArray()); AmstradCPCTapesSubMenu.DropDownItems.AddRange(items.ToArray());
} }
private void AmstradCpcDisksSubMenu_DropDownOpened(object sender, EventArgs e) private void AmstradCpcDisksSubMenu_DropDownOpened(object sender, EventArgs e)
{ {
AmstradCPCDisksSubMenu.DropDownItems.Clear(); AmstradCPCDisksSubMenu.DropDownItems.Clear();
if (Emulator is not AmstradCPC ams) return;
List<ToolStripItem> items = new(); List<ToolStripItem> items = new();
if (Emulator is AmstradCPC ams)
{
var diskMediaIndex = ams._machine.DiskMediaIndex; var diskMediaIndex = ams._machine.DiskMediaIndex;
for (int i = 0; i < ams._diskInfo.Count; i++) for (int i = 0; i < ams._diskInfo.Count; i++)
@ -2189,8 +2138,6 @@ namespace BizHawk.Client.EmuHawk
items.Add(menuItem); items.Add(menuItem);
} }
}
AmstradCPCDisksSubMenu.DropDownItems.AddRange(items.ToArray()); AmstradCPCDisksSubMenu.DropDownItems.AddRange(items.ToArray());
} }