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

Open Virtual Pad hotkey

This commit is contained in:
adelikat 2012-11-23 17:03:10 +00:00
parent 6d7ae2574d
commit 9ee8093f7a
5 changed files with 762 additions and 731 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BizHawk.MultiClient/Config.cs
View File

@ -656,6 +656,7 @@ namespace BizHawk.MultiClient
public string ToggleSNESOBJ3Binding = ""; public string ToggleSNESOBJ3Binding = "";
public string ToggleSNESOBJ4Binding = ""; public string ToggleSNESOBJ4Binding = "";
public string SaveMovieBinding = ""; public string SaveMovieBinding = "";
public string OpenVirtualPadBinding = "";
// NES Sound settings // NES Sound settings
public bool NESEnableSquare1 = true; public bool NESEnableSquare1 = true;

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

@ -669,6 +669,7 @@ namespace BizHawk.MultiClient
luaConsoleToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.LuaConsole; luaConsoleToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.LuaConsole;
cheatsToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.Cheats; cheatsToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.Cheats;
tAStudioToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.TASTudio; tAStudioToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.TASTudio;
virtualPadToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.OpenVirtualPadBinding;
if (Global.Emulator.CoreOutputComm.CpuTraceAvailable) if (Global.Emulator.CoreOutputComm.CpuTraceAvailable)
{ {

4
BizHawk.MultiClient/MainForm.cs
View File

@ -629,7 +629,7 @@ namespace BizHawk.MultiClient
"Play Movie", "Record Movie", "Stop Movie", "Play Beginning", "Volume Up", "Volume Down", "Toggle MultiTrack", "Record All", "Record None", "Increment Player", "Play Movie", "Record Movie", "Stop Movie", "Play Beginning", "Volume Up", "Volume Down", "Toggle MultiTrack", "Record All", "Record None", "Increment Player",
"Soft Reset", "Decrement Player", "Record AVI/WAV", "Stop AVI/WAV", "Toggle Menu", "Increase Speed", "Decrease Speed", "Toggle Background Input", "Soft Reset", "Decrement Player", "Record AVI/WAV", "Stop AVI/WAV", "Toggle Menu", "Increase Speed", "Decrease Speed", "Toggle Background Input",
"Autohold", "Clear Autohold", "SNES Toggle BG 1", "SNES Toggle BG 2", "SNES Toggle BG 3", "SNES Toggle BG 4", "SNES Toggle OBJ 1", "SNES Toggle OBJ 2", "SNES Toggle OBJ 3", "Autohold", "Clear Autohold", "SNES Toggle BG 1", "SNES Toggle BG 2", "SNES Toggle BG 3", "SNES Toggle BG 4", "SNES Toggle OBJ 1", "SNES Toggle OBJ 2", "SNES Toggle OBJ 3",
"SNES Toggle OBJ 4", "Reboot Core", "Save Movie" } "SNES Toggle OBJ 4", "Reboot Core", "Save Movie", "Virtual Pad" }
}; };
private void InitControls() private void InitControls()
@ -700,6 +700,7 @@ namespace BizHawk.MultiClient
controls.BindMulti("Next Slot", Global.Config.NextSlot); controls.BindMulti("Next Slot", Global.Config.NextSlot);
controls.BindMulti("Ram Watch", Global.Config.RamWatch); controls.BindMulti("Ram Watch", Global.Config.RamWatch);
controls.BindMulti("TASTudio", Global.Config.TASTudio); controls.BindMulti("TASTudio", Global.Config.TASTudio);
controls.BindMulti("Virtual Pad", Global.Config.OpenVirtualPadBinding);
controls.BindMulti("Ram Search", Global.Config.RamSearch); controls.BindMulti("Ram Search", Global.Config.RamSearch);
controls.BindMulti("Ram Poke", Global.Config.RamPoke); controls.BindMulti("Ram Poke", Global.Config.RamPoke);
controls.BindMulti("Hex Editor", Global.Config.HexEditor); controls.BindMulti("Hex Editor", Global.Config.HexEditor);
@ -2357,6 +2358,7 @@ namespace BizHawk.MultiClient
case "Lua Console": OpenLuaConsole(); break; case "Lua Console": OpenLuaConsole(); break;
case "Cheats": LoadCheatsWindow(); break; case "Cheats": LoadCheatsWindow(); break;
case "TASTudio": LoadTAStudio(); break; case "TASTudio": LoadTAStudio(); break;
case "Virtual Pad": LoadVirtualPads(); break;
case "Open ROM": OpenROM(); break; case "Open ROM": OpenROM(); break;
case "Close ROM": CloseROM(); break; case "Close ROM": CloseROM(); break;
case "Display FPS": ToggleFPS(); break; case "Display FPS": ToggleFPS(); break;

1484
BizHawk.MultiClient/config/HotkeyWindow.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

3
BizHawk.MultiClient/config/HotkeyWindow.cs
View File

@ -113,6 +113,7 @@ namespace BizHawk.MultiClient
IDW_SNES_ToggleOBJ3.SetBindings(Global.Config.ToggleSNESOBJ3Binding); IDW_SNES_ToggleOBJ3.SetBindings(Global.Config.ToggleSNESOBJ3Binding);
IDW_SNES_ToggleOBJ4.SetBindings(Global.Config.ToggleSNESOBJ4Binding); IDW_SNES_ToggleOBJ4.SetBindings(Global.Config.ToggleSNESOBJ4Binding);
IDW_SaveMovie.SetBindings(Global.Config.SaveMovieBinding); IDW_SaveMovie.SetBindings(Global.Config.SaveMovieBinding);
IDW_OpenVirtualPad.SetBindings(Global.Config.OpenVirtualPadBinding);
} }
private void button2_Click(object sender, EventArgs e) private void button2_Click(object sender, EventArgs e)
{ {
@ -235,6 +236,8 @@ namespace BizHawk.MultiClient
Global.Config.ToggleSNESOBJ3Binding = IDW_SNES_ToggleOBJ3.Text; Global.Config.ToggleSNESOBJ3Binding = IDW_SNES_ToggleOBJ3.Text;
Global.Config.ToggleSNESOBJ4Binding = IDW_SNES_ToggleOBJ4.Text; Global.Config.ToggleSNESOBJ4Binding = IDW_SNES_ToggleOBJ4.Text;
Global.Config.OpenVirtualPadBinding = IDW_OpenVirtualPad.Text;
Global.OSD.AddMessage("Hotkey settings saved"); Global.OSD.AddMessage("Hotkey settings saved");
this.DialogResult = DialogResult.OK; this.DialogResult = DialogResult.OK;
this.Close(); this.Close();