Some reorg on mainform menu item code

BizHawk.Client.EmuHawk/MainForm.Designer.cs

@@ -1328,14 +1328,14 @@
 			this.extensionsToolStripMenuItem.Name = "extensionsToolStripMenuItem";
 			this.extensionsToolStripMenuItem.Size = new System.Drawing.Size(159, 22);
 			this.extensionsToolStripMenuItem.Text = "File Extensions...";
-			this.extensionsToolStripMenuItem.Click += new System.EventHandler(this.extensionsToolStripMenuItem_Click);
+			this.extensionsToolStripMenuItem.Click += new System.EventHandler(this.FileExtensionsMenuItem_Click);
 			// 
 			// ClientOptionsMenuItem
 			// 
 			this.ClientOptionsMenuItem.Name = "ClientOptionsMenuItem";
 			this.ClientOptionsMenuItem.Size = new System.Drawing.Size(159, 22);
 			this.ClientOptionsMenuItem.Text = "&Customize...";
-			this.ClientOptionsMenuItem.Click += new System.EventHandler(this.guiOptionsToolStripMenuItem_Click);
+			this.ClientOptionsMenuItem.Click += new System.EventHandler(this.CustomizeMenuItem_Click);
 			// 
 			// toolStripSeparator9
 			// 
@@ -1602,7 +1602,7 @@
 			this.CoresSubMenu.Name = "CoresSubMenu";
 			this.CoresSubMenu.Size = new System.Drawing.Size(159, 22);
 			this.CoresSubMenu.Text = "Cores";
-			this.CoresSubMenu.DropDownOpened += new System.EventHandler(this.CoreSelectionMenuItem_DropDownOpened);
+			this.CoresSubMenu.DropDownOpened += new System.EventHandler(this.CoresSubMenu_DropDownOpened);
 			// 
 			// GBInSGBMenuItem
 			// 
@@ -1894,14 +1894,14 @@
 			this.PCEtileViewerToolStripMenuItem.Name = "PCEtileViewerToolStripMenuItem";
 			this.PCEtileViewerToolStripMenuItem.Size = new System.Drawing.Size(259, 22);
 			this.PCEtileViewerToolStripMenuItem.Text = "&Tile Viewer";
-			this.PCEtileViewerToolStripMenuItem.Click += new System.EventHandler(this.PCEtileViewerToolStripMenuItem_Click);
+			this.PCEtileViewerToolStripMenuItem.Click += new System.EventHandler(this.PceTileViewerMenuItem_Click);
 			// 
 			// codeDataLoggerToolStripMenuItem
 			// 
 			this.codeDataLoggerToolStripMenuItem.Name = "codeDataLoggerToolStripMenuItem";
 			this.codeDataLoggerToolStripMenuItem.Size = new System.Drawing.Size(259, 22);
 			this.codeDataLoggerToolStripMenuItem.Text = "Code-Data Logger";
-			this.codeDataLoggerToolStripMenuItem.Click += new System.EventHandler(this.codeDataLoggerToolStripMenuItem_Click);
+			this.codeDataLoggerToolStripMenuItem.Click += new System.EventHandler(this.CodeDataLoggerMenuItem_Click);
 			// 
 			// toolStripSeparator25
 			// 
@@ -2106,7 +2106,7 @@
 			this.SMSVDPViewerToolStripMenuItem.Name = "SMSVDPViewerToolStripMenuItem";
 			this.SMSVDPViewerToolStripMenuItem.Size = new System.Drawing.Size(241, 22);
 			this.SMSVDPViewerToolStripMenuItem.Text = "&VDP Viewer";
-			this.SMSVDPViewerToolStripMenuItem.Click += new System.EventHandler(this.SMSVDPViewerToolStripMenuItem_Click);
+			this.SMSVDPViewerToolStripMenuItem.Click += new System.EventHandler(this.SmsVdpViewerMenuItem_Click);
 			// 
 			// TI83SubMenu
 			// 
@@ -2471,7 +2471,7 @@
 			this.vDPViewerToolStripMenuItem.Name = "vDPViewerToolStripMenuItem";
 			this.vDPViewerToolStripMenuItem.Size = new System.Drawing.Size(134, 22);
 			this.vDPViewerToolStripMenuItem.Text = "&VDP Viewer";
