Change Power Cycle menu item and hotkey to Reboot Core since that is what it really does, and does not emulate a power cycle

This commit is contained in:
adelikat 2012-09-16 16:06:28 +00:00
parent 640af8021d
commit 7ce6a27da9
6 changed files with 98 additions and 98 deletions

View File

@ -468,7 +468,7 @@ namespace BizHawk.MultiClient
public string ToggleBackgroundInput = ""; public string ToggleBackgroundInput = "";
public string IncreaseSpeedBinding = "Equals"; public string IncreaseSpeedBinding = "Equals";
public string DecreaseSpeedBinding = "Minus"; public string DecreaseSpeedBinding = "Minus";
public string HardResetBinding = "Ctrl+R"; public string RebootCoreResetBinding = "Ctrl+R";
public string FastForwardBinding = "Tab, J1 B6"; public string FastForwardBinding = "Tab, J1 B6";
public string RewindBinding = "Shift+R, J1 B5"; public string RewindBinding = "Shift+R, J1 B5";
public string EmulatorPauseBinding = "Pause"; public string EmulatorPauseBinding = "Pause";

View File

@ -104,7 +104,7 @@
this.emulationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.emulationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.pauseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.pauseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
this.powerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.rebootCoreToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.resetToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.resetToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.viewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.viewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.windowFilterMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.windowFilterMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@ -224,10 +224,11 @@
this.p0DifficultyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.p0DifficultyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.rightDifficultyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.rightDifficultyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.gBToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.gBToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.changeDMGPalettesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.forceDMGModeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.forceDMGModeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.gBAInCGBModeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.gBAInCGBModeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.multicartCompatibilityToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.multicartCompatibilityToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
this.changeDMGPalettesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.sNESToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.sNESToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.displayToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.displayToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.bG0ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.bG0ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@ -283,7 +284,6 @@
this.cmiScreenshotClipboard = new System.Windows.Forms.ToolStripMenuItem(); this.cmiScreenshotClipboard = new System.Windows.Forms.ToolStripMenuItem();
this.cmiCloseRom = new System.Windows.Forms.ToolStripMenuItem(); this.cmiCloseRom = new System.Windows.Forms.ToolStripMenuItem();
this.cmiShowMenu = new System.Windows.Forms.ToolStripMenuItem(); this.cmiShowMenu = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
this.menuStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout();
this.StatusSlot0.SuspendLayout(); this.StatusSlot0.SuspendLayout();
this.contextMenuStrip1.SuspendLayout(); this.contextMenuStrip1.SuspendLayout();
@ -973,8 +973,8 @@
// //
this.emulationToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.emulationToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.pauseToolStripMenuItem, this.pauseToolStripMenuItem,
this.rebootCoreToolStripMenuItem,
this.toolStripSeparator1, this.toolStripSeparator1,
this.powerToolStripMenuItem,
this.resetToolStripMenuItem}); this.resetToolStripMenuItem});
this.emulationToolStripMenuItem.Name = "emulationToolStripMenuItem"; this.emulationToolStripMenuItem.Name = "emulationToolStripMenuItem";
this.emulationToolStripMenuItem.Size = new System.Drawing.Size(73, 19); this.emulationToolStripMenuItem.Size = new System.Drawing.Size(73, 19);
@ -985,26 +985,26 @@
// //
this.pauseToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Pause; this.pauseToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Pause;
this.pauseToolStripMenuItem.Name = "pauseToolStripMenuItem"; this.pauseToolStripMenuItem.Name = "pauseToolStripMenuItem";
this.pauseToolStripMenuItem.Size = new System.Drawing.Size(139, 22); this.pauseToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.pauseToolStripMenuItem.Text = "&Pause"; this.pauseToolStripMenuItem.Text = "&Pause";
this.pauseToolStripMenuItem.Click += new System.EventHandler(this.pauseToolStripMenuItem_Click); this.pauseToolStripMenuItem.Click += new System.EventHandler(this.pauseToolStripMenuItem_Click);
// //
// toolStripSeparator1 // toolStripSeparator1
// //
this.toolStripSeparator1.Name = "toolStripSeparator1"; this.toolStripSeparator1.Name = "toolStripSeparator1";
this.toolStripSeparator1.Size = new System.Drawing.Size(136, 6); this.toolStripSeparator1.Size = new System.Drawing.Size(149, 6);
// //
// powerToolStripMenuItem // rebootCoreToolStripMenuItem
// //
this.powerToolStripMenuItem.Name = "powerToolStripMenuItem"; this.rebootCoreToolStripMenuItem.Name = "rebootCoreToolStripMenuItem";
this.powerToolStripMenuItem.Size = new System.Drawing.Size(139, 22); this.rebootCoreToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.powerToolStripMenuItem.Text = "Power Cycle"; this.rebootCoreToolStripMenuItem.Text = "Reboot Core";
this.powerToolStripMenuItem.Click += new System.EventHandler(this.powerToolStripMenuItem_Click); this.rebootCoreToolStripMenuItem.Click += new System.EventHandler(this.powerToolStripMenuItem_Click);
// //
// resetToolStripMenuItem // resetToolStripMenuItem
// //
this.resetToolStripMenuItem.Name = "resetToolStripMenuItem"; this.resetToolStripMenuItem.Name = "resetToolStripMenuItem";
this.resetToolStripMenuItem.Size = new System.Drawing.Size(139, 22); this.resetToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.resetToolStripMenuItem.Text = "&Reset"; this.resetToolStripMenuItem.Text = "&Reset";
this.resetToolStripMenuItem.Click += new System.EventHandler(this.resetToolStripMenuItem_Click); this.resetToolStripMenuItem.Click += new System.EventHandler(this.resetToolStripMenuItem_Click);
// //
@ -1952,13 +1952,6 @@
this.gBToolStripMenuItem.Text = "&GB"; this.gBToolStripMenuItem.Text = "&GB";
this.gBToolStripMenuItem.DropDownOpened += new System.EventHandler(this.gBToolStripMenuItem_DropDownOpened); this.gBToolStripMenuItem.DropDownOpened += new System.EventHandler(this.gBToolStripMenuItem_DropDownOpened);
// //
// changeDMGPalettesToolStripMenuItem
//
this.changeDMGPalettesToolStripMenuItem.Name = "changeDMGPalettesToolStripMenuItem";
this.changeDMGPalettesToolStripMenuItem.Size = new System.Drawing.Size(198, 22);
this.changeDMGPalettesToolStripMenuItem.Text = "Change DMG Palettes...";
this.changeDMGPalettesToolStripMenuItem.Click += new System.EventHandler(this.changeDMGPalettesToolStripMenuItem_Click);
//
// forceDMGModeToolStripMenuItem // forceDMGModeToolStripMenuItem
// //
this.forceDMGModeToolStripMenuItem.Name = "forceDMGModeToolStripMenuItem"; this.forceDMGModeToolStripMenuItem.Name = "forceDMGModeToolStripMenuItem";
@ -1980,6 +1973,18 @@
this.multicartCompatibilityToolStripMenuItem.Text = "Multicart Compatibility"; this.multicartCompatibilityToolStripMenuItem.Text = "Multicart Compatibility";
this.multicartCompatibilityToolStripMenuItem.Click += new System.EventHandler(this.multicartCompatibilityToolStripMenuItem_Click); this.multicartCompatibilityToolStripMenuItem.Click += new System.EventHandler(this.multicartCompatibilityToolStripMenuItem_Click);
// //
// toolStripSeparator8
//
this.toolStripSeparator8.Name = "toolStripSeparator8";
this.toolStripSeparator8.Size = new System.Drawing.Size(195, 6);
//
// changeDMGPalettesToolStripMenuItem
//
this.changeDMGPalettesToolStripMenuItem.Name = "changeDMGPalettesToolStripMenuItem";
this.changeDMGPalettesToolStripMenuItem.Size = new System.Drawing.Size(198, 22);
this.changeDMGPalettesToolStripMenuItem.Text = "Change DMG Palettes...";
this.changeDMGPalettesToolStripMenuItem.Click += new System.EventHandler(this.changeDMGPalettesToolStripMenuItem_Click);
//
// sNESToolStripMenuItem // sNESToolStripMenuItem
// //
this.sNESToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.sNESToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@ -2439,11 +2444,6 @@
this.cmiShowMenu.Text = "Show Menu"; this.cmiShowMenu.Text = "Show Menu";
this.cmiShowMenu.Click += new System.EventHandler(this.showMenuToolStripMenuItem_Click); this.cmiShowMenu.Click += new System.EventHandler(this.showMenuToolStripMenuItem_Click);
// //
// toolStripSeparator8
//
this.toolStripSeparator8.Name = "toolStripSeparator8";
this.toolStripSeparator8.Size = new System.Drawing.Size(195, 6);
//
// MainForm // MainForm
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 14F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 14F);
@ -2508,7 +2508,7 @@
private System.Windows.Forms.ToolStripMenuItem helpToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem helpToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem pauseToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem pauseToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
private System.Windows.Forms.ToolStripMenuItem powerToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem rebootCoreToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem resetToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem resetToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem helpToolStripMenuItem1; private System.Windows.Forms.ToolStripMenuItem helpToolStripMenuItem1;
private System.Windows.Forms.ToolStripMenuItem aboutToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem aboutToolStripMenuItem;

View File

@ -362,10 +362,10 @@ namespace BizHawk.MultiClient
private void powerToolStripMenuItem_Click(object sender, EventArgs e) private void powerToolStripMenuItem_Click(object sender, EventArgs e)
{ {
PowerCycle(); RebootCore();
} }
void PowerCycle() void RebootCore()
{ {
LoadRom(CurrentlyOpenRom); LoadRom(CurrentlyOpenRom);
} }
@ -1478,14 +1478,14 @@ namespace BizHawk.MultiClient
private void emulationToolStripMenuItem_DropDownOpened(object sender, EventArgs e) private void emulationToolStripMenuItem_DropDownOpened(object sender, EventArgs e)
{ {
powerToolStripMenuItem.Enabled = !IsNullEmulator(); rebootCoreToolStripMenuItem.Enabled = !IsNullEmulator();
resetToolStripMenuItem.Enabled = Global.Emulator.ControllerDefinition.BoolButtons.Contains("Reset"); resetToolStripMenuItem.Enabled = Global.Emulator.ControllerDefinition.BoolButtons.Contains("Reset");
pauseToolStripMenuItem.Checked = EmulatorPaused; pauseToolStripMenuItem.Checked = EmulatorPaused;
if (didMenuPause) pauseToolStripMenuItem.Checked = wasPaused; if (didMenuPause) pauseToolStripMenuItem.Checked = wasPaused;
pauseToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.EmulatorPauseBinding; pauseToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.EmulatorPauseBinding;
powerToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HardResetBinding; rebootCoreToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.RebootCoreResetBinding;
resetToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SoftResetBinding; resetToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SoftResetBinding;
} }

View File

@ -605,7 +605,7 @@ namespace BizHawk.MultiClient
controls.BindMulti("DecreaseWindowSize", Global.Config.DecreaseWindowSize); controls.BindMulti("DecreaseWindowSize", Global.Config.DecreaseWindowSize);
controls.BindMulti("Fast Forward", Global.Config.FastForwardBinding); controls.BindMulti("Fast Forward", Global.Config.FastForwardBinding);
controls.BindMulti("Rewind", Global.Config.RewindBinding); controls.BindMulti("Rewind", Global.Config.RewindBinding);
controls.BindMulti("Hard Reset", Global.Config.HardResetBinding); controls.BindMulti("Hard Reset", Global.Config.RebootCoreResetBinding);
controls.BindMulti("Emulator Pause", Global.Config.EmulatorPauseBinding); controls.BindMulti("Emulator Pause", Global.Config.EmulatorPauseBinding);
controls.BindMulti("Frame Advance", Global.Config.FrameAdvanceBinding); controls.BindMulti("Frame Advance", Global.Config.FrameAdvanceBinding);
controls.BindMulti("Increase Speed", Global.Config.IncreaseSpeedBinding); controls.BindMulti("Increase Speed", Global.Config.IncreaseSpeedBinding);

View File

@ -212,14 +212,14 @@
this.IDW_SNES_ToggleBG3 = new BizHawk.MultiClient.InputWidget(); this.IDW_SNES_ToggleBG3 = new BizHawk.MultiClient.InputWidget();
this.IDW_SNES_ToggleBG2 = new BizHawk.MultiClient.InputWidget(); this.IDW_SNES_ToggleBG2 = new BizHawk.MultiClient.InputWidget();
this.IDW_SNES_ToggleBG1 = new BizHawk.MultiClient.InputWidget(); this.IDW_SNES_ToggleBG1 = new BizHawk.MultiClient.InputWidget();
this.IDW_SNES_ToggleOBJ4 = new BizHawk.MultiClient.InputWidget();
this.IDW_SNES_ToggleOBJ3 = new BizHawk.MultiClient.InputWidget();
this.IDW_SNES_ToggleOBJ2 = new BizHawk.MultiClient.InputWidget();
this.IDW_SNES_ToggleOBJ1 = new BizHawk.MultiClient.InputWidget();
this.IDB_SAVE = new System.Windows.Forms.Button(); this.IDB_SAVE = new System.Windows.Forms.Button();
this.IDB_CANCEL = new System.Windows.Forms.Button(); this.IDB_CANCEL = new System.Windows.Forms.Button();
this.label38 = new System.Windows.Forms.Label(); this.label38 = new System.Windows.Forms.Label();
this.AutoTabCheckBox = new System.Windows.Forms.CheckBox(); this.AutoTabCheckBox = new System.Windows.Forms.CheckBox();
this.IDW_SNES_ToggleOBJ1 = new BizHawk.MultiClient.InputWidget();
this.IDW_SNES_ToggleOBJ2 = new BizHawk.MultiClient.InputWidget();
this.IDW_SNES_ToggleOBJ4 = new BizHawk.MultiClient.InputWidget();
this.IDW_SNES_ToggleOBJ3 = new BizHawk.MultiClient.InputWidget();
this.hotkeyTabs.SuspendLayout(); this.hotkeyTabs.SuspendLayout();
this.tabPage1.SuspendLayout(); this.tabPage1.SuspendLayout();
this.tabPage2.SuspendLayout(); this.tabPage2.SuspendLayout();
@ -598,9 +598,9 @@
this.label35.AutoSize = true; this.label35.AutoSize = true;
this.label35.Location = new System.Drawing.Point(6, 182); this.label35.Location = new System.Drawing.Point(6, 182);
this.label35.Name = "label35"; this.label35.Name = "label35";
this.label35.Size = new System.Drawing.Size(61, 13); this.label35.Size = new System.Drawing.Size(67, 13);
this.label35.TabIndex = 2; this.label35.TabIndex = 2;
this.label35.Text = "Hard Reset"; this.label35.Text = "Reboot Core";
// //
// label34 // label34
// //
@ -1958,23 +1958,14 @@
this.obj1label.TabIndex = 116; this.obj1label.TabIndex = 116;
this.obj1label.Text = "Toggle OBJ 1"; this.obj1label.Text = "Toggle OBJ 1";
// //
// IDW_SNES_ToggleBG1 // IDW_SNES_ToggleBG4
// //
this.IDW_SNES_ToggleBG1.AcceptsTab = true; this.IDW_SNES_ToggleBG4.AcceptsTab = true;
this.IDW_SNES_ToggleBG1.BackColor = System.Drawing.SystemColors.Window; this.IDW_SNES_ToggleBG4.BackColor = System.Drawing.SystemColors.Window;
this.IDW_SNES_ToggleBG1.Location = new System.Drawing.Point(93, 10); this.IDW_SNES_ToggleBG4.Location = new System.Drawing.Point(93, 82);
this.IDW_SNES_ToggleBG1.Name = "IDW_SNES_ToggleBG1"; this.IDW_SNES_ToggleBG4.Name = "IDW_SNES_ToggleBG4";
this.IDW_SNES_ToggleBG1.Size = new System.Drawing.Size(100, 20); this.IDW_SNES_ToggleBG4.Size = new System.Drawing.Size(100, 20);
this.IDW_SNES_ToggleBG1.TabIndex = 200; this.IDW_SNES_ToggleBG4.TabIndex = 215;
//
// IDW_SNES_ToggleBG2
//
this.IDW_SNES_ToggleBG2.AcceptsTab = true;
this.IDW_SNES_ToggleBG2.BackColor = System.Drawing.SystemColors.Window;
this.IDW_SNES_ToggleBG2.Location = new System.Drawing.Point(93, 34);
this.IDW_SNES_ToggleBG2.Name = "IDW_SNES_ToggleBG2";
this.IDW_SNES_ToggleBG2.Size = new System.Drawing.Size(100, 20);
this.IDW_SNES_ToggleBG2.TabIndex = 205;
// //
// IDW_SNES_ToggleBG3 // IDW_SNES_ToggleBG3
// //
@ -1985,14 +1976,59 @@
this.IDW_SNES_ToggleBG3.Size = new System.Drawing.Size(100, 20); this.IDW_SNES_ToggleBG3.Size = new System.Drawing.Size(100, 20);
this.IDW_SNES_ToggleBG3.TabIndex = 210; this.IDW_SNES_ToggleBG3.TabIndex = 210;
// //
// IDW_SNES_ToggleBG4 // IDW_SNES_ToggleBG2
// //
this.IDW_SNES_ToggleBG4.AcceptsTab = true; this.IDW_SNES_ToggleBG2.AcceptsTab = true;
this.IDW_SNES_ToggleBG4.BackColor = System.Drawing.SystemColors.Window; this.IDW_SNES_ToggleBG2.BackColor = System.Drawing.SystemColors.Window;
this.IDW_SNES_ToggleBG4.Location = new System.Drawing.Point(93, 82); this.IDW_SNES_ToggleBG2.Location = new System.Drawing.Point(93, 34);
this.IDW_SNES_ToggleBG4.Name = "IDW_SNES_ToggleBG4"; this.IDW_SNES_ToggleBG2.Name = "IDW_SNES_ToggleBG2";
this.IDW_SNES_ToggleBG4.Size = new System.Drawing.Size(100, 20); this.IDW_SNES_ToggleBG2.Size = new System.Drawing.Size(100, 20);
this.IDW_SNES_ToggleBG4.TabIndex = 215; this.IDW_SNES_ToggleBG2.TabIndex = 205;
//
// IDW_SNES_ToggleBG1
//
this.IDW_SNES_ToggleBG1.AcceptsTab = true;
this.IDW_SNES_ToggleBG1.BackColor = System.Drawing.SystemColors.Window;
this.IDW_SNES_ToggleBG1.Location = new System.Drawing.Point(93, 10);
this.IDW_SNES_ToggleBG1.Name = "IDW_SNES_ToggleBG1";
this.IDW_SNES_ToggleBG1.Size = new System.Drawing.Size(100, 20);
this.IDW_SNES_ToggleBG1.TabIndex = 200;
//
// IDW_SNES_ToggleOBJ4
//
this.IDW_SNES_ToggleOBJ4.AcceptsTab = true;
this.IDW_SNES_ToggleOBJ4.BackColor = System.Drawing.SystemColors.Window;
this.IDW_SNES_ToggleOBJ4.Location = new System.Drawing.Point(93, 178);
this.IDW_SNES_ToggleOBJ4.Name = "IDW_SNES_ToggleOBJ4";
this.IDW_SNES_ToggleOBJ4.Size = new System.Drawing.Size(100, 20);
this.IDW_SNES_ToggleOBJ4.TabIndex = 265;
//
// IDW_SNES_ToggleOBJ3
//
this.IDW_SNES_ToggleOBJ3.AcceptsTab = true;
this.IDW_SNES_ToggleOBJ3.BackColor = System.Drawing.SystemColors.Window;
this.IDW_SNES_ToggleOBJ3.Location = new System.Drawing.Point(93, 154);
this.IDW_SNES_ToggleOBJ3.Name = "IDW_SNES_ToggleOBJ3";
this.IDW_SNES_ToggleOBJ3.Size = new System.Drawing.Size(100, 20);
this.IDW_SNES_ToggleOBJ3.TabIndex = 260;
//
// IDW_SNES_ToggleOBJ2
//
this.IDW_SNES_ToggleOBJ2.AcceptsTab = true;
this.IDW_SNES_ToggleOBJ2.BackColor = System.Drawing.SystemColors.Window;
this.IDW_SNES_ToggleOBJ2.Location = new System.Drawing.Point(93, 130);
this.IDW_SNES_ToggleOBJ2.Name = "IDW_SNES_ToggleOBJ2";
this.IDW_SNES_ToggleOBJ2.Size = new System.Drawing.Size(100, 20);
this.IDW_SNES_ToggleOBJ2.TabIndex = 255;
//
// IDW_SNES_ToggleOBJ1
//
this.IDW_SNES_ToggleOBJ1.AcceptsTab = true;
this.IDW_SNES_ToggleOBJ1.BackColor = System.Drawing.SystemColors.Window;
this.IDW_SNES_ToggleOBJ1.Location = new System.Drawing.Point(93, 106);
this.IDW_SNES_ToggleOBJ1.Name = "IDW_SNES_ToggleOBJ1";
this.IDW_SNES_ToggleOBJ1.Size = new System.Drawing.Size(100, 20);
this.IDW_SNES_ToggleOBJ1.TabIndex = 250;
// //
// IDB_SAVE // IDB_SAVE
// //
@ -2037,42 +2073,6 @@
this.AutoTabCheckBox.UseVisualStyleBackColor = true; this.AutoTabCheckBox.UseVisualStyleBackColor = true;
this.AutoTabCheckBox.CheckedChanged += new System.EventHandler(this.AutoTabCheckBox_CheckedChanged); this.AutoTabCheckBox.CheckedChanged += new System.EventHandler(this.AutoTabCheckBox_CheckedChanged);
// //
// IDW_SNES_OBJ1
//
this.IDW_SNES_ToggleOBJ1.AcceptsTab = true;
this.IDW_SNES_ToggleOBJ1.BackColor = System.Drawing.SystemColors.Window;
this.IDW_SNES_ToggleOBJ1.Location = new System.Drawing.Point(93, 106);
this.IDW_SNES_ToggleOBJ1.Name = "IDW_SNES_OBJ1";
this.IDW_SNES_ToggleOBJ1.Size = new System.Drawing.Size(100, 20);
this.IDW_SNES_ToggleOBJ1.TabIndex = 250;
//
// IDW_SNES_OBJ2
//
this.IDW_SNES_ToggleOBJ2.AcceptsTab = true;
this.IDW_SNES_ToggleOBJ2.BackColor = System.Drawing.SystemColors.Window;
this.IDW_SNES_ToggleOBJ2.Location = new System.Drawing.Point(93, 130);
this.IDW_SNES_ToggleOBJ2.Name = "IDW_SNES_OBJ2";
this.IDW_SNES_ToggleOBJ2.Size = new System.Drawing.Size(100, 20);
this.IDW_SNES_ToggleOBJ2.TabIndex = 255;
//
// IDW_SNES_OBJ3
//
this.IDW_SNES_ToggleOBJ3.AcceptsTab = true;
this.IDW_SNES_ToggleOBJ3.BackColor = System.Drawing.SystemColors.Window;
this.IDW_SNES_ToggleOBJ3.Location = new System.Drawing.Point(93, 154);
this.IDW_SNES_ToggleOBJ3.Name = "IDW_SNES_OBJ3";
this.IDW_SNES_ToggleOBJ3.Size = new System.Drawing.Size(100, 20);
this.IDW_SNES_ToggleOBJ3.TabIndex = 260;
//
// IDW_SNES_OBJ4
//
this.IDW_SNES_ToggleOBJ4.AcceptsTab = true;
this.IDW_SNES_ToggleOBJ4.BackColor = System.Drawing.SystemColors.Window;
this.IDW_SNES_ToggleOBJ4.Location = new System.Drawing.Point(93, 178);
this.IDW_SNES_ToggleOBJ4.Name = "IDW_SNES_OBJ4";
this.IDW_SNES_ToggleOBJ4.Size = new System.Drawing.Size(100, 20);
this.IDW_SNES_ToggleOBJ4.TabIndex = 265;
//
// HotkeyWindow // HotkeyWindow
// //
this.AcceptButton = this.IDB_SAVE; this.AcceptButton = this.IDB_SAVE;

View File

@ -17,7 +17,7 @@ namespace BizHawk.MultiClient.tools
IDW_FRAMEADVANCE.SetBindings(Global.Config.FrameAdvanceBinding); IDW_FRAMEADVANCE.SetBindings(Global.Config.FrameAdvanceBinding);
IDW_PAUSE.SetBindings(Global.Config.EmulatorPauseBinding); IDW_PAUSE.SetBindings(Global.Config.EmulatorPauseBinding);
IDW_HARDRESET.SetBindings(Global.Config.HardResetBinding); IDW_HARDRESET.SetBindings(Global.Config.RebootCoreResetBinding);
IDW_REWIND.SetBindings(Global.Config.RewindBinding); IDW_REWIND.SetBindings(Global.Config.RewindBinding);
IDW_UNTHROTTLE.SetBindings(Global.Config.TurboBinding); IDW_UNTHROTTLE.SetBindings(Global.Config.TurboBinding);
IDW_MAXTURBO.SetBindings(Global.Config.MaxTurboBinding); IDW_MAXTURBO.SetBindings(Global.Config.MaxTurboBinding);
@ -132,7 +132,7 @@ namespace BizHawk.MultiClient.tools
Global.Config.FastForwardBinding = IDW_FASTFORWARD.Text; Global.Config.FastForwardBinding = IDW_FASTFORWARD.Text;
Global.Config.FrameAdvanceBinding = IDW_FRAMEADVANCE.Text; Global.Config.FrameAdvanceBinding = IDW_FRAMEADVANCE.Text;
Global.Config.HardResetBinding = IDW_HARDRESET.Text; Global.Config.RebootCoreResetBinding = IDW_HARDRESET.Text;
Global.Config.RewindBinding = IDW_REWIND.Text; Global.Config.RewindBinding = IDW_REWIND.Text;
Global.Config.TurboBinding = IDW_UNTHROTTLE.Text; Global.Config.TurboBinding = IDW_UNTHROTTLE.Text;
Global.Config.MaxTurboBinding = IDW_MAXTURBO.Text; Global.Config.MaxTurboBinding = IDW_MAXTURBO.Text;