From d7148424aaa69d30cfe11072fd24cb1b554c106b Mon Sep 17 00:00:00 2001 From: "andres.delikat" Date: Sat, 16 Apr 2011 19:35:37 +0000 Subject: [PATCH] Open ROM & Close ROM hotkeys (no default mapping atm) --- BizHawk.MultiClient/Config.cs | 2 + BizHawk.MultiClient/MainForm.MenuItems.cs | 26 +- BizHawk.MultiClient/MainForm.cs | 48 +- .../config/HotkeyWindow.Designer.cs | 628 ++++++++++-------- BizHawk.MultiClient/config/HotkeyWindow.cs | 4 + 5 files changed, 393 insertions(+), 315 deletions(-) diff --git a/BizHawk.MultiClient/Config.cs b/BizHawk.MultiClient/Config.cs index d7b03f5c26..f19e8f1127 100644 --- a/BizHawk.MultiClient/Config.cs +++ b/BizHawk.MultiClient/Config.cs @@ -199,6 +199,8 @@ public string HexEditor = ""; public string LuaConsole = ""; public string Cheats = ""; + public string OpenROM = ""; + public string CloseROM = ""; // SMS / GameGear Settings public bool SmsEnableFM = true; diff --git a/BizHawk.MultiClient/MainForm.MenuItems.cs b/BizHawk.MultiClient/MainForm.MenuItems.cs index be2197c5e3..36774e1036 100644 --- a/BizHawk.MultiClient/MainForm.MenuItems.cs +++ b/BizHawk.MultiClient/MainForm.MenuItems.cs @@ -243,17 +243,7 @@ namespace BizHawk.MultiClient private void closeROMToolStripMenuItem_Click(object sender, EventArgs e) { - CloseGame(); - Global.Emulator = new NullEmulator(); - Global.Game = null; - RamSearch1.Restart(); - HexEditor1.Restart(); - NESPPU1.Restart(); - NESNameTableViewer1.Restart(); - NESDebug1.Restart(); - Cheats1.Restart(); - Text = "BizHawk"; - HandlePlatformMenus(); + CloseROM(); } private void saveStateToolStripMenuItem_Click(object sender, EventArgs e) @@ -376,19 +366,7 @@ namespace BizHawk.MultiClient private void openROMToolStripMenuItem_Click(object sender, EventArgs e) { - var ofd = new OpenFileDialog(); - ofd.InitialDirectory = Global.Config.LastRomPath; - ofd.Filter = "Rom Files|*.NES;*.SMS;*.GG;*.SG;*.PCE;*.SGX;*.GB;*.BIN;*.SMD;*.ZIP;*.7z|NES|*.NES|Master System|*.SMS;*.GG;*.SG;*.ZIP;*.7z|PC Engine|*.PCE;*.SGX;*.ZIP;*.7z|Gameboy|*.GB;*.ZIP;*.7z|Archive Files|*.zip;*.7z|All Files|*.*"; - ofd.RestoreDirectory = true; - - Global.Sound.StopSound(); - var result = ofd.ShowDialog(); - Global.Sound.StartSound(); - if (result != DialogResult.OK) - return; - var file = new FileInfo(ofd.FileName); - Global.Config.LastRomPath = file.DirectoryName; - LoadRom(file.FullName); + OpenROM(); } private void replayInputLogToolStripMenuItem_Click(object sender, EventArgs e) diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs index c0f43a2b5c..72126c56d6 100644 --- a/BizHawk.MultiClient/MainForm.cs +++ b/BizHawk.MultiClient/MainForm.cs @@ -261,7 +261,7 @@ namespace BizHawk.MultiClient "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"} + "Ram Watch", "Ram Search", "Ram Poke", "Hex Editor", "Lua Console", "Cheats", "Open ROM", "Close ROM"} }; private void InitControls() @@ -318,6 +318,8 @@ namespace BizHawk.MultiClient controls.BindMulti("Hex Editor", Global.Config.HexEditor); controls.BindMulti("Lua Console", Global.Config.LuaConsole); controls.BindMulti("Cheats", Global.Config.Cheats); + controls.BindMulti("Open ROM", Global.Config.OpenROM); + controls.BindMulti("Close ROM", Global.Config.CloseROM); Global.ClientControls = controls; @@ -790,6 +792,18 @@ namespace BizHawk.MultiClient LoadCheatsWindow(); Global.ClientControls.UnpressButton("Cheats"); } + + if (Global.ClientControls["Open ROM"]) + { + OpenROM(); + Global.ClientControls.UnpressButton("Open ROM"); + } + + if (Global.ClientControls["Close ROM"]) + { + CloseROM(); + Global.ClientControls.UnpressButton("Close ROM"); + } } void StepRunLoop_Throttle() @@ -1419,6 +1433,38 @@ namespace BizHawk.MultiClient NESToolStripMenuItem.Visible = false; } + private void OpenROM() + { + var ofd = new OpenFileDialog(); + ofd.InitialDirectory = Global.Config.LastRomPath; + ofd.Filter = "Rom Files|*.NES;*.SMS;*.GG;*.SG;*.PCE;*.SGX;*.GB;*.BIN;*.SMD;*.ZIP;*.7z|NES|*.NES|Master System|*.SMS;*.GG;*.SG;*.ZIP;*.7z|PC Engine|*.PCE;*.SGX;*.ZIP;*.7z|Gameboy|*.GB;*.ZIP;*.7z|Archive Files|*.zip;*.7z|All Files|*.*"; + ofd.RestoreDirectory = true; + + Global.Sound.StopSound(); + var result = ofd.ShowDialog(); + Global.Sound.StartSound(); + if (result != DialogResult.OK) + return; + var file = new FileInfo(ofd.FileName); + Global.Config.LastRomPath = file.DirectoryName; + LoadRom(file.FullName); + } + + private void CloseROM() + { + CloseGame(); + Global.Emulator = new NullEmulator(); + Global.Game = null; + RamSearch1.Restart(); + HexEditor1.Restart(); + NESPPU1.Restart(); + NESNameTableViewer1.Restart(); + NESDebug1.Restart(); + Cheats1.Restart(); + Text = "BizHawk"; + HandlePlatformMenus(); + } + private void frameSkipToolStripMenuItem_DropDownOpened(object sender, EventArgs e) { miDisplayVsync.Checked = Global.Config.LimitFramerate; diff --git a/BizHawk.MultiClient/config/HotkeyWindow.Designer.cs b/BizHawk.MultiClient/config/HotkeyWindow.Designer.cs index b5961c78ea..21e0f8809d 100644 --- a/BizHawk.MultiClient/config/HotkeyWindow.Designer.cs +++ b/BizHawk.MultiClient/config/HotkeyWindow.Designer.cs @@ -31,24 +31,15 @@ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(HotkeyWindow)); this.hotkeyTabs = new System.Windows.Forms.TabControl(); this.tabPage1 = new System.Windows.Forms.TabPage(); - this.IDW_FRAMEADVANCE = new BizHawk.MultiClient.InputWidget(); 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.IDW_REWIND = new BizHawk.MultiClient.InputWidget(); this.label37 = new System.Windows.Forms.Label(); - this.IDW_FASTFORWARD = new BizHawk.MultiClient.InputWidget(); this.label36 = new System.Windows.Forms.Label(); - this.IDW_HARDRESET = new BizHawk.MultiClient.InputWidget(); this.label35 = new System.Windows.Forms.Label(); - this.IDW_PAUSE = new BizHawk.MultiClient.InputWidget(); this.label34 = new System.Windows.Forms.Label(); this.label33 = 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.IDW_QuickSave = new BizHawk.MultiClient.InputWidget(); this.tabPage2 = new System.Windows.Forms.TabPage(); this.label50 = new System.Windows.Forms.Label(); this.label49 = new System.Windows.Forms.Label(); @@ -85,6 +76,34 @@ this.label4 = new System.Windows.Forms.Label(); this.label2 = 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_PREVIOUSSLOT = new BizHawk.MultiClient.InputWidget(); this.IDW_LOADNAMEDSTATE = new BizHawk.MultiClient.InputWidget(); @@ -119,35 +138,20 @@ this.IDW_SS4 = new BizHawk.MultiClient.InputWidget(); this.IDW_SS3 = 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_MTDECPLAYER = 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_MTSELECTALL = new BizHawk.MultiClient.InputWidget(); - this.tabPage4 = new System.Windows.Forms.TabPage(); this.IDW_TOOLBOX = new BizHawk.MultiClient.InputWidget(); - this.label46 = new System.Windows.Forms.Label(); - this.label56 = new System.Windows.Forms.Label(); this.IDW_Cheats = new BizHawk.MultiClient.InputWidget(); - this.label55 = new System.Windows.Forms.Label(); this.IDW_LuaConsole = new BizHawk.MultiClient.InputWidget(); - this.label54 = new System.Windows.Forms.Label(); this.IDW_HexEditor = new BizHawk.MultiClient.InputWidget(); - this.label53 = new System.Windows.Forms.Label(); this.IDW_RamPoke = new BizHawk.MultiClient.InputWidget(); - this.label52 = new System.Windows.Forms.Label(); this.IDW_RamSearch = new BizHawk.MultiClient.InputWidget(); - this.label51 = new System.Windows.Forms.Label(); 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_CloseROM = new BizHawk.MultiClient.InputWidget(); + this.label58 = new System.Windows.Forms.Label(); this.hotkeyTabs.SuspendLayout(); this.tabPage1.SuspendLayout(); this.tabPage2.SuspendLayout(); @@ -172,6 +176,10 @@ // // tabPage1 // + this.tabPage1.Controls.Add(this.IDW_CloseROM); + this.tabPage1.Controls.Add(this.label58); + this.tabPage1.Controls.Add(this.IDW_OpenROM); + this.tabPage1.Controls.Add(this.label57); this.tabPage1.Controls.Add(this.IDW_FRAMEADVANCE); this.tabPage1.Controls.Add(this.label45); this.tabPage1.Controls.Add(this.IDW_FULLSCREEN); @@ -198,60 +206,24 @@ this.tabPage1.Text = "General"; this.tabPage1.UseVisualStyleBackColor = true; // - // IDW_FRAMEADVANCE - // - this.IDW_FRAMEADVANCE.AcceptsTab = true; - this.IDW_FRAMEADVANCE.BackColor = System.Drawing.SystemColors.Window; - this.IDW_FRAMEADVANCE.Location = new System.Drawing.Point(92, 8); - this.IDW_FRAMEADVANCE.Name = "IDW_FRAMEADVANCE"; - this.IDW_FRAMEADVANCE.Size = new System.Drawing.Size(100, 20); - this.IDW_FRAMEADVANCE.TabIndex = 1; - // // label45 // this.label45.AutoSize = true; - this.label45.Location = new System.Drawing.Point(207, 83); + this.label45.Location = new System.Drawing.Point(209, 35); this.label45.Name = "label45"; this.label45.Size = new System.Drawing.Size(60, 13); this.label45.TabIndex = 13; this.label45.Text = "Full Screen"; // - // IDW_FULLSCREEN - // - this.IDW_FULLSCREEN.AcceptsTab = true; - this.IDW_FULLSCREEN.BackColor = System.Drawing.SystemColors.Window; - this.IDW_FULLSCREEN.Location = new System.Drawing.Point(293, 80); - this.IDW_FULLSCREEN.Name = "IDW_FULLSCREEN"; - this.IDW_FULLSCREEN.Size = new System.Drawing.Size(100, 20); - this.IDW_FULLSCREEN.TabIndex = 9; - // - // IDW_SCREENSHOT - // - this.IDW_SCREENSHOT.AcceptsTab = true; - this.IDW_SCREENSHOT.BackColor = System.Drawing.SystemColors.Window; - this.IDW_SCREENSHOT.Location = new System.Drawing.Point(293, 56); - this.IDW_SCREENSHOT.Name = "IDW_SCREENSHOT"; - this.IDW_SCREENSHOT.Size = new System.Drawing.Size(100, 20); - this.IDW_SCREENSHOT.TabIndex = 8; - // // label44 // this.label44.AutoSize = true; - this.label44.Location = new System.Drawing.Point(207, 59); + this.label44.Location = new System.Drawing.Point(209, 11); this.label44.Name = "label44"; this.label44.Size = new System.Drawing.Size(61, 13); this.label44.TabIndex = 12; 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 // this.label37.AutoSize = true; @@ -261,15 +233,6 @@ this.label37.TabIndex = 4; 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 // this.label36.AutoSize = true; @@ -279,15 +242,6 @@ this.label36.TabIndex = 3; 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 // this.label35.AutoSize = true; @@ -297,15 +251,6 @@ this.label35.TabIndex = 2; 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 // this.label34.AutoSize = true; @@ -318,7 +263,7 @@ // label33 // this.label33.AutoSize = true; - this.label33.Location = new System.Drawing.Point(207, 11); + this.label33.Location = new System.Drawing.Point(6, 132); this.label33.Name = "label33"; this.label33.Size = new System.Drawing.Size(63, 13); this.label33.TabIndex = 10; @@ -327,21 +272,12 @@ // label32 // this.label32.AutoSize = true; - this.label32.Location = new System.Drawing.Point(207, 35); + this.label32.Location = new System.Drawing.Point(6, 156); this.label32.Name = "label32"; this.label32.Size = new System.Drawing.Size(62, 13); this.label32.TabIndex = 11; this.label32.Text = "Quick Load"; // - // IDW_QuickLoad - // - this.IDW_QuickLoad.AcceptsTab = true; - this.IDW_QuickLoad.BackColor = System.Drawing.SystemColors.Window; - this.IDW_QuickLoad.Location = new System.Drawing.Point(293, 32); - this.IDW_QuickLoad.Name = "IDW_QuickLoad"; - this.IDW_QuickLoad.Size = new System.Drawing.Size(100, 20); - this.IDW_QuickLoad.TabIndex = 7; - // // label31 // this.label31.AutoSize = true; @@ -351,15 +287,6 @@ this.label31.TabIndex = 0; this.label31.Text = "Frame Advance"; // - // IDW_QuickSave - // - this.IDW_QuickSave.AcceptsTab = true; - this.IDW_QuickSave.BackColor = System.Drawing.SystemColors.Window; - this.IDW_QuickSave.Location = new System.Drawing.Point(293, 8); - this.IDW_QuickSave.Name = "IDW_QuickSave"; - this.IDW_QuickSave.Size = new System.Drawing.Size(100, 20); - this.IDW_QuickSave.TabIndex = 6; - // // tabPage2 // this.tabPage2.Controls.Add(this.label50); @@ -752,6 +679,288 @@ this.label1.TabIndex = 62; 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 // this.IDW_NEXTSLOT.Location = new System.Drawing.Point(361, 288); @@ -991,26 +1200,6 @@ this.IDW_SS2.Size = new System.Drawing.Size(100, 20); 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 // this.IDW_TOGGLEMTRACK.AcceptsTab = true; @@ -1038,51 +1227,6 @@ this.IDW_MTINCPLAYER.Size = new System.Drawing.Size(100, 20); 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 // this.IDW_SELECTNONE.AcceptsTab = true; @@ -1101,30 +1245,6 @@ this.IDW_MTSELECTALL.Size = new System.Drawing.Size(100, 20); 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.IDW_Cheats); - this.tabPage4.Controls.Add(this.label55); - this.tabPage4.Controls.Add(this.IDW_LuaConsole); - this.tabPage4.Controls.Add(this.label54); - this.tabPage4.Controls.Add(this.IDW_HexEditor); - this.tabPage4.Controls.Add(this.label53); - this.tabPage4.Controls.Add(this.IDW_RamPoke); - this.tabPage4.Controls.Add(this.label52); - this.tabPage4.Controls.Add(this.IDW_RamSearch); - this.tabPage4.Controls.Add(this.label51); - 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); - // // IDW_TOOLBOX // this.IDW_TOOLBOX.Location = new System.Drawing.Point(87, 164); @@ -1132,24 +1252,6 @@ this.IDW_TOOLBOX.Size = new System.Drawing.Size(100, 20); 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"; - // // IDW_Cheats // this.IDW_Cheats.AcceptsTab = true; @@ -1159,15 +1261,6 @@ this.IDW_Cheats.Size = new System.Drawing.Size(100, 20); this.IDW_Cheats.TabIndex = 79; // - // 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"; - // // IDW_LuaConsole // this.IDW_LuaConsole.AcceptsTab = true; @@ -1177,15 +1270,6 @@ this.IDW_LuaConsole.Size = new System.Drawing.Size(100, 20); this.IDW_LuaConsole.TabIndex = 77; // - // 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"; - // // IDW_HexEditor // this.IDW_HexEditor.AcceptsTab = true; @@ -1195,15 +1279,6 @@ this.IDW_HexEditor.Size = new System.Drawing.Size(100, 20); this.IDW_HexEditor.TabIndex = 75; // - // 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"; - // // IDW_RamPoke // this.IDW_RamPoke.AcceptsTab = true; @@ -1213,15 +1288,6 @@ this.IDW_RamPoke.Size = new System.Drawing.Size(100, 20); this.IDW_RamPoke.TabIndex = 73; // - // 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"; - // // IDW_RamSearch // this.IDW_RamSearch.AcceptsTab = true; @@ -1231,15 +1297,6 @@ this.IDW_RamSearch.Size = new System.Drawing.Size(100, 20); this.IDW_RamSearch.TabIndex = 71; // - // 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_RamWatch // this.IDW_RamWatch.AcceptsTab = true; @@ -1249,36 +1306,23 @@ this.IDW_RamWatch.Size = new System.Drawing.Size(100, 20); this.IDW_RamWatch.TabIndex = 69; // - // IDB_SAVE + // IDW_CloseROM // - 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); + 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; // - // IDB_CANCEL + // label58 // - 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"; + 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"; // // HotkeyWindow // @@ -1430,5 +1474,9 @@ private InputWidget IDW_LuaConsole; private InputWidget IDW_TOOLBOX; private System.Windows.Forms.Label label46; + private InputWidget IDW_OpenROM; + private System.Windows.Forms.Label label57; + private InputWidget IDW_CloseROM; + private System.Windows.Forms.Label label58; } } \ No newline at end of file diff --git a/BizHawk.MultiClient/config/HotkeyWindow.cs b/BizHawk.MultiClient/config/HotkeyWindow.cs index f9ec413b38..0a31643eef 100644 --- a/BizHawk.MultiClient/config/HotkeyWindow.cs +++ b/BizHawk.MultiClient/config/HotkeyWindow.cs @@ -68,6 +68,8 @@ namespace BizHawk.MultiClient.tools IDW_HexEditor.Text = Global.Config.HexEditor; IDW_LuaConsole.Text = Global.Config.LuaConsole; IDW_Cheats.Text = Global.Config.Cheats; + IDW_OpenROM.Text = Global.Config.OpenROM; + IDW_CloseROM.Text = Global.Config.CloseROM; } private void button2_Click(object sender, EventArgs e) { @@ -131,6 +133,8 @@ namespace BizHawk.MultiClient.tools Global.Config.HexEditor = IDW_HexEditor.Text; Global.Config.LuaConsole = IDW_LuaConsole.Text; Global.Config.Cheats = IDW_Cheats.Text; + Global.Config.OpenROM = IDW_OpenROM.Text; + Global.Config.CloseROM = IDW_CloseROM.Text; this.DialogResult = DialogResult.OK; this.Close();