-			this.vDPViewerToolStripMenuItem.Click += new System.EventHandler(this.vDPViewerToolStripMenuItem_Click);
+			this.vDPViewerToolStripMenuItem.Click += new System.EventHandler(this.GenVdpViewerMenuItem_Click);
 			// 
 			// toolStripSeparator26
 			// 
@@ -2483,7 +2483,7 @@
 			this.GenesisSettingsToolStripMenuItem.Name = "GenesisSettingsToolStripMenuItem";
 			this.GenesisSettingsToolStripMenuItem.Size = new System.Drawing.Size(134, 22);
 			this.GenesisSettingsToolStripMenuItem.Text = "&Settings...";
-			this.GenesisSettingsToolStripMenuItem.Click += new System.EventHandler(this.GenesisSettingsToolStripMenuItem_Click);
+			this.GenesisSettingsToolStripMenuItem.Click += new System.EventHandler(this.GenesisSettingsMenuItem_Click);
 			// 
 			// HelpSubMenu
 			// 
@@ -2979,14 +2979,14 @@
 			this.toolStripMenuItem15.Name = "toolStripMenuItem15";
 			this.toolStripMenuItem15.Size = new System.Drawing.Size(159, 22);
 			this.toolStripMenuItem15.Text = "File Extensions...";
-			this.toolStripMenuItem15.Click += new System.EventHandler(this.extensionsToolStripMenuItem_Click);
+			this.toolStripMenuItem15.Click += new System.EventHandler(this.FileExtensionsMenuItem_Click);
 			// 
 			// customizeToolStripMenuItem
 			// 
 			this.customizeToolStripMenuItem.Name = "customizeToolStripMenuItem";
 			this.customizeToolStripMenuItem.Size = new System.Drawing.Size(159, 22);
 			this.customizeToolStripMenuItem.Text = "Customize...";
-			this.customizeToolStripMenuItem.Click += new System.EventHandler(this.guiOptionsToolStripMenuItem_Click);
+			this.customizeToolStripMenuItem.Click += new System.EventHandler(this.CustomizeMenuItem_Click);
 			// 
 			// toolStripSeparator30
 			// 

BizHawk.Client.EmuHawk/MainForm.Events.cs

@@ -750,6 +750,12 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
+		private void CoresSubMenu_DropDownOpened(object sender, EventArgs e)
+		{
+			GBInSGBMenuItem.Checked = Global.Config.GB_AsSGB;
+			NesInQuickNESMenuItem.Checked = Global.Config.NES_InQuickNES;
+		}
+
 		private void ControllersMenuItem_Click(object sender, EventArgs e)
 		{
 			var controller = new ControllerConfig(Global.Emulator.ControllerDefinition);
@@ -762,14 +768,18 @@ namespace BizHawk.Client.EmuHawk
 
 		private void HotkeysMenuItem_Click(object sender, EventArgs e)
 		{
-			var hotkeys = new HotkeyConfig();
+			if (new HotkeyConfig().ShowDialog() == DialogResult.OK)
-			if (hotkeys.ShowDialog() == DialogResult.OK)
 			{
 				InitControls();
 				InputManager.SyncControls();
 			}
 		}
 
+		private void FirmwaresMenuItem_Click(object sender, EventArgs e)
+		{
+			new FirmwaresConfig().ShowDialog();
+		}
+
 		private void MessagesMenuItem_Click(object sender, EventArgs e)
 		{
 			new MessageConfig().ShowDialog();
@@ -782,8 +792,7 @@ namespace BizHawk.Client.EmuHawk
 
 		private void SoundMenuItem_Click(object sender, EventArgs e)
 		{
-			var sound = new SoundConfig();
+			if (new SoundConfig().ShowDialog() == DialogResult.OK)
-			if (sound.ShowDialog() == DialogResult.OK)
 			{
 				RewireSound();
 			}
@@ -799,9 +808,14 @@ namespace BizHawk.Client.EmuHawk
 			new RewindConfig().ShowDialog();
 		}
 
-		private void FirmwaresMenuItem_Click(object sender, EventArgs e)
+		private void FileExtensionsMenuItem_Click(object sender, EventArgs e)
 		{
-			new FirmwaresConfig().Show();
+			new FileExtensionPreferences().ShowDialog();
+		}
+
+		private void CustomizeMenuItem_Click(object sender, EventArgs e)
+		{
+			new EmuHawkOptions().ShowDialog();
 		}
 
 		private void ClickThrottleMenuItem_Click(object sender, EventArgs e)
@@ -856,6 +870,7 @@ namespace BizHawk.Client.EmuHawk
 					RewireSound();
 				}
 			}
