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

Hotkeys - add ordinal to determine order in the hotkey dialog

This commit is contained in:
adelikat 2013-08-04 17:08:51 +00:00
parent 23de20a5b8
commit 562e117e64
3 changed files with 107 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

195
BizHawk.MultiClient/Config.cs
View File

@ -592,113 +592,113 @@ namespace BizHawk.MultiClient
public BindingCollection HotkeyBindings = new BindingCollection()
{
//General
new Binding() { DisplayName = "Frame Advance", Bindings = "F", TabGroup = "General" },
new Binding() { DisplayName = "Rewind", Bindings = "Shift+R, X1 LeftShoulder", TabGroup = "General" },
new Binding() { DisplayName = "Pause", Bindings = "Pause", TabGroup = "General" },
new Binding() { DisplayName = "Fast Forward", Bindings = "Tab, X1 RightShoulder", TabGroup = "General" },
new Binding() { DisplayName = "Turbo", Bindings = "Shift+Tab", TabGroup = "General" },
new Binding() { DisplayName = "Toggle Throttle", Bindings = "", TabGroup = "General" },
new Binding() { DisplayName = "Soft Reset", Bindings = "", TabGroup = "General" },
new Binding() { DisplayName = "Hard Reset", Bindings = "", TabGroup = "General" },
new Binding() { DisplayName = "Quick Load", Bindings = "P", TabGroup = "General" },
new Binding() { DisplayName = "Quick Save", Bindings = "I", TabGroup = "General" },
new Binding() { DisplayName = "Autohold", Bindings = "", TabGroup = "General" },
new Binding() { DisplayName = "Clear Autohold", Bindings = "", TabGroup = "General" },
new Binding() { DisplayName = "Screenshot", Bindings = "F12", TabGroup = "General" },
new Binding() { DisplayName = "Full Screen", Bindings = "Alt+Return", TabGroup = "General" },
new Binding() { DisplayName = "Open ROM", Bindings = "Ctrl+O", TabGroup = "General" },
new Binding() { DisplayName = "Close ROM", Bindings = "Ctrl+W", TabGroup = "General" },
new Binding() { DisplayName = "Display FPS", Bindings = "", TabGroup = "General" },
new Binding() { DisplayName = "Frame Counter", Bindings = "", TabGroup = "General" },
new Binding() { DisplayName = "Lag Counter", Bindings = "", TabGroup = "General" },
new Binding() { DisplayName = "Input Display", Bindings = "", TabGroup = "General" },
new Binding() { DisplayName = "Toggle BG Input", Bindings = "", TabGroup = "General" },
new Binding() { DisplayName = "Toggle Menu", Bindings = "", TabGroup = "General" },
new Binding() { DisplayName = "Volume Up", Bindings = "", TabGroup = "General" },
new Binding() { DisplayName = "Volume Down", Bindings = "", TabGroup = "General" },
new Binding() { DisplayName = "Record A/V", Bindings = "", TabGroup = "General" },
new Binding() { DisplayName = "Stop A/V", Bindings = "", TabGroup = "General" },
new Binding() { DisplayName = "Larger Window", Bindings = "Alt+UpArrow", TabGroup = "General" },
new Binding() { DisplayName = "Smaller Window", Bindings = "Alt+DownArrow", TabGroup = "General" },
new Binding() { DisplayName = "Increase Speed", Bindings = "Equals", TabGroup = "General" },
new Binding() { DisplayName = "Decrease Speed", Bindings = "Minus", TabGroup = "General" },
new Binding() { DisplayName = "Reboot Core", Bindings = "Ctrl+R", TabGroup = "General" },
new Binding() { DisplayName = "Autofire", Bindings = "", TabGroup = "General" },
new Binding() { DisplayName = "Frame Advance", Bindings = "F", TabGroup = "General", DefaultBinding = "F", Ordinal = 0 },
new Binding() { DisplayName = "Rewind", Bindings = "Shift+R, X1 LeftShoulder", TabGroup = "General", DefaultBinding = "Shift+R, X1 LeftShoulder", Ordinal = 1 },
new Binding() { DisplayName = "Pause", Bindings = "Pause", TabGroup = "General", DefaultBinding = "Pause", Ordinal = 2 },
new Binding() { DisplayName = "Fast Forward", Bindings = "Tab, X1 RightShoulder", TabGroup = "General", DefaultBinding = "Tab, X1 RightShoulder", Ordinal = 3 },
new Binding() { DisplayName = "Turbo", Bindings = "Shift+Tab", TabGroup = "General", DefaultBinding = "Shift+Tab", Ordinal = 4 },
new Binding() { DisplayName = "Toggle Throttle", Bindings = "", TabGroup = "General", DefaultBinding = "", Ordinal = 5 },
new Binding() { DisplayName = "Soft Reset", Bindings = "", TabGroup = "General", DefaultBinding = "", Ordinal = 6 },
new Binding() { DisplayName = "Hard Reset", Bindings = "", TabGroup = "General", DefaultBinding = "", Ordinal = 7 },
new Binding() { DisplayName = "Quick Load", Bindings = "P", TabGroup = "General", DefaultBinding = "P", Ordinal = 8 },
new Binding() { DisplayName = "Quick Save", Bindings = "I", TabGroup = "General", DefaultBinding = "I", Ordinal = 9 },
new Binding() { DisplayName = "Autohold", Bindings = "", TabGroup = "General", DefaultBinding = "", Ordinal = 10 },
new Binding() { DisplayName = "Clear Autohold", Bindings = "", TabGroup = "General", DefaultBinding = "", Ordinal = 11 },
new Binding() { DisplayName = "Screenshot", Bindings = "F12", TabGroup = "General", DefaultBinding = "F12", Ordinal = 12 },
new Binding() { DisplayName = "Full Screen", Bindings = "Alt+Return", TabGroup = "General", DefaultBinding = "Alt+Return", Ordinal = 13 },
new Binding() { DisplayName = "Open ROM", Bindings = "Ctrl+O", TabGroup = "General", DefaultBinding = "Ctrl+O", Ordinal = 14 },
new Binding() { DisplayName = "Close ROM", Bindings = "Ctrl+W", TabGroup = "General", DefaultBinding = "Ctrl+W", Ordinal = 15 },
new Binding() { DisplayName = "Display FPS", Bindings = "", TabGroup = "General", DefaultBinding = "", Ordinal = 16 },
new Binding() { DisplayName = "Frame Counter", Bindings = "", TabGroup = "General", DefaultBinding = "", Ordinal = 17 },
new Binding() { DisplayName = "Lag Counter", Bindings = "", TabGroup = "General", DefaultBinding = "", Ordinal = 18 },
new Binding() { DisplayName = "Input Display", Bindings = "", TabGroup = "General", DefaultBinding = "", Ordinal = 19 },
new Binding() { DisplayName = "Toggle BG Input", Bindings = "", TabGroup = "General", DefaultBinding = "", Ordinal = 20 },
new Binding() { DisplayName = "Toggle Menu", Bindings = "", TabGroup = "General", DefaultBinding = "", Ordinal = 21 },
new Binding() { DisplayName = "Volume Up", Bindings = "", TabGroup = "General", DefaultBinding = "", Ordinal = 22 },
new Binding() { DisplayName = "Volume Down", Bindings = "", TabGroup = "General", DefaultBinding = "", Ordinal = 23 },
new Binding() { DisplayName = "Record A/V", Bindings = "", TabGroup = "General", DefaultBinding = "", Ordinal = 24 },
new Binding() { DisplayName = "Stop A/V", Bindings = "", TabGroup = "General", DefaultBinding = "", Ordinal = 25 },
new Binding() { DisplayName = "Larger Window", Bindings = "Alt+UpArrow", TabGroup = "General", DefaultBinding = "Alt+UpArrow", Ordinal = 26 },
new Binding() { DisplayName = "Smaller Window", Bindings = "Alt+DownArrow", TabGroup = "General", DefaultBinding = "Alt+DownArrow", Ordinal = 27 },
new Binding() { DisplayName = "Increase Speed", Bindings = "Equals", TabGroup = "General", DefaultBinding = "Equals", Ordinal = 28 },
new Binding() { DisplayName = "Decrease Speed", Bindings = "Minus", TabGroup = "General", DefaultBinding = "Minus", Ordinal = 29 },
new Binding() { DisplayName = "Reboot Core", Bindings = "Ctrl+R", TabGroup = "General", DefaultBinding = "Ctrl+R", Ordinal = 30 },
new Binding() { DisplayName = "Autofire", Bindings = "", TabGroup = "General", DefaultBinding = "", Ordinal = 31 },
//Save States
new Binding() { DisplayName = "Save State 0", Bindings = "Shift+F10", TabGroup = "Save States" },
new Binding() { DisplayName = "Save State 1", Bindings = "Shift+F1", TabGroup = "Save States" },
new Binding() { DisplayName = "Save State 2", Bindings = "Shift+F2", TabGroup = "Save States" },
new Binding() { DisplayName = "Save State 3", Bindings = "Shift+F3", TabGroup = "Save States" },
new Binding() { DisplayName = "Save State 4", Bindings = "Shift+F4", TabGroup = "Save States" },
new Binding() { DisplayName = "Save State 5", Bindings = "Shift+F5", TabGroup = "Save States" },
new Binding() { DisplayName = "Save State 6", Bindings = "Shift+F6", TabGroup = "Save States" },
new Binding() { DisplayName = "Save State 7", Bindings = "Shift+F7", TabGroup = "Save States" },
new Binding() { DisplayName = "Save State 8", Bindings = "Shift+F8", TabGroup = "Save States" },
new Binding() { DisplayName = "Save State 9", Bindings = "Shift+F9", TabGroup = "Save States" },
new Binding() { DisplayName = "Load State 0", Bindings = "F10", TabGroup = "Save States" },
new Binding() { DisplayName = "Load State 1", Bindings = "F1", TabGroup = "Save States" },
new Binding() { DisplayName = "Load State 2", Bindings = "F2", TabGroup = "Save States" },
new Binding() { DisplayName = "Load State 3", Bindings = "F3", TabGroup = "Save States" },
new Binding() { DisplayName = "Load State 4", Bindings = "F4", TabGroup = "Save States" },
new Binding() { DisplayName = "Load State 5", Bindings = "F5", TabGroup = "Save States" },
new Binding() { DisplayName = "Load State 6", Bindings = "F6", TabGroup = "Save States" },
new Binding() { DisplayName = "Load State 7", Bindings = "F7", TabGroup = "Save States" },
new Binding() { DisplayName = "Load State 8", Bindings = "F8", TabGroup = "Save States" },
new Binding() { DisplayName = "Load State 9", Bindings = "F9", TabGroup = "Save States" },
new Binding() { DisplayName = "Select State 0", Bindings = "D0", TabGroup = "Save States" },
new Binding() { DisplayName = "Select State 1", Bindings = "D1", TabGroup = "Save States" },
new Binding() { DisplayName = "Select State 2", Bindings = "D2", TabGroup = "Save States" },
new Binding() { DisplayName = "Select State 3", Bindings = "D3", TabGroup = "Save States" },
new Binding() { DisplayName = "Select State 4", Bindings = "D4", TabGroup = "Save States" },
new Binding() { DisplayName = "Select State 5", Bindings = "D5", TabGroup = "Save States" },
new Binding() { DisplayName = "Select State 6", Bindings = "D6", TabGroup = "Save States" },
new Binding() { DisplayName = "Select State 7", Bindings = "D7", TabGroup = "Save States" },
new Binding() { DisplayName = "Select State 8", Bindings = "D8", TabGroup = "Save States" },
new Binding() { DisplayName = "Select State 9", Bindings = "D9", TabGroup = "Save States" },
new Binding() { DisplayName = "Save Named State", Bindings = "", TabGroup = "Save States" },
new Binding() { DisplayName = "Load Named State", Bindings = "", TabGroup = "Save States" },
new Binding() { DisplayName = "Previous Slot", Bindings = "", TabGroup = "Save States" },
new Binding() { DisplayName = "Next Slot", Bindings = "", TabGroup = "Save States" },
new Binding() { DisplayName = "Save State 0", Bindings = "Shift+F10", TabGroup = "Save States", DefaultBinding = "Shift+F10", Ordinal = 1 },
new Binding() { DisplayName = "Save State 1", Bindings = "Shift+F1", TabGroup = "Save States", DefaultBinding = "Shift+F1", Ordinal = 2 },
new Binding() { DisplayName = "Save State 2", Bindings = "Shift+F2", TabGroup = "Save States", DefaultBinding = "Shift+F2", Ordinal = 3 },
new Binding() { DisplayName = "Save State 3", Bindings = "Shift+F3", TabGroup = "Save States", DefaultBinding = "Shift+F3", Ordinal = 4 },
new Binding() { DisplayName = "Save State 4", Bindings = "Shift+F4", TabGroup = "Save States", DefaultBinding = "Shift+F4", Ordinal = 5 },
new Binding() { DisplayName = "Save State 5", Bindings = "Shift+F5", TabGroup = "Save States", DefaultBinding = "Shift+F5", Ordinal = 6 },
new Binding() { DisplayName = "Save State 6", Bindings = "Shift+F6", TabGroup = "Save States", DefaultBinding = "Shift+F6", Ordinal = 7 },
new Binding() { DisplayName = "Save State 7", Bindings = "Shift+F7", TabGroup = "Save States", DefaultBinding = "Shift+F7", Ordinal = 8 },
new Binding() { DisplayName = "Save State 8", Bindings = "Shift+F8", TabGroup = "Save States", DefaultBinding = "Shift+F8", Ordinal = 9 },
new Binding() { DisplayName = "Save State 9", Bindings = "Shift+F9", TabGroup = "Save States", DefaultBinding = "Shift+F9", Ordinal = 10 },
new Binding() { DisplayName = "Load State 0", Bindings = "F10", TabGroup = "Save States", DefaultBinding = "F10", Ordinal = 11 },
new Binding() { DisplayName = "Load State 1", Bindings = "F1", TabGroup = "Save States", DefaultBinding = "F1", Ordinal = 12 },
new Binding() { DisplayName = "Load State 2", Bindings = "F2", TabGroup = "Save States", DefaultBinding = "F2", Ordinal = 13 },
new Binding() { DisplayName = "Load State 3", Bindings = "F3", TabGroup = "Save States", DefaultBinding = "F3", Ordinal = 14 },
new Binding() { DisplayName = "Load State 4", Bindings = "F4", TabGroup = "Save States", DefaultBinding = "F4", Ordinal = 15 },
new Binding() { DisplayName = "Load State 5", Bindings = "F5", TabGroup = "Save States", DefaultBinding = "F5", Ordinal = 16 },
new Binding() { DisplayName = "Load State 6", Bindings = "F6", TabGroup = "Save States", DefaultBinding = "F6", Ordinal = 17 },
new Binding() { DisplayName = "Load State 7", Bindings = "F7", TabGroup = "Save States", DefaultBinding = "F7", Ordinal = 18 },
new Binding() { DisplayName = "Load State 8", Bindings = "F8", TabGroup = "Save States", DefaultBinding = "F8", Ordinal = 19 },
new Binding() { DisplayName = "Load State 9", Bindings = "F9", TabGroup = "Save States", DefaultBinding = "F9", Ordinal = 20 },
new Binding() { DisplayName = "Select State 0", Bindings = "D0", TabGroup = "Save States", DefaultBinding = "D0", Ordinal = 21 },
new Binding() { DisplayName = "Select State 1", Bindings = "D1", TabGroup = "Save States", DefaultBinding = "D1", Ordinal = 22 },
new Binding() { DisplayName = "Select State 2", Bindings = "D2", TabGroup = "Save States", DefaultBinding = "D2", Ordinal = 23 },
new Binding() { DisplayName = "Select State 3", Bindings = "D3", TabGroup = "Save States", DefaultBinding = "D3", Ordinal = 24 },
new Binding() { DisplayName = "Select State 4", Bindings = "D4", TabGroup = "Save States", DefaultBinding = "D4", Ordinal = 25 },
new Binding() { DisplayName = "Select State 5", Bindings = "D5", TabGroup = "Save States", DefaultBinding = "D5", Ordinal = 26 },
new Binding() { DisplayName = "Select State 6", Bindings = "D6", TabGroup = "Save States", DefaultBinding = "D6", Ordinal = 27 },
new Binding() { DisplayName = "Select State 7", Bindings = "D7", TabGroup = "Save States", DefaultBinding = "D7", Ordinal = 28 },
new Binding() { DisplayName = "Select State 8", Bindings = "D8", TabGroup = "Save States", DefaultBinding = "D8", Ordinal = 29 },
new Binding() { DisplayName = "Select State 9", Bindings = "D9", TabGroup = "Save States", DefaultBinding = "D9", Ordinal = 30 },
new Binding() { DisplayName = "Save Named State", Bindings = "", TabGroup = "Save States", DefaultBinding = "", Ordinal = 31 },
new Binding() { DisplayName = "Load Named State", Bindings = "", TabGroup = "Save States", DefaultBinding = "", Ordinal = 32 },
new Binding() { DisplayName = "Previous Slot", Bindings = "", TabGroup = "Save States", DefaultBinding = "", Ordinal = 33 },
new Binding() { DisplayName = "Next Slot", Bindings = "", TabGroup = "Save States", DefaultBinding = "", Ordinal = 34 },
//Movie
new Binding() { DisplayName = "Toggle read-only", Bindings = "Q", TabGroup = "Movie" },
new Binding() { DisplayName = "Play Movie", Bindings = "", TabGroup = "Movie" },
new Binding() { DisplayName = "Record Movie", Bindings = "", TabGroup = "Movie" },
new Binding() { DisplayName = "Stop Movie", Bindings = "", TabGroup = "Movie" },
new Binding() { DisplayName = "Play from beginning", Bindings = "", TabGroup = "Movie" },
new Binding() { DisplayName = "Save Movie", Bindings = "", TabGroup = "Movie" },
new Binding() { DisplayName = "Toggle MultiTrack", Bindings = "", TabGroup = "Movie" },
new Binding() { DisplayName = "MT Select All", Bindings = "", TabGroup = "Movie" },
new Binding() { DisplayName = "MT Select None", Bindings = "", TabGroup = "Movie" },
new Binding() { DisplayName = "MT Increment Player", Bindings = "", TabGroup = "Movie" },
new Binding() { DisplayName = "MT Decrement Player", Bindings = "", TabGroup = "Movie" },
new Binding() { DisplayName = "Movie Poke", Bindings = "", TabGroup = "Movie" },
new Binding() { DisplayName = "Scrub Input", Bindings = "", TabGroup = "Movie" },
new Binding() { DisplayName = "Toggle read-only", Bindings = "Q", TabGroup = "Movie", DefaultBinding = "Q", Ordinal = 0 },
new Binding() { DisplayName = "Play Movie", Bindings = "", TabGroup = "Movie", DefaultBinding = "", Ordinal = 1 },
new Binding() { DisplayName = "Record Movie", Bindings = "", TabGroup = "Movie", DefaultBinding = "", Ordinal = 2 },
new Binding() { DisplayName = "Stop Movie", Bindings = "", TabGroup = "Movie", DefaultBinding = "", Ordinal = 3 },
new Binding() { DisplayName = "Play from beginning", Bindings = "", TabGroup = "Movie", DefaultBinding = "", Ordinal = 4 },
new Binding() { DisplayName = "Save Movie", Bindings = "", TabGroup = "Movie", DefaultBinding = "", Ordinal = 5 },
new Binding() { DisplayName = "Toggle MultiTrack", Bindings = "", TabGroup = "Movie", DefaultBinding = "", Ordinal = 6 },
new Binding() { DisplayName = "MT Select All", Bindings = "", TabGroup = "Movie", DefaultBinding = "", Ordinal = 7 },
new Binding() { DisplayName = "MT Select None", Bindings = "", TabGroup = "Movie", DefaultBinding = "", Ordinal = 8 },
new Binding() { DisplayName = "MT Increment Player", Bindings = "", TabGroup = "Movie", DefaultBinding = "", Ordinal = 9 },
new Binding() { DisplayName = "MT Decrement Player", Bindings = "", TabGroup = "Movie", DefaultBinding = "", Ordinal = 10 },
new Binding() { DisplayName = "Movie Poke", Bindings = "", TabGroup = "Movie", DefaultBinding = "", Ordinal = 11 },
new Binding() { DisplayName = "Scrub Input", Bindings = "", TabGroup = "Movie", DefaultBinding = "", Ordinal = 12 },
//Tools
new Binding() { DisplayName = "Ram Watch", Bindings = "", TabGroup = "Tools" },
new Binding() { DisplayName = "Ram Search", Bindings = "", TabGroup = "Tools" },
new Binding() { DisplayName = "Ram Poke", Bindings = "", TabGroup = "Tools" },
new Binding() { DisplayName = "Hex Editor", Bindings = "", TabGroup = "Tools" },
new Binding() { DisplayName = "Lua Console", Bindings = "", TabGroup = "Tools" },
new Binding() { DisplayName = "Cheats", Bindings = "", TabGroup = "Tools" },
new Binding() { DisplayName = "TAStudio", Bindings = "", TabGroup = "Tools" },
new Binding() { DisplayName = "ToolBox", Bindings = "T", TabGroup = "Tools" },
new Binding() { DisplayName = "Virtual Pad", Bindings = "", TabGroup = "Tools" },
new Binding() { DisplayName = "Ram Watch", Bindings = "", TabGroup = "Tools", DefaultBinding = "", Ordinal = 0 },
new Binding() { DisplayName = "Ram Search", Bindings = "", TabGroup = "Tools", DefaultBinding = "", Ordinal = 1 },
new Binding() { DisplayName = "Ram Poke", Bindings = "", TabGroup = "Tools", DefaultBinding = "", Ordinal = 2 },
new Binding() { DisplayName = "Hex Editor", Bindings = "", TabGroup = "Tools", DefaultBinding = "", Ordinal = 3 },
new Binding() { DisplayName = "Lua Console", Bindings = "", TabGroup = "Tools", DefaultBinding = "", Ordinal = 4 },
new Binding() { DisplayName = "Cheats", Bindings = "", TabGroup = "Tools", DefaultBinding = "", Ordinal = 5 },
new Binding() { DisplayName = "TAStudio", Bindings = "", TabGroup = "Tools", DefaultBinding = "", Ordinal = 6 },
new Binding() { DisplayName = "ToolBox", Bindings = "T", TabGroup = "Tools", DefaultBinding = "", Ordinal = 7 },
new Binding() { DisplayName = "Virtual Pad", Bindings = "", TabGroup = "Tools", DefaultBinding = "", Ordinal = 8 },
//SNES
new Binding() { DisplayName = "SNES Toggle BG 1", Bindings = "", TabGroup = "SNES" },
new Binding() { DisplayName = "SNES Toggle BG 2", Bindings = "", TabGroup = "SNES" },
new Binding() { DisplayName = "SNES Toggle BG 3", Bindings = "", TabGroup = "SNES" },
new Binding() { DisplayName = "SNES Toggle BG 4", Bindings = "", TabGroup = "SNES" },
new Binding() { DisplayName = "SNES Toggle OBJ 1", Bindings = "", TabGroup = "SNES" },
new Binding() { DisplayName = "SNES Toggle OBJ 2", Bindings = "", TabGroup = "SNES" },
new Binding() { DisplayName = "SNES Toggle OBJ 3", Bindings = "", TabGroup = "SNES" },
new Binding() { DisplayName = "SNES Toggle OBJ 4", Bindings = "", TabGroup = "SNES" },
new Binding() { DisplayName = "Toggle BG 1", Bindings = "", TabGroup = "SNES", DefaultBinding = "", Ordinal = 0 },
new Binding() { DisplayName = "Toggle BG 2", Bindings = "", TabGroup = "SNES", DefaultBinding = "", Ordinal = 1 },
new Binding() { DisplayName = "Toggle BG 3", Bindings = "", TabGroup = "SNES", DefaultBinding = "", Ordinal = 2 },
new Binding() { DisplayName = "Toggle BG 4", Bindings = "", TabGroup = "SNES", DefaultBinding = "", Ordinal = 3 },
new Binding() { DisplayName = "Toggle OBJ 1", Bindings = "", TabGroup = "SNES", DefaultBinding = "", Ordinal = 4 },
new Binding() { DisplayName = "Toggle OBJ 2", Bindings = "", TabGroup = "SNES", DefaultBinding = "", Ordinal = 5 },
new Binding() { DisplayName = "Toggle OBJ 3", Bindings = "", TabGroup = "SNES", DefaultBinding = "", Ordinal = 6 },
new Binding() { DisplayName = "Toggle OBJ 4", Bindings = "", TabGroup = "SNES", DefaultBinding = "", Ordinal = 7 },
//Analog
new Binding() { DisplayName = "Y Up Large", Bindings = "", TabGroup = "Analog" },
new Binding() { DisplayName = "Y Up Large", Bindings = "", TabGroup = "Analog", DefaultBinding = "", Ordinal = 0 },
};
//Analog Hotkey values
@ -870,6 +870,7 @@ namespace BizHawk.MultiClient
public string Bindings;
public string DefaultBinding;
public string TabGroup;
public int Ordinal = 0;
public Binding() { }
}

