Add config menu to context menu when in full screen mode

BizHawk.MultiClient/MainForm.MenuItems.cs

@@ -179,6 +179,11 @@ namespace BizHawk.MultiClient
 		}
 
 		private void soundToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			OpenSoundConfigDialog();
+		}
+
+		private void OpenSoundConfigDialog()
 		{
 			SoundConfig s = new SoundConfig();
 			var result = s.ShowDialog();
@@ -453,7 +458,11 @@ namespace BizHawk.MultiClient
 
 		private void controllersToolStripMenuItem_Click(object sender, EventArgs e)
 		{
-			
+			OpenControllerConfig();
+		}
+
+		private void OpenControllerConfig()
+		{
 			ControllerConfig c = new ControllerConfig();
 			c.ShowDialog();
 			if (c.DialogResult == DialogResult.OK)
@@ -464,6 +473,11 @@ namespace BizHawk.MultiClient
 		}
 
 		private void hotkeysToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			OpenHotkeyDialog();
+		}
+
+		private void OpenHotkeyDialog()
 		{
 			HotkeyWindow h = new HotkeyWindow();
 			h.ShowDialog();
@@ -705,8 +719,7 @@ namespace BizHawk.MultiClient
 
 		private void messagesToolStripMenuItem_Click(object sender, EventArgs e)
 		{
-			MessageConfig m = new MessageConfig();
+			new MessageConfig().ShowDialog();
-			m.ShowDialog();
 		}
 
 		private void autoloadVirtualKeyboardToolStripMenuItem_Click(object sender, EventArgs e)
@@ -729,8 +742,7 @@ namespace BizHawk.MultiClient
 
 		private void pathsToolStripMenuItem_Click(object sender, EventArgs e)
 		{
-			PathConfig p = new PathConfig();
+			new PathConfig().ShowDialog();
-			p.ShowDialog();
 		}
 
 		private void displayRerecordCountToolStripMenuItem_Click(object sender, EventArgs e)
@@ -1002,20 +1014,14 @@ namespace BizHawk.MultiClient
 
 		private void contextMenuStrip1_Opening(object sender, System.ComponentModel.CancelEventArgs e)
 		{
-			if (EmulatorPaused)
+			wasPaused = EmulatorPaused;
-			{
-				wasPaused = true;
-			}
-			else
-			{
-				wasPaused = false;
-			}
-
 			didMenuPause = true;
 			PauseEmulator();
 
 			//TODO - MUST refactor this to hide all and then view a set depending on the state
 
+			configToolStripMenuItem1.Visible = InFullscreen;
+
 			if (IsNullEmulator())
 			{
 				cmiOpenRom.Visible = true;
@@ -1044,10 +1050,12 @@ namespace BizHawk.MultiClient
 				if (InFullscreen)
 				{
 					cmiOpenRom.Visible = true;
+					configToolStripMenuItem1.Visible = true;
 				}
 				else
 				{
 					cmiOpenRom.Visible = false;
+					configToolStripMenuItem1.Visible = false;
 				}
 				
 				cmiLoadLastRom.Visible = false;

BizHawk.MultiClient/MainForm.cs

@@ -5504,5 +5504,34 @@ namespace BizHawk.MultiClient
 			}
 		}
 
+		private void controllersToolStripMenuItem1_Click(object sender, EventArgs e)
+		{
+			OpenControllerConfig();
+		}
+
+		private void hotkeysToolStripMenuItem1_Click(object sender, EventArgs e)
+		{
+			OpenHotkeyDialog();
+		}
+
+		private void messagesToolStripMenuItem1_Click(object sender, EventArgs e)
+		{
+			new MessageConfig().ShowDialog();
+		}
+
+		private void pathsToolStripMenuItem1_Click(object sender, EventArgs e)
+		{
+			new PathConfig().ShowDialog();
+		}
+
+		private void soundToolStripMenuItem1_Click(object sender, EventArgs e)
+		{
+			OpenSoundConfigDialog();
+		}
+
+		private void autofireToolStripMenuItem1_Click(object sender, EventArgs e)
+		{
+			new AutofireConfig().ShowDialog();
+		}
 	}
 }

BizHawk.MultiClient/MainForm.resx

@@ -124,7 +124,7 @@
     <value>126, 17</value>
   </metadata>
   <metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>233, 17</value>
+    <value>233, 13</value>
   </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>43</value>