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

DS - wire up settings to UI

This commit is contained in:
adelikat 2020-03-28 11:35:13 -05:00
parent 3e89a7f201
commit 1647783fa8
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -460,7 +460,8 @@
this.ShowMenuContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ShowMenuContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.timerMouseIdle = new System.Windows.Forms.Timer(this.components); this.timerMouseIdle = new System.Windows.Forms.Timer(this.components);
this.NDSSubMenu = new System.Windows.Forms.ToolStripMenuItem(); this.NDSSubMenu = new System.Windows.Forms.ToolStripMenuItem();
this.NDSSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.NdsSyncSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.NdsSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.MainformMenu.SuspendLayout(); this.MainformMenu.SuspendLayout();
this.MainStatusBar.SuspendLayout(); this.MainStatusBar.SuspendLayout();
this.MainFormContextMenu.SuspendLayout(); this.MainFormContextMenu.SuspendLayout();
@ -3990,18 +3991,27 @@
// NDSSubMenu // NDSSubMenu
// //
this.NDSSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.NDSSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.NDSSettingsMenuItem}); this.NdsSettingsMenuItem,
this.NdsSyncSettingsMenuItem
});
this.NDSSubMenu.Name = "NDSSubMenu"; this.NDSSubMenu.Name = "NDSSubMenu";
this.NDSSubMenu.Size = new System.Drawing.Size(42, 19); this.NDSSubMenu.Size = new System.Drawing.Size(42, 19);
this.NDSSubMenu.Text = "NDS"; this.NDSSubMenu.Text = "NDS";
this.NDSSubMenu.DropDownOpened += new System.EventHandler(this.NDSSubMenu_DropDownOpened); this.NDSSubMenu.DropDownOpened += new System.EventHandler(this.NDSSubMenu_DropDownOpened);
// //
// NDSSyncSettingsMenuItem
//
this.NdsSyncSettingsMenuItem.Name = "NdsSyncSettingsMenuItem";
this.NdsSyncSettingsMenuItem.Size = new System.Drawing.Size(180, 22);
this.NdsSyncSettingsMenuItem.Text = "Sync Settings...";
this.NdsSyncSettingsMenuItem.Click += new System.EventHandler(this.NDSSyncSettingsMenuItem_Click);
//
// NDSSettingsMenuItem // NDSSettingsMenuItem
// //
this.NDSSettingsMenuItem.Name = "NDSSettingsMenuItem"; this.NdsSettingsMenuItem.Name = "NdsSettingsMenuItem";
this.NDSSettingsMenuItem.Size = new System.Drawing.Size(180, 22); this.NdsSettingsMenuItem.Size = new System.Drawing.Size(180, 22);
this.NDSSettingsMenuItem.Text = "Settings..."; this.NdsSettingsMenuItem.Text = "Settings...";
this.NDSSettingsMenuItem.Click += new System.EventHandler(this.NDSSettingsMenuItem_Click); this.NdsSettingsMenuItem.Click += new System.EventHandler(this.NDSSettingsMenuItem_Click);
// //
// MainForm // MainForm
// //
@ -4473,7 +4483,8 @@
private System.Windows.Forms.ToolStripMenuItem SubGBHawkMenuItem; private System.Windows.Forms.ToolStripMenuItem SubGBHawkMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator38; private System.Windows.Forms.ToolStripSeparator toolStripSeparator38;
private System.Windows.Forms.ToolStripMenuItem NDSSubMenu; private System.Windows.Forms.ToolStripMenuItem NDSSubMenu;
private System.Windows.Forms.ToolStripMenuItem NDSSettingsMenuItem; private System.Windows.Forms.ToolStripMenuItem NdsSyncSettingsMenuItem;
private System.Windows.Forms.ToolStripMenuItem NdsSettingsMenuItem;
private System.Windows.Forms.ToolStripMenuItem arcadeToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem arcadeToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem settingsToolStripMenuItem2; private System.Windows.Forms.ToolStripMenuItem settingsToolStripMenuItem2;
} }

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

@ -2028,10 +2028,15 @@ namespace BizHawk.Client.EmuHawk
private void NDSSubMenu_DropDownOpened(object sender, EventArgs e) private void NDSSubMenu_DropDownOpened(object sender, EventArgs e)
{ {
NDSSettingsMenuItem.Enabled = MovieSession.Movie.NotActive(); NdsSyncSettingsMenuItem.Enabled = MovieSession.Movie.NotActive();
} }
private void NDSSettingsMenuItem_Click(object sender, EventArgs e) private void NDSSettingsMenuItem_Click(object sender, EventArgs e)
{
GenericCoreConfig.DoDialog(this, "NDS Settings", false, true);
}
private void NDSSyncSettingsMenuItem_Click(object sender, EventArgs e)
{ {
if (Emulator is MelonDS ds) if (Emulator is MelonDS ds)
{ {