+
 			VsyncMessage();
 		}
 
@@ -923,6 +938,22 @@ namespace BizHawk.Client.EmuHawk
 			Global.Config.SaveStateType = Config.SaveStateTypeE.Text;
 		}
 
+		private void GBInSGBMenuItem_Click(object sender, EventArgs e)
+		{
+			Global.Config.GB_AsSGB ^= true;
+			FlagNeedsReboot();
+		}
+
+		private void NesInQuickNESMenuItem_Click(object sender, EventArgs e)
+		{
+			Global.Config.NES_InQuickNES ^= true;
+			FlagNeedsReboot();
+		}
+
+		private void N64VideoPluginSettingsMenuItem_Click(object sender, EventArgs e)
+		{
+			N64PluginSettingsMenuItem_Click(sender, e);
+		}
 
 		private void SaveConfigMenuItem_Click(object sender, EventArgs e)
 		{
@@ -1015,9 +1046,15 @@ namespace BizHawk.Client.EmuHawk
 			{
 				dlg.ShowDialog(this);
 			}
+
 			GlobalWin.Sound.StartSound();
 		}
 
+		private void batchRunnerToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			new BatchRun().ShowDialog();
+		}
+
 		#endregion
 
 		#region NES
@@ -1126,6 +1163,16 @@ namespace BizHawk.Client.EmuHawk
 			GlobalWin.Tools.Load<PceBgViewer>();
 		}
 
+		private void PceTileViewerMenuItem_Click(object sender, EventArgs e)
+		{
+			GlobalWin.Tools.Load<PCETileViewer>();
+		}
+
+		private void CodeDataLoggerMenuItem_Click(object sender, EventArgs e)
+		{
+			GlobalWin.Tools.Load<PCECDL>();
+		}
+
 		private void PCEAlwaysPerformSpriteLimitMenuItem_Click(object sender, EventArgs e)
 		{
 			var s = (PCEngine.PCESettings)Global.Emulator.GetSettings();
@@ -1303,6 +1350,11 @@ namespace BizHawk.Client.EmuHawk
 			GlobalWin.Tools.LoadGameGenieEc();
 		}
 
+		private void SmsVdpViewerMenuItem_Click(object sender, EventArgs e)
+		{
+			GlobalWin.Tools.Load<SmsVDPViewer>();
+		}
+
 		#endregion
 
 		#region TI83
@@ -1351,6 +1403,21 @@ namespace BizHawk.Client.EmuHawk
 
 		#region Atari
 