16
BizHawk.MultiClient/MainForm.cs
View File

@ -2001,14 +2001,14 @@ namespace BizHawk.MultiClient
case "ToolBox": LoadToolBox(); break;
case "Virtual Pad": LoadVirtualPads(); break;
case "SNES Toggle BG 1": SNES_ToggleBG1(); break;
case "SNES Toggle BG 2": SNES_ToggleBG2(); break;
case "SNES Toggle BG 3": SNES_ToggleBG3(); break;
case "SNES Toggle BG 4": SNES_ToggleBG4(); break;
case "SNES Toggle OBJ 1": SNES_ToggleOBJ1(); break;
case "SNES Toggle OBJ 2": SNES_ToggleOBJ2(); break;
case "SNES Toggle OBJ 3": SNES_ToggleOBJ3(); break;
case "SNES Toggle OBJ 4": SNES_ToggleOBJ4(); break;
case "Toggle BG 1": SNES_ToggleBG1(); break;
case "Toggle BG 2": SNES_ToggleBG2(); break;
case "Toggle BG 3": SNES_ToggleBG3(); break;
case "Toggle BG 4": SNES_ToggleBG4(); break;
case "Toggle OBJ 1": SNES_ToggleOBJ1(); break;
case "Toggle OBJ 2": SNES_ToggleOBJ2(); break;
case "Toggle OBJ 3": SNES_ToggleOBJ3(); break;
case "Toggle OBJ 4": SNES_ToggleOBJ4(); break;
case "Y Up Large Binding":

2
BizHawk.MultiClient/config/NewHotkeyWindow.cs
View File

@ -88,7 +88,7 @@ namespace BizHawk.MultiClient
tb.Name = tab;
tb.Text = tab;
List<Binding> bindings = Global.Config.HotkeyBindings.Where(x => x.TabGroup == tab).OrderBy(x => x.DisplayName).ToList();
List<Binding> bindings = Global.Config.HotkeyBindings.Where(x => x.TabGroup == tab).OrderBy(x => x.Ordinal).ThenBy(x => x.DisplayName).ToList();
int _x = 6;
int _y = 14;