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

Previous & Next Slot Hotkeys, also update Quick Save & Load menu item shortcuts dynamically

This commit is contained in:
andres.delikat 2011-04-11 00:43:28 +00:00
parent 01aa6850ff
commit d09ce40792
5 changed files with 330 additions and 252 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
BizHawk.MultiClient/Config.cs
View File

@ -191,7 +191,8 @@
public string ToolBox = "T"; public string ToolBox = "T";
public string SaveNamedState = ""; public string SaveNamedState = "";
public string LoadNamedState = ""; public string LoadNamedState = "";
public string PreviousSlot = "";
public string NextSlot = "";
// SMS / GameGear Settings // SMS / GameGear Settings
public bool SmsEnableFM = true; public bool SmsEnableFM = true;

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

@ -223,17 +223,12 @@ namespace BizHawk.MultiClient
private void previousSlotToolStripMenuItem_Click(object sender, EventArgs e) private void previousSlotToolStripMenuItem_Click(object sender, EventArgs e)
{ {
if (SaveSlot == 0) SaveSlot = 9; //Wrap to end of slot list PreviousSlot();
else if (SaveSlot > 9) SaveSlot = 9; //Meh, just in case
else SaveSlot--;
SaveSlotSelectedMessage();
} }
private void nextSlotToolStripMenuItem_Click(object sender, EventArgs e) private void nextSlotToolStripMenuItem_Click(object sender, EventArgs e)
{ {
if (SaveSlot >= 9) SaveSlot = 1; //Wrap to beginning of slot list NextSlot();
else SaveSlot++;
SaveSlotSelectedMessage();
} }
private void saveToCurrentSlotToolStripMenuItem_Click(object sender, EventArgs e) private void saveToCurrentSlotToolStripMenuItem_Click(object sender, EventArgs e)
@ -515,6 +510,10 @@ namespace BizHawk.MultiClient
selectSlot7ToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SelectSlot7; selectSlot7ToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SelectSlot7;
selectSlot8ToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SelectSlot8; selectSlot8ToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SelectSlot8;
selectSlot9ToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SelectSlot9; selectSlot9ToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SelectSlot9;
previousSlotToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.PreviousSlot;
nextSlotToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.NextSlot;
saveToCurrentSlotToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.QuickSave;
loadConfigToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.QuickLoad;
} }
} }
} }

31
BizHawk.MultiClient/MainForm.cs
View File

@ -260,7 +260,7 @@ namespace BizHawk.MultiClient
"Emulator Pause", "Frame Advance", "Screenshot", "Toggle Fullscreen", "SelectSlot0", "SelectSlot1", "SelectSlot2", "SelectSlot3", "SelectSlot4", "Emulator Pause", "Frame Advance", "Screenshot", "Toggle Fullscreen", "SelectSlot0", "SelectSlot1", "SelectSlot2", "SelectSlot3", "SelectSlot4",
"SelectSlot5", "SelectSlot6", "SelectSlot7", "SelectSlot8", "SelectSlot9", "SaveSlot0", "SaveSlot1", "SaveSlot2", "SaveSlot3", "SaveSlot4", "SelectSlot5", "SelectSlot6", "SelectSlot7", "SelectSlot8", "SelectSlot9", "SaveSlot0", "SaveSlot1", "SaveSlot2", "SaveSlot3", "SaveSlot4",
"SaveSlot5","SaveSlot6","SaveSlot7","SaveSlot8","SaveSlot9","LoadSlot0","LoadSlot1","LoadSlot2","LoadSlot3","LoadSlot4","LoadSlot5","LoadSlot6", "SaveSlot5","SaveSlot6","SaveSlot7","SaveSlot8","SaveSlot9","LoadSlot0","LoadSlot1","LoadSlot2","LoadSlot3","LoadSlot4","LoadSlot5","LoadSlot6",
"LoadSlot7","LoadSlot8","LoadSlot9", "ToolBox"} "LoadSlot7","LoadSlot8","LoadSlot9", "ToolBox", "Previous Slot", "Next Slot"}
}; };
private void InitControls() private void InitControls()
@ -309,6 +309,8 @@ namespace BizHawk.MultiClient
controls.BindMulti("ToolBox", Global.Config.ToolBox); controls.BindMulti("ToolBox", Global.Config.ToolBox);
controls.BindMulti("Save Named State", Global.Config.SaveNamedState); controls.BindMulti("Save Named State", Global.Config.SaveNamedState);
controls.BindMulti("Load Named State", Global.Config.LoadNamedState); controls.BindMulti("Load Named State", Global.Config.LoadNamedState);
controls.BindMulti("Previous Slot", Global.Config.PreviousSlot);
controls.BindMulti("Next Slot", Global.Config.NextSlot);
Global.ClientControls = controls; Global.ClientControls = controls;
var smsControls = new Controller(SMS.SmsController); var smsControls = new Controller(SMS.SmsController);
@ -726,6 +728,18 @@ namespace BizHawk.MultiClient
LoadStateAs(); LoadStateAs();
Global.ClientControls.UnpressButton("Load Named State"); Global.ClientControls.UnpressButton("Load Named State");
} }
if (Global.ClientControls["Previous Slot"])
{
PreviousSlot();
Global.ClientControls.UnpressButton("Previous Slot");
}
if (Global.ClientControls["Next Slot"])
{
NextSlot();
Global.ClientControls.UnpressButton("Next Slot");
}
} }
void StepRunLoop_Throttle() void StepRunLoop_Throttle()
@ -1406,5 +1420,20 @@ namespace BizHawk.MultiClient
HexEditor1.SaveConfigSettings(); HexEditor1.SaveConfigSettings();
ConfigService.Save("config.ini", Global.Config); ConfigService.Save("config.ini", Global.Config);
} }
private void PreviousSlot()
{
if (SaveSlot == 0) SaveSlot = 9; //Wrap to end of slot list
else if (SaveSlot > 9) SaveSlot = 9; //Meh, just in case
else SaveSlot--;
SaveSlotSelectedMessage();
}
private void NextSlot()
{
if (SaveSlot >= 9) SaveSlot = 1; //Wrap to beginning of slot list
else SaveSlot++;
SaveSlotSelectedMessage();
}
} }
} }

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