+		private void AtariSubMenu_DropDownOpened(object sender, EventArgs e)
+		{
+			if (!VersionInfo.INTERIM)
+			{
+				Atari2600DebuggerMenuItem.Visible =
+					toolStripSeparator31.Visible =
+					false;
+			}
+		}
+
+		private void Atari2600DebuggerMenuItem_Click(object sender, EventArgs e)
+		{
+			GlobalWin.Tools.Load<Atari2600Debugger>();
+		}
+
 		private void AtariSettingsToolStripMenuItem_Click(object sender, EventArgs e)
 		{
 			GenericCoreConfig.DoDialog(this, "Atari 2600 Settings");
@@ -1609,7 +1676,12 @@ namespace BizHawk.Client.EmuHawk
 
 		#region GEN
 
-		private void GenesisSettingsToolStripMenuItem_Click(object sender, EventArgs e)
+		private void GenVdpViewerMenuItem_Click(object sender, EventArgs e)
+		{
+			GlobalWin.Tools.Load<GenVDPViewer>();
+		}
+
+		private void GenesisSettingsMenuItem_Click(object sender, EventArgs e)
 		{
 			GenericCoreConfig.DoDialog(this, "Genesis Settings");
 		}
@@ -1751,6 +1823,30 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
+		private void SavestateTypeContextSubMenu_DropDownOpened(object sender, EventArgs e)
+		{
+			SavestateTypeDefaultContextMenuItem.Checked = false;
+			SavestateBinaryContextMenuItem.Checked = false;
+			SavestateTextContextMenuItem.Checked = false;
+			switch (Global.Config.SaveStateType)
+			{
+				case Config.SaveStateTypeE.Binary: SavestateBinaryContextMenuItem.Checked = true; break;
+				case Config.SaveStateTypeE.Text: SavestateTextContextMenuItem.Checked = true; break;
+				case Config.SaveStateTypeE.Default: SavestateTypeDefaultContextMenuItem.Checked = true; break;
+			}
+		}
+
+		private void DisplayConfigMenuItem_Click(object sender, EventArgs e)
+		{
+			new config.DisplayConfigLite().ShowDialog();
+		}
+
+		private void CoreSelectionContextSubMenu_DropDownOpened(object sender, EventArgs e)
+		{
+			GBInSGBContextMenuItem.Checked = Global.Config.GB_AsSGB;
+			NesInQuickNESContextMenuItem.Checked = Global.Config.NES_InQuickNES;
+		}
+
 		private void LoadLastRomContextMenuItem_Click(object sender, EventArgs e)
 		{
 			LoadRomFromRecent(Global.Config.RecentRoms.MostRecent);

BizHawk.Client.EmuHawk/MainForm.cs

@@ -3200,102 +3200,5 @@ namespace BizHawk.Client.EmuHawk
 		}
 
 		#endregion
-
-		private void NesInQuickNESMenuItem_Click(object sender, EventArgs e)
-		{
-			Global.Config.NES_InQuickNES ^= true;
-			FlagNeedsReboot();
-		}
-
-		private void batchRunnerToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			new BatchRun().ShowDialog();
-		}
-
-		private void CoreSelectionMenuItem_DropDownOpened(object sender, EventArgs e)
-		{
-			GBInSGBMenuItem.Checked = Global.Config.GB_AsSGB;
-			NesInQuickNESMenuItem.Checked = Global.Config.NES_InQuickNES;
-		}
-
-		private void DisplayConfigMenuItem_Click(object sender, EventArgs e)
-		{
-			new config.DisplayConfigLite().ShowDialog();
-		}
-
-		private void PCEtileViewerToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			GlobalWin.Tools.Load<PCETileViewer>();
-		}
-
-		private void SMSVDPViewerToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			GlobalWin.Tools.Load<SmsVDPViewer>();
-		}
-
-		private void codeDataLoggerToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			GlobalWin.Tools.Load<PCECDL>();
-		}
-
-		private void vDPViewerToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			GlobalWin.Tools.Load<GenVDPViewer>();
-		}
-
-		private void extensionsToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			new FileExtensionPreferences().ShowDialog();
-		}
-
-		private void Atari2600DebuggerMenuItem_Click(object sender, EventArgs e)
-		{
-			GlobalWin.Tools.Load<Atari2600Debugger>();
-		}
-
-		private void AtariSubMenu_DropDownOpened(object sender, EventArgs e)
-		{
-			if (!VersionInfo.INTERIM)
-			{
-				Atari2600DebuggerMenuItem.Visible =
-					toolStripSeparator31.Visible = 
-					false;
-			}
-		}
-
-		private void SavestateTypeContextSubMenu_DropDownOpened(object sender, EventArgs e)
-		{
-			SavestateTypeDefaultContextMenuItem.Checked = false;
-			SavestateBinaryContextMenuItem.Checked = false;
-			SavestateTextContextMenuItem.Checked = false;
-			switch (Global.Config.SaveStateType)
-			{
-				case Config.SaveStateTypeE.Binary: SavestateBinaryContextMenuItem.Checked = true; break;
-				case Config.SaveStateTypeE.Text: SavestateTextContextMenuItem.Checked = true; break;
-				case Config.SaveStateTypeE.Default: SavestateTypeDefaultContextMenuItem.Checked = true; break;
-			}
-		}
-
-		private void GBInSGBMenuItem_Click(object sender, EventArgs e)
-		{
-			Global.Config.GB_AsSGB ^= true;
-			FlagNeedsReboot();
-		}
-
-		private void CoreSelectionContextSubMenu_DropDownOpened(object sender, EventArgs e)
-		{
-			GBInSGBContextMenuItem.Checked = Global.Config.GB_AsSGB;
-			NesInQuickNESContextMenuItem.Checked = Global.Config.NES_InQuickNES;
-		}
-
-		private void N64VideoPluginSettingsMenuItem_Click(object sender, EventArgs e)
-		{
-			N64PluginSettingsMenuItem_Click(sender, e);
-		}
-
-		private void guiOptionsToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			new EmuHawkOptions().ShowDialog();
-		}
 	}
 }