From 6949a8dd59b899c17070086a883b7759864a6ccd Mon Sep 17 00:00:00 2001 From: "andres.delikat" Date: Sat, 9 Jul 2011 16:12:56 +0000 Subject: [PATCH] InputWidget overhaul to use the new GetPressedKeys() function. InputWidget no longer wipes all mappings. In autotab mode it replaces the first key mapping instead of all. There is now a max number of bindings of 4 (but changeable). Still has some quirks to work out like Alt+F4 no longer closes the dialog, and TAB has weird behavior. Also, need to implement non-autotab handling. Reworked Hotkey config to use this inputwidget, but not inputconfig yet --- .../config/HotkeyWindow.Designer.cs | 940 +++++++++--------- BizHawk.MultiClient/config/HotkeyWindow.cs | 140 +-- BizHawk.MultiClient/config/InputWidget.cs | 336 +++---- 3 files changed, 661 insertions(+), 755 deletions(-) diff --git a/BizHawk.MultiClient/config/HotkeyWindow.Designer.cs b/BizHawk.MultiClient/config/HotkeyWindow.Designer.cs index c30137cc53..be9e19f3b8 100644 --- a/BizHawk.MultiClient/config/HotkeyWindow.Designer.cs +++ b/BizHawk.MultiClient/config/HotkeyWindow.Designer.cs @@ -32,25 +32,45 @@ this.hotkeyTabs = new System.Windows.Forms.TabControl(); this.tabPage1 = new System.Windows.Forms.TabPage(); this.label71 = new System.Windows.Forms.Label(); + this.IDW_RESET = new BizHawk.MultiClient.InputWidget(); this.label70 = new System.Windows.Forms.Label(); + this.IDW_UNTHROTTLE = new BizHawk.MultiClient.InputWidget(); this.label69 = new System.Windows.Forms.Label(); + this.IDW_VOLDOWN = new BizHawk.MultiClient.InputWidget(); this.label68 = new System.Windows.Forms.Label(); + this.IDW_VOLUP = new BizHawk.MultiClient.InputWidget(); + this.IDW_InputDisplay = new BizHawk.MultiClient.InputWidget(); this.label62 = new System.Windows.Forms.Label(); + this.IDW_LagCounter = new BizHawk.MultiClient.InputWidget(); this.label61 = new System.Windows.Forms.Label(); + this.IDW_FrameCounter = new BizHawk.MultiClient.InputWidget(); this.label60 = new System.Windows.Forms.Label(); + 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.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.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(); @@ -86,49 +106,6 @@ this.label2 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); this.HR = new BizHawk.Core.HorizontalLine(); - this.tabPage3 = new System.Windows.Forms.TabPage(); - this.label67 = new System.Windows.Forms.Label(); - this.label66 = new System.Windows.Forms.Label(); - this.label65 = new System.Windows.Forms.Label(); - this.label64 = new System.Windows.Forms.Label(); - this.label63 = new System.Windows.Forms.Label(); - 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.AutoTabCheckBox = new System.Windows.Forms.CheckBox(); - this.IDW_RESET = new BizHawk.MultiClient.InputWidget(); - this.IDW_UNTHROTTLE = new BizHawk.MultiClient.InputWidget(); - this.IDW_VOLDOWN = new BizHawk.MultiClient.InputWidget(); - this.IDW_VOLUP = new BizHawk.MultiClient.InputWidget(); - this.IDW_InputDisplay = new BizHawk.MultiClient.InputWidget(); - this.IDW_LagCounter = new BizHawk.MultiClient.InputWidget(); - this.IDW_FrameCounter = new BizHawk.MultiClient.InputWidget(); - this.IDW_DisplayFPS = new BizHawk.MultiClient.InputWidget(); - this.IDW_CloseROM = new BizHawk.MultiClient.InputWidget(); - 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_SS1 = 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(); @@ -162,8 +139,19 @@ 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_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(); + this.label65 = new System.Windows.Forms.Label(); + this.label64 = new System.Windows.Forms.Label(); + this.label63 = new System.Windows.Forms.Label(); + 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_STOPMOVIE = new BizHawk.MultiClient.InputWidget(); this.IDW_PLAYMOVIE = new BizHawk.MultiClient.InputWidget(); this.IDW_RECORDMOVIE = new BizHawk.MultiClient.InputWidget(); @@ -172,13 +160,25 @@ 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(); + 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_LuaConsole = new BizHawk.MultiClient.InputWidget(); this.IDW_HexEditor = new BizHawk.MultiClient.InputWidget(); this.IDW_RamPoke = new BizHawk.MultiClient.InputWidget(); this.IDW_RamSearch = 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.AutoTabCheckBox = new System.Windows.Forms.CheckBox(); this.hotkeyTabs.SuspendLayout(); this.tabPage1.SuspendLayout(); this.tabPage2.SuspendLayout(); @@ -258,6 +258,15 @@ this.label71.TabIndex = 61; this.label71.Text = "Soft Reset"; // + // IDW_RESET + // + this.IDW_RESET.AcceptsTab = true; + this.IDW_RESET.BackColor = System.Drawing.SystemColors.Window; + this.IDW_RESET.Location = new System.Drawing.Point(92, 130); + this.IDW_RESET.Name = "IDW_RESET"; + this.IDW_RESET.Size = new System.Drawing.Size(100, 20); + this.IDW_RESET.TabIndex = 25; + // // label70 // this.label70.AutoSize = true; @@ -267,6 +276,15 @@ this.label70.TabIndex = 59; this.label70.Text = "Turbo"; // + // IDW_UNTHROTTLE + // + this.IDW_UNTHROTTLE.AcceptsTab = true; + this.IDW_UNTHROTTLE.BackColor = System.Drawing.SystemColors.Window; + this.IDW_UNTHROTTLE.Location = new System.Drawing.Point(92, 106); + this.IDW_UNTHROTTLE.Name = "IDW_UNTHROTTLE"; + this.IDW_UNTHROTTLE.Size = new System.Drawing.Size(100, 20); + this.IDW_UNTHROTTLE.TabIndex = 20; + // // label69 // this.label69.AutoSize = true; @@ -276,6 +294,15 @@ this.label69.TabIndex = 28; this.label69.Text = "Volume Down"; // + // IDW_VOLDOWN + // + this.IDW_VOLDOWN.AcceptsTab = true; + this.IDW_VOLDOWN.BackColor = System.Drawing.SystemColors.Window; + 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 = 85; + // // label68 // this.label68.AutoSize = true; @@ -285,6 +312,24 @@ this.label68.TabIndex = 26; this.label68.Text = "Volume Up"; // + // IDW_VOLUP + // + this.IDW_VOLUP.AcceptsTab = true; + this.IDW_VOLUP.BackColor = System.Drawing.SystemColors.Window; + 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 = 80; + // + // IDW_InputDisplay + // + this.IDW_InputDisplay.AcceptsTab = true; + this.IDW_InputDisplay.BackColor = System.Drawing.SystemColors.Window; + this.IDW_InputDisplay.Location = new System.Drawing.Point(293, 179); + this.IDW_InputDisplay.Name = "IDW_InputDisplay"; + this.IDW_InputDisplay.Size = new System.Drawing.Size(100, 20); + this.IDW_InputDisplay.TabIndex = 75; + // // label62 // this.label62.AutoSize = true; @@ -294,6 +339,15 @@ this.label62.TabIndex = 24; this.label62.Text = "Input Display"; // + // IDW_LagCounter + // + this.IDW_LagCounter.AcceptsTab = true; + this.IDW_LagCounter.BackColor = System.Drawing.SystemColors.Window; + this.IDW_LagCounter.Location = new System.Drawing.Point(293, 154); + this.IDW_LagCounter.Name = "IDW_LagCounter"; + this.IDW_LagCounter.Size = new System.Drawing.Size(100, 20); + this.IDW_LagCounter.TabIndex = 70; + // // label61 // this.label61.AutoSize = true; @@ -303,6 +357,15 @@ this.label61.TabIndex = 22; this.label61.Text = "Lag Counter"; // + // IDW_FrameCounter + // + this.IDW_FrameCounter.AcceptsTab = true; + this.IDW_FrameCounter.BackColor = System.Drawing.SystemColors.Window; + this.IDW_FrameCounter.Location = new System.Drawing.Point(293, 130); + this.IDW_FrameCounter.Name = "IDW_FrameCounter"; + this.IDW_FrameCounter.Size = new System.Drawing.Size(100, 20); + this.IDW_FrameCounter.TabIndex = 65; + // // label60 // this.label60.AutoSize = true; @@ -312,6 +375,15 @@ this.label60.TabIndex = 20; this.label60.Text = "Frame Counter"; // + // IDW_DisplayFPS + // + this.IDW_DisplayFPS.AcceptsTab = true; + this.IDW_DisplayFPS.BackColor = System.Drawing.SystemColors.Window; + this.IDW_DisplayFPS.Location = new System.Drawing.Point(292, 105); + this.IDW_DisplayFPS.Name = "IDW_DisplayFPS"; + this.IDW_DisplayFPS.Size = new System.Drawing.Size(100, 20); + this.IDW_DisplayFPS.TabIndex = 60; + // // label59 // this.label59.AutoSize = true; @@ -321,6 +393,15 @@ 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(293, 81); + this.IDW_CloseROM.Name = "IDW_CloseROM"; + this.IDW_CloseROM.Size = new System.Drawing.Size(100, 20); + this.IDW_CloseROM.TabIndex = 56; + // // label58 // this.label58.AutoSize = true; @@ -330,6 +411,15 @@ 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(293, 57); + this.IDW_OpenROM.Name = "IDW_OpenROM"; + this.IDW_OpenROM.Size = new System.Drawing.Size(100, 20); + this.IDW_OpenROM.TabIndex = 55; + // // label57 // this.label57.AutoSize = true; @@ -339,6 +429,15 @@ 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, 10); + 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; @@ -348,6 +447,24 @@ 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, 33); + this.IDW_FULLSCREEN.Name = "IDW_FULLSCREEN"; + this.IDW_FULLSCREEN.Size = new System.Drawing.Size(100, 20); + this.IDW_FULLSCREEN.TabIndex = 50; + // + // IDW_SCREENSHOT + // + this.IDW_SCREENSHOT.AcceptsTab = true; + this.IDW_SCREENSHOT.BackColor = System.Drawing.SystemColors.Window; + this.IDW_SCREENSHOT.Location = new System.Drawing.Point(293, 9); + this.IDW_SCREENSHOT.Name = "IDW_SCREENSHOT"; + this.IDW_SCREENSHOT.Size = new System.Drawing.Size(100, 20); + this.IDW_SCREENSHOT.TabIndex = 45; + // // label44 // this.label44.AutoSize = true; @@ -357,6 +474,15 @@ 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, 34); + 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; @@ -366,6 +492,15 @@ 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, 82); + this.IDW_FASTFORWARD.Name = "IDW_FASTFORWARD"; + this.IDW_FASTFORWARD.Size = new System.Drawing.Size(100, 20); + this.IDW_FASTFORWARD.TabIndex = 15; + // // label36 // this.label36.AutoSize = true; @@ -375,6 +510,15 @@ 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, 154); + this.IDW_HARDRESET.Name = "IDW_HARDRESET"; + this.IDW_HARDRESET.Size = new System.Drawing.Size(100, 20); + this.IDW_HARDRESET.TabIndex = 30; + // // label35 // this.label35.AutoSize = true; @@ -384,6 +528,15 @@ 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, 58); + this.IDW_PAUSE.Name = "IDW_PAUSE"; + this.IDW_PAUSE.Size = new System.Drawing.Size(100, 20); + this.IDW_PAUSE.TabIndex = 10; + // // label34 // this.label34.AutoSize = true; @@ -411,6 +564,15 @@ 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(92, 178); + this.IDW_QuickLoad.Name = "IDW_QuickLoad"; + this.IDW_QuickLoad.Size = new System.Drawing.Size(100, 20); + this.IDW_QuickLoad.TabIndex = 35; + // // label31 // this.label31.AutoSize = true; @@ -420,6 +582,15 @@ 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(92, 202); + this.IDW_QuickSave.Name = "IDW_QuickSave"; + this.IDW_QuickSave.Size = new System.Drawing.Size(100, 20); + this.IDW_QuickSave.TabIndex = 40; + // // tabPage2 // this.tabPage2.Controls.Add(this.IDW_SS1); @@ -499,6 +670,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; @@ -812,433 +991,6 @@ this.HR.Size = new System.Drawing.Size(558, 2); this.HR.TabIndex = 0; // - // tabPage3 - // - this.tabPage3.Controls.Add(this.IDW_TOGGLEREADONLY); - this.tabPage3.Controls.Add(this.IDW_PLAYBEGINNING); - this.tabPage3.Controls.Add(this.label67); - this.tabPage3.Controls.Add(this.label66); - this.tabPage3.Controls.Add(this.label65); - this.tabPage3.Controls.Add(this.label64); - this.tabPage3.Controls.Add(this.label63); - 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_STOPMOVIE); - this.tabPage3.Controls.Add(this.IDW_PLAYMOVIE); - this.tabPage3.Controls.Add(this.IDW_RECORDMOVIE); - 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.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(605, 315); - this.tabPage3.TabIndex = 2; - this.tabPage3.Text = "Movie"; - this.tabPage3.UseVisualStyleBackColor = true; - // - // label67 - // - this.label67.AutoSize = true; - this.label67.Location = new System.Drawing.Point(6, 116); - this.label67.Name = "label67"; - this.label67.Size = new System.Drawing.Size(99, 13); - this.label67.TabIndex = 85; - this.label67.Text = "Play from beginning"; - // - // label66 - // - this.label66.AutoSize = true; - this.label66.Location = new System.Drawing.Point(6, 90); - this.label66.Name = "label66"; - this.label66.Size = new System.Drawing.Size(60, 13); - this.label66.TabIndex = 83; - this.label66.Text = "Stop movie"; - // - // label65 - // - this.label65.AutoSize = true; - this.label65.Location = new System.Drawing.Point(6, 38); - this.label65.Name = "label65"; - this.label65.Size = new System.Drawing.Size(58, 13); - this.label65.TabIndex = 81; - this.label65.Text = "Play movie"; - // - // label64 - // - this.label64.AutoSize = true; - this.label64.Location = new System.Drawing.Point(6, 64); - this.label64.Name = "label64"; - this.label64.Size = new System.Drawing.Size(73, 13); - this.label64.TabIndex = 79; - this.label64.Text = "Record movie"; - // - // label63 - // - this.label63.AutoSize = true; - this.label63.Location = new System.Drawing.Point(6, 12); - this.label63.Name = "label63"; - this.label63.Size = new System.Drawing.Size(86, 13); - this.label63.TabIndex = 77; - this.label63.Text = "Toggle read-only"; - // - // label43 - // - this.label43.AutoSize = true; - this.label43.Location = new System.Drawing.Point(225, 113); - 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(225, 87); - 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(225, 61); - 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(225, 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(225, 9); - 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_RamWatch); - 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.Location = new System.Drawing.Point(4, 28); - this.tabPage4.Name = "tabPage4"; - this.tabPage4.Size = new System.Drawing.Size(605, 315); - this.tabPage4.TabIndex = 3; - this.tabPage4.Text = "Tools"; - this.tabPage4.UseVisualStyleBackColor = true; - // - // 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"; - // - // AutoTabCheckBox - // - this.AutoTabCheckBox.AutoSize = true; - this.AutoTabCheckBox.Location = new System.Drawing.Point(552, 362); - this.AutoTabCheckBox.Name = "AutoTabCheckBox"; - this.AutoTabCheckBox.Size = new System.Drawing.Size(70, 17); - this.AutoTabCheckBox.TabIndex = 100; - this.AutoTabCheckBox.Text = "Auto Tab"; - this.AutoTabCheckBox.UseVisualStyleBackColor = true; - this.AutoTabCheckBox.CheckedChanged += new System.EventHandler(this.AutoTabCheckBox_CheckedChanged); - // - // IDW_RESET - // - this.IDW_RESET.AcceptsTab = true; - this.IDW_RESET.BackColor = System.Drawing.SystemColors.Window; - this.IDW_RESET.Location = new System.Drawing.Point(92, 130); - this.IDW_RESET.Name = "IDW_RESET"; - this.IDW_RESET.Size = new System.Drawing.Size(100, 20); - this.IDW_RESET.TabIndex = 25; - // - // IDW_UNTHROTTLE - // - this.IDW_UNTHROTTLE.AcceptsTab = true; - this.IDW_UNTHROTTLE.BackColor = System.Drawing.SystemColors.Window; - this.IDW_UNTHROTTLE.Location = new System.Drawing.Point(92, 106); - this.IDW_UNTHROTTLE.Name = "IDW_UNTHROTTLE"; - this.IDW_UNTHROTTLE.Size = new System.Drawing.Size(100, 20); - this.IDW_UNTHROTTLE.TabIndex = 20; - // - // IDW_VOLDOWN - // - this.IDW_VOLDOWN.AcceptsTab = true; - this.IDW_VOLDOWN.BackColor = System.Drawing.SystemColors.Window; - 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 = 85; - // - // IDW_VOLUP - // - this.IDW_VOLUP.AcceptsTab = true; - this.IDW_VOLUP.BackColor = System.Drawing.SystemColors.Window; - 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 = 80; - // - // IDW_InputDisplay - // - this.IDW_InputDisplay.AcceptsTab = true; - this.IDW_InputDisplay.BackColor = System.Drawing.SystemColors.Window; - this.IDW_InputDisplay.Location = new System.Drawing.Point(293, 179); - this.IDW_InputDisplay.Name = "IDW_InputDisplay"; - this.IDW_InputDisplay.Size = new System.Drawing.Size(100, 20); - this.IDW_InputDisplay.TabIndex = 75; - // - // IDW_LagCounter - // - this.IDW_LagCounter.AcceptsTab = true; - this.IDW_LagCounter.BackColor = System.Drawing.SystemColors.Window; - this.IDW_LagCounter.Location = new System.Drawing.Point(293, 154); - this.IDW_LagCounter.Name = "IDW_LagCounter"; - this.IDW_LagCounter.Size = new System.Drawing.Size(100, 20); - this.IDW_LagCounter.TabIndex = 70; - // - // IDW_FrameCounter - // - this.IDW_FrameCounter.AcceptsTab = true; - this.IDW_FrameCounter.BackColor = System.Drawing.SystemColors.Window; - this.IDW_FrameCounter.Location = new System.Drawing.Point(293, 130); - this.IDW_FrameCounter.Name = "IDW_FrameCounter"; - this.IDW_FrameCounter.Size = new System.Drawing.Size(100, 20); - this.IDW_FrameCounter.TabIndex = 65; - // - // IDW_DisplayFPS - // - this.IDW_DisplayFPS.AcceptsTab = true; - this.IDW_DisplayFPS.BackColor = System.Drawing.SystemColors.Window; - this.IDW_DisplayFPS.Location = new System.Drawing.Point(292, 105); - this.IDW_DisplayFPS.Name = "IDW_DisplayFPS"; - this.IDW_DisplayFPS.Size = new System.Drawing.Size(100, 20); - this.IDW_DisplayFPS.TabIndex = 60; - // - // IDW_CloseROM - // - this.IDW_CloseROM.AcceptsTab = true; - this.IDW_CloseROM.BackColor = System.Drawing.SystemColors.Window; - this.IDW_CloseROM.Location = new System.Drawing.Point(293, 81); - this.IDW_CloseROM.Name = "IDW_CloseROM"; - this.IDW_CloseROM.Size = new System.Drawing.Size(100, 20); - this.IDW_CloseROM.TabIndex = 55; - // - // IDW_OpenROM - // - this.IDW_OpenROM.AcceptsTab = true; - this.IDW_OpenROM.BackColor = System.Drawing.SystemColors.Window; - this.IDW_OpenROM.Location = new System.Drawing.Point(293, 57); - this.IDW_OpenROM.Name = "IDW_OpenROM"; - this.IDW_OpenROM.Size = new System.Drawing.Size(100, 20); - this.IDW_OpenROM.TabIndex = 55; - // - // IDW_FRAMEADVANCE - // - this.IDW_FRAMEADVANCE.AcceptsTab = true; - this.IDW_FRAMEADVANCE.BackColor = System.Drawing.SystemColors.Window; - this.IDW_FRAMEADVANCE.Location = new System.Drawing.Point(92, 10); - this.IDW_FRAMEADVANCE.Name = "IDW_FRAMEADVANCE"; - this.IDW_FRAMEADVANCE.Size = new System.Drawing.Size(100, 20); - this.IDW_FRAMEADVANCE.TabIndex = 1; - // - // IDW_FULLSCREEN - // - this.IDW_FULLSCREEN.AcceptsTab = true; - this.IDW_FULLSCREEN.BackColor = System.Drawing.SystemColors.Window; - this.IDW_FULLSCREEN.Location = new System.Drawing.Point(293, 33); - this.IDW_FULLSCREEN.Name = "IDW_FULLSCREEN"; - this.IDW_FULLSCREEN.Size = new System.Drawing.Size(100, 20); - this.IDW_FULLSCREEN.TabIndex = 50; - // - // IDW_SCREENSHOT - // - this.IDW_SCREENSHOT.AcceptsTab = true; - this.IDW_SCREENSHOT.BackColor = System.Drawing.SystemColors.Window; - this.IDW_SCREENSHOT.Location = new System.Drawing.Point(293, 9); - this.IDW_SCREENSHOT.Name = "IDW_SCREENSHOT"; - this.IDW_SCREENSHOT.Size = new System.Drawing.Size(100, 20); - this.IDW_SCREENSHOT.TabIndex = 45; - // - // IDW_REWIND - // - this.IDW_REWIND.AcceptsTab = true; - this.IDW_REWIND.BackColor = System.Drawing.SystemColors.Window; - this.IDW_REWIND.Location = new System.Drawing.Point(92, 34); - 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, 82); - this.IDW_FASTFORWARD.Name = "IDW_FASTFORWARD"; - this.IDW_FASTFORWARD.Size = new System.Drawing.Size(100, 20); - this.IDW_FASTFORWARD.TabIndex = 15; - // - // IDW_HARDRESET - // - this.IDW_HARDRESET.AcceptsTab = true; - this.IDW_HARDRESET.BackColor = System.Drawing.SystemColors.Window; - this.IDW_HARDRESET.Location = new System.Drawing.Point(92, 154); - this.IDW_HARDRESET.Name = "IDW_HARDRESET"; - this.IDW_HARDRESET.Size = new System.Drawing.Size(100, 20); - this.IDW_HARDRESET.TabIndex = 30; - // - // IDW_PAUSE - // - this.IDW_PAUSE.AcceptsTab = true; - this.IDW_PAUSE.BackColor = System.Drawing.SystemColors.Window; - this.IDW_PAUSE.Location = new System.Drawing.Point(92, 58); - this.IDW_PAUSE.Name = "IDW_PAUSE"; - this.IDW_PAUSE.Size = new System.Drawing.Size(100, 20); - this.IDW_PAUSE.TabIndex = 10; - // - // IDW_QuickLoad - // - this.IDW_QuickLoad.AcceptsTab = true; - this.IDW_QuickLoad.BackColor = System.Drawing.SystemColors.Window; - 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 = 35; - // - // IDW_QuickSave - // - this.IDW_QuickSave.AcceptsTab = true; - this.IDW_QuickSave.BackColor = System.Drawing.SystemColors.Window; - this.IDW_QuickSave.Location = new System.Drawing.Point(92, 202); - this.IDW_QuickSave.Name = "IDW_QuickSave"; - this.IDW_QuickSave.Size = new System.Drawing.Size(100, 20); - this.IDW_QuickSave.TabIndex = 40; - // - // 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_NEXTSLOT // this.IDW_NEXTSLOT.Location = new System.Drawing.Point(361, 288); @@ -1470,6 +1222,36 @@ this.IDW_SS2.Size = new System.Drawing.Size(100, 20); this.IDW_SS2.TabIndex = 64; // + // tabPage3 + // + this.tabPage3.Controls.Add(this.IDW_TOGGLEREADONLY); + this.tabPage3.Controls.Add(this.IDW_PLAYBEGINNING); + this.tabPage3.Controls.Add(this.label67); + this.tabPage3.Controls.Add(this.label66); + this.tabPage3.Controls.Add(this.label65); + this.tabPage3.Controls.Add(this.label64); + this.tabPage3.Controls.Add(this.label63); + 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_STOPMOVIE); + this.tabPage3.Controls.Add(this.IDW_PLAYMOVIE); + this.tabPage3.Controls.Add(this.IDW_RECORDMOVIE); + 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.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(605, 315); + this.tabPage3.TabIndex = 2; + this.tabPage3.Text = "Movie"; + this.tabPage3.UseVisualStyleBackColor = true; + // // IDW_TOGGLEREADONLY // this.IDW_TOGGLEREADONLY.AcceptsTab = true; @@ -1488,6 +1270,96 @@ this.IDW_PLAYBEGINNING.Size = new System.Drawing.Size(100, 20); this.IDW_PLAYBEGINNING.TabIndex = 72; // + // label67 + // + this.label67.AutoSize = true; + this.label67.Location = new System.Drawing.Point(6, 116); + this.label67.Name = "label67"; + this.label67.Size = new System.Drawing.Size(99, 13); + this.label67.TabIndex = 85; + this.label67.Text = "Play from beginning"; + // + // label66 + // + this.label66.AutoSize = true; + this.label66.Location = new System.Drawing.Point(6, 90); + this.label66.Name = "label66"; + this.label66.Size = new System.Drawing.Size(60, 13); + this.label66.TabIndex = 83; + this.label66.Text = "Stop movie"; + // + // label65 + // + this.label65.AutoSize = true; + this.label65.Location = new System.Drawing.Point(6, 38); + this.label65.Name = "label65"; + this.label65.Size = new System.Drawing.Size(58, 13); + this.label65.TabIndex = 81; + this.label65.Text = "Play movie"; + // + // label64 + // + this.label64.AutoSize = true; + this.label64.Location = new System.Drawing.Point(6, 64); + this.label64.Name = "label64"; + this.label64.Size = new System.Drawing.Size(73, 13); + this.label64.TabIndex = 79; + this.label64.Text = "Record movie"; + // + // label63 + // + this.label63.AutoSize = true; + this.label63.Location = new System.Drawing.Point(6, 12); + this.label63.Name = "label63"; + this.label63.Size = new System.Drawing.Size(86, 13); + this.label63.TabIndex = 77; + this.label63.Text = "Toggle read-only"; + // + // label43 + // + this.label43.AutoSize = true; + this.label43.Location = new System.Drawing.Point(225, 113); + 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(225, 87); + 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(225, 61); + 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(225, 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(225, 9); + this.label39.Name = "label39"; + this.label39.Size = new System.Drawing.Size(93, 13); + this.label39.TabIndex = 67; + this.label39.Text = "Toggle MultiTrack"; + // // IDW_STOPMOVIE // this.IDW_STOPMOVIE.AcceptsTab = true; @@ -1560,6 +1432,29 @@ this.IDW_MTSELECTALL.Size = new System.Drawing.Size(100, 20); this.IDW_MTSELECTALL.TabIndex = 81; // + // tabPage4 + // + this.tabPage4.Controls.Add(this.IDW_RamWatch); + 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.Location = new System.Drawing.Point(4, 28); + this.tabPage4.Name = "tabPage4"; + this.tabPage4.Size = new System.Drawing.Size(605, 315); + this.tabPage4.TabIndex = 3; + this.tabPage4.Text = "Tools"; + this.tabPage4.UseVisualStyleBackColor = true; + // // IDW_RamWatch // this.IDW_RamWatch.AcceptsTab = true; @@ -1576,6 +1471,69 @@ 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"; + // + // 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 // this.IDW_Cheats.AcceptsTab = true; @@ -1621,6 +1579,48 @@ this.IDW_RamSearch.Size = new System.Drawing.Size(100, 20); this.IDW_RamSearch.TabIndex = 71; // + // 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"; + // + // AutoTabCheckBox + // + this.AutoTabCheckBox.AutoSize = true; + this.AutoTabCheckBox.Location = new System.Drawing.Point(552, 362); + this.AutoTabCheckBox.Name = "AutoTabCheckBox"; + this.AutoTabCheckBox.Size = new System.Drawing.Size(70, 17); + this.AutoTabCheckBox.TabIndex = 100; + this.AutoTabCheckBox.Text = "Auto Tab"; + this.AutoTabCheckBox.UseVisualStyleBackColor = true; + this.AutoTabCheckBox.CheckedChanged += new System.EventHandler(this.AutoTabCheckBox_CheckedChanged); + // // HotkeyWindow // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); diff --git a/BizHawk.MultiClient/config/HotkeyWindow.cs b/BizHawk.MultiClient/config/HotkeyWindow.cs index 069bd08ab0..15ab8b1035 100644 --- a/BizHawk.MultiClient/config/HotkeyWindow.cs +++ b/BizHawk.MultiClient/config/HotkeyWindow.cs @@ -14,80 +14,80 @@ namespace BizHawk.MultiClient.tools public HotkeyWindow() { InitializeComponent(); - IDW_FRAMEADVANCE.Text = Global.Config.FrameAdvanceBinding; - IDW_PAUSE.Text = Global.Config.EmulatorPauseBinding; - IDW_HARDRESET.Text = Global.Config.HardResetBinding; - IDW_REWIND.Text = Global.Config.RewindBinding; - IDW_UNTHROTTLE.Text = Global.Config.TurboBinding; - IDW_FASTFORWARD.Text = Global.Config.FastForwardBinding; - IDW_SCREENSHOT.Text = Global.Config.ScreenshotBinding; - IDW_FULLSCREEN.Text = Global.Config.ToggleFullscreenBinding; + IDW_FRAMEADVANCE.SetBindings(Global.Config.FrameAdvanceBinding); + IDW_PAUSE.SetBindings(Global.Config.EmulatorPauseBinding); + IDW_HARDRESET.SetBindings(Global.Config.HardResetBinding); + IDW_REWIND.SetBindings(Global.Config.RewindBinding); + IDW_UNTHROTTLE.SetBindings(Global.Config.TurboBinding); + IDW_FASTFORWARD.SetBindings(Global.Config.FastForwardBinding); + IDW_SCREENSHOT.SetBindings(Global.Config.ScreenshotBinding); + IDW_FULLSCREEN.SetBindings(Global.Config.ToggleFullscreenBinding); - IDW_QuickSave.Text = Global.Config.QuickSave; - IDW_QuickLoad.Text = Global.Config.QuickLoad; + IDW_QuickSave.SetBindings(Global.Config.QuickSave); + IDW_QuickLoad.SetBindings(Global.Config.QuickLoad); //Save States - IDW_SS0.Text = Global.Config.SaveSlot0; - IDW_SS1.Text = Global.Config.SaveSlot1; - IDW_SS2.Text = Global.Config.SaveSlot2; - IDW_SS3.Text = Global.Config.SaveSlot3; - IDW_SS4.Text = Global.Config.SaveSlot4; - IDW_SS5.Text = Global.Config.SaveSlot5; - IDW_SS6.Text = Global.Config.SaveSlot6; - IDW_SS7.Text = Global.Config.SaveSlot7; - IDW_SS8.Text = Global.Config.SaveSlot8; - IDW_SS9.Text = Global.Config.SaveSlot9; + IDW_SS0.SetBindings(Global.Config.SaveSlot0); + IDW_SS1.SetBindings(Global.Config.SaveSlot1); + IDW_SS2.SetBindings(Global.Config.SaveSlot2); + IDW_SS3.SetBindings(Global.Config.SaveSlot3); + IDW_SS4.SetBindings(Global.Config.SaveSlot4); + IDW_SS5.SetBindings(Global.Config.SaveSlot5); + IDW_SS6.SetBindings(Global.Config.SaveSlot6); + IDW_SS7.SetBindings(Global.Config.SaveSlot7); + IDW_SS8.SetBindings(Global.Config.SaveSlot8); + IDW_SS9.SetBindings(Global.Config.SaveSlot9); //Load States - IDW_LS0.Text = Global.Config.LoadSlot0; - IDW_LS1.Text = Global.Config.LoadSlot1; - IDW_LS2.Text = Global.Config.LoadSlot2; - IDW_LS3.Text = Global.Config.LoadSlot3; - IDW_LS4.Text = Global.Config.LoadSlot4; - IDW_LS5.Text = Global.Config.LoadSlot5; - IDW_LS6.Text = Global.Config.LoadSlot6; - IDW_LS7.Text = Global.Config.LoadSlot7; - IDW_LS8.Text = Global.Config.LoadSlot8; - IDW_LS9.Text = Global.Config.LoadSlot9; + IDW_LS0.SetBindings(Global.Config.LoadSlot0); + IDW_LS1.SetBindings(Global.Config.LoadSlot1); + IDW_LS2.SetBindings(Global.Config.LoadSlot2); + IDW_LS3.SetBindings(Global.Config.LoadSlot3); + IDW_LS4.SetBindings(Global.Config.LoadSlot4); + IDW_LS5.SetBindings(Global.Config.LoadSlot5); + IDW_LS6.SetBindings(Global.Config.LoadSlot6); + IDW_LS7.SetBindings(Global.Config.LoadSlot7); + IDW_LS8.SetBindings(Global.Config.LoadSlot8); + IDW_LS9.SetBindings(Global.Config.LoadSlot9); //Select States - IDW_ST0.Text = Global.Config.SelectSlot0; - IDW_ST1.Text = Global.Config.SelectSlot1; - IDW_ST2.Text = Global.Config.SelectSlot2; - IDW_ST3.Text = Global.Config.SelectSlot3; - IDW_ST4.Text = Global.Config.SelectSlot4; - IDW_ST5.Text = Global.Config.SelectSlot5; - IDW_ST6.Text = Global.Config.SelectSlot6; - IDW_ST7.Text = Global.Config.SelectSlot7; - IDW_ST8.Text = Global.Config.SelectSlot8; - IDW_ST9.Text = Global.Config.SelectSlot9; - IDW_TOOLBOX.Text = Global.Config.ToolBox; - IDW_SAVENAMEDSTATE.Text = Global.Config.SaveNamedState; - IDW_LOADNAMEDSTATE.Text = Global.Config.LoadNamedState; - IDW_NEXTSLOT.Text = Global.Config.NextSlot; - IDW_PREVIOUSSLOT.Text = Global.Config.PreviousSlot; - IDW_RamWatch.Text = Global.Config.RamWatch; - IDW_RamSearch.Text = Global.Config.RamSearch; - IDW_RamPoke.Text = Global.Config.RamPoke; - 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; - IDW_DisplayFPS.Text = Global.Config.FPSBinding; - IDW_FrameCounter.Text = Global.Config.FrameCounterBinding; - IDW_LagCounter.Text = Global.Config.LagCounterBinding; - IDW_InputDisplay.Text = Global.Config.InputDisplayBinding; - IDW_TOGGLEREADONLY.Text = Global.Config.ReadOnlyToggleBinding; - IDW_PLAYMOVIE.Text = Global.Config.PlayMovieBinding; - IDW_RECORDMOVIE.Text = Global.Config.RecordMovieBinding; - IDW_STOPMOVIE.Text = Global.Config.StopMovieBinding; - IDW_PLAYBEGINNING.Text = Global.Config.PlayBeginningBinding; - IDW_VOLUP.Text = Global.Config.VolUpBinding; - IDW_VOLDOWN.Text = Global.Config.VolDownBinding; - IDW_TOGGLEMTRACK.Text = Global.Config.ToggleMultiTrack; - IDW_SELECTNONE.Text = Global.Config.MTRecordNone; - IDW_MTSELECTALL.Text = Global.Config.MTRecordAll; - IDW_MTINCPLAYER.Text = Global.Config.MTIncrementPlayer; - IDW_MTDECPLAYER.Text = Global.Config.MTDecrementPlayer; - IDW_RESET.Text = Global.Config.SoftResetBinding; + IDW_ST0.SetBindings(Global.Config.SelectSlot0); + IDW_ST1.SetBindings(Global.Config.SelectSlot1); + IDW_ST2.SetBindings(Global.Config.SelectSlot2); + IDW_ST3.SetBindings(Global.Config.SelectSlot3); + IDW_ST4.SetBindings(Global.Config.SelectSlot4); + IDW_ST5.SetBindings(Global.Config.SelectSlot5); + IDW_ST6.SetBindings(Global.Config.SelectSlot6); + IDW_ST7.SetBindings(Global.Config.SelectSlot7); + IDW_ST8.SetBindings(Global.Config.SelectSlot8); + IDW_ST9.SetBindings(Global.Config.SelectSlot9); + IDW_TOOLBOX.SetBindings(Global.Config.ToolBox); + IDW_SAVENAMEDSTATE.SetBindings(Global.Config.SaveNamedState); + IDW_LOADNAMEDSTATE.SetBindings(Global.Config.LoadNamedState); + IDW_NEXTSLOT.SetBindings(Global.Config.NextSlot); + IDW_PREVIOUSSLOT.SetBindings(Global.Config.PreviousSlot); + IDW_RamWatch.SetBindings(Global.Config.RamWatch); + IDW_RamSearch.SetBindings(Global.Config.RamSearch); + IDW_RamPoke.SetBindings(Global.Config.RamPoke); + IDW_HexEditor.SetBindings(Global.Config.HexEditor); + IDW_LuaConsole.SetBindings(Global.Config.LuaConsole); + IDW_Cheats.SetBindings(Global.Config.Cheats); + IDW_OpenROM.SetBindings(Global.Config.OpenROM); + IDW_CloseROM.SetBindings(Global.Config.CloseROM); + IDW_DisplayFPS.SetBindings(Global.Config.FPSBinding); + IDW_FrameCounter.SetBindings(Global.Config.FrameCounterBinding); + IDW_LagCounter.SetBindings(Global.Config.LagCounterBinding); + IDW_InputDisplay.SetBindings(Global.Config.InputDisplayBinding); + IDW_TOGGLEREADONLY.SetBindings(Global.Config.ReadOnlyToggleBinding); + IDW_PLAYMOVIE.SetBindings(Global.Config.PlayMovieBinding); + IDW_RECORDMOVIE.SetBindings(Global.Config.RecordMovieBinding); + IDW_STOPMOVIE.SetBindings(Global.Config.StopMovieBinding); + IDW_PLAYBEGINNING.SetBindings(Global.Config.PlayBeginningBinding); + IDW_VOLUP.SetBindings(Global.Config.VolUpBinding); + IDW_VOLDOWN.SetBindings(Global.Config.VolDownBinding); + IDW_TOGGLEMTRACK.SetBindings(Global.Config.ToggleMultiTrack); + IDW_SELECTNONE.SetBindings(Global.Config.MTRecordNone); + IDW_MTSELECTALL.SetBindings(Global.Config.MTRecordAll); + IDW_MTINCPLAYER.SetBindings(Global.Config.MTIncrementPlayer); + IDW_MTDECPLAYER.SetBindings(Global.Config.MTDecrementPlayer); + IDW_RESET.SetBindings(Global.Config.SoftResetBinding); } private void button2_Click(object sender, EventArgs e) { diff --git a/BizHawk.MultiClient/config/InputWidget.cs b/BizHawk.MultiClient/config/InputWidget.cs index 14a5c95a14..2774e16928 100644 --- a/BizHawk.MultiClient/config/InputWidget.cs +++ b/BizHawk.MultiClient/config/InputWidget.cs @@ -7,160 +7,146 @@ namespace BizHawk.MultiClient { public class InputWidget : TextBox { - private Timer timer = new Timer(); - public InputWidget() + int MaxBind = 4; //Max number of bindings allowed + private Timer timer = new Timer(); + public bool AutoTab = true; + string[] Bindings = new string[4]; + string wasPressed = ""; + + public InputWidget() { this.ContextMenu = new ContextMenu(); - this.timer.Tick += new System.EventHandler(this.Timer_Tick); + this.timer.Tick += new System.EventHandler(this.Timer_Tick); + InitializeBindings(); } - public List Bindings = new List(); - public bool AutoTab = true; - bool ctrlWasPressed = false; - bool altWasPressed = false; - bool shiftWasPressed = false; - - string TempBindingStr = ""; //TODO: remove me, this is for a proof of concept - - protected override void OnEnter(EventArgs e) - { - timer.Start(); - base.OnEnter(e); - } - - protected override void OnLeave(EventArgs e) - { - timer.Stop(); - this.Text = TempBindingStr; - base.OnLeave(e); - } - - private void Timer_Tick(object sender, EventArgs e) - { - Input.Update(); - TempBindingStr = Input.GetPressedKey(); - if (TempBindingStr != null) - { - // just for debugging. not really sure how to rebind from inside the timer? - MessageBox.Show(TempBindingStr); - } - } - - void UpdateLabel() + public InputWidget(int maxBindings) { - if (Bindings.Count == 0) - { - Text = ""; - } - else - { - Text = ""; - for (int x = 0; x < Bindings.Count; x++) - Text += Bindings[x].ToString(); - } - Update(); + this.ContextMenu = new ContextMenu(); + this.timer.Tick += new System.EventHandler(this.Timer_Tick); + MaxBind = maxBindings; + Bindings = new string[MaxBind]; + InitializeBindings(); } - protected override void OnKeyDown(KeyEventArgs e) + private void InitializeBindings() { - /* - e.Handled = true; - if (e.KeyCode == Keys.ControlKey) return; - if (e.KeyCode == Keys.ShiftKey) return; - if (e.KeyCode == Keys.Menu) return; - if (e.KeyCode != Keys.Escape) + for (int x = 0; x < MaxBind; x++) { - KeyboardBinding kb = new KeyboardBinding(); - kb.key = e.KeyCode; - kb.modifiers = e.Modifiers; - Bindings.Clear(); - Bindings.Add(kb); - UpdateLabel(); + Bindings[x] = ""; } - else + } + + protected override void OnEnter(EventArgs e) + { + timer.Start(); + base.OnEnter(e); + Input.Update(); + wasPressed = Input.GetPressedKey(); + } + + protected override void OnLeave(EventArgs e) + { + timer.Stop(); + UpdateLabel(); + base.OnLeave(e); + } + + private void Timer_Tick(object sender, EventArgs e) + { + ReadKeys(); + } + + private void ReadKeys() + { + Input.Update(); + string TempBindingStr = Input.GetPressedKey(); + if (wasPressed != "" && TempBindingStr == wasPressed) return; + if (TempBindingStr != null) { - Bindings.Clear(); + if (TempBindingStr == "Escape") + { + ClearBindings(); + Increment(); + return; + } + + if (TempBindingStr == "Alt+F4") + return; + + Bindings[0] = TempBindingStr; UpdateLabel(); + Increment(); } - - if (e.KeyCode == Keys.F4) - e.Handled = false; - - if (AutoTab) - this.Parent.SelectNextControl(this, true, true, true, true); - */ } protected override void OnKeyUp(KeyEventArgs e) { - if (e.KeyData == Keys.ControlKey) + if (e.KeyCode == Keys.F4 && e.Modifiers == Keys.Alt) { - if (ctrlWasPressed) - { - KeyboardBinding kb = new KeyboardBinding(); - kb.key = Keys.ControlKey; - Bindings.Clear(); - Bindings.Add(kb); - UpdateLabel(); - this.Parent.SelectNextControl(this, true, true, true, true); - ctrlWasPressed = false; - shiftWasPressed = false; - altWasPressed = false; - } - else - { - ctrlWasPressed = true; - shiftWasPressed = false; - altWasPressed = false; - BackColor = SystemColors.ControlLight; - } - } - else if (e.KeyData == Keys.ShiftKey) - { - if (shiftWasPressed) - { - KeyboardBinding kb = new KeyboardBinding(); - kb.key = Keys.ShiftKey; - Bindings.Clear(); - Bindings.Add(kb); - UpdateLabel(); - this.Parent.SelectNextControl(this, true, true, true, true); - ctrlWasPressed = false; - shiftWasPressed = false; - altWasPressed = false; - } - else - { - shiftWasPressed = true; - altWasPressed = false; - ctrlWasPressed = false; - BackColor = SystemColors.ControlLight; - } - } - else if (e.KeyData == Keys.Menu) - { - if (altWasPressed) - { - KeyboardBinding kb = new KeyboardBinding(); - kb.key = Keys.Menu; - Bindings.Clear(); - Bindings.Add(kb); - UpdateLabel(); - this.Parent.SelectNextControl(this, true, true, true, true); - ctrlWasPressed = false; - shiftWasPressed = false; - altWasPressed = false; - } - else - { - altWasPressed = true; - ctrlWasPressed = false; - shiftWasPressed = false; - BackColor = SystemColors.ControlLight; - } + base.OnKeyUp(e); } + wasPressed = ""; + } - base.OnKeyUp(e); + protected override void OnKeyDown(KeyEventArgs e) + { + if (e.KeyCode == Keys.F4 && e.Modifiers == Keys.Alt) + { + base.OnKeyDown(e); + } + e.Handled = true; + } + + // Advances to the next widget or the next binding depending on the autotab setting + private void Increment() + { + if (AutoTab) + this.Parent.SelectNextControl(this, true, true, true, true); + } + + public void ClearBindings() + { + for (int x = 0; x < MaxBind; x++) + Bindings[x] = ""; + } + + public void UpdateLabel() + { + Text = ""; + for (int x = 0; x < MaxBind; x++) + { + if (Bindings[x].Length > 0) + { + Text += Bindings[x]; + if (x < MaxBind - 1 && Bindings[x+1].Length > 0) + Text += ", "; + } + } + } + + public void SetBindings(string bindingsString) + { + Text = ""; + ClearBindings(); + string str = bindingsString.Trim(); + int x; + for (int i = 0; i < MaxBind; i++) + { + str = str.Trim(); + x = str.IndexOf(','); + if (x < 0) + { + Bindings[i] = str; + str = ""; + } + else + { + Bindings[i] = str.Substring(0, x); + str = str.Substring(x + 1, str.Length - x - 1); + } + } + UpdateLabel(); } protected override void OnKeyPress(KeyPressEventArgs e) @@ -184,89 +170,9 @@ namespace BizHawk.MultiClient { if (keyData == Keys.Tab) { - KeyboardBinding kb = new KeyboardBinding(); - kb.key = keyData; - Bindings.Clear(); - Bindings.Add(kb); - UpdateLabel(); + ReadKeys(); } return false; } } - - public class KeyboardBinding : IBinding - { - public override string ToString() - { - // Convert Windows key names to SlimDX key names - string str = ""; - - str += key.ToString(); - if (str.Length == 2 && str == "F4") //Don't allow mapping of alt+f4 - if ((modifiers & Keys.Alt) != 0) - return ""; - if (str.Length == 10 && str == "ControlKey") - str = "Ctrl"; - if (str.Length == 4 && str == "Menu") - str = "Alt"; - if (str.Length == 8 && str == "ShiftKey") - str = "Shift"; - if (str.Length == 2 && str == "Up") - str = "UpArrow"; - if (str.Length == 4 && str == "Down") - str = "DownArrow"; - if (str.Length == 4 && str == "Left") - str = "LeftArrow"; - if (str.Length == 5 && str == "Right") - str = "RightArrow"; - if (str.Length >= 6 && str.Substring(0, 6) == "NumPad") - str = str.Insert(3, "ber"); - if (str.Length == 7 && str.Substring(0, 7) == "Decimal") - str = "NumberPadPeriod"; - if (str.Length == 6 && str.Substring(0, 6) == "Divide") - str = "NumberPadSlash"; - if (str.Length == 8 && str.Substring(0, 8) == "Multiply") - str = "NumberPadStar"; - if (str.Length == 8 && str.Substring(0, 8) == "Subtract") - str = "NumberPadMinus"; - if (str.Length == 3 && str.Substring(0, 3) == "Add") - str = "NumberPadPlus"; - if (str.Length == 4 && str == "Oem5") - str = "BackSlash"; - if (str.Length == 4 && str == "Oem6") - str = "RightBracket"; - if (str.Length == 4 && str == "Next") - str = "PageDown"; - if (str.Length == 11 && str == "OemQuestion") - str = "Slash"; - if (str.Length == 8 && str == "Oemtilde") - str = "Grave"; - if (str.Length == 8 && str == "Oemcomma") - str = "Comma"; - if (str.Length > 3) - { - if (str.Substring(0, 3) == "Oem") - str = str.Substring(3, str.Length - 3); - } - //Oem Removed now removed from these but they still need conversion - if (str.Length == 12 && str.Substring(0, 12) == "OpenBrackets") - str = "LeftBracket"; - - if ((modifiers & Keys.Shift) != 0) - str = str.Insert(0, "Shift+"); - if ((modifiers & Keys.Control) != 0) - str = str.Insert(0, "Ctrl+"); - if ((modifiers & Keys.Alt) != 0) - str = str.Insert(0, "Alt+"); - - return str; - } - public Keys key; - public Keys modifiers; - } - - public interface IBinding - { - - } } \ No newline at end of file