ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Need to have instances in Controller types if no defaults. 

Also added more HotKeys
This commit is contained in:
kylethomson 2011-02-20 06:52:39 +00:00
parent 957cf69bae
commit 3cf44657c1
5 changed files with 317 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
BizHawk.MultiClient/BizHawk.MultiClient.csproj
View File

@ -3,7 +3,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<ProductVersion>9.0.21022</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{DD448B37-BA3F-4544-9754-5406E8094723}</ProjectGuid>
<OutputType>WinExe</OutputType>
@ -226,6 +226,7 @@
<ItemGroup>
<EmbeddedResource Include="AboutBox.resx">
<DependentUpon>AboutBox.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="config\InputConfig.resx">
<DependentUpon>InputConfig.cs</DependentUpon>

46
BizHawk.MultiClient/Config.cs
View File

@ -134,13 +134,22 @@
{
if (defaults)
{
Up = "J1 Up, UpArrow";
Down = "J1 Down, DownArrow";
Left = "J1 Left, LeftArrow";
Up = "J1 Up, UpArrow";
Down = "J1 Down, DownArrow";
Left = "J1 Left, LeftArrow";
Right = "J1 Right, RightArrow";
B1 = "J1 B1, Z";
B2 = "J1 B2, X";
B1 = "J1 B1, Z";
B2 = "J1 B2, X";
}
else
{
Up = "";
Down = "";
Right = "";
Left = "";
B1 = "";
B2 = "";
}
}
}
@ -159,14 +168,25 @@
{
if (defaults)
{
Up = "J1 Up, UpArrow";
Down = "J1 Down, DownArrow";
Left = "J1 Left, LeftArrow";
Right = "J1 Right, RightArrow";
I = "J1 I, Z";
II = "J1 II, X";
Run = "J1 Run, C";
Select = "J1 Select, V";
Up = "J1 Up, UpArrow";
Down = "J1 Down, DownArrow";
Left = "J1 Left, LeftArrow";
Right = "J1 Right, RightArrow";
I = "J1 B1, Z";
II = "J1 B2, X";
Run = "J1 B10, C";
Select = "J1 B9, V";
}
else
{
Up = "";
Down = "";
Right = "";
Left = "";
I = "";
II = "";
Run = "";
Select = "";
}
}
}

51
BizHawk.MultiClient/config/InputConfig.cs
View File

@ -272,10 +272,8 @@ namespace BizHawk.MultiClient
}
}
private void InputConfig_Load(object sender, EventArgs e)
{
//SystemComboBox = new ComboBox();
//Determine the System currently loaded, and set that one up first, if null emulator set, what is the default?
/*
{
if (!(Global.Emulator is NullEmulator))
{
switch (Global.Game.System)
@ -283,41 +281,50 @@ namespace BizHawk.MultiClient
case "SMS":
case "SG":
case "GG":
joypads = 2;
this.SystemComboBox.SelectedItem = 0;
break;
case "PCE":
case "SGX":
joypads = 5;
this.SystemComboBox.SelectedItem = 1;
break;
case "GEN":
joypads = 8;
this.SystemComboBox.SelectedItem = 2;
break;
case "TI83":
joypads = 1;
this.SystemComboBox.SelectedItem = 3;
break;
case "GB":
joypads = 1;
this.SystemComboBox.SelectedItem = 4;
break;
default:
joypads = 2;
break;
}
}
else
{
joypads = 2;
}
ControllComboBox.Items.Clear();
for (int i = 0; i < joypads; i++)
{
ControllComboBox.Items.Add(string.Format("Joypad {0}", i + 1));
}
ControllComboBox.SelectedIndex = 0;*/
}
}
private void OK_Click(object sender, EventArgs e)
{
if (Changed)
{
switch (CurSelectConsole)
{
case "SMS / GG / SG-1000":
UpdateSMS(CurSelectController);
break;
case "PC Engine / SGX":
UpdatePCE(CurSelectController);
break;
case "Gameboy":
//UpdateGB();
break;
case "Sega Genesis":
//UpdateGenesis();
break;
case "TI-83":
//Update TI-83();
break;
}
}
this.Close();
}

381
BizHawk.MultiClient/tools/HotkeyWindow.Designer.cs generated
View File

@ -30,13 +30,23 @@
{
this.hotkeyTabs = new System.Windows.Forms.TabControl();
this.tabPage1 = new System.Windows.Forms.TabPage();
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.IDW_FRAMEADVANCE = new BizHawk.MultiClient.InputWidget();
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_ST7 = new BizHawk.MultiClient.InputWidget();
this.IDW_ST0 = new BizHawk.MultiClient.InputWidget();
this.label21 = new System.Windows.Forms.Label();
this.label22 = new System.Windows.Forms.Label();
this.label23 = new System.Windows.Forms.Label();
@ -67,19 +77,6 @@
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.IDB_SAVE = new System.Windows.Forms.Button();
this.IDB_CANCEL = new System.Windows.Forms.Button();
this.label37 = new System.Windows.Forms.Label();
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_FRAMEADVANCE = new BizHawk.MultiClient.InputWidget();
this.IDW_QuickLoad = new BizHawk.MultiClient.InputWidget();
this.IDW_QuickSave = new BizHawk.MultiClient.InputWidget();
this.IDW_ST7 = new BizHawk.MultiClient.InputWidget();
this.IDW_ST0 = new BizHawk.MultiClient.InputWidget();
this.IDW_ST9 = new BizHawk.MultiClient.InputWidget();
this.IDW_ST8 = new BizHawk.MultiClient.InputWidget();
this.IDW_ST6 = new BizHawk.MultiClient.InputWidget();
@ -108,10 +105,24 @@
this.IDW_SS3 = new BizHawk.MultiClient.InputWidget();
this.IDW_SS2 = new BizHawk.MultiClient.InputWidget();
this.IDW_SS1 = new BizHawk.MultiClient.InputWidget();
this.tabPage3 = new System.Windows.Forms.TabPage();
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.IDW_SELECTNONE = new BizHawk.MultiClient.InputWidget();
this.label41 = new System.Windows.Forms.Label();
this.IDW_MTSELECTALL = new BizHawk.MultiClient.InputWidget();
this.label40 = new System.Windows.Forms.Label();
this.IDW_TOGGLEMTRACK = new BizHawk.MultiClient.InputWidget();
this.label39 = 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.hotkeyTabs.SuspendLayout();
this.tabPage1.SuspendLayout();
this.tabPage2.SuspendLayout();
this.tabPage3.SuspendLayout();
this.SuspendLayout();
//
// hotkeyTabs
@ -150,6 +161,33 @@
this.tabPage1.Text = "General";
this.tabPage1.UseVisualStyleBackColor = true;
//
// IDW_REWIND
//
this.IDW_REWIND.AcceptsTab = true;
this.IDW_REWIND.BackColor = System.Drawing.SystemColors.Window;
this.IDW_REWIND.Location = new System.Drawing.Point(92, 107);
this.IDW_REWIND.Name = "IDW_REWIND";
this.IDW_REWIND.Size = new System.Drawing.Size(100, 20);
this.IDW_REWIND.TabIndex = 74;
//
// label37
//
this.label37.AutoSize = true;
this.label37.Location = new System.Drawing.Point(6, 108);
this.label37.Name = "label37";
this.label37.Size = new System.Drawing.Size(43, 13);
this.label37.TabIndex = 73;
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, 81);
this.IDW_FASTFORWARD.Name = "IDW_FASTFORWARD";
this.IDW_FASTFORWARD.Size = new System.Drawing.Size(100, 20);
this.IDW_FASTFORWARD.TabIndex = 72;
//
// label36
//
this.label36.AutoSize = true;
@ -159,6 +197,15 @@
this.label36.TabIndex = 71;
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 = 70;
//
// label35
//
this.label35.AutoSize = true;
@ -168,6 +215,15 @@
this.label35.TabIndex = 69;
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, 32);
this.IDW_PAUSE.Name = "IDW_PAUSE";
this.IDW_PAUSE.Size = new System.Drawing.Size(100, 20);
this.IDW_PAUSE.TabIndex = 68;
//
// label34
//
this.label34.AutoSize = true;
@ -177,6 +233,15 @@
this.label34.TabIndex = 67;
this.label34.Text = "Pause";
//
// 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 = 66;
//
// label33
//
this.label33.AutoSize = true;
@ -195,6 +260,15 @@
this.label32.TabIndex = 64;
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 = 63;
//
// label31
//
this.label31.AutoSize = true;
@ -204,6 +278,15 @@
this.label31.TabIndex = 62;
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 = 61;
//
// tabPage2
//
this.tabPage2.Controls.Add(this.IDW_ST7);
@ -274,6 +357,20 @@
this.tabPage2.Text = "Save States";
this.tabPage2.UseVisualStyleBackColor = true;
//
// IDW_ST7
//
this.IDW_ST7.Location = new System.Drawing.Point(468, 150);
this.IDW_ST7.Name = "IDW_ST7";
this.IDW_ST7.Size = new System.Drawing.Size(100, 20);
this.IDW_ST7.TabIndex = 120;
//
// IDW_ST0
//
this.IDW_ST0.Location = new System.Drawing.Point(468, 222);
this.IDW_ST0.Name = "IDW_ST0";
this.IDW_ST0.Size = new System.Drawing.Size(100, 20);
this.IDW_ST0.TabIndex = 119;
//
// label21
//
this.label21.AutoSize = true;
@ -544,122 +641,6 @@
this.label1.TabIndex = 62;
this.label1.Text = "Save State 1";
//
// tabPage3
//
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, 258);
this.tabPage3.TabIndex = 2;
this.tabPage3.Text = "YourMom";
this.tabPage3.UseVisualStyleBackColor = true;
//
// 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 = 1;
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 = 2;
this.IDB_CANCEL.Text = "Cancel";
this.IDB_CANCEL.UseVisualStyleBackColor = true;
this.IDB_CANCEL.Click += new System.EventHandler(this.button2_Click);
//
// label37
//
this.label37.AutoSize = true;
this.label37.Location = new System.Drawing.Point(6, 108);
this.label37.Name = "label37";
this.label37.Size = new System.Drawing.Size(43, 13);
this.label37.TabIndex = 73;
this.label37.Text = "Rewind";
//
// IDW_REWIND
//
this.IDW_REWIND.AcceptsTab = true;
this.IDW_REWIND.BackColor = System.Drawing.SystemColors.Window;
this.IDW_REWIND.Location = new System.Drawing.Point(92, 107);
this.IDW_REWIND.Name = "IDW_REWIND";
this.IDW_REWIND.Size = new System.Drawing.Size(100, 20);
this.IDW_REWIND.TabIndex = 74;
//
// IDW_FASTFORWARD
//
this.IDW_FASTFORWARD.AcceptsTab = true;
this.IDW_FASTFORWARD.BackColor = System.Drawing.SystemColors.Window;
this.IDW_FASTFORWARD.Location = new System.Drawing.Point(92, 81);
this.IDW_FASTFORWARD.Name = "IDW_FASTFORWARD";
this.IDW_FASTFORWARD.Size = new System.Drawing.Size(100, 20);
this.IDW_FASTFORWARD.TabIndex = 72;
//
// 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 = 70;
//
// IDW_PAUSE
//
this.IDW_PAUSE.AcceptsTab = true;
this.IDW_PAUSE.BackColor = System.Drawing.SystemColors.Window;
this.IDW_PAUSE.Location = new System.Drawing.Point(92, 32);
this.IDW_PAUSE.Name = "IDW_PAUSE";
this.IDW_PAUSE.Size = new System.Drawing.Size(100, 20);
this.IDW_PAUSE.TabIndex = 68;
//
// 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 = 66;
//
// 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 = 63;
//
// 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 = 61;
//
// IDW_ST7
//
this.IDW_ST7.Location = new System.Drawing.Point(468, 150);
this.IDW_ST7.Name = "IDW_ST7";
this.IDW_ST7.Size = new System.Drawing.Size(100, 20);
this.IDW_ST7.TabIndex = 120;
//
// IDW_ST0
//
this.IDW_ST0.Location = new System.Drawing.Point(468, 222);
this.IDW_ST0.Name = "IDW_ST0";
this.IDW_ST0.Size = new System.Drawing.Size(100, 20);
this.IDW_ST0.TabIndex = 119;
//
// IDW_ST9
//
this.IDW_ST9.Location = new System.Drawing.Point(468, 198);
@ -857,6 +838,136 @@
this.IDW_SS1.Size = new System.Drawing.Size(100, 20);
this.IDW_SS1.TabIndex = 61;
//
// tabPage3
//
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.IDW_SELECTNONE);
this.tabPage3.Controls.Add(this.label41);
this.tabPage3.Controls.Add(this.IDW_MTSELECTALL);
this.tabPage3.Controls.Add(this.label40);
this.tabPage3.Controls.Add(this.IDW_TOGGLEMTRACK);
this.tabPage3.Controls.Add(this.label39);
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, 258);
this.tabPage3.TabIndex = 2;
this.tabPage3.Text = "MultiTrack";
this.tabPage3.UseVisualStyleBackColor = true;
//
// IDW_MTDECPLAYER
//
this.IDW_MTDECPLAYER.AcceptsTab = true;
this.IDW_MTDECPLAYER.BackColor = System.Drawing.SystemColors.Window;
this.IDW_MTDECPLAYER.Location = new System.Drawing.Point(105, 100);
this.IDW_MTDECPLAYER.Name = "IDW_MTDECPLAYER";
this.IDW_MTDECPLAYER.Size = new System.Drawing.Size(100, 20);
this.IDW_MTDECPLAYER.TabIndex = 76;
//
// IDW_MTINCPLAYER
//
this.IDW_MTINCPLAYER.AcceptsTab = true;
this.IDW_MTINCPLAYER.BackColor = System.Drawing.SystemColors.Window;
this.IDW_MTINCPLAYER.Location = new System.Drawing.Point(105, 78);
this.IDW_MTINCPLAYER.Name = "IDW_MTINCPLAYER";
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";
//
// IDW_SELECTNONE
//
this.IDW_SELECTNONE.AcceptsTab = true;
this.IDW_SELECTNONE.BackColor = System.Drawing.SystemColors.Window;
this.IDW_SELECTNONE.Location = new System.Drawing.Point(105, 56);
this.IDW_SELECTNONE.Name = "IDW_SELECTNONE";
this.IDW_SELECTNONE.Size = new System.Drawing.Size(100, 20);
this.IDW_SELECTNONE.TabIndex = 72;
//
// 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";
//
// IDW_MTSELECTALL
//
this.IDW_MTSELECTALL.AcceptsTab = true;
this.IDW_MTSELECTALL.BackColor = System.Drawing.SystemColors.Window;
this.IDW_MTSELECTALL.Location = new System.Drawing.Point(105, 32);
this.IDW_MTSELECTALL.Name = "IDW_MTSELECTALL";
this.IDW_MTSELECTALL.Size = new System.Drawing.Size(100, 20);
this.IDW_MTSELECTALL.TabIndex = 70;
//
// 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";
//
// IDW_TOGGLEMTRACK
//
this.IDW_TOGGLEMTRACK.AcceptsTab = true;
this.IDW_TOGGLEMTRACK.BackColor = System.Drawing.SystemColors.Window;
this.IDW_TOGGLEMTRACK.Location = new System.Drawing.Point(105, 9);
this.IDW_TOGGLEMTRACK.Name = "IDW_TOGGLEMTRACK";
this.IDW_TOGGLEMTRACK.Size = new System.Drawing.Size(100, 20);
this.IDW_TOGGLEMTRACK.TabIndex = 68;
//
// 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";
//
// 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 = 1;
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 = 2;
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;
@ -885,6 +996,8 @@
this.tabPage1.PerformLayout();
this.tabPage2.ResumeLayout(false);
this.tabPage2.PerformLayout();
this.tabPage3.ResumeLayout(false);
this.tabPage3.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
@ -974,5 +1087,15 @@
private InputWidget IDW_REWIND;
private System.Windows.Forms.Label label37;
private System.Windows.Forms.Label label38;
private InputWidget IDW_SELECTNONE;
private System.Windows.Forms.Label label41;
private InputWidget IDW_MTSELECTALL;
private System.Windows.Forms.Label label40;
private InputWidget IDW_TOGGLEMTRACK;
private System.Windows.Forms.Label label39;
private System.Windows.Forms.Label label43;
private System.Windows.Forms.Label label42;
private InputWidget IDW_MTDECPLAYER;
private InputWidget IDW_MTINCPLAYER;
}
}

1
BizHawk.MultiClient/tools/HotkeyWindow.cs
View File

@ -110,5 +110,6 @@ namespace BizHawk.MultiClient.tools
this.Close();
}
}
}