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

Add config menu to context menu when in full screen mode

This commit is contained in:
adelikat 2013-07-10 18:04:05 +00:00
parent cbb35fc3ce
commit dba02ffb85
4 changed files with 465 additions and 352 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

750
BizHawk.MultiClient/MainForm.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

36
BizHawk.MultiClient/MainForm.MenuItems.cs
View File

@ -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();
m.ShowDialog();
new MessageConfig().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();
p.ShowDialog();
new PathConfig().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 = true;
}
else
{
wasPaused = false;
}
wasPaused = EmulatorPaused;
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;

29
BizHawk.MultiClient/MainForm.cs
View File

@ -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();
}
}
}

2
BizHawk.MultiClient/MainForm.resx
View File

@ -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>