Hotkeys for Display FPS, Frame Counter, Lag Counter, Input Display

This commit is contained in:
andres.delikat 2011-04-16 20:12:16 +00:00
parent d7148424aa
commit 3c9cb66523
6 changed files with 517 additions and 363 deletions

View File

@ -201,6 +201,10 @@
public string Cheats = ""; public string Cheats = "";
public string OpenROM = ""; public string OpenROM = "";
public string CloseROM = ""; public string CloseROM = "";
public string FrameCounterBinding = "";
public string FPSBinding = "";
public string LagCounterBinding = "";
public string InputDisplayBinding = "";
// SMS / GameGear Settings // SMS / GameGear Settings
public bool SmsEnableFM = true; public bool SmsEnableFM = true;

View File

@ -217,8 +217,7 @@
// openROMToolStripMenuItem // openROMToolStripMenuItem
// //
this.openROMToolStripMenuItem.Name = "openROMToolStripMenuItem"; this.openROMToolStripMenuItem.Name = "openROMToolStripMenuItem";
this.openROMToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); this.openROMToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.openROMToolStripMenuItem.Size = new System.Drawing.Size(177, 22);
this.openROMToolStripMenuItem.Text = "Open ROM"; this.openROMToolStripMenuItem.Text = "Open ROM";
this.openROMToolStripMenuItem.Click += new System.EventHandler(this.openROMToolStripMenuItem_Click); this.openROMToolStripMenuItem.Click += new System.EventHandler(this.openROMToolStripMenuItem_Click);
// //
@ -230,7 +229,7 @@
this.clearToolStripMenuItem, this.clearToolStripMenuItem,
this.autoloadMostRecentToolStripMenuItem}); this.autoloadMostRecentToolStripMenuItem});
this.recentROMToolStripMenuItem.Name = "recentROMToolStripMenuItem"; this.recentROMToolStripMenuItem.Name = "recentROMToolStripMenuItem";
this.recentROMToolStripMenuItem.Size = new System.Drawing.Size(177, 22); this.recentROMToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.recentROMToolStripMenuItem.Text = "Recent ROM"; this.recentROMToolStripMenuItem.Text = "Recent ROM";
this.recentROMToolStripMenuItem.DropDownOpened += new System.EventHandler(this.recentROMToolStripMenuItem_DropDownOpened); this.recentROMToolStripMenuItem.DropDownOpened += new System.EventHandler(this.recentROMToolStripMenuItem_DropDownOpened);
// //
@ -262,14 +261,14 @@
// closeROMToolStripMenuItem // closeROMToolStripMenuItem
// //
this.closeROMToolStripMenuItem.Name = "closeROMToolStripMenuItem"; this.closeROMToolStripMenuItem.Name = "closeROMToolStripMenuItem";
this.closeROMToolStripMenuItem.Size = new System.Drawing.Size(177, 22); this.closeROMToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.closeROMToolStripMenuItem.Text = "&Close ROM"; this.closeROMToolStripMenuItem.Text = "&Close ROM";
this.closeROMToolStripMenuItem.Click += new System.EventHandler(this.closeROMToolStripMenuItem_Click); this.closeROMToolStripMenuItem.Click += new System.EventHandler(this.closeROMToolStripMenuItem_Click);
// //
// toolStripMenuItem1 // toolStripMenuItem1
// //
this.toolStripMenuItem1.Name = "toolStripMenuItem1"; this.toolStripMenuItem1.Name = "toolStripMenuItem1";
this.toolStripMenuItem1.Size = new System.Drawing.Size(174, 6); this.toolStripMenuItem1.Size = new System.Drawing.Size(149, 6);
// //
// saveStateToolStripMenuItem // saveStateToolStripMenuItem
// //
@ -287,7 +286,7 @@
this.toolStripSeparator6, this.toolStripSeparator6,
this.saveNamedStateToolStripMenuItem}); this.saveNamedStateToolStripMenuItem});
this.saveStateToolStripMenuItem.Name = "saveStateToolStripMenuItem"; this.saveStateToolStripMenuItem.Name = "saveStateToolStripMenuItem";
this.saveStateToolStripMenuItem.Size = new System.Drawing.Size(177, 22); this.saveStateToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.saveStateToolStripMenuItem.Text = "Save State"; this.saveStateToolStripMenuItem.Text = "Save State";
this.saveStateToolStripMenuItem.DropDownOpened += new System.EventHandler(this.saveStateToolStripMenuItem_DropDownOpened); this.saveStateToolStripMenuItem.DropDownOpened += new System.EventHandler(this.saveStateToolStripMenuItem_DropDownOpened);
// //
@ -389,7 +388,7 @@
this.toolStripSeparator7, this.toolStripSeparator7,
this.loadNamedStateToolStripMenuItem}); this.loadNamedStateToolStripMenuItem});
this.loadStateToolStripMenuItem.Name = "loadStateToolStripMenuItem"; this.loadStateToolStripMenuItem.Name = "loadStateToolStripMenuItem";
this.loadStateToolStripMenuItem.Size = new System.Drawing.Size(177, 22); this.loadStateToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.loadStateToolStripMenuItem.Text = "Load State"; this.loadStateToolStripMenuItem.Text = "Load State";
this.loadStateToolStripMenuItem.DropDownOpened += new System.EventHandler(this.loadStateToolStripMenuItem_DropDownOpened); this.loadStateToolStripMenuItem.DropDownOpened += new System.EventHandler(this.loadStateToolStripMenuItem_DropDownOpened);
// //
@ -494,7 +493,7 @@
this.saveToCurrentSlotToolStripMenuItem, this.saveToCurrentSlotToolStripMenuItem,
this.loadCurrentSlotToolStripMenuItem}); this.loadCurrentSlotToolStripMenuItem});
this.saveSlotToolStripMenuItem.Name = "saveSlotToolStripMenuItem"; this.saveSlotToolStripMenuItem.Name = "saveSlotToolStripMenuItem";
this.saveSlotToolStripMenuItem.Size = new System.Drawing.Size(177, 22); this.saveSlotToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.saveSlotToolStripMenuItem.Text = "SaveSlot"; this.saveSlotToolStripMenuItem.Text = "SaveSlot";
this.saveSlotToolStripMenuItem.DropDownOpened += new System.EventHandler(this.saveSlotToolStripMenuItem_DropDownOpened); this.saveSlotToolStripMenuItem.DropDownOpened += new System.EventHandler(this.saveSlotToolStripMenuItem_DropDownOpened);
// //
@ -604,7 +603,7 @@
// toolStripMenuItem2 // toolStripMenuItem2
// //
this.toolStripMenuItem2.Name = "toolStripMenuItem2"; this.toolStripMenuItem2.Name = "toolStripMenuItem2";
this.toolStripMenuItem2.Size = new System.Drawing.Size(174, 6); this.toolStripMenuItem2.Size = new System.Drawing.Size(149, 6);
// //
// movieToolStripMenuItem // movieToolStripMenuItem
// //
@ -616,7 +615,7 @@
this.playFromBeginningToolStripMenuItem, this.playFromBeginningToolStripMenuItem,
this.replayInputLogToolStripMenuItem}); this.replayInputLogToolStripMenuItem});
this.movieToolStripMenuItem.Name = "movieToolStripMenuItem"; this.movieToolStripMenuItem.Name = "movieToolStripMenuItem";
this.movieToolStripMenuItem.Size = new System.Drawing.Size(177, 22); this.movieToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.movieToolStripMenuItem.Text = "Movie"; this.movieToolStripMenuItem.Text = "Movie";
// //
// recentToolStripMenuItem // recentToolStripMenuItem
@ -663,20 +662,20 @@
// screenshotF12ToolStripMenuItem // screenshotF12ToolStripMenuItem
// //
this.screenshotF12ToolStripMenuItem.Name = "screenshotF12ToolStripMenuItem"; this.screenshotF12ToolStripMenuItem.Name = "screenshotF12ToolStripMenuItem";
this.screenshotF12ToolStripMenuItem.Size = new System.Drawing.Size(177, 22); this.screenshotF12ToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.screenshotF12ToolStripMenuItem.Text = "Screenshot"; this.screenshotF12ToolStripMenuItem.Text = "Screenshot";
this.screenshotF12ToolStripMenuItem.Click += new System.EventHandler(this.screenshotF12ToolStripMenuItem_Click); this.screenshotF12ToolStripMenuItem.Click += new System.EventHandler(this.screenshotF12ToolStripMenuItem_Click);
// //
// toolStripSeparator4 // toolStripSeparator4
// //
this.toolStripSeparator4.Name = "toolStripSeparator4"; this.toolStripSeparator4.Name = "toolStripSeparator4";
this.toolStripSeparator4.Size = new System.Drawing.Size(174, 6); this.toolStripSeparator4.Size = new System.Drawing.Size(149, 6);
// //
// exitToolStripMenuItem // exitToolStripMenuItem
// //
this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; this.exitToolStripMenuItem.Name = "exitToolStripMenuItem";
this.exitToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4))); this.exitToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4)));
this.exitToolStripMenuItem.Size = new System.Drawing.Size(177, 22); this.exitToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.exitToolStripMenuItem.Text = "Exit"; this.exitToolStripMenuItem.Text = "Exit";
this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click);
// //
@ -1158,59 +1157,59 @@
// toolBoxToolStripMenuItem // toolBoxToolStripMenuItem
// //
this.toolBoxToolStripMenuItem.Name = "toolBoxToolStripMenuItem"; this.toolBoxToolStripMenuItem.Name = "toolBoxToolStripMenuItem";
this.toolBoxToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.toolBoxToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
this.toolBoxToolStripMenuItem.Text = "&Tool Box"; this.toolBoxToolStripMenuItem.Text = "&Tool Box";
this.toolBoxToolStripMenuItem.Click += new System.EventHandler(this.toolBoxToolStripMenuItem_Click); this.toolBoxToolStripMenuItem.Click += new System.EventHandler(this.toolBoxToolStripMenuItem_Click);
// //
// toolStripSeparator12 // toolStripSeparator12
// //
this.toolStripSeparator12.Name = "toolStripSeparator12"; this.toolStripSeparator12.Name = "toolStripSeparator12";
this.toolStripSeparator12.Size = new System.Drawing.Size(149, 6); this.toolStripSeparator12.Size = new System.Drawing.Size(140, 6);
// //
// rAMWatchToolStripMenuItem // rAMWatchToolStripMenuItem
// //
this.rAMWatchToolStripMenuItem.Name = "rAMWatchToolStripMenuItem"; this.rAMWatchToolStripMenuItem.Name = "rAMWatchToolStripMenuItem";
this.rAMWatchToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.rAMWatchToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
this.rAMWatchToolStripMenuItem.Text = "RAM &Watch"; this.rAMWatchToolStripMenuItem.Text = "RAM &Watch";
this.rAMWatchToolStripMenuItem.Click += new System.EventHandler(this.RAMWatchToolStripMenuItem_Click); this.rAMWatchToolStripMenuItem.Click += new System.EventHandler(this.RAMWatchToolStripMenuItem_Click);
// //
// rAMSearchToolStripMenuItem // rAMSearchToolStripMenuItem
// //
this.rAMSearchToolStripMenuItem.Name = "rAMSearchToolStripMenuItem"; this.rAMSearchToolStripMenuItem.Name = "rAMSearchToolStripMenuItem";
this.rAMSearchToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.rAMSearchToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
this.rAMSearchToolStripMenuItem.Text = "RAM &Search"; this.rAMSearchToolStripMenuItem.Text = "RAM &Search";
this.rAMSearchToolStripMenuItem.Click += new System.EventHandler(this.rAMSearchToolStripMenuItem_Click); this.rAMSearchToolStripMenuItem.Click += new System.EventHandler(this.rAMSearchToolStripMenuItem_Click);
// //
// rAMPokeToolStripMenuItem // rAMPokeToolStripMenuItem
// //
this.rAMPokeToolStripMenuItem.Name = "rAMPokeToolStripMenuItem"; this.rAMPokeToolStripMenuItem.Name = "rAMPokeToolStripMenuItem";
this.rAMPokeToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.rAMPokeToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
this.rAMPokeToolStripMenuItem.Text = "RAM &Poke"; this.rAMPokeToolStripMenuItem.Text = "RAM &Poke";
this.rAMPokeToolStripMenuItem.Click += new System.EventHandler(this.RAMPokeToolStripMenuItem_Click); this.rAMPokeToolStripMenuItem.Click += new System.EventHandler(this.RAMPokeToolStripMenuItem_Click);
// //
// hexEditorToolStripMenuItem // hexEditorToolStripMenuItem
// //
this.hexEditorToolStripMenuItem.Name = "hexEditorToolStripMenuItem"; this.hexEditorToolStripMenuItem.Name = "hexEditorToolStripMenuItem";
this.hexEditorToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.hexEditorToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
this.hexEditorToolStripMenuItem.Text = "&Hex Editor"; this.hexEditorToolStripMenuItem.Text = "&Hex Editor";
this.hexEditorToolStripMenuItem.Click += new System.EventHandler(this.hexEditorToolStripMenuItem_Click); this.hexEditorToolStripMenuItem.Click += new System.EventHandler(this.hexEditorToolStripMenuItem_Click);
// //
// toolStripSeparator11 // toolStripSeparator11
// //
this.toolStripSeparator11.Name = "toolStripSeparator11"; this.toolStripSeparator11.Name = "toolStripSeparator11";
this.toolStripSeparator11.Size = new System.Drawing.Size(149, 6); this.toolStripSeparator11.Size = new System.Drawing.Size(140, 6);
// //
// luaConsoleToolStripMenuItem // luaConsoleToolStripMenuItem
// //
this.luaConsoleToolStripMenuItem.Name = "luaConsoleToolStripMenuItem"; this.luaConsoleToolStripMenuItem.Name = "luaConsoleToolStripMenuItem";
this.luaConsoleToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.luaConsoleToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
this.luaConsoleToolStripMenuItem.Text = "Lua Console"; this.luaConsoleToolStripMenuItem.Text = "Lua Console";
this.luaConsoleToolStripMenuItem.Click += new System.EventHandler(this.luaConsoleToolStripMenuItem_Click); this.luaConsoleToolStripMenuItem.Click += new System.EventHandler(this.luaConsoleToolStripMenuItem_Click);
// //
// cheatsToolStripMenuItem // cheatsToolStripMenuItem
// //
this.cheatsToolStripMenuItem.Name = "cheatsToolStripMenuItem"; this.cheatsToolStripMenuItem.Name = "cheatsToolStripMenuItem";
this.cheatsToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.cheatsToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
this.cheatsToolStripMenuItem.Text = "Cheats"; this.cheatsToolStripMenuItem.Text = "Cheats";
this.cheatsToolStripMenuItem.Click += new System.EventHandler(this.cheatsToolStripMenuItem_Click); this.cheatsToolStripMenuItem.Click += new System.EventHandler(this.cheatsToolStripMenuItem_Click);
// //

View File

@ -313,22 +313,22 @@ namespace BizHawk.MultiClient
private void displayFPSToolStripMenuItem_Click(object sender, EventArgs e) private void displayFPSToolStripMenuItem_Click(object sender, EventArgs e)
{ {
Global.Config.DisplayFPS ^= true; ToggleFPS();
} }
private void displayFrameCounterToolStripMenuItem_Click(object sender, EventArgs e) private void displayFrameCounterToolStripMenuItem_Click(object sender, EventArgs e)
{ {
Global.Config.DisplayFrameCounter ^= true; ToggleFrameCounter();
} }
private void displayInputToolStripMenuItem_Click(object sender, EventArgs e) private void displayInputToolStripMenuItem_Click(object sender, EventArgs e)
{ {
Global.Config.DisplayInput ^= true; ToggleInputDisplay();
} }
private void displayLagCounterToolStripMenuItem_Click(object sender, EventArgs e) private void displayLagCounterToolStripMenuItem_Click(object sender, EventArgs e)
{ {
Global.Config.DisplayLagCounter ^= true; ToggleLagCounter();
} }
private void screenshotF12ToolStripMenuItem_Click(object sender, EventArgs e) private void screenshotF12ToolStripMenuItem_Click(object sender, EventArgs e)

View File

@ -260,8 +260,8 @@ 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", "Previous Slot", "Next Slot", "LoadSlot7","LoadSlot8","LoadSlot9", "ToolBox", "Previous Slot", "Next Slot", "Ram Watch", "Ram Search", "Ram Poke", "Hex Editor",
"Ram Watch", "Ram Search", "Ram Poke", "Hex Editor", "Lua Console", "Cheats", "Open ROM", "Close ROM"} "Lua Console", "Cheats", "Open ROM", "Close ROM", "Display FPS", "Display FrameCounter", "Display LagCounter", "Display Input"}
}; };
private void InitControls() private void InitControls()
@ -320,6 +320,10 @@ namespace BizHawk.MultiClient
controls.BindMulti("Cheats", Global.Config.Cheats); controls.BindMulti("Cheats", Global.Config.Cheats);
controls.BindMulti("Open ROM", Global.Config.OpenROM); controls.BindMulti("Open ROM", Global.Config.OpenROM);
controls.BindMulti("Close ROM", Global.Config.CloseROM); controls.BindMulti("Close ROM", Global.Config.CloseROM);
controls.BindMulti("Display FPS", Global.Config.FPSBinding);
controls.BindMulti("Display FrameCounter", Global.Config.FrameCounterBinding);
controls.BindMulti("Display LagCounter", Global.Config.LagCounterBinding);
controls.BindMulti("Display Input", Global.Config.InputDisplayBinding);
Global.ClientControls = controls; Global.ClientControls = controls;
@ -804,6 +808,30 @@ namespace BizHawk.MultiClient
CloseROM(); CloseROM();
Global.ClientControls.UnpressButton("Close ROM"); Global.ClientControls.UnpressButton("Close ROM");
} }
//"Display LagCounter", "Display Input"}
if (Global.ClientControls["Display FPS"])
{
ToggleFPS();
Global.ClientControls.UnpressButton("Display FPS");
}
if (Global.ClientControls["Display FrameCounter"])
{
ToggleFrameCounter();
Global.ClientControls.UnpressButton("Display FrameCounter");
}
if (Global.ClientControls["Display LagCounter"])
{
ToggleLagCounter();
Global.ClientControls.UnpressButton("Display LagCounter");
}
if (Global.ClientControls["Display Input"])
{
ToggleInputDisplay();
Global.ClientControls.UnpressButton("Display Input");
}
} }
void StepRunLoop_Throttle() void StepRunLoop_Throttle()
@ -1071,8 +1099,6 @@ namespace BizHawk.MultiClient
loadstate8toolStripMenuItem.Enabled = false; loadstate8toolStripMenuItem.Enabled = false;
loadstate9toolStripMenuItem.Enabled = false; loadstate9toolStripMenuItem.Enabled = false;
loadstate0toolStripMenuItem.Enabled = false; loadstate0toolStripMenuItem.Enabled = false;
screenshotF12ToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.ScreenshotBinding;
} }
else else
{ {
@ -1113,9 +1139,9 @@ namespace BizHawk.MultiClient
selectSlot6ToolStripMenuItem.Checked = false; selectSlot6ToolStripMenuItem.Checked = false;
selectSlot7ToolStripMenuItem.Checked = false; selectSlot7ToolStripMenuItem.Checked = false;
selectSlot8ToolStripMenuItem.Checked = false; selectSlot8ToolStripMenuItem.Checked = false;
selectSlot9ToolStripMenuItem.Checked = false; selectSlot9ToolStripMenuItem.Checked = false;
selectSlot1ToolStripMenuItem.Checked = false; selectSlot1ToolStripMenuItem.Checked = false;
switch (SaveSlot) switch (SaveSlot)
{ {
case 0: case 0:
@ -1158,6 +1184,8 @@ namespace BizHawk.MultiClient
autoloadMostRecentToolStripMenuItem.Checked = false; autoloadMostRecentToolStripMenuItem.Checked = false;
screenshotF12ToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.ScreenshotBinding; screenshotF12ToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.ScreenshotBinding;
openROMToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.OpenROM;
closeROMToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.CloseROM;
} }
private void recentROMToolStripMenuItem_DropDownOpened(object sender, EventArgs e) private void recentROMToolStripMenuItem_DropDownOpened(object sender, EventArgs e)
@ -1378,6 +1406,11 @@ namespace BizHawk.MultiClient
displayLagCounterToolStripMenuItem.Checked = Global.Config.DisplayLagCounter; displayLagCounterToolStripMenuItem.Checked = Global.Config.DisplayLagCounter;
displayInputToolStripMenuItem.Checked = Global.Config.DisplayInput; displayInputToolStripMenuItem.Checked = Global.Config.DisplayInput;
displayFPSToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.FPSBinding;
displayFrameCounterToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.FrameCounterBinding;
displayLagCounterToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.LagCounterBinding;
displayInputToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.InputDisplayBinding;
x1MenuItem.Checked = false; x1MenuItem.Checked = false;
x2MenuItem.Checked = false; x2MenuItem.Checked = false;
x3MenuItem.Checked = false; x3MenuItem.Checked = false;
@ -1537,5 +1570,25 @@ namespace BizHawk.MultiClient
else SaveSlot++; else SaveSlot++;
SaveSlotSelectedMessage(); SaveSlotSelectedMessage();
} }
private void ToggleFPS()
{
Global.Config.DisplayFPS ^= true;
}
private void ToggleFrameCounter()
{
Global.Config.DisplayFrameCounter ^= true;
}
private void ToggleLagCounter()
{
Global.Config.DisplayLagCounter ^= true;
}
private void ToggleInputDisplay()
{
Global.Config.DisplayInput ^= true;
}
} }
} }

View File

@ -31,15 +31,30 @@
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_DisplayFPS = new BizHawk.MultiClient.InputWidget();
this.label59 = new System.Windows.Forms.Label();
this.IDW_CloseROM = new BizHawk.MultiClient.InputWidget();
this.label58 = new System.Windows.Forms.Label();
this.IDW_OpenROM = new BizHawk.MultiClient.InputWidget();
this.label57 = 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.label50 = new System.Windows.Forms.Label(); this.label50 = new System.Windows.Forms.Label();
this.label49 = new System.Windows.Forms.Label(); this.label49 = new System.Windows.Forms.Label();
@ -76,34 +91,6 @@
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.tabPage4 = new System.Windows.Forms.TabPage();
this.label46 = new System.Windows.Forms.Label();
this.label56 = new System.Windows.Forms.Label();
this.label55 = new System.Windows.Forms.Label();
this.label54 = new System.Windows.Forms.Label();
this.label53 = new System.Windows.Forms.Label();
this.label52 = new System.Windows.Forms.Label();
this.label51 = 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.label57 = new System.Windows.Forms.Label();
this.IDW_OpenROM = 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_NEXTSLOT = new BizHawk.MultiClient.InputWidget(); this.IDW_NEXTSLOT = new BizHawk.MultiClient.InputWidget();
this.IDW_PREVIOUSSLOT = new BizHawk.MultiClient.InputWidget(); this.IDW_PREVIOUSSLOT = new BizHawk.MultiClient.InputWidget();
this.IDW_LOADNAMEDSTATE = new BizHawk.MultiClient.InputWidget(); this.IDW_LOADNAMEDSTATE = new BizHawk.MultiClient.InputWidget();
@ -138,20 +125,41 @@
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.tabPage4 = new System.Windows.Forms.TabPage();
this.IDW_TOOLBOX = new BizHawk.MultiClient.InputWidget(); this.IDW_TOOLBOX = new BizHawk.MultiClient.InputWidget();
this.label46 = new System.Windows.Forms.Label();
this.label56 = new System.Windows.Forms.Label();
this.label55 = new System.Windows.Forms.Label();
this.label54 = new System.Windows.Forms.Label();
this.label53 = new System.Windows.Forms.Label();
this.label52 = new System.Windows.Forms.Label();
this.label51 = new System.Windows.Forms.Label();
this.IDW_Cheats = new BizHawk.MultiClient.InputWidget(); this.IDW_Cheats = new BizHawk.MultiClient.InputWidget();
this.IDW_LuaConsole = new BizHawk.MultiClient.InputWidget(); this.IDW_LuaConsole = new BizHawk.MultiClient.InputWidget();
this.IDW_HexEditor = new BizHawk.MultiClient.InputWidget(); this.IDW_HexEditor = new BizHawk.MultiClient.InputWidget();
this.IDW_RamPoke = new BizHawk.MultiClient.InputWidget(); this.IDW_RamPoke = new BizHawk.MultiClient.InputWidget();
this.IDW_RamSearch = new BizHawk.MultiClient.InputWidget(); this.IDW_RamSearch = new BizHawk.MultiClient.InputWidget();
this.IDW_RamWatch = new BizHawk.MultiClient.InputWidget(); this.IDW_RamWatch = new BizHawk.MultiClient.InputWidget();
this.IDW_CloseROM = new BizHawk.MultiClient.InputWidget(); this.IDB_SAVE = new System.Windows.Forms.Button();
this.label58 = new System.Windows.Forms.Label(); this.IDB_CANCEL = new System.Windows.Forms.Button();
this.label38 = new System.Windows.Forms.Label();
this.IDW_FrameCounter = new BizHawk.MultiClient.InputWidget();
this.label60 = new System.Windows.Forms.Label();
this.IDW_LagCounter = new BizHawk.MultiClient.InputWidget();
this.label61 = new System.Windows.Forms.Label();
this.IDW_InputDisplay = new BizHawk.MultiClient.InputWidget();
this.label62 = new System.Windows.Forms.Label();
this.hotkeyTabs.SuspendLayout(); this.hotkeyTabs.SuspendLayout();
this.tabPage1.SuspendLayout(); this.tabPage1.SuspendLayout();
this.tabPage2.SuspendLayout(); this.tabPage2.SuspendLayout();
@ -176,6 +184,14 @@
// //
// tabPage1 // tabPage1
// //
this.tabPage1.Controls.Add(this.IDW_InputDisplay);
this.tabPage1.Controls.Add(this.label62);
this.tabPage1.Controls.Add(this.IDW_LagCounter);
this.tabPage1.Controls.Add(this.label61);
this.tabPage1.Controls.Add(this.IDW_FrameCounter);
this.tabPage1.Controls.Add(this.label60);
this.tabPage1.Controls.Add(this.IDW_DisplayFPS);
this.tabPage1.Controls.Add(this.label59);
this.tabPage1.Controls.Add(this.IDW_CloseROM); this.tabPage1.Controls.Add(this.IDW_CloseROM);
this.tabPage1.Controls.Add(this.label58); this.tabPage1.Controls.Add(this.label58);
this.tabPage1.Controls.Add(this.IDW_OpenROM); this.tabPage1.Controls.Add(this.IDW_OpenROM);
@ -206,6 +222,69 @@
this.tabPage1.Text = "General"; this.tabPage1.Text = "General";
this.tabPage1.UseVisualStyleBackColor = true; this.tabPage1.UseVisualStyleBackColor = true;
// //
// IDW_DisplayFPS
//
this.IDW_DisplayFPS.AcceptsTab = true;
this.IDW_DisplayFPS.BackColor = System.Drawing.SystemColors.Window;
this.IDW_DisplayFPS.Location = new System.Drawing.Point(294, 104);
this.IDW_DisplayFPS.Name = "IDW_DisplayFPS";
this.IDW_DisplayFPS.Size = new System.Drawing.Size(100, 20);
this.IDW_DisplayFPS.TabIndex = 17;
//
// label59
//
this.label59.AutoSize = true;
this.label59.Location = new System.Drawing.Point(208, 107);
this.label59.Name = "label59";
this.label59.Size = new System.Drawing.Size(64, 13);
this.label59.TabIndex = 18;
this.label59.Text = "Display FPS";
//
// IDW_CloseROM
//
this.IDW_CloseROM.AcceptsTab = true;
this.IDW_CloseROM.BackColor = System.Drawing.SystemColors.Window;
this.IDW_CloseROM.Location = new System.Drawing.Point(295, 80);
this.IDW_CloseROM.Name = "IDW_CloseROM";
this.IDW_CloseROM.Size = new System.Drawing.Size(100, 20);
this.IDW_CloseROM.TabIndex = 15;
//
// label58
//
this.label58.AutoSize = true;
this.label58.Location = new System.Drawing.Point(209, 83);
this.label58.Name = "label58";
this.label58.Size = new System.Drawing.Size(61, 13);
this.label58.TabIndex = 16;
this.label58.Text = "Close ROM";
//
// IDW_OpenROM
//
this.IDW_OpenROM.AcceptsTab = true;
this.IDW_OpenROM.BackColor = System.Drawing.SystemColors.Window;
this.IDW_OpenROM.Location = new System.Drawing.Point(295, 56);
this.IDW_OpenROM.Name = "IDW_OpenROM";
this.IDW_OpenROM.Size = new System.Drawing.Size(100, 20);
this.IDW_OpenROM.TabIndex = 10;
//
// label57
//
this.label57.AutoSize = true;
this.label57.Location = new System.Drawing.Point(209, 59);
this.label57.Name = "label57";
this.label57.Size = new System.Drawing.Size(61, 13);
this.label57.TabIndex = 14;
this.label57.Text = "Open ROM";
//
// IDW_FRAMEADVANCE
//
this.IDW_FRAMEADVANCE.AcceptsTab = true;
this.IDW_FRAMEADVANCE.BackColor = System.Drawing.SystemColors.Window;
this.IDW_FRAMEADVANCE.Location = new System.Drawing.Point(92, 9);
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,6 +294,24 @@
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(295, 32);
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(295, 8);
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;
@ -224,6 +321,15 @@
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;
@ -233,6 +339,15 @@
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;
@ -242,6 +357,15 @@
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;
@ -251,6 +375,15 @@
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;
@ -278,6 +411,15 @@
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(92, 153);
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;
@ -287,6 +429,15 @@
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(92, 129);
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.label50);
@ -679,288 +830,6 @@
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, 315);
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";
//
// tabPage4
//
this.tabPage4.Controls.Add(this.IDW_TOOLBOX);
this.tabPage4.Controls.Add(this.label46);
this.tabPage4.Controls.Add(this.label56);
this.tabPage4.Controls.Add(this.label55);
this.tabPage4.Controls.Add(this.label54);
this.tabPage4.Controls.Add(this.label53);
this.tabPage4.Controls.Add(this.label52);
this.tabPage4.Controls.Add(this.label51);
this.tabPage4.Controls.Add(this.IDW_Cheats);
this.tabPage4.Controls.Add(this.IDW_LuaConsole);
this.tabPage4.Controls.Add(this.IDW_HexEditor);
this.tabPage4.Controls.Add(this.IDW_RamPoke);
this.tabPage4.Controls.Add(this.IDW_RamSearch);
this.tabPage4.Controls.Add(this.IDW_RamWatch);
this.tabPage4.Location = new System.Drawing.Point(4, 28);
this.tabPage4.Name = "tabPage4";
this.tabPage4.Size = new System.Drawing.Size(590, 315);
this.tabPage4.TabIndex = 3;
this.tabPage4.Text = "Tools";
this.tabPage4.UseVisualStyleBackColor = true;
this.tabPage4.Click += new System.EventHandler(this.tabPage4_Click);
//
// label46
//
this.label46.AutoSize = true;
this.label46.Location = new System.Drawing.Point(26, 167);
this.label46.Name = "label46";
this.label46.Size = new System.Drawing.Size(49, 13);
this.label46.TabIndex = 81;
this.label46.Text = "Tool Box";
//
// label56
//
this.label56.AutoSize = true;
this.label56.Location = new System.Drawing.Point(35, 141);
this.label56.Name = "label56";
this.label56.Size = new System.Drawing.Size(40, 13);
this.label56.TabIndex = 80;
this.label56.Text = "Cheats";
//
// label55
//
this.label55.AutoSize = true;
this.label55.Location = new System.Drawing.Point(10, 115);
this.label55.Name = "label55";
this.label55.Size = new System.Drawing.Size(66, 13);
this.label55.TabIndex = 78;
this.label55.Text = "Lua Console";
//
// label54
//
this.label54.AutoSize = true;
this.label54.Location = new System.Drawing.Point(19, 91);
this.label54.Name = "label54";
this.label54.Size = new System.Drawing.Size(56, 13);
this.label54.TabIndex = 76;
this.label54.Text = "Hex Editor";
//
// label53
//
this.label53.AutoSize = true;
this.label53.Location = new System.Drawing.Point(19, 66);
this.label53.Name = "label53";
this.label53.Size = new System.Drawing.Size(57, 13);
this.label53.TabIndex = 74;
this.label53.Text = "Ram Poke";
//
// label52
//
this.label52.AutoSize = true;
this.label52.Location = new System.Drawing.Point(10, 41);
this.label52.Name = "label52";
this.label52.Size = new System.Drawing.Size(66, 13);
this.label52.TabIndex = 72;
this.label52.Text = "Ram Search";
//
// label51
//
this.label51.AutoSize = true;
this.label51.Location = new System.Drawing.Point(12, 16);
this.label51.Name = "label51";
this.label51.Size = new System.Drawing.Size(64, 13);
this.label51.TabIndex = 70;
this.label51.Text = "Ram Watch";
//
// 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";
//
// label57
//
this.label57.AutoSize = true;
this.label57.Location = new System.Drawing.Point(209, 59);
this.label57.Name = "label57";
this.label57.Size = new System.Drawing.Size(61, 13);
this.label57.TabIndex = 14;
this.label57.Text = "Open ROM";
//
// IDW_OpenROM
//
this.IDW_OpenROM.AcceptsTab = true;
this.IDW_OpenROM.BackColor = System.Drawing.SystemColors.Window;
this.IDW_OpenROM.Location = new System.Drawing.Point(295, 56);
this.IDW_OpenROM.Name = "IDW_OpenROM";
this.IDW_OpenROM.Size = new System.Drawing.Size(100, 20);
this.IDW_OpenROM.TabIndex = 10;
//
// IDW_FRAMEADVANCE
//
this.IDW_FRAMEADVANCE.AcceptsTab = true;
this.IDW_FRAMEADVANCE.BackColor = System.Drawing.SystemColors.Window;
this.IDW_FRAMEADVANCE.Location = new System.Drawing.Point(92, 9);
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(295, 32);
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(295, 8);
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(92, 153);
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(92, 129);
this.IDW_QuickSave.Name = "IDW_QuickSave";
this.IDW_QuickSave.Size = new System.Drawing.Size(100, 20);
this.IDW_QuickSave.TabIndex = 6;
//
// IDW_NEXTSLOT // IDW_NEXTSLOT
// //
this.IDW_NEXTSLOT.Location = new System.Drawing.Point(361, 288); this.IDW_NEXTSLOT.Location = new System.Drawing.Point(361, 288);
@ -1200,6 +1069,26 @@
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, 315);
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;
@ -1227,6 +1116,51 @@
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;
@ -1245,6 +1179,29 @@
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;
// //
// tabPage4
//
this.tabPage4.Controls.Add(this.IDW_TOOLBOX);
this.tabPage4.Controls.Add(this.label46);
this.tabPage4.Controls.Add(this.label56);
this.tabPage4.Controls.Add(this.label55);
this.tabPage4.Controls.Add(this.label54);
this.tabPage4.Controls.Add(this.label53);
this.tabPage4.Controls.Add(this.label52);
this.tabPage4.Controls.Add(this.label51);
this.tabPage4.Controls.Add(this.IDW_Cheats);
this.tabPage4.Controls.Add(this.IDW_LuaConsole);
this.tabPage4.Controls.Add(this.IDW_HexEditor);
this.tabPage4.Controls.Add(this.IDW_RamPoke);
this.tabPage4.Controls.Add(this.IDW_RamSearch);
this.tabPage4.Controls.Add(this.IDW_RamWatch);
this.tabPage4.Location = new System.Drawing.Point(4, 28);
this.tabPage4.Name = "tabPage4";
this.tabPage4.Size = new System.Drawing.Size(590, 315);
this.tabPage4.TabIndex = 3;
this.tabPage4.Text = "Tools";
this.tabPage4.UseVisualStyleBackColor = true;
//
// IDW_TOOLBOX // IDW_TOOLBOX
// //
this.IDW_TOOLBOX.Location = new System.Drawing.Point(87, 164); this.IDW_TOOLBOX.Location = new System.Drawing.Point(87, 164);
@ -1252,6 +1209,69 @@
this.IDW_TOOLBOX.Size = new System.Drawing.Size(100, 20); this.IDW_TOOLBOX.Size = new System.Drawing.Size(100, 20);
this.IDW_TOOLBOX.TabIndex = 82; this.IDW_TOOLBOX.TabIndex = 82;
// //
// label46
//
this.label46.AutoSize = true;
this.label46.Location = new System.Drawing.Point(26, 167);
this.label46.Name = "label46";
this.label46.Size = new System.Drawing.Size(49, 13);
this.label46.TabIndex = 81;
this.label46.Text = "Tool Box";
//
// label56
//
this.label56.AutoSize = true;
this.label56.Location = new System.Drawing.Point(35, 141);
this.label56.Name = "label56";
this.label56.Size = new System.Drawing.Size(40, 13);
this.label56.TabIndex = 80;
this.label56.Text = "Cheats";
//
// label55
//
this.label55.AutoSize = true;
this.label55.Location = new System.Drawing.Point(10, 115);
this.label55.Name = "label55";
this.label55.Size = new System.Drawing.Size(66, 13);
this.label55.TabIndex = 78;
this.label55.Text = "Lua Console";
//
// label54
//
this.label54.AutoSize = true;
this.label54.Location = new System.Drawing.Point(19, 91);
this.label54.Name = "label54";
this.label54.Size = new System.Drawing.Size(56, 13);
this.label54.TabIndex = 76;
this.label54.Text = "Hex Editor";
//
// label53
//
this.label53.AutoSize = true;
this.label53.Location = new System.Drawing.Point(19, 66);
this.label53.Name = "label53";
this.label53.Size = new System.Drawing.Size(57, 13);
this.label53.TabIndex = 74;
this.label53.Text = "Ram Poke";
//
// label52
//
this.label52.AutoSize = true;
this.label52.Location = new System.Drawing.Point(10, 41);
this.label52.Name = "label52";
this.label52.Size = new System.Drawing.Size(66, 13);
this.label52.TabIndex = 72;
this.label52.Text = "Ram Search";
//
// label51
//
this.label51.AutoSize = true;
this.label51.Location = new System.Drawing.Point(12, 16);
this.label51.Name = "label51";
this.label51.Size = new System.Drawing.Size(64, 13);
this.label51.TabIndex = 70;
this.label51.Text = "Ram Watch";
//
// IDW_Cheats // IDW_Cheats
// //
this.IDW_Cheats.AcceptsTab = true; this.IDW_Cheats.AcceptsTab = true;
@ -1306,23 +1326,90 @@
this.IDW_RamWatch.Size = new System.Drawing.Size(100, 20); this.IDW_RamWatch.Size = new System.Drawing.Size(100, 20);
this.IDW_RamWatch.TabIndex = 69; this.IDW_RamWatch.TabIndex = 69;
// //
// IDW_CloseROM // IDB_SAVE
// //
this.IDW_CloseROM.AcceptsTab = true; this.IDB_SAVE.Location = new System.Drawing.Point(441, 9);
this.IDW_CloseROM.BackColor = System.Drawing.SystemColors.Window; this.IDB_SAVE.Name = "IDB_SAVE";
this.IDW_CloseROM.Location = new System.Drawing.Point(295, 80); this.IDB_SAVE.Size = new System.Drawing.Size(82, 22);
this.IDW_CloseROM.Name = "IDW_CloseROM"; this.IDB_SAVE.TabIndex = 99;
this.IDW_CloseROM.Size = new System.Drawing.Size(100, 20); this.IDB_SAVE.TabStop = false;
this.IDW_CloseROM.TabIndex = 15; this.IDB_SAVE.Text = "Save";
this.IDB_SAVE.UseVisualStyleBackColor = true;
this.IDB_SAVE.Click += new System.EventHandler(this.IDB_SAVE_Click);
// //
// label58 // IDB_CANCEL
// //
this.label58.AutoSize = true; this.IDB_CANCEL.Location = new System.Drawing.Point(528, 9);
this.label58.Location = new System.Drawing.Point(209, 83); this.IDB_CANCEL.Name = "IDB_CANCEL";
this.label58.Name = "label58"; this.IDB_CANCEL.Size = new System.Drawing.Size(80, 22);
this.label58.Size = new System.Drawing.Size(61, 13); this.IDB_CANCEL.TabIndex = 98;
this.label58.TabIndex = 16; this.IDB_CANCEL.TabStop = false;
this.label58.Text = "Close ROM"; 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_FrameCounter
//
this.IDW_FrameCounter.AcceptsTab = true;
this.IDW_FrameCounter.BackColor = System.Drawing.SystemColors.Window;
this.IDW_FrameCounter.Location = new System.Drawing.Point(295, 129);
this.IDW_FrameCounter.Name = "IDW_FrameCounter";
this.IDW_FrameCounter.Size = new System.Drawing.Size(100, 20);
this.IDW_FrameCounter.TabIndex = 19;
//
// label60
//
this.label60.AutoSize = true;
this.label60.Location = new System.Drawing.Point(209, 132);
this.label60.Name = "label60";
this.label60.Size = new System.Drawing.Size(76, 13);
this.label60.TabIndex = 20;
this.label60.Text = "Frame Counter";
//
// IDW_LagCounter
//
this.IDW_LagCounter.AcceptsTab = true;
this.IDW_LagCounter.BackColor = System.Drawing.SystemColors.Window;
this.IDW_LagCounter.Location = new System.Drawing.Point(295, 153);
this.IDW_LagCounter.Name = "IDW_LagCounter";
this.IDW_LagCounter.Size = new System.Drawing.Size(100, 20);
this.IDW_LagCounter.TabIndex = 21;
//
// label61
//
this.label61.AutoSize = true;
this.label61.Location = new System.Drawing.Point(209, 156);
this.label61.Name = "label61";
this.label61.Size = new System.Drawing.Size(65, 13);
this.label61.TabIndex = 22;
this.label61.Text = "Lag Counter";
//
// IDW_InputDisplay
//
this.IDW_InputDisplay.AcceptsTab = true;
this.IDW_InputDisplay.BackColor = System.Drawing.SystemColors.Window;
this.IDW_InputDisplay.Location = new System.Drawing.Point(295, 178);
this.IDW_InputDisplay.Name = "IDW_InputDisplay";
this.IDW_InputDisplay.Size = new System.Drawing.Size(100, 20);
this.IDW_InputDisplay.TabIndex = 23;
//
// label62
//
this.label62.AutoSize = true;
this.label62.Location = new System.Drawing.Point(209, 181);
this.label62.Name = "label62";
this.label62.Size = new System.Drawing.Size(68, 13);
this.label62.TabIndex = 24;
this.label62.Text = "Input Display";
// //
// HotkeyWindow // HotkeyWindow
// //
@ -1478,5 +1565,13 @@
private System.Windows.Forms.Label label57; private System.Windows.Forms.Label label57;
private InputWidget IDW_CloseROM; private InputWidget IDW_CloseROM;
private System.Windows.Forms.Label label58; private System.Windows.Forms.Label label58;
private InputWidget IDW_DisplayFPS;
private System.Windows.Forms.Label label59;
private InputWidget IDW_InputDisplay;
private System.Windows.Forms.Label label62;
private InputWidget IDW_LagCounter;
private System.Windows.Forms.Label label61;
private InputWidget IDW_FrameCounter;
private System.Windows.Forms.Label label60;
} }
} }

View File

@ -70,6 +70,10 @@ namespace BizHawk.MultiClient.tools
IDW_Cheats.Text = Global.Config.Cheats; IDW_Cheats.Text = Global.Config.Cheats;
IDW_OpenROM.Text = Global.Config.OpenROM; IDW_OpenROM.Text = Global.Config.OpenROM;
IDW_CloseROM.Text = Global.Config.CloseROM; IDW_CloseROM.Text = Global.Config.CloseROM;
IDW_DisplayFPS.Text = Global.Config.FPSBinding;
IDW_FrameCounter.Text = Global.Config.FrameCounterBinding;
IDW_LagCounter.Text = Global.Config.LagCounterBinding;
IDW_InputDisplay.Text = Global.Config.InputDisplayBinding;
} }
private void button2_Click(object sender, EventArgs e) private void button2_Click(object sender, EventArgs e)
{ {
@ -135,6 +139,10 @@ namespace BizHawk.MultiClient.tools
Global.Config.Cheats = IDW_Cheats.Text; Global.Config.Cheats = IDW_Cheats.Text;
Global.Config.OpenROM = IDW_OpenROM.Text; Global.Config.OpenROM = IDW_OpenROM.Text;
Global.Config.CloseROM = IDW_CloseROM.Text; Global.Config.CloseROM = IDW_CloseROM.Text;
Global.Config.FPSBinding = IDW_DisplayFPS.Text;
Global.Config.FrameCounterBinding = IDW_FrameCounter.Text;
Global.Config.LagCounterBinding = IDW_LagCounter.Text;
Global.Config.InputDisplayBinding = IDW_InputDisplay.Text;
this.DialogResult = DialogResult.OK; this.DialogResult = DialogResult.OK;
this.Close(); this.Close();
@ -144,10 +152,5 @@ namespace BizHawk.MultiClient.tools
{ {
hotkeyTabs.TabPages[hotkeyTabs.SelectedIndex].Controls[0].Focus(); hotkeyTabs.TabPages[hotkeyTabs.SelectedIndex].Controls[0].Focus();
} }
private void tabPage4_Click(object sender, EventArgs e)
{
}
} }
} }