@ -31,35 +31,20 @@
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(HotkeyWindow)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(HotkeyWindow));
this.hotkeyTabs = new System.Windows.Forms.TabControl(); this.hotkeyTabs = new System.Windows.Forms.TabControl();
this.tabPage1 = new System.Windows.Forms.TabPage(); this.tabPage1 = new System.Windows.Forms.TabPage();
this.IDW_TOOLBOX = new BizHawk.MultiClient.InputWidget();
this.label46 = new System.Windows.Forms.Label(); this.label46 = new System.Windows.Forms.Label();
this.IDW_FRAMEADVANCE = new BizHawk.MultiClient.InputWidget();
this.label45 = new System.Windows.Forms.Label(); this.label45 = new System.Windows.Forms.Label();
this.IDW_FULLSCREEN = new BizHawk.MultiClient.InputWidget();
this.IDW_SCREENSHOT = new BizHawk.MultiClient.InputWidget();
this.label44 = new System.Windows.Forms.Label(); this.label44 = new System.Windows.Forms.Label();
this.IDW_REWIND = new BizHawk.MultiClient.InputWidget();
this.label37 = new System.Windows.Forms.Label(); this.label37 = new System.Windows.Forms.Label();
this.IDW_FASTFORWARD = new BizHawk.MultiClient.InputWidget();
this.label36 = new System.Windows.Forms.Label(); this.label36 = new System.Windows.Forms.Label();
this.IDW_HARDRESET = new BizHawk.MultiClient.InputWidget();
this.label35 = new System.Windows.Forms.Label(); this.label35 = new System.Windows.Forms.Label();
this.IDW_PAUSE = new BizHawk.MultiClient.InputWidget();
this.label34 = new System.Windows.Forms.Label(); this.label34 = new System.Windows.Forms.Label();
this.label33 = new System.Windows.Forms.Label(); this.label33 = new System.Windows.Forms.Label();
this.label32 = new System.Windows.Forms.Label(); this.label32 = new System.Windows.Forms.Label();
this.IDW_QuickLoad = new BizHawk.MultiClient.InputWidget();
this.label31 = new System.Windows.Forms.Label(); this.label31 = new System.Windows.Forms.Label();
this.IDW_QuickSave = new BizHawk.MultiClient.InputWidget();
this.tabPage2 = new System.Windows.Forms.TabPage(); this.tabPage2 = new System.Windows.Forms.TabPage();
this.HR = new BizHawk.Core.HorizontalLine(); this.HR = new BizHawk.Core.HorizontalLine();
this.label48 = new System.Windows.Forms.Label(); this.label48 = new System.Windows.Forms.Label();
this.IDW_LOADNAMEDSTATE = new BizHawk.MultiClient.InputWidget();
this.label47 = new System.Windows.Forms.Label(); this.label47 = new System.Windows.Forms.Label();
this.IDW_SAVENAMEDSTATE = new BizHawk.MultiClient.InputWidget();
this.IDW_SS1 = new BizHawk.MultiClient.InputWidget();
this.IDW_ST7 = new BizHawk.MultiClient.InputWidget();
this.IDW_ST0 = new BizHawk.MultiClient.InputWidget();
this.label21 = new System.Windows.Forms.Label(); this.label21 = new System.Windows.Forms.Label();
this.label22 = new System.Windows.Forms.Label(); this.label22 = new System.Windows.Forms.Label();
this.label23 = new System.Windows.Forms.Label(); this.label23 = new System.Windows.Forms.Label();
@ -90,6 +75,30 @@
this.label4 = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label();
this.tabPage3 = new System.Windows.Forms.TabPage();
this.label43 = new System.Windows.Forms.Label();
this.label42 = new System.Windows.Forms.Label();
this.label41 = new System.Windows.Forms.Label();
this.label40 = new System.Windows.Forms.Label();
this.label39 = new System.Windows.Forms.Label();
this.IDB_SAVE = new System.Windows.Forms.Button();
this.IDB_CANCEL = new System.Windows.Forms.Button();
this.label38 = new System.Windows.Forms.Label();
this.IDW_TOOLBOX = new BizHawk.MultiClient.InputWidget();
this.IDW_FRAMEADVANCE = new BizHawk.MultiClient.InputWidget();
this.IDW_FULLSCREEN = new BizHawk.MultiClient.InputWidget();
this.IDW_SCREENSHOT = new BizHawk.MultiClient.InputWidget();
this.IDW_REWIND = new BizHawk.MultiClient.InputWidget();
this.IDW_FASTFORWARD = new BizHawk.MultiClient.InputWidget();
this.IDW_HARDRESET = new BizHawk.MultiClient.InputWidget();
this.IDW_PAUSE = new BizHawk.MultiClient.InputWidget();
this.IDW_QuickLoad = new BizHawk.MultiClient.InputWidget();
this.IDW_QuickSave = new BizHawk.MultiClient.InputWidget();
this.IDW_LOADNAMEDSTATE = new BizHawk.MultiClient.InputWidget();
this.IDW_SAVENAMEDSTATE = new BizHawk.MultiClient.InputWidget();
this.IDW_SS1 = new BizHawk.MultiClient.InputWidget();
this.IDW_ST7 = new BizHawk.MultiClient.InputWidget();
this.IDW_ST0 = new BizHawk.MultiClient.InputWidget();
this.IDW_ST9 = new BizHawk.MultiClient.InputWidget(); this.IDW_ST9 = new BizHawk.MultiClient.InputWidget();
this.IDW_ST8 = new BizHawk.MultiClient.InputWidget(); this.IDW_ST8 = new BizHawk.MultiClient.InputWidget();
this.IDW_ST6 = new BizHawk.MultiClient.InputWidget(); this.IDW_ST6 = new BizHawk.MultiClient.InputWidget();
@ -117,20 +126,15 @@
this.IDW_SS4 = new BizHawk.MultiClient.InputWidget(); this.IDW_SS4 = new BizHawk.MultiClient.InputWidget();
this.IDW_SS3 = new BizHawk.MultiClient.InputWidget(); this.IDW_SS3 = new BizHawk.MultiClient.InputWidget();
this.IDW_SS2 = new BizHawk.MultiClient.InputWidget(); this.IDW_SS2 = new BizHawk.MultiClient.InputWidget();
this.tabPage3 = new System.Windows.Forms.TabPage();
this.IDW_TOGGLEMTRACK = new BizHawk.MultiClient.InputWidget(); this.IDW_TOGGLEMTRACK = new BizHawk.MultiClient.InputWidget();
this.IDW_MTDECPLAYER = new BizHawk.MultiClient.InputWidget(); this.IDW_MTDECPLAYER = new BizHawk.MultiClient.InputWidget();
this.IDW_MTINCPLAYER = new BizHawk.MultiClient.InputWidget(); this.IDW_MTINCPLAYER = new BizHawk.MultiClient.InputWidget();
this.label43 = new System.Windows.Forms.Label();
this.label42 = new System.Windows.Forms.Label();
this.label41 = new System.Windows.Forms.Label();
this.label40 = new System.Windows.Forms.Label();
this.label39 = new System.Windows.Forms.Label();
this.IDW_SELECTNONE = new BizHawk.MultiClient.InputWidget(); this.IDW_SELECTNONE = new BizHawk.MultiClient.InputWidget();
this.IDW_MTSELECTALL = new BizHawk.MultiClient.InputWidget(); this.IDW_MTSELECTALL = new BizHawk.MultiClient.InputWidget();
this.IDB_SAVE = new System.Windows.Forms.Button(); this.IDW_PREVIOUSSLOT = new BizHawk.MultiClient.InputWidget();
this.IDB_CANCEL = new System.Windows.Forms.Button(); this.IDW_NEXTSLOT = new BizHawk.MultiClient.InputWidget();
this.label38 = new System.Windows.Forms.Label(); this.label49 = new System.Windows.Forms.Label();
this.label50 = new System.Windows.Forms.Label();
this.hotkeyTabs.SuspendLayout(); this.hotkeyTabs.SuspendLayout();
this.tabPage1.SuspendLayout(); this.tabPage1.SuspendLayout();
this.tabPage2.SuspendLayout(); this.tabPage2.SuspendLayout();
@ -146,7 +150,7 @@
this.hotkeyTabs.Location = new System.Drawing.Point(12, 12); this.hotkeyTabs.Location = new System.Drawing.Point(12, 12);
this.hotkeyTabs.Name = "hotkeyTabs"; this.hotkeyTabs.Name = "hotkeyTabs";
this.hotkeyTabs.SelectedIndex = 0; this.hotkeyTabs.SelectedIndex = 0;
this.hotkeyTabs.Size = new System.Drawing.Size(598, 328); this.hotkeyTabs.Size = new System.Drawing.Size(598, 347);
this.hotkeyTabs.TabIndex = 97; this.hotkeyTabs.TabIndex = 97;
this.hotkeyTabs.TabStop = false; this.hotkeyTabs.TabStop = false;
this.hotkeyTabs.SelectedIndexChanged += new System.EventHandler(this.hotkeyTabs_SelectedIndexChanged); this.hotkeyTabs.SelectedIndexChanged += new System.EventHandler(this.hotkeyTabs_SelectedIndexChanged);
@ -181,13 +185,6 @@
this.tabPage1.Text = "General"; this.tabPage1.Text = "General";
this.tabPage1.UseVisualStyleBackColor = true; this.tabPage1.UseVisualStyleBackColor = true;
// //
// IDW_TOOLBOX
//
this.IDW_TOOLBOX.Location = new System.Drawing.Point(293, 107);
this.IDW_TOOLBOX.Name = "IDW_TOOLBOX";
this.IDW_TOOLBOX.Size = new System.Drawing.Size(100, 20);
this.IDW_TOOLBOX.TabIndex = 15;
//
// label46 // label46
// //
this.label46.AutoSize = true; this.label46.AutoSize = true;
@ -197,15 +194,6 @@
this.label46.TabIndex = 14; this.label46.TabIndex = 14;
this.label46.Text = "Tool Box"; this.label46.Text = "Tool Box";
// //
// IDW_FRAMEADVANCE
//
this.IDW_FRAMEADVANCE.AcceptsTab = true;
this.IDW_FRAMEADVANCE.BackColor = System.Drawing.SystemColors.Window;
this.IDW_FRAMEADVANCE.Location = new System.Drawing.Point(92, 8);
this.IDW_FRAMEADVANCE.Name = "IDW_FRAMEADVANCE";
this.IDW_FRAMEADVANCE.Size = new System.Drawing.Size(100, 20);
this.IDW_FRAMEADVANCE.TabIndex = 1;
//
// label45 // label45
// //
this.label45.AutoSize = true; this.label45.AutoSize = true;
@ -215,24 +203,6 @@
this.label45.TabIndex = 13; this.label45.TabIndex = 13;
this.label45.Text = "Full Screen"; this.label45.Text = "Full Screen";
// //
// IDW_FULLSCREEN
//
this.IDW_FULLSCREEN.AcceptsTab = true;
this.IDW_FULLSCREEN.BackColor = System.Drawing.SystemColors.Window;
this.IDW_FULLSCREEN.Location = new System.Drawing.Point(293, 80);
this.IDW_FULLSCREEN.Name = "IDW_FULLSCREEN";
this.IDW_FULLSCREEN.Size = new System.Drawing.Size(100, 20);
this.IDW_FULLSCREEN.TabIndex = 9;
//
// IDW_SCREENSHOT
//
this.IDW_SCREENSHOT.AcceptsTab = true;
this.IDW_SCREENSHOT.BackColor = System.Drawing.SystemColors.Window;
this.IDW_SCREENSHOT.Location = new System.Drawing.Point(293, 56);
this.IDW_SCREENSHOT.Name = "IDW_SCREENSHOT";
this.IDW_SCREENSHOT.Size = new System.Drawing.Size(100, 20);
this.IDW_SCREENSHOT.TabIndex = 8;
//
// label44 // label44
// //
this.label44.AutoSize = true; this.label44.AutoSize = true;
@ -242,15 +212,6 @@
this.label44.TabIndex = 12; this.label44.TabIndex = 12;
this.label44.Text = "Screenshot"; this.label44.Text = "Screenshot";
// //
// IDW_REWIND
//
this.IDW_REWIND.AcceptsTab = true;
this.IDW_REWIND.BackColor = System.Drawing.SystemColors.Window;
this.IDW_REWIND.Location = new System.Drawing.Point(92, 104);
this.IDW_REWIND.Name = "IDW_REWIND";
this.IDW_REWIND.Size = new System.Drawing.Size(100, 20);
this.IDW_REWIND.TabIndex = 5;
//
// label37 // label37
// //
this.label37.AutoSize = true; this.label37.AutoSize = true;
@ -260,15 +221,6 @@
this.label37.TabIndex = 4; this.label37.TabIndex = 4;
this.label37.Text = "Rewind"; this.label37.Text = "Rewind";
// //
// IDW_FASTFORWARD
//
this.IDW_FASTFORWARD.AcceptsTab = true;
this.IDW_FASTFORWARD.BackColor = System.Drawing.SystemColors.Window;
this.IDW_FASTFORWARD.Location = new System.Drawing.Point(92, 80);
this.IDW_FASTFORWARD.Name = "IDW_FASTFORWARD";
this.IDW_FASTFORWARD.Size = new System.Drawing.Size(100, 20);
this.IDW_FASTFORWARD.TabIndex = 4;
//
// label36 // label36
// //
this.label36.AutoSize = true; this.label36.AutoSize = true;
@ -278,15 +230,6 @@
this.label36.TabIndex = 3; this.label36.TabIndex = 3;
this.label36.Text = "Fast Forward"; this.label36.Text = "Fast Forward";
// //
// IDW_HARDRESET
//
this.IDW_HARDRESET.AcceptsTab = true;
this.IDW_HARDRESET.BackColor = System.Drawing.SystemColors.Window;
this.IDW_HARDRESET.Location = new System.Drawing.Point(92, 56);
this.IDW_HARDRESET.Name = "IDW_HARDRESET";
this.IDW_HARDRESET.Size = new System.Drawing.Size(100, 20);
this.IDW_HARDRESET.TabIndex = 3;
//
// label35 // label35
// //
this.label35.AutoSize = true; this.label35.AutoSize = true;
@ -296,15 +239,6 @@
this.label35.TabIndex = 2; this.label35.TabIndex = 2;
this.label35.Text = "Hard Reset"; this.label35.Text = "Hard Reset";
// //
// IDW_PAUSE
//
this.IDW_PAUSE.AcceptsTab = true;
this.IDW_PAUSE.BackColor = System.Drawing.SystemColors.Window;
this.IDW_PAUSE.Location = new System.Drawing.Point(92, 33);
this.IDW_PAUSE.Name = "IDW_PAUSE";
this.IDW_PAUSE.Size = new System.Drawing.Size(100, 20);
this.IDW_PAUSE.TabIndex = 2;
//
// label34 // label34
// //
this.label34.AutoSize = true; this.label34.AutoSize = true;
@ -332,15 +266,6 @@
this.label32.TabIndex = 11; this.label32.TabIndex = 11;
this.label32.Text = "Quick Load"; this.label32.Text = "Quick Load";
// //
// IDW_QuickLoad
//
this.IDW_QuickLoad.AcceptsTab = true;
this.IDW_QuickLoad.BackColor = System.Drawing.SystemColors.Window;
this.IDW_QuickLoad.Location = new System.Drawing.Point(293, 32);
this.IDW_QuickLoad.Name = "IDW_QuickLoad";
this.IDW_QuickLoad.Size = new System.Drawing.Size(100, 20);
this.IDW_QuickLoad.TabIndex = 7;
//
// label31 // label31
// //
this.label31.AutoSize = true; this.label31.AutoSize = true;
@ -350,17 +275,12 @@
this.label31.TabIndex = 0; this.label31.TabIndex = 0;
this.label31.Text = "Frame Advance"; this.label31.Text = "Frame Advance";
// //
// IDW_QuickSave
//
this.IDW_QuickSave.AcceptsTab = true;
this.IDW_QuickSave.BackColor = System.Drawing.SystemColors.Window;
this.IDW_QuickSave.Location = new System.Drawing.Point(293, 8);
this.IDW_QuickSave.Name = "IDW_QuickSave";
this.IDW_QuickSave.Size = new System.Drawing.Size(100, 20);
this.IDW_QuickSave.TabIndex = 6;
//
// tabPage2 // tabPage2
// //
this.tabPage2.Controls.Add(this.label50);
this.tabPage2.Controls.Add(this.label49);
this.tabPage2.Controls.Add(this.IDW_NEXTSLOT);
this.tabPage2.Controls.Add(this.IDW_PREVIOUSSLOT);
this.tabPage2.Controls.Add(this.HR); this.tabPage2.Controls.Add(this.HR);
this.tabPage2.Controls.Add(this.label48); this.tabPage2.Controls.Add(this.label48);
this.tabPage2.Controls.Add(this.IDW_LOADNAMEDSTATE); this.tabPage2.Controls.Add(this.IDW_LOADNAMEDSTATE);
@ -429,7 +349,7 @@
this.tabPage2.Location = new System.Drawing.Point(4, 28); this.tabPage2.Location = new System.Drawing.Point(4, 28);
this.tabPage2.Name = "tabPage2"; this.tabPage2.Name = "tabPage2";
this.tabPage2.Padding = new System.Windows.Forms.Padding(3); this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
this.tabPage2.Size = new System.Drawing.Size(590, 296); this.tabPage2.Size = new System.Drawing.Size(590, 315);
this.tabPage2.TabIndex = 1; this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "Save States"; this.tabPage2.Text = "Save States";
this.tabPage2.UseVisualStyleBackColor = true; this.tabPage2.UseVisualStyleBackColor = true;
@ -444,57 +364,21 @@
// label48 // label48
// //
this.label48.AutoSize = true; this.label48.AutoSize = true;
this.label48.Location = new System.Drawing.Point(282, 268); this.label48.Location = new System.Drawing.Point(55, 291);
this.label48.Name = "label48"; this.label48.Name = "label48";
this.label48.Size = new System.Drawing.Size(96, 13); this.label48.Size = new System.Drawing.Size(96, 13);
this.label48.TabIndex = 122; this.label48.TabIndex = 122;
this.label48.Text = "Load Named State"; this.label48.Text = "Load Named State";
// //
// IDW_LOADNAMEDSTATE
//
this.IDW_LOADNAMEDSTATE.Location = new System.Drawing.Point(382, 264);
this.IDW_LOADNAMEDSTATE.Name = "IDW_LOADNAMEDSTATE";
this.IDW_LOADNAMEDSTATE.Size = new System.Drawing.Size(100, 20);
this.IDW_LOADNAMEDSTATE.TabIndex = 121;
//
// label47 // label47
// //
this.label47.AutoSize = true; this.label47.AutoSize = true;
this.label47.Location = new System.Drawing.Point(55, 268); this.label47.Location = new System.Drawing.Point(55, 265);
this.label47.Name = "label47"; this.label47.Name = "label47";
this.label47.Size = new System.Drawing.Size(97, 13); this.label47.Size = new System.Drawing.Size(97, 13);
this.label47.TabIndex = 120; this.label47.TabIndex = 120;
this.label47.Text = "Save Named State"; this.label47.Text = "Save Named State";
// //
// IDW_SAVENAMEDSTATE
//
this.IDW_SAVENAMEDSTATE.Location = new System.Drawing.Point(154, 264);
this.IDW_SAVENAMEDSTATE.Name = "IDW_SAVENAMEDSTATE";
this.IDW_SAVENAMEDSTATE.Size = new System.Drawing.Size(100, 20);
this.IDW_SAVENAMEDSTATE.TabIndex = 119;
//
// IDW_SS1
//
this.IDW_SS1.BackColor = System.Drawing.SystemColors.Window;
this.IDW_SS1.Location = new System.Drawing.Point(88, 6);
this.IDW_SS1.Name = "IDW_SS1";
this.IDW_SS1.Size = new System.Drawing.Size(100, 20);
this.IDW_SS1.TabIndex = 61;
//
// IDW_ST7
//
this.IDW_ST7.Location = new System.Drawing.Point(468, 150);
this.IDW_ST7.Name = "IDW_ST7";
this.IDW_ST7.Size = new System.Drawing.Size(100, 20);
this.IDW_ST7.TabIndex = 107;
//
// IDW_ST0
//
this.IDW_ST0.Location = new System.Drawing.Point(468, 222);
this.IDW_ST0.Name = "IDW_ST0";
this.IDW_ST0.Size = new System.Drawing.Size(100, 20);
this.IDW_ST0.TabIndex = 110;
//
// label21 // label21
// //
this.label21.AutoSize = true; this.label21.AutoSize = true;
@ -765,6 +649,226 @@
this.label1.TabIndex = 62; this.label1.TabIndex = 62;
this.label1.Text = "Save State 1"; this.label1.Text = "Save State 1";
// //
// tabPage3
//
this.tabPage3.Controls.Add(this.IDW_TOGGLEMTRACK);
this.tabPage3.Controls.Add(this.IDW_MTDECPLAYER);
this.tabPage3.Controls.Add(this.IDW_MTINCPLAYER);
this.tabPage3.Controls.Add(this.label43);
this.tabPage3.Controls.Add(this.label42);
this.tabPage3.Controls.Add(this.label41);
this.tabPage3.Controls.Add(this.label40);
this.tabPage3.Controls.Add(this.label39);
this.tabPage3.Controls.Add(this.IDW_SELECTNONE);
this.tabPage3.Controls.Add(this.IDW_MTSELECTALL);
this.tabPage3.Location = new System.Drawing.Point(4, 28);
this.tabPage3.Name = "tabPage3";
this.tabPage3.Padding = new System.Windows.Forms.Padding(3);
this.tabPage3.Size = new System.Drawing.Size(590, 296);
this.tabPage3.TabIndex = 2;
this.tabPage3.Text = "MultiTrack";
this.tabPage3.UseVisualStyleBackColor = true;
//
// label43
//
this.label43.AutoSize = true;
this.label43.Location = new System.Drawing.Point(6, 103);
this.label43.Name = "label43";
this.label43.Size = new System.Drawing.Size(91, 13);
this.label43.TabIndex = 74;
this.label43.Text = "Decrement Player";
//
// label42
//
this.label42.AutoSize = true;
this.label42.Location = new System.Drawing.Point(6, 81);
this.label42.Name = "label42";
this.label42.Size = new System.Drawing.Size(86, 13);
this.label42.TabIndex = 73;
this.label42.Text = "Increment Player";
//
// label41
//
this.label41.AutoSize = true;
this.label41.Location = new System.Drawing.Point(6, 59);
this.label41.Name = "label41";
this.label41.Size = new System.Drawing.Size(66, 13);
this.label41.TabIndex = 71;
this.label41.Text = "Select None";
//
// label40
//
this.label40.AutoSize = true;
this.label40.Location = new System.Drawing.Point(6, 35);
this.label40.Name = "label40";
this.label40.Size = new System.Drawing.Size(51, 13);
this.label40.TabIndex = 69;
this.label40.Text = "Select All";
//
// label39
//
this.label39.AutoSize = true;
this.label39.Location = new System.Drawing.Point(6, 12);
this.label39.Name = "label39";
this.label39.Size = new System.Drawing.Size(93, 13);
this.label39.TabIndex = 67;
this.label39.Text = "Toggle MultiTrack";
//
// IDB_SAVE
//
this.IDB_SAVE.Location = new System.Drawing.Point(441, 9);
this.IDB_SAVE.Name = "IDB_SAVE";
this.IDB_SAVE.Size = new System.Drawing.Size(82, 22);
this.IDB_SAVE.TabIndex = 99;
this.IDB_SAVE.TabStop = false;
this.IDB_SAVE.Text = "Save";
this.IDB_SAVE.UseVisualStyleBackColor = true;
this.IDB_SAVE.Click += new System.EventHandler(this.IDB_SAVE_Click);
//
// IDB_CANCEL
//
this.IDB_CANCEL.Location = new System.Drawing.Point(528, 9);
this.IDB_CANCEL.Name = "IDB_CANCEL";
this.IDB_CANCEL.Size = new System.Drawing.Size(80, 22);
this.IDB_CANCEL.TabIndex = 98;
this.IDB_CANCEL.TabStop = false;
this.IDB_CANCEL.Text = "Cancel";
this.IDB_CANCEL.UseVisualStyleBackColor = true;
this.IDB_CANCEL.Click += new System.EventHandler(this.button2_Click);
//
// label38
//
this.label38.AutoSize = true;
this.label38.Location = new System.Drawing.Point(22, 362);
this.label38.Name = "label38";
this.label38.Size = new System.Drawing.Size(153, 13);
this.label38.TabIndex = 3;
this.label38.Text = "* Escape clears a key mapping";
//
// IDW_TOOLBOX
//
this.IDW_TOOLBOX.Location = new System.Drawing.Point(293, 107);
this.IDW_TOOLBOX.Name = "IDW_TOOLBOX";
this.IDW_TOOLBOX.Size = new System.Drawing.Size(100, 20);
this.IDW_TOOLBOX.TabIndex = 15;
//
// IDW_FRAMEADVANCE
//
this.IDW_FRAMEADVANCE.AcceptsTab = true;
this.IDW_FRAMEADVANCE.BackColor = System.Drawing.SystemColors.Window;
this.IDW_FRAMEADVANCE.Location = new System.Drawing.Point(92, 8);
this.IDW_FRAMEADVANCE.Name = "IDW_FRAMEADVANCE";
this.IDW_FRAMEADVANCE.Size = new System.Drawing.Size(100, 20);
this.IDW_FRAMEADVANCE.TabIndex = 1;
//
// IDW_FULLSCREEN
//
this.IDW_FULLSCREEN.AcceptsTab = true;
this.IDW_FULLSCREEN.BackColor = System.Drawing.SystemColors.Window;
this.IDW_FULLSCREEN.Location = new System.Drawing.Point(293, 80);
this.IDW_FULLSCREEN.Name = "IDW_FULLSCREEN";
this.IDW_FULLSCREEN.Size = new System.Drawing.Size(100, 20);
this.IDW_FULLSCREEN.TabIndex = 9;
//
// IDW_SCREENSHOT
//
this.IDW_SCREENSHOT.AcceptsTab = true;
this.IDW_SCREENSHOT.BackColor = System.Drawing.SystemColors.Window;
this.IDW_SCREENSHOT.Location = new System.Drawing.Point(293, 56);
this.IDW_SCREENSHOT.Name = "IDW_SCREENSHOT";
this.IDW_SCREENSHOT.Size = new System.Drawing.Size(100, 20);
this.IDW_SCREENSHOT.TabIndex = 8;
//
// IDW_REWIND
//
this.IDW_REWIND.AcceptsTab = true;
this.IDW_REWIND.BackColor = System.Drawing.SystemColors.Window;
this.IDW_REWIND.Location = new System.Drawing.Point(92, 104);
this.IDW_REWIND.Name = "IDW_REWIND";
this.IDW_REWIND.Size = new System.Drawing.Size(100, 20);
this.IDW_REWIND.TabIndex = 5;
//
// IDW_FASTFORWARD
//
this.IDW_FASTFORWARD.AcceptsTab = true;
this.IDW_FASTFORWARD.BackColor = System.Drawing.SystemColors.Window;
this.IDW_FASTFORWARD.Location = new System.Drawing.Point(92, 80);
this.IDW_FASTFORWARD.Name = "IDW_FASTFORWARD";
this.IDW_FASTFORWARD.Size = new System.Drawing.Size(100, 20);
this.IDW_FASTFORWARD.TabIndex = 4;
//
// IDW_HARDRESET
//
this.IDW_HARDRESET.AcceptsTab = true;
this.IDW_HARDRESET.BackColor = System.Drawing.SystemColors.Window;
this.IDW_HARDRESET.Location = new System.Drawing.Point(92, 56);
this.IDW_HARDRESET.Name = "IDW_HARDRESET";
this.IDW_HARDRESET.Size = new System.Drawing.Size(100, 20);
this.IDW_HARDRESET.TabIndex = 3;
//
// IDW_PAUSE
//
this.IDW_PAUSE.AcceptsTab = true;
this.IDW_PAUSE.BackColor = System.Drawing.SystemColors.Window;
this.IDW_PAUSE.Location = new System.Drawing.Point(92, 33);
this.IDW_PAUSE.Name = "IDW_PAUSE";
this.IDW_PAUSE.Size = new System.Drawing.Size(100, 20);
this.IDW_PAUSE.TabIndex = 2;
//
// IDW_QuickLoad
//
this.IDW_QuickLoad.AcceptsTab = true;
this.IDW_QuickLoad.BackColor = System.Drawing.SystemColors.Window;
this.IDW_QuickLoad.Location = new System.Drawing.Point(293, 32);
this.IDW_QuickLoad.Name = "IDW_QuickLoad";
this.IDW_QuickLoad.Size = new System.Drawing.Size(100, 20);
this.IDW_QuickLoad.TabIndex = 7;
//
// IDW_QuickSave
//
this.IDW_QuickSave.AcceptsTab = true;
this.IDW_QuickSave.BackColor = System.Drawing.SystemColors.Window;
this.IDW_QuickSave.Location = new System.Drawing.Point(293, 8);
this.IDW_QuickSave.Name = "IDW_QuickSave";
this.IDW_QuickSave.Size = new System.Drawing.Size(100, 20);
this.IDW_QuickSave.TabIndex = 6;
//
// IDW_LOADNAMEDSTATE
//
this.IDW_LOADNAMEDSTATE.Location = new System.Drawing.Point(155, 287);
this.IDW_LOADNAMEDSTATE.Name = "IDW_LOADNAMEDSTATE";
this.IDW_LOADNAMEDSTATE.Size = new System.Drawing.Size(100, 20);
this.IDW_LOADNAMEDSTATE.TabIndex = 121;
//
// IDW_SAVENAMEDSTATE
//
this.IDW_SAVENAMEDSTATE.Location = new System.Drawing.Point(154, 261);
this.IDW_SAVENAMEDSTATE.Name = "IDW_SAVENAMEDSTATE";
this.IDW_SAVENAMEDSTATE.Size = new System.Drawing.Size(100, 20);
this.IDW_SAVENAMEDSTATE.TabIndex = 119;
//
// IDW_SS1
//
this.IDW_SS1.BackColor = System.Drawing.SystemColors.Window;
this.IDW_SS1.Location = new System.Drawing.Point(88, 6);
this.IDW_SS1.Name = "IDW_SS1";
this.IDW_SS1.Size = new System.Drawing.Size(100, 20);
this.IDW_SS1.TabIndex = 61;
//
// IDW_ST7
//
this.IDW_ST7.Location = new System.Drawing.Point(468, 150);
this.IDW_ST7.Name = "IDW_ST7";
this.IDW_ST7.Size = new System.Drawing.Size(100, 20);
this.IDW_ST7.TabIndex = 107;
//
// IDW_ST0
//
this.IDW_ST0.Location = new System.Drawing.Point(468, 222);
this.IDW_ST0.Name = "IDW_ST0";
this.IDW_ST0.Size = new System.Drawing.Size(100, 20);
this.IDW_ST0.TabIndex = 110;
//
// IDW_ST9 // IDW_ST9
// //
this.IDW_ST9.Location = new System.Drawing.Point(468, 198); this.IDW_ST9.Location = new System.Drawing.Point(468, 198);
@ -954,26 +1058,6 @@
this.IDW_SS2.Size = new System.Drawing.Size(100, 20); this.IDW_SS2.Size = new System.Drawing.Size(100, 20);
this.IDW_SS2.TabIndex = 64; this.IDW_SS2.TabIndex = 64;
// //
// tabPage3
//
this.tabPage3.Controls.Add(this.IDW_TOGGLEMTRACK);
this.tabPage3.Controls.Add(this.IDW_MTDECPLAYER);
this.tabPage3.Controls.Add(this.IDW_MTINCPLAYER);
this.tabPage3.Controls.Add(this.label43);
this.tabPage3.Controls.Add(this.label42);
this.tabPage3.Controls.Add(this.label41);
this.tabPage3.Controls.Add(this.label40);
this.tabPage3.Controls.Add(this.label39);
this.tabPage3.Controls.Add(this.IDW_SELECTNONE);
this.tabPage3.Controls.Add(this.IDW_MTSELECTALL);
this.tabPage3.Location = new System.Drawing.Point(4, 28);
this.tabPage3.Name = "tabPage3";
this.tabPage3.Padding = new System.Windows.Forms.Padding(3);
this.tabPage3.Size = new System.Drawing.Size(590, 296);
this.tabPage3.TabIndex = 2;
this.tabPage3.Text = "MultiTrack";
this.tabPage3.UseVisualStyleBackColor = true;
//
// IDW_TOGGLEMTRACK // IDW_TOGGLEMTRACK
// //
this.IDW_TOGGLEMTRACK.AcceptsTab = true; this.IDW_TOGGLEMTRACK.AcceptsTab = true;
@ -1001,51 +1085,6 @@
this.IDW_MTINCPLAYER.Size = new System.Drawing.Size(100, 20); this.IDW_MTINCPLAYER.Size = new System.Drawing.Size(100, 20);
this.IDW_MTINCPLAYER.TabIndex = 75; this.IDW_MTINCPLAYER.TabIndex = 75;
// //
// label43
//
this.label43.AutoSize = true;
this.label43.Location = new System.Drawing.Point(6, 103);
this.label43.Name = "label43";
this.label43.Size = new System.Drawing.Size(91, 13);
this.label43.TabIndex = 74;
this.label43.Text = "Decrement Player";
//
// label42
//
this.label42.AutoSize = true;
this.label42.Location = new System.Drawing.Point(6, 81);
this.label42.Name = "label42";
this.label42.Size = new System.Drawing.Size(86, 13);
this.label42.TabIndex = 73;
this.label42.Text = "Increment Player";
//
// label41
//
this.label41.AutoSize = true;
this.label41.Location = new System.Drawing.Point(6, 59);
this.label41.Name = "label41";
this.label41.Size = new System.Drawing.Size(66, 13);
this.label41.TabIndex = 71;
this.label41.Text = "Select None";
//
// label40
//
this.label40.AutoSize = true;
this.label40.Location = new System.Drawing.Point(6, 35);
this.label40.Name = "label40";
this.label40.Size = new System.Drawing.Size(51, 13);
this.label40.TabIndex = 69;
this.label40.Text = "Select All";
//
// label39
//
this.label39.AutoSize = true;
this.label39.Location = new System.Drawing.Point(6, 12);
this.label39.Name = "label39";
this.label39.Size = new System.Drawing.Size(93, 13);
this.label39.TabIndex = 67;
this.label39.Text = "Toggle MultiTrack";
//
// IDW_SELECTNONE // IDW_SELECTNONE
// //
this.IDW_SELECTNONE.AcceptsTab = true; this.IDW_SELECTNONE.AcceptsTab = true;
@ -1064,42 +1103,43 @@
this.IDW_MTSELECTALL.Size = new System.Drawing.Size(100, 20); this.IDW_MTSELECTALL.Size = new System.Drawing.Size(100, 20);
this.IDW_MTSELECTALL.TabIndex = 70; this.IDW_MTSELECTALL.TabIndex = 70;
// //
// IDB_SAVE // IDW_PREVIOUSSLOT
// //
this.IDB_SAVE.Location = new System.Drawing.Point(441, 9); this.IDW_PREVIOUSSLOT.Location = new System.Drawing.Point(361, 265);
this.IDB_SAVE.Name = "IDB_SAVE"; this.IDW_PREVIOUSSLOT.Name = "IDW_PREVIOUSSLOT";
this.IDB_SAVE.Size = new System.Drawing.Size(82, 22); this.IDW_PREVIOUSSLOT.Size = new System.Drawing.Size(100, 20);
this.IDB_SAVE.TabIndex = 99; this.IDW_PREVIOUSSLOT.TabIndex = 123;
this.IDB_SAVE.TabStop = false;
this.IDB_SAVE.Text = "Save";
this.IDB_SAVE.UseVisualStyleBackColor = true;
this.IDB_SAVE.Click += new System.EventHandler(this.IDB_SAVE_Click);
// //
// IDB_CANCEL // IDW_NEXTSLOT
// //
this.IDB_CANCEL.Location = new System.Drawing.Point(528, 9); this.IDW_NEXTSLOT.Location = new System.Drawing.Point(361, 288);
this.IDB_CANCEL.Name = "IDB_CANCEL"; this.IDW_NEXTSLOT.Name = "IDW_NEXTSLOT";
this.IDB_CANCEL.Size = new System.Drawing.Size(80, 22); this.IDW_NEXTSLOT.Size = new System.Drawing.Size(100, 20);
this.IDB_CANCEL.TabIndex = 98; this.IDW_NEXTSLOT.TabIndex = 124;
this.IDB_CANCEL.TabStop = false;
this.IDB_CANCEL.Text = "Cancel";
this.IDB_CANCEL.UseVisualStyleBackColor = true;
this.IDB_CANCEL.Click += new System.EventHandler(this.button2_Click);
// //
// label38 // label49
// //
this.label38.AutoSize = true; this.label49.AutoSize = true;
this.label38.Location = new System.Drawing.Point(22, 343); this.label49.Location = new System.Drawing.Point(284, 268);
this.label38.Name = "label38"; this.label49.Name = "label49";
this.label38.Size = new System.Drawing.Size(153, 13); this.label49.Size = new System.Drawing.Size(69, 13);
this.label38.TabIndex = 3; this.label49.TabIndex = 125;
this.label38.Text = "* Escape clears a key mapping"; this.label49.Text = "Previous Slot";
//
// label50
//
this.label50.AutoSize = true;
this.label50.Location = new System.Drawing.Point(303, 291);
this.label50.Name = "label50";
this.label50.Size = new System.Drawing.Size(50, 13);
this.label50.TabIndex = 126;
this.label50.Text = "Next Slot";
// //
// HotkeyWindow // HotkeyWindow
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(622, 362); this.ClientSize = new System.Drawing.Size(622, 380);
this.Controls.Add(this.label38); this.Controls.Add(this.label38);
this.Controls.Add(this.IDB_CANCEL); this.Controls.Add(this.IDB_CANCEL);
this.Controls.Add(this.IDB_SAVE); this.Controls.Add(this.IDB_SAVE);
@ -1226,5 +1266,9 @@
private System.Windows.Forms.Label label47; private System.Windows.Forms.Label label47;
private InputWidget IDW_SAVENAMEDSTATE; private InputWidget IDW_SAVENAMEDSTATE;
private BizHawk.Core.HorizontalLine HR; private BizHawk.Core.HorizontalLine HR;
private System.Windows.Forms.Label label50;
private System.Windows.Forms.Label label49;
private InputWidget IDW_NEXTSLOT;
private InputWidget IDW_PREVIOUSSLOT;
} }
} }

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

@ -60,6 +60,8 @@ namespace BizHawk.MultiClient.tools
IDW_TOOLBOX.Text = Global.Config.ToolBox; IDW_TOOLBOX.Text = Global.Config.ToolBox;
IDW_SAVENAMEDSTATE.Text = Global.Config.SaveNamedState; IDW_SAVENAMEDSTATE.Text = Global.Config.SaveNamedState;
IDW_LOADNAMEDSTATE.Text = Global.Config.LoadNamedState; IDW_LOADNAMEDSTATE.Text = Global.Config.LoadNamedState;
IDW_NEXTSLOT.Text = Global.Config.NextSlot;
IDW_PREVIOUSSLOT.Text = Global.Config.PreviousSlot;
} }
private void button2_Click(object sender, EventArgs e) private void button2_Click(object sender, EventArgs e)
{ {
@ -115,6 +117,9 @@ namespace BizHawk.MultiClient.tools
Global.Config.ToolBox = IDW_TOOLBOX.Text; Global.Config.ToolBox = IDW_TOOLBOX.Text;
Global.Config.SaveNamedState = IDW_SAVENAMEDSTATE.Text; Global.Config.SaveNamedState = IDW_SAVENAMEDSTATE.Text;
Global.Config.LoadNamedState = IDW_LOADNAMEDSTATE.Text; Global.Config.LoadNamedState = IDW_LOADNAMEDSTATE.Text;
Global.Config.PreviousSlot = IDW_PREVIOUSSLOT.Text;
Global.Config.NextSlot = IDW_NEXTSLOT.Text;
this.DialogResult = DialogResult.OK; this.DialogResult = DialogResult.OK;
this.Close(); this.Close();
} }