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

mainform - move some functions around

This commit is contained in:
adelikat 2014-07-29 01:33:54 +00:00
parent 50ff80997a
commit d74b619222
3 changed files with 36 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BizHawk.Client.EmuHawk/MainForm.Designer.cs generated
View File

@ -2302,7 +2302,7 @@
this.GBcoreSettingsToolStripMenuItem.Name = "GBcoreSettingsToolStripMenuItem"; this.GBcoreSettingsToolStripMenuItem.Name = "GBcoreSettingsToolStripMenuItem";
this.GBcoreSettingsToolStripMenuItem.Size = new System.Drawing.Size(233, 22); this.GBcoreSettingsToolStripMenuItem.Size = new System.Drawing.Size(233, 22);
this.GBcoreSettingsToolStripMenuItem.Text = "Settings..."; this.GBcoreSettingsToolStripMenuItem.Text = "Settings...";
this.GBcoreSettingsToolStripMenuItem.Click += new System.EventHandler(this.GBcoreSettingsToolStripMenuItem_Click); this.GBcoreSettingsToolStripMenuItem.Click += new System.EventHandler(this.GBCoreSettingsMenuItem_Click);
// //
// LoadGBInSGBMenuItem // LoadGBInSGBMenuItem
// //
@ -2593,7 +2593,7 @@
this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem"; this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem";
this.settingsToolStripMenuItem.Size = new System.Drawing.Size(125, 22); this.settingsToolStripMenuItem.Size = new System.Drawing.Size(125, 22);
this.settingsToolStripMenuItem.Text = "&Settings..."; this.settingsToolStripMenuItem.Text = "&Settings...";
this.settingsToolStripMenuItem.Click += new System.EventHandler(this.settingsToolStripMenuItem_Click); this.settingsToolStripMenuItem.Click += new System.EventHandler(this.WondersawnSettingsMenuItem_Click);
// //
// HelpSubMenu // HelpSubMenu
// //

34
BizHawk.Client.EmuHawk/MainForm.Events.cs
View File

@ -911,6 +911,18 @@ namespace BizHawk.Client.EmuHawk
new EmuHawkOptions().ShowDialog(); new EmuHawkOptions().ShowDialog();
} }
private void ProfilesMenuItem_Click(object sender, EventArgs e)
{
if (new ProfileConfig().ShowDialog() == DialogResult.OK)
{
GlobalWin.OSD.AddMessage("Profile settings saved");
}
else
{
GlobalWin.OSD.AddMessage("Profile config aborted");
}
}
private void ClickThrottleMenuItem_Click(object sender, EventArgs e) private void ClickThrottleMenuItem_Click(object sender, EventArgs e)
{ {
Global.Config.ClockThrottle ^= true; Global.Config.ClockThrottle ^= true;
@ -1567,6 +1579,11 @@ namespace BizHawk.Client.EmuHawk
LoadGBInSGBMenuItem.Checked = Global.Config.GB_AsSGB; LoadGBInSGBMenuItem.Checked = Global.Config.GB_AsSGB;
} }
private void GBCoreSettingsMenuItem_Click(object sender, EventArgs e)
{
config.GB.GBPrefs.DoGBPrefsDialog(this);
}
private void GBForceDMGMenuItem_Click(object sender, EventArgs e) private void GBForceDMGMenuItem_Click(object sender, EventArgs e)
{ {
var s = (Gameboy.GambatteSyncSettings)Global.Emulator.GetSyncSettings(); var s = (Gameboy.GambatteSyncSettings)Global.Emulator.GetSyncSettings();
@ -1828,6 +1845,15 @@ namespace BizHawk.Client.EmuHawk
#endregion #endregion
#region Wondersawn
private void WondersawnSettingsMenuItem_Click(object sender, EventArgs e)
{
GenericCoreConfig.DoDialog(this, "WonderSwan Settings");
}
#endregion
#region Help #region Help
private void OnlineHelpMenuItem_Click(object sender, EventArgs e) private void OnlineHelpMenuItem_Click(object sender, EventArgs e)
@ -2153,6 +2179,14 @@ namespace BizHawk.Client.EmuHawk
} }
} }
private void ProfileFirstBootLabel_Click(object sender, EventArgs e)
{
var profileForm = new ProfileConfig();
profileForm.ShowDialog();
Global.Config.FirstBoot = false;
ProfileFirstBootLabel.Visible = false;
}
#endregion #endregion
#region Form Events #region Form Events

30
BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -3335,36 +3335,6 @@ namespace BizHawk.Client.EmuHawk
#endregion #endregion
private void GBcoreSettingsToolStripMenuItem_Click(object sender, EventArgs e)
{
config.GB.GBPrefs.DoGBPrefsDialog(this);
}
private void settingsToolStripMenuItem_Click(object sender, EventArgs e)
{
GenericCoreConfig.DoDialog(this, "WonderSwan Settings");
}
private void ProfilesMenuItem_Click(object sender, EventArgs e)
{
if (new ProfileConfig().ShowDialog() == DialogResult.OK)
{
GlobalWin.OSD.AddMessage("Profile settings saved");
}
else
{
GlobalWin.OSD.AddMessage("Profile config aborted");
}
}
private void ProfileFirstBootLabel_Click(object sender, EventArgs e)
{
var profileForm = new ProfileConfig();
profileForm.ShowDialog();
Global.Config.FirstBoot = false;
ProfileFirstBootLabel.Visible = false;
}
// TODO: move me // TODO: move me
private IControlMainform _master; private IControlMainform _master;
public void RelinquishControl(IControlMainform master) public void RelinquishControl(IControlMainform master)