From 1647783fa8a7cc13762096a185c9f316a380387b Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sat, 28 Mar 2020 11:35:13 -0500
Subject: [PATCH] DS - wire up settings to UI

---
 BizHawk.Client.EmuHawk/MainForm.Designer.cs | 25 +++++++++++++++------
 BizHawk.Client.EmuHawk/MainForm.Events.cs   |  7 +++++-
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/BizHawk.Client.EmuHawk/MainForm.Designer.cs b/BizHawk.Client.EmuHawk/MainForm.Designer.cs
index da76d51300..952244bf6e 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Designer.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Designer.cs
@@ -460,7 +460,8 @@
 			this.ShowMenuContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.timerMouseIdle = new System.Windows.Forms.Timer(this.components);
 			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.MainStatusBar.SuspendLayout();
 			this.MainFormContextMenu.SuspendLayout();
@@ -3990,18 +3991,27 @@
 			// NDSSubMenu
 			// 
 			this.NDSSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.NDSSettingsMenuItem});
+				this.NdsSettingsMenuItem,
+				this.NdsSyncSettingsMenuItem
+			});
 			this.NDSSubMenu.Name = "NDSSubMenu";
 			this.NDSSubMenu.Size = new System.Drawing.Size(42, 19);
 			this.NDSSubMenu.Text = "NDS";
 			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
 			// 
-			this.NDSSettingsMenuItem.Name = "NDSSettingsMenuItem";
-			this.NDSSettingsMenuItem.Size = new System.Drawing.Size(180, 22);
-			this.NDSSettingsMenuItem.Text = "Settings...";
-			this.NDSSettingsMenuItem.Click += new System.EventHandler(this.NDSSettingsMenuItem_Click);
+			this.NdsSettingsMenuItem.Name = "NdsSettingsMenuItem";
+			this.NdsSettingsMenuItem.Size = new System.Drawing.Size(180, 22);
+			this.NdsSettingsMenuItem.Text = "Settings...";
+			this.NdsSettingsMenuItem.Click += new System.EventHandler(this.NDSSettingsMenuItem_Click);
 			// 
 			// MainForm
 			// 
@@ -4473,7 +4483,8 @@
 		private System.Windows.Forms.ToolStripMenuItem SubGBHawkMenuItem;
 		private System.Windows.Forms.ToolStripSeparator toolStripSeparator38;
 		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 settingsToolStripMenuItem2;
 	}
diff --git a/BizHawk.Client.EmuHawk/MainForm.Events.cs b/BizHawk.Client.EmuHawk/MainForm.Events.cs
index 21b4771e08..1e79c1afca 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Events.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Events.cs
@@ -2028,10 +2028,15 @@ namespace BizHawk.Client.EmuHawk
 
 		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)
+		{
+			GenericCoreConfig.DoDialog(this, "NDS Settings", false, true);
+		}
+
+		private void NDSSyncSettingsMenuItem_Click(object sender, EventArgs e)
 		{
 			if (Emulator is MelonDS ds)
 			{