diff --git a/BizHawk.MultiClient/Config.cs b/BizHawk.MultiClient/Config.cs index 99356490b0..96c75cf39c 100644 --- a/BizHawk.MultiClient/Config.cs +++ b/BizHawk.MultiClient/Config.cs @@ -356,6 +356,7 @@ public string PlayBeginningBinding = ""; public string VolUpBinding = ""; public string VolDownBinding = ""; + public string SoftResetBinding = ""; public string ToggleMultiTrack = ""; public string MTRecordAll = ""; public string MTRecordNone = ""; diff --git a/BizHawk.MultiClient/MainForm.MenuItems.cs b/BizHawk.MultiClient/MainForm.MenuItems.cs index a0b232bc66..457380bd2b 100644 --- a/BizHawk.MultiClient/MainForm.MenuItems.cs +++ b/BizHawk.MultiClient/MainForm.MenuItems.cs @@ -294,8 +294,7 @@ namespace BizHawk.MultiClient private void resetToolStripMenuItem_Click(object sender, EventArgs e) { - if (Global.Emulator.ControllerDefinition.BoolButtons.Contains("Reset")) - Global.ActiveController.ForceButton("Reset"); + SoftReset(); } private void pauseToolStripMenuItem_Click(object sender, EventArgs e) diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs index 378cf4f31c..628726cad1 100644 --- a/BizHawk.MultiClient/MainForm.cs +++ b/BizHawk.MultiClient/MainForm.cs @@ -377,13 +377,13 @@ namespace BizHawk.MultiClient { Name = "Emulator Frontend Controls", BoolButtons = { "Fast Forward", "Rewind", "Hard Reset", "Mode Flip", "Quick Save State", "Quick Load State", "Save Named State", "Load Named State", - "Emulator Pause", "Frame Advance", "Unthrottle", "Screenshot", "Toggle Fullscreen", "SelectSlot0", "SelectSlot1", "SelectSlot2", "SelectSlot3", "SelectSlot4", - "SelectSlot5", "SelectSlot6", "SelectSlot7", "SelectSlot8", "SelectSlot9", "SaveSlot0", "SaveSlot1", "SaveSlot2", "SaveSlot3", "SaveSlot4", - "SaveSlot5","SaveSlot6","SaveSlot7","SaveSlot8","SaveSlot9","LoadSlot0","LoadSlot1","LoadSlot2","LoadSlot3","LoadSlot4","LoadSlot5","LoadSlot6", - "LoadSlot7","LoadSlot8","LoadSlot9", "ToolBox", "Previous Slot", "Next Slot", "Ram Watch", "Ram Search", "Ram Poke", "Hex Editor", - "Lua Console", "Cheats", "Open ROM", "Close ROM", "Display FPS", "Display FrameCounter", "Display LagCounter", "Display Input", "Toggle Read Only", - "Play Movie", "Record Movie", "Stop Movie", "Play Beginning", "Volume Up", "Volume Down", "Toggle MultiTrack", "Record All", "Record None", "Increment Player", - "Decrement Player"} + "Emulator Pause", "Frame Advance", "Unthrottle", "Screenshot", "Toggle Fullscreen", "SelectSlot0", "SelectSlot1", "SelectSlot2", "SelectSlot3", "SelectSlot4", + "SelectSlot5", "SelectSlot6", "SelectSlot7", "SelectSlot8", "SelectSlot9", "SaveSlot0", "SaveSlot1", "SaveSlot2", "SaveSlot3", "SaveSlot4", + "SaveSlot5","SaveSlot6","SaveSlot7","SaveSlot8","SaveSlot9","LoadSlot0","LoadSlot1","LoadSlot2","LoadSlot3","LoadSlot4","LoadSlot5","LoadSlot6", + "LoadSlot7","LoadSlot8","LoadSlot9", "ToolBox", "Previous Slot", "Next Slot", "Ram Watch", "Ram Search", "Ram Poke", "Hex Editor", + "Lua Console", "Cheats", "Open ROM", "Close ROM", "Display FPS", "Display FrameCounter", "Display LagCounter", "Display Input", "Toggle Read Only", + "Play Movie", "Record Movie", "Stop Movie", "Play Beginning", "Volume Up", "Volume Down", "Toggle MultiTrack", "Record All", "Record None", "Increment Player", + "Soft Reset", "Decrement Player"} }; private void InitControls() @@ -454,11 +454,12 @@ namespace BizHawk.MultiClient controls.BindMulti("Play Beginning", Global.Config.PlayBeginningBinding); controls.BindMulti("Volume Up", Global.Config.VolUpBinding); controls.BindMulti("Volume Down", Global.Config.VolDownBinding); - controls.BindMulti("Toggle MultiTrack", Global.Config.ToggleMultiTrack); - controls.BindMulti("Record All", Global.Config.MTRecordAll); - controls.BindMulti("Record None", Global.Config.MTRecordNone); - controls.BindMulti("Increment Player", Global.Config.MTIncrementPlayer); - controls.BindMulti("Decrement Player", Global.Config.MTDecrementPlayer); + controls.BindMulti("Toggle MultiTrack", Global.Config.ToggleMultiTrack); + controls.BindMulti("Record All", Global.Config.MTRecordAll); + controls.BindMulti("Record None", Global.Config.MTRecordNone); + controls.BindMulti("Increment Player", Global.Config.MTIncrementPlayer); + controls.BindMulti("Decrement Player", Global.Config.MTDecrementPlayer); + controls.BindMulti("Soft Reset", Global.Config.SoftResetBinding); Global.ClientControls = controls; @@ -495,7 +496,7 @@ namespace BizHawk.MultiClient Global.PCEControls = pceControls; var nesControls = new Controller(NES.NESController); - nesControls.BindMulti("Reset", Global.Config.NESReset); + //nesControls.BindMulti("Reset", Global.Config.NESReset); //Let multiclient handle all resets the same for (int i = 0; i < 2 /*TODO*/; i++) { nesControls.BindMulti("P" + (i + 1) + " Up", Global.Config.NESController[i].Up); @@ -583,8 +584,6 @@ namespace BizHawk.MultiClient TI83Controls.BindMulti("2ND", Global.Config.TI83Controller[0].SECOND); TI83Controls.BindMulti("MODE", Global.Config.TI83Controller[0].MODE); TI83Controls.BindMulti("DEL", Global.Config.TI83Controller[0].DEL); - TI83Controls.BindMulti("DEL", Global.Config.TI83Controller[0].COMMA); - TI83Controls.BindMulti("DEL", Global.Config.TI83Controller[0].SIN); Global.TI83Controls = TI83Controls; } @@ -1165,56 +1164,63 @@ namespace BizHawk.MultiClient VolumeDown(); Global.ClientControls.UnpressButton("Volume Down"); } - if (Global.ClientControls["Toggle MultiTrack"]) - { - Global.MainForm.UserMovie.MultiTrack.IsActive = !Global.MainForm.UserMovie.MultiTrack.IsActive; - if (Global.MainForm.UserMovie.MultiTrack.IsActive) - { - Global.RenderPanel.AddMessage("MultiTrack Enabled"); - Global.RenderPanel.MT = "Recording None"; - } - else - Global.RenderPanel.AddMessage("MultiTrack Disabled"); - Global.MainForm.UserMovie.MultiTrack.RecordAll = false; - Global.MainForm.UserMovie.MultiTrack.CurrentPlayer = 0; - Global.ClientControls.UnpressButton("Toggle MultiTrack"); - } - if (Global.ClientControls["Increment Player"]) - { - Global.MainForm.UserMovie.MultiTrack.CurrentPlayer++; - Global.MainForm.UserMovie.MultiTrack.RecordAll = false; - if (Global.MainForm.UserMovie.MultiTrack.CurrentPlayer > 5) //TODO: Replace with console's maximum or current maximum players??! - { - Global.MainForm.UserMovie.MultiTrack.CurrentPlayer = 1; - } - Global.ClientControls.UnpressButton("Increment Player"); - Global.RenderPanel.MT = "Recording Player " + Global.MainForm.UserMovie.MultiTrack.CurrentPlayer.ToString(); - } - if (Global.ClientControls["Decrement Player"]) - { - Global.MainForm.UserMovie.MultiTrack.CurrentPlayer--; - Global.MainForm.UserMovie.MultiTrack.RecordAll = false; - if (Global.MainForm.UserMovie.MultiTrack.CurrentPlayer < 1) - { - Global.MainForm.UserMovie.MultiTrack.CurrentPlayer = 5;//TODO: Replace with console's maximum or current maximum players??! - } - Global.ClientControls.UnpressButton("Decrement Player"); - Global.RenderPanel.MT = "Recording Player " + Global.MainForm.UserMovie.MultiTrack.CurrentPlayer.ToString(); - } - if (Global.ClientControls["Record All"]) - { - Global.MainForm.UserMovie.MultiTrack.CurrentPlayer = 0; - Global.MainForm.UserMovie.MultiTrack.RecordAll = true; - Global.ClientControls.UnpressButton("Record All"); - Global.RenderPanel.MT = "Recording All"; - } - if (Global.ClientControls["Record None"]) - { - Global.MainForm.UserMovie.MultiTrack.CurrentPlayer = 0; - Global.MainForm.UserMovie.MultiTrack.RecordAll = false; - Global.ClientControls.UnpressButton("Record None"); - Global.RenderPanel.MT = "Recording None"; - } + + if (Global.ClientControls["Soft Reset"]) + { + SoftReset(); + Global.ClientControls.UnpressButton("Soft Reset"); + } + + if (Global.ClientControls["Toggle MultiTrack"]) + { + Global.MainForm.UserMovie.MultiTrack.IsActive = !Global.MainForm.UserMovie.MultiTrack.IsActive; + if (Global.MainForm.UserMovie.MultiTrack.IsActive) + { + Global.RenderPanel.AddMessage("MultiTrack Enabled"); + Global.RenderPanel.MT = "Recording None"; + } + else + Global.RenderPanel.AddMessage("MultiTrack Disabled"); + Global.MainForm.UserMovie.MultiTrack.RecordAll = false; + Global.MainForm.UserMovie.MultiTrack.CurrentPlayer = 0; + Global.ClientControls.UnpressButton("Toggle MultiTrack"); + } + if (Global.ClientControls["Increment Player"]) + { + Global.MainForm.UserMovie.MultiTrack.CurrentPlayer++; + Global.MainForm.UserMovie.MultiTrack.RecordAll = false; + if (Global.MainForm.UserMovie.MultiTrack.CurrentPlayer > 5) //TODO: Replace with console's maximum or current maximum players??! + { + Global.MainForm.UserMovie.MultiTrack.CurrentPlayer = 1; + } + Global.ClientControls.UnpressButton("Increment Player"); + Global.RenderPanel.MT = "Recording Player " + Global.MainForm.UserMovie.MultiTrack.CurrentPlayer.ToString(); + } + if (Global.ClientControls["Decrement Player"]) + { + Global.MainForm.UserMovie.MultiTrack.CurrentPlayer--; + Global.MainForm.UserMovie.MultiTrack.RecordAll = false; + if (Global.MainForm.UserMovie.MultiTrack.CurrentPlayer < 1) + { + Global.MainForm.UserMovie.MultiTrack.CurrentPlayer = 5;//TODO: Replace with console's maximum or current maximum players??! + } + Global.ClientControls.UnpressButton("Decrement Player"); + Global.RenderPanel.MT = "Recording Player " + Global.MainForm.UserMovie.MultiTrack.CurrentPlayer.ToString(); + } + if (Global.ClientControls["Record All"]) + { + Global.MainForm.UserMovie.MultiTrack.CurrentPlayer = 0; + Global.MainForm.UserMovie.MultiTrack.RecordAll = true; + Global.ClientControls.UnpressButton("Record All"); + Global.RenderPanel.MT = "Recording All"; + } + if (Global.ClientControls["Record None"]) + { + Global.MainForm.UserMovie.MultiTrack.CurrentPlayer = 0; + Global.MainForm.UserMovie.MultiTrack.RecordAll = false; + Global.ClientControls.UnpressButton("Record None"); + Global.RenderPanel.MT = "Recording None"; + } } void StepRunLoop_Throttle() @@ -2316,5 +2322,11 @@ namespace BizHawk.MultiClient gbDebugger.Show(); } } + + private void SoftReset() + { + if (Global.Emulator.ControllerDefinition.BoolButtons.Contains("Reset")) + Global.ActiveController.ForceButton("Reset"); + } } } \ No newline at end of file diff --git a/BizHawk.MultiClient/config/HotkeyWindow.Designer.cs b/BizHawk.MultiClient/config/HotkeyWindow.Designer.cs index 8b73ec942c..bbf8fd1cc7 100644 --- a/BizHawk.MultiClient/config/HotkeyWindow.Designer.cs +++ b/BizHawk.MultiClient/config/HotkeyWindow.Designer.cs @@ -68,6 +68,7 @@ this.label31 = new System.Windows.Forms.Label(); this.IDW_QuickSave = new BizHawk.MultiClient.InputWidget(); this.tabPage2 = new System.Windows.Forms.TabPage(); + this.IDW_SS1 = new BizHawk.MultiClient.InputWidget(); this.label50 = new System.Windows.Forms.Label(); this.label49 = new System.Windows.Forms.Label(); this.label48 = new System.Windows.Forms.Label(); @@ -107,7 +108,6 @@ this.IDW_PREVIOUSSLOT = 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(); @@ -138,6 +138,7 @@ this.IDW_SS3 = new BizHawk.MultiClient.InputWidget(); this.IDW_SS2 = new BizHawk.MultiClient.InputWidget(); this.tabPage3 = new System.Windows.Forms.TabPage(); + this.IDW_TOGGLEREADONLY = new BizHawk.MultiClient.InputWidget(); this.IDW_PLAYBEGINNING = new BizHawk.MultiClient.InputWidget(); this.label67 = new System.Windows.Forms.Label(); this.label66 = new System.Windows.Forms.Label(); @@ -152,13 +153,13 @@ this.IDW_STOPMOVIE = new BizHawk.MultiClient.InputWidget(); this.IDW_PLAYMOVIE = new BizHawk.MultiClient.InputWidget(); this.IDW_RECORDMOVIE = new BizHawk.MultiClient.InputWidget(); - this.IDW_TOGGLEREADONLY = new BizHawk.MultiClient.InputWidget(); this.IDW_TOGGLEMTRACK = new BizHawk.MultiClient.InputWidget(); this.IDW_MTDECPLAYER = new BizHawk.MultiClient.InputWidget(); this.IDW_MTINCPLAYER = new BizHawk.MultiClient.InputWidget(); this.IDW_SELECTNONE = new BizHawk.MultiClient.InputWidget(); this.IDW_MTSELECTALL = new BizHawk.MultiClient.InputWidget(); this.tabPage4 = new System.Windows.Forms.TabPage(); + this.IDW_RamWatch = 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(); @@ -172,10 +173,11 @@ this.IDW_HexEditor = new BizHawk.MultiClient.InputWidget(); this.IDW_RamPoke = new BizHawk.MultiClient.InputWidget(); this.IDW_RamSearch = new BizHawk.MultiClient.InputWidget(); - this.IDW_RamWatch = new BizHawk.MultiClient.InputWidget(); 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_RESET = new BizHawk.MultiClient.InputWidget(); + this.label71 = new System.Windows.Forms.Label(); this.hotkeyTabs.SuspendLayout(); this.tabPage1.SuspendLayout(); this.tabPage2.SuspendLayout(); @@ -200,6 +202,8 @@ // // tabPage1 // + this.tabPage1.Controls.Add(this.label71); + this.tabPage1.Controls.Add(this.IDW_RESET); this.tabPage1.Controls.Add(this.label70); this.tabPage1.Controls.Add(this.IDW_UNTHROTTLE); this.tabPage1.Controls.Add(this.label69); @@ -247,7 +251,7 @@ // label70 // this.label70.AutoSize = true; - this.label70.Location = new System.Drawing.Point(6, 130); + this.label70.Location = new System.Drawing.Point(408, 58); this.label70.Name = "label70"; this.label70.Size = new System.Drawing.Size(53, 13); this.label70.TabIndex = 59; @@ -257,10 +261,10 @@ // this.IDW_UNTHROTTLE.AcceptsTab = true; this.IDW_UNTHROTTLE.BackColor = System.Drawing.SystemColors.Window; - this.IDW_UNTHROTTLE.Location = new System.Drawing.Point(92, 128); + this.IDW_UNTHROTTLE.Location = new System.Drawing.Point(494, 56); this.IDW_UNTHROTTLE.Name = "IDW_UNTHROTTLE"; this.IDW_UNTHROTTLE.Size = new System.Drawing.Size(100, 20); - this.IDW_UNTHROTTLE.TabIndex = 58; + this.IDW_UNTHROTTLE.TabIndex = 105; // // label69 // @@ -278,7 +282,7 @@ this.IDW_VOLDOWN.Location = new System.Drawing.Point(494, 33); this.IDW_VOLDOWN.Name = "IDW_VOLDOWN"; this.IDW_VOLDOWN.Size = new System.Drawing.Size(100, 20); - this.IDW_VOLDOWN.TabIndex = 9; + this.IDW_VOLDOWN.TabIndex = 101; // // label68 // @@ -296,7 +300,7 @@ this.IDW_VOLUP.Location = new System.Drawing.Point(494, 7); this.IDW_VOLUP.Name = "IDW_VOLUP"; this.IDW_VOLUP.Size = new System.Drawing.Size(100, 20); - this.IDW_VOLUP.TabIndex = 8; + this.IDW_VOLUP.TabIndex = 100; // // IDW_InputDisplay // @@ -455,15 +459,15 @@ // 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.Location = new System.Drawing.Point(92, 130); this.IDW_REWIND.Name = "IDW_REWIND"; this.IDW_REWIND.Size = new System.Drawing.Size(100, 20); - this.IDW_REWIND.TabIndex = 5; + this.IDW_REWIND.TabIndex = 6; // // label37 // this.label37.AutoSize = true; - this.label37.Location = new System.Drawing.Point(6, 107); + this.label37.Location = new System.Drawing.Point(6, 133); this.label37.Name = "label37"; this.label37.Size = new System.Drawing.Size(43, 13); this.label37.TabIndex = 4; @@ -548,7 +552,7 @@ this.IDW_QuickLoad.Location = new System.Drawing.Point(92, 178); this.IDW_QuickLoad.Name = "IDW_QuickLoad"; this.IDW_QuickLoad.Size = new System.Drawing.Size(100, 20); - this.IDW_QuickLoad.TabIndex = 7; + this.IDW_QuickLoad.TabIndex = 9; // // label31 // @@ -566,7 +570,7 @@ this.IDW_QuickSave.Location = new System.Drawing.Point(92, 154); this.IDW_QuickSave.Name = "IDW_QuickSave"; this.IDW_QuickSave.Size = new System.Drawing.Size(100, 20); - this.IDW_QuickSave.TabIndex = 6; + this.IDW_QuickSave.TabIndex = 7; // // tabPage2 // @@ -647,6 +651,14 @@ this.tabPage2.Text = "Save States"; this.tabPage2.UseVisualStyleBackColor = true; // + // 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; + // // label50 // this.label50.AutoSize = true; @@ -988,14 +1000,6 @@ 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); @@ -1229,6 +1233,15 @@ this.tabPage3.Text = "Movie"; this.tabPage3.UseVisualStyleBackColor = true; // + // IDW_TOGGLEREADONLY + // + this.IDW_TOGGLEREADONLY.AcceptsTab = true; + this.IDW_TOGGLEREADONLY.BackColor = System.Drawing.SystemColors.Window; + this.IDW_TOGGLEREADONLY.Location = new System.Drawing.Point(105, 9); + this.IDW_TOGGLEREADONLY.Name = "IDW_TOGGLEREADONLY"; + this.IDW_TOGGLEREADONLY.Size = new System.Drawing.Size(100, 20); + this.IDW_TOGGLEREADONLY.TabIndex = 68; + // // IDW_PLAYBEGINNING // this.IDW_PLAYBEGINNING.AcceptsTab = true; @@ -1355,15 +1368,6 @@ this.IDW_RECORDMOVIE.Size = new System.Drawing.Size(100, 20); this.IDW_RECORDMOVIE.TabIndex = 70; // - // IDW_TOGGLEREADONLY - // - this.IDW_TOGGLEREADONLY.AcceptsTab = true; - this.IDW_TOGGLEREADONLY.BackColor = System.Drawing.SystemColors.Window; - this.IDW_TOGGLEREADONLY.Location = new System.Drawing.Point(105, 9); - this.IDW_TOGGLEREADONLY.Name = "IDW_TOGGLEREADONLY"; - this.IDW_TOGGLEREADONLY.Size = new System.Drawing.Size(100, 20); - this.IDW_TOGGLEREADONLY.TabIndex = 68; - // // IDW_TOGGLEMTRACK // this.IDW_TOGGLEMTRACK.AcceptsTab = true; @@ -1432,6 +1436,15 @@ this.tabPage4.Text = "Tools"; this.tabPage4.UseVisualStyleBackColor = true; // + // IDW_RamWatch + // + this.IDW_RamWatch.AcceptsTab = true; + this.IDW_RamWatch.BackColor = System.Drawing.SystemColors.Window; + this.IDW_RamWatch.Location = new System.Drawing.Point(87, 13); + this.IDW_RamWatch.Name = "IDW_RamWatch"; + this.IDW_RamWatch.Size = new System.Drawing.Size(100, 20); + this.IDW_RamWatch.TabIndex = 69; + // // IDW_TOOLBOX // this.IDW_TOOLBOX.Location = new System.Drawing.Point(87, 164); @@ -1547,15 +1560,6 @@ this.IDW_RamSearch.Size = new System.Drawing.Size(100, 20); this.IDW_RamSearch.TabIndex = 71; // - // IDW_RamWatch - // - this.IDW_RamWatch.AcceptsTab = true; - this.IDW_RamWatch.BackColor = System.Drawing.SystemColors.Window; - this.IDW_RamWatch.Location = new System.Drawing.Point(87, 13); - this.IDW_RamWatch.Name = "IDW_RamWatch"; - this.IDW_RamWatch.Size = new System.Drawing.Size(100, 20); - this.IDW_RamWatch.TabIndex = 69; - // // IDB_SAVE // this.IDB_SAVE.Location = new System.Drawing.Point(441, 9); @@ -1587,6 +1591,24 @@ this.label38.TabIndex = 3; this.label38.Text = "* Escape clears a key mapping"; // + // IDW_RESET + // + this.IDW_RESET.AcceptsTab = true; + this.IDW_RESET.BackColor = System.Drawing.SystemColors.Window; + this.IDW_RESET.Location = new System.Drawing.Point(92, 107); + this.IDW_RESET.Name = "IDW_RESET"; + this.IDW_RESET.Size = new System.Drawing.Size(100, 20); + this.IDW_RESET.TabIndex = 5; + // + // label71 + // + this.label71.AutoSize = true; + this.label71.Location = new System.Drawing.Point(6, 110); + this.label71.Name = "label71"; + this.label71.Size = new System.Drawing.Size(57, 13); + this.label71.TabIndex = 61; + this.label71.Text = "Soft Reset"; + // // HotkeyWindow // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -1766,5 +1788,7 @@ private InputWidget IDW_VOLUP; private System.Windows.Forms.Label label70; private InputWidget IDW_UNTHROTTLE; + private InputWidget IDW_RESET; + private System.Windows.Forms.Label label71; } } \ No newline at end of file diff --git a/BizHawk.MultiClient/config/HotkeyWindow.cs b/BizHawk.MultiClient/config/HotkeyWindow.cs index 0cd9d4f6cb..5a926f72ea 100644 --- a/BizHawk.MultiClient/config/HotkeyWindow.cs +++ b/BizHawk.MultiClient/config/HotkeyWindow.cs @@ -87,6 +87,7 @@ namespace BizHawk.MultiClient.tools IDW_MTSELECTALL.Text = Global.Config.MTRecordAll; IDW_MTINCPLAYER.Text = Global.Config.MTIncrementPlayer; IDW_MTDECPLAYER.Text = Global.Config.MTDecrementPlayer; + IDW_RESET.Text = Global.Config.SoftResetBinding; } private void button2_Click(object sender, EventArgs e) { @@ -170,6 +171,7 @@ namespace BizHawk.MultiClient.tools Global.Config.MTRecordNone = IDW_SELECTNONE.Text; Global.Config.MTIncrementPlayer = IDW_MTINCPLAYER.Text; Global.Config.MTDecrementPlayer = IDW_MTDECPLAYER.Text; + Global.Config.SoftResetBinding = IDW_RESET.Text; this.DialogResult = DialogResult.OK; this.Close();