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

allow sameboy/gbhawk/virtu/c64hawk settings to be editted without loading the core

This commit is contained in:
CasualPokePlayer 2022-05-28 13:35:21 -07:00
parent b2a609119a
commit e29958c658
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1609,10 +1609,10 @@ namespace BizHawk.Client.EmuHawk
=> GBPrefs.DoGBPrefsDialog(Config, this, Game, MovieSession, settable, gambatte); => GBPrefs.DoGBPrefsDialog(Config, this, Game, MovieSession, settable, gambatte);
private DialogResult OpenGBHawkSettingsDialog() private DialogResult OpenGBHawkSettingsDialog()
=> OpenGenericCoreConfig("Gameboy Settings"); => OpenGenericCoreConfigFor<GBHawk>("Gameboy Settings");
private DialogResult OpenSameBoySettingsDialog() private DialogResult OpenSameBoySettingsDialog()
=> OpenGenericCoreConfig("Gameboy Settings"); => OpenGenericCoreConfigFor<Sameboy>("Gameboy Settings");
private void GbCoreSettingsMenuItem_Click(object sender, EventArgs e) private void GbCoreSettingsMenuItem_Click(object sender, EventArgs e)
{ {
@ -1885,7 +1885,7 @@ namespace BizHawk.Client.EmuHawk
}; };
} }
private void OpenGenericCoreConfigFor<T>(string title) private DialogResult OpenGenericCoreConfigFor<T>(string title)
where T : IEmulator where T : IEmulator
=> GenericCoreConfig.DoDialogFor(this, GetSettingsAdapterFor<T>(), title, isMovieActive: MovieSession.Movie.IsActive()); => GenericCoreConfig.DoDialogFor(this, GetSettingsAdapterFor<T>(), title, isMovieActive: MovieSession.Movie.IsActive());
@ -1899,7 +1899,7 @@ namespace BizHawk.Client.EmuHawk
} }
private DialogResult OpenVirtuSettingsDialog() private DialogResult OpenVirtuSettingsDialog()
=> OpenGenericCoreConfig("Apple II Settings"); => OpenGenericCoreConfigFor<AppleII>("Apple II Settings");
private void AppleIISettingsMenuItem_Click(object sender, EventArgs e) private void AppleIISettingsMenuItem_Click(object sender, EventArgs e)
{ {
@ -1979,7 +1979,7 @@ namespace BizHawk.Client.EmuHawk
} }
private DialogResult OpenC64HawkSettingsDialog() private DialogResult OpenC64HawkSettingsDialog()
=> OpenGenericCoreConfig("C64 Settings"); => OpenGenericCoreConfigFor<C64>("C64 Settings");
private void C64SettingsMenuItem_Click(object sender, EventArgs e) private void C64SettingsMenuItem_Click(object sender, EventArgs e)
{ {
@ -2784,7 +2784,6 @@ namespace BizHawk.Client.EmuHawk
// C64Hawk // C64Hawk
var c64HawkSettingsItem = CreateSettingsItem("Settings...", (_, _) => OpenC64HawkSettingsDialog()); var c64HawkSettingsItem = CreateSettingsItem("Settings...", (_, _) => OpenC64HawkSettingsDialog());
var c64HawkSubmenu = CreateCoreSubmenu(VSystemCategory.PCs, CoreNames.C64Hawk, c64HawkSettingsItem); var c64HawkSubmenu = CreateCoreSubmenu(VSystemCategory.PCs, CoreNames.C64Hawk, c64HawkSettingsItem);
c64HawkSubmenu.DropDownOpened += (_, _) => c64HawkSettingsItem.Enabled = Emulator is C64;
items.Add(c64HawkSubmenu); items.Add(c64HawkSubmenu);
// ChannelFHawk // ChannelFHawk
@ -2849,7 +2848,6 @@ namespace BizHawk.Client.EmuHawk
// GBHawk // GBHawk
var gbHawkSettingsItem = CreateSettingsItem("Settings...", (_, _) => OpenGBHawkSettingsDialog()); var gbHawkSettingsItem = CreateSettingsItem("Settings...", (_, _) => OpenGBHawkSettingsDialog());
var gbHawkSubmenu = CreateCoreSubmenu(VSystemCategory.Handhelds, CoreNames.GbHawk, gbHawkSettingsItem); var gbHawkSubmenu = CreateCoreSubmenu(VSystemCategory.Handhelds, CoreNames.GbHawk, gbHawkSettingsItem);
gbHawkSubmenu.DropDownOpened += (_, _) => gbHawkSettingsItem.Enabled = Emulator is GBHawk;
items.Add(gbHawkSubmenu); items.Add(gbHawkSubmenu);
// GBHawkLink // GBHawkLink
@ -3007,7 +3005,6 @@ namespace BizHawk.Client.EmuHawk
CoreNames.Sameboy, CoreNames.Sameboy,
sameBoySettingsItem, sameBoySettingsItem,
CreateSettingsItem("Choose Custom Palette...", (_, _) => OpenSameBoyPaletteSettingsDialog(GetSettingsAdapterFor<Sameboy>()))); CreateSettingsItem("Choose Custom Palette...", (_, _) => OpenSameBoyPaletteSettingsDialog(GetSettingsAdapterFor<Sameboy>())));
sameBoySubmenu.DropDownOpened += (_, _) => sameBoySettingsItem.Enabled = Emulator is Sameboy;
items.Add(sameBoySubmenu); items.Add(sameBoySubmenu);
// Saturnus // Saturnus
@ -3072,7 +3069,6 @@ namespace BizHawk.Client.EmuHawk
// Virtu // Virtu
var virtuSettingsItem = CreateSettingsItem("Settings...", (_, _) => OpenVirtuSettingsDialog()); var virtuSettingsItem = CreateSettingsItem("Settings...", (_, _) => OpenVirtuSettingsDialog());
var virtuSubmenu = CreateCoreSubmenu(VSystemCategory.PCs, CoreNames.Virtu, virtuSettingsItem); var virtuSubmenu = CreateCoreSubmenu(VSystemCategory.PCs, CoreNames.Virtu, virtuSettingsItem);
virtuSubmenu.DropDownOpened += (_, _) => virtuSettingsItem.Enabled = Emulator is AppleII;
items.Add(virtuSubmenu); items.Add(virtuSubmenu);
// Virtual Boyee // Virtual Boyee

4
src/BizHawk.Client.EmuHawk/config/GenericCoreConfig.cs
View File

@ -127,14 +127,14 @@ namespace BizHawk.Client.EmuHawk
return owner.ShowDialogAsChild(dlg); return owner.ShowDialogAsChild(dlg);
} }
public static void DoDialogFor( public static DialogResult DoDialogFor(
IDialogParent owner, IDialogParent owner,
ISettingsAdapter settable, ISettingsAdapter settable,
string title, string title,
bool isMovieActive) bool isMovieActive)
{ {
using GenericCoreConfig dlg = new(settable, isMovieActive) { Text = title }; using GenericCoreConfig dlg = new(settable, isMovieActive) { Text = title };
owner.ShowDialogAsChild(dlg); return owner.ShowDialogAsChild(dlg);
} }
private void PropertyGrid2_PropertyValueChanged(object s, PropertyValueChangedEventArgs e) private void PropertyGrid2_PropertyValueChanged(object s, PropertyValueChangedEventArgs e)