diff --git a/BizHawk.MultiClient/BizHawk.MultiClient.csproj b/BizHawk.MultiClient/BizHawk.MultiClient.csproj index 2df78cb008..2ecafdb0dd 100644 --- a/BizHawk.MultiClient/BizHawk.MultiClient.csproj +++ b/BizHawk.MultiClient/BizHawk.MultiClient.csproj @@ -958,6 +958,7 @@ + diff --git a/BizHawk.MultiClient/Properties/Resources.Designer.cs b/BizHawk.MultiClient/Properties/Resources.Designer.cs index 4ea29cd472..7da6edc2ec 100644 --- a/BizHawk.MultiClient/Properties/Resources.Designer.cs +++ b/BizHawk.MultiClient/Properties/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.269 +// Runtime Version:4.0.30319.296 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -305,6 +305,13 @@ namespace BizHawk.MultiClient.Properties { } } + internal static System.Drawing.Bitmap GBA_Controller { + get { + object obj = ResourceManager.GetObject("GBA_Controller", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + internal static System.Drawing.Bitmap GBController { get { object obj = ResourceManager.GetObject("GBController", resourceCulture); diff --git a/BizHawk.MultiClient/Properties/Resources.resx b/BizHawk.MultiClient/Properties/Resources.resx index e6c3e390ca..380b83fde2 100644 --- a/BizHawk.MultiClient/Properties/Resources.resx +++ b/BizHawk.MultiClient/Properties/Resources.resx @@ -846,4 +846,7 @@ ..\config\ControllerImages\colecovisioncontroller.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\config\ControllerImages\GBA_Controller.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/BizHawk.MultiClient/config/ControllerConfig.Designer.cs b/BizHawk.MultiClient/config/ControllerConfig.Designer.cs index a87742689c..16b95011cc 100644 --- a/BizHawk.MultiClient/config/ControllerConfig.Designer.cs +++ b/BizHawk.MultiClient/config/ControllerConfig.Designer.cs @@ -33,147 +33,154 @@ this.pictureBox14 = new System.Windows.Forms.PictureBox(); this.tabControl2 = new System.Windows.Forms.TabControl(); this.tabPage13 = new System.Windows.Forms.TabPage(); + this.NESController1Panel = new BizHawk.MultiClient.ControllerConfigPanel(); this.tabPage14 = new System.Windows.Forms.TabPage(); + this.NESController2Panel = new BizHawk.MultiClient.ControllerConfigPanel(); this.tabPage15 = new System.Windows.Forms.TabPage(); + this.NESController3Panel = new BizHawk.MultiClient.ControllerConfigPanel(); this.tabPage16 = new System.Windows.Forms.TabPage(); + this.NESController4Panel = new BizHawk.MultiClient.ControllerConfigPanel(); this.tabPage17 = new System.Windows.Forms.TabPage(); + this.NESConsoleButtons = new BizHawk.MultiClient.ControllerConfigPanel(); this.tabPage18 = new System.Windows.Forms.TabPage(); + this.NESAutofire1Panel = new BizHawk.MultiClient.ControllerConfigPanel(); this.tabPage19 = new System.Windows.Forms.TabPage(); + this.NESAutofire2Panel = new BizHawk.MultiClient.ControllerConfigPanel(); this.tabPage20 = new System.Windows.Forms.TabPage(); + this.NESAutofire3Panel = new BizHawk.MultiClient.ControllerConfigPanel(); this.tabPage21 = new System.Windows.Forms.TabPage(); + this.NESAutofire4Panel = new BizHawk.MultiClient.ControllerConfigPanel(); this.tabPageSNES = new System.Windows.Forms.TabPage(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.tabControl3 = new System.Windows.Forms.TabControl(); this.tabPage22 = new System.Windows.Forms.TabPage(); + this.SNESController1Panel = new BizHawk.MultiClient.ControllerConfigPanel(); this.tabPage23 = new System.Windows.Forms.TabPage(); + this.SNESController2Panel = new BizHawk.MultiClient.ControllerConfigPanel(); this.tabPage24 = new System.Windows.Forms.TabPage(); + this.SNESController3Panel = new BizHawk.MultiClient.ControllerConfigPanel(); this.tabPage25 = new System.Windows.Forms.TabPage(); + this.SNESController4Panel = new BizHawk.MultiClient.ControllerConfigPanel(); this.tabPage26 = new System.Windows.Forms.TabPage(); + this.SNESConsoleButtons = new BizHawk.MultiClient.ControllerConfigPanel(); this.tabPage27 = new System.Windows.Forms.TabPage(); + this.SNESAutofire1Panel = new BizHawk.MultiClient.ControllerConfigPanel(); this.tabPage28 = new System.Windows.Forms.TabPage(); + this.SNESAutofire2Panel = new BizHawk.MultiClient.ControllerConfigPanel(); this.tabPage29 = new System.Windows.Forms.TabPage(); + this.SNESAutofire3Panel = new BizHawk.MultiClient.ControllerConfigPanel(); this.tabPage30 = new System.Windows.Forms.TabPage(); + this.SNESAutofire4Panel = new BizHawk.MultiClient.ControllerConfigPanel(); this.tabPageGameboy = new System.Windows.Forms.TabPage(); this.pictureBox2 = new System.Windows.Forms.PictureBox(); this.tabControl4 = new System.Windows.Forms.TabControl(); this.tabPage31 = new System.Windows.Forms.TabPage(); + this.GBController1Panel = new BizHawk.MultiClient.ControllerConfigPanel(); this.tabPage32 = new System.Windows.Forms.TabPage(); + this.GBAutofire1Panel = new BizHawk.MultiClient.ControllerConfigPanel(); this.tabPageGenesis = new System.Windows.Forms.TabPage(); this.pictureBox6 = new System.Windows.Forms.PictureBox(); this.tabControl9 = new System.Windows.Forms.TabControl(); this.tabPage52 = new System.Windows.Forms.TabPage(); + this.GenesisController1Panel = new BizHawk.MultiClient.ControllerConfigPanel(); this.tabPage53 = new System.Windows.Forms.TabPage(); this.tabPage54 = new System.Windows.Forms.TabPage(); + this.GenesisConsoleButtons = new BizHawk.MultiClient.ControllerConfigPanel(); this.tabPage55 = new System.Windows.Forms.TabPage(); + this.GenesisAutofire1Panel = new BizHawk.MultiClient.ControllerConfigPanel(); this.tabPage56 = new System.Windows.Forms.TabPage(); this.tabPageSMS = new System.Windows.Forms.TabPage(); this.pictureBox3 = new System.Windows.Forms.PictureBox(); this.tabControl5 = new System.Windows.Forms.TabControl(); this.tabPage33 = new System.Windows.Forms.TabPage(); + this.SMSController1Panel = new BizHawk.MultiClient.ControllerConfigPanel(); this.tabPage34 = new System.Windows.Forms.TabPage(); + this.SMSController2Panel = new BizHawk.MultiClient.ControllerConfigPanel(); this.Console = new System.Windows.Forms.TabPage(); + this.SMSConsoleButtons = new BizHawk.MultiClient.ControllerConfigPanel(); this.tabPage51 = new System.Windows.Forms.TabPage(); + this.SMSAutofire1Panel = new BizHawk.MultiClient.ControllerConfigPanel(); this.tabPage57 = new System.Windows.Forms.TabPage(); + this.SMSAutofire2Panel = new BizHawk.MultiClient.ControllerConfigPanel(); this.tabPagePCE = new System.Windows.Forms.TabPage(); this.pictureBox4 = new System.Windows.Forms.PictureBox(); this.tabControl6 = new System.Windows.Forms.TabControl(); this.tabPage36 = new System.Windows.Forms.TabPage(); + this.PCEController1Panel = new BizHawk.MultiClient.ControllerConfigPanel(); this.tabPage37 = new System.Windows.Forms.TabPage(); + this.PCEController2Panel = new BizHawk.MultiClient.ControllerConfigPanel(); this.tabPage38 = new System.Windows.Forms.TabPage(); + this.PCEController3Panel = new BizHawk.MultiClient.ControllerConfigPanel(); this.tabPage39 = new System.Windows.Forms.TabPage(); + this.PCEController4Panel = new BizHawk.MultiClient.ControllerConfigPanel(); this.tabPage40 = new System.Windows.Forms.TabPage(); + this.PCEController5Panel = new BizHawk.MultiClient.ControllerConfigPanel(); this.tabPage41 = new System.Windows.Forms.TabPage(); + this.PCEAutofire1Panel = new BizHawk.MultiClient.ControllerConfigPanel(); this.tabPage42 = new System.Windows.Forms.TabPage(); + this.PCEAutofire2Panel = new BizHawk.MultiClient.ControllerConfigPanel(); this.tabPage43 = new System.Windows.Forms.TabPage(); + this.PCEAutofire3Panel = new BizHawk.MultiClient.ControllerConfigPanel(); this.tabPage44 = new System.Windows.Forms.TabPage(); + this.PCEAutofire4Panel = new BizHawk.MultiClient.ControllerConfigPanel(); this.tabPage45 = new System.Windows.Forms.TabPage(); + this.PCEAutofire5Panel = new BizHawk.MultiClient.ControllerConfigPanel(); this.tabPageAtari2600 = new System.Windows.Forms.TabPage(); this.pictureBox5 = new System.Windows.Forms.PictureBox(); this.tabControl7 = new System.Windows.Forms.TabControl(); this.tabPage46 = new System.Windows.Forms.TabPage(); + this.Atari2600Controller1Panel = new BizHawk.MultiClient.ControllerConfigPanel(); this.tabPage47 = new System.Windows.Forms.TabPage(); + this.Atari2600Controller2Panel = new BizHawk.MultiClient.ControllerConfigPanel(); this.tabPage48 = new System.Windows.Forms.TabPage(); + this.Atari2600ConsoleButtons = new BizHawk.MultiClient.ControllerConfigPanel(); this.tabPage35 = new System.Windows.Forms.TabPage(); + this.Atari2600Autofire1Panel = new BizHawk.MultiClient.ControllerConfigPanel(); this.tabPage58 = new System.Windows.Forms.TabPage(); + this.Atari2600Autofire2Panel = new BizHawk.MultiClient.ControllerConfigPanel(); this.tabPageC64 = new System.Windows.Forms.TabPage(); this.tabControl8 = new System.Windows.Forms.TabControl(); this.tabPage49 = new System.Windows.Forms.TabPage(); this.pictureBox8 = new System.Windows.Forms.PictureBox(); + this.C64Controller1Panel = new BizHawk.MultiClient.ControllerConfigPanel(); this.tabPage50 = new System.Windows.Forms.TabPage(); this.pictureBox9 = new System.Windows.Forms.PictureBox(); + this.C64Controller2Panel = new BizHawk.MultiClient.ControllerConfigPanel(); this.tabPage10 = new System.Windows.Forms.TabPage(); this.pictureBox10 = new System.Windows.Forms.PictureBox(); + this.C64Autofire1Panel = new BizHawk.MultiClient.ControllerConfigPanel(); this.tabPage11 = new System.Windows.Forms.TabPage(); this.pictureBox11 = new System.Windows.Forms.PictureBox(); + this.C64Autofire2Panel = new BizHawk.MultiClient.ControllerConfigPanel(); this.tabPage12 = new System.Windows.Forms.TabPage(); + this.C64KeyboardPanel = new BizHawk.MultiClient.ControllerConfigPanel(); this.pictureBox12 = new System.Windows.Forms.PictureBox(); - this.tabPageTI83 = new System.Windows.Forms.TabPage(); - this.pictureBox7 = new System.Windows.Forms.PictureBox(); this.tabPageColeco = new System.Windows.Forms.TabPage(); this.pictureBox15 = new System.Windows.Forms.PictureBox(); this.tabControl10 = new System.Windows.Forms.TabControl(); this.tabPage60 = new System.Windows.Forms.TabPage(); + this.COLController1Panel = new BizHawk.MultiClient.ControllerConfigPanel(); this.tabPage61 = new System.Windows.Forms.TabPage(); + this.COLAutofire1Panel = new BizHawk.MultiClient.ControllerConfigPanel(); this.tabPage62 = new System.Windows.Forms.TabPage(); + this.COLController2Panel = new BizHawk.MultiClient.ControllerConfigPanel(); this.tabPage63 = new System.Windows.Forms.TabPage(); + this.COLAutofire2Panel = new BizHawk.MultiClient.ControllerConfigPanel(); + this.tabPageTI83 = new System.Windows.Forms.TabPage(); + this.pictureBox7 = new System.Windows.Forms.PictureBox(); + this.TI83ControllerPanel = new BizHawk.MultiClient.ControllerConfigPanel(); this.Cancel = new System.Windows.Forms.Button(); this.OK = new System.Windows.Forms.Button(); this.label38 = new System.Windows.Forms.Label(); this.AllowLR = new System.Windows.Forms.CheckBox(); - this.NESController1Panel = new BizHawk.MultiClient.ControllerConfigPanel(); - this.NESController2Panel = new BizHawk.MultiClient.ControllerConfigPanel(); - this.NESController3Panel = new BizHawk.MultiClient.ControllerConfigPanel(); - this.NESController4Panel = new BizHawk.MultiClient.ControllerConfigPanel(); - this.NESConsoleButtons = new BizHawk.MultiClient.ControllerConfigPanel(); - this.NESAutofire1Panel = new BizHawk.MultiClient.ControllerConfigPanel(); - this.NESAutofire2Panel = new BizHawk.MultiClient.ControllerConfigPanel(); - this.NESAutofire3Panel = new BizHawk.MultiClient.ControllerConfigPanel(); - this.NESAutofire4Panel = new BizHawk.MultiClient.ControllerConfigPanel(); - this.SNESController1Panel = new BizHawk.MultiClient.ControllerConfigPanel(); - this.SNESController2Panel = new BizHawk.MultiClient.ControllerConfigPanel(); - this.SNESController3Panel = new BizHawk.MultiClient.ControllerConfigPanel(); - this.SNESController4Panel = new BizHawk.MultiClient.ControllerConfigPanel(); - this.SNESConsoleButtons = new BizHawk.MultiClient.ControllerConfigPanel(); - this.SNESAutofire1Panel = new BizHawk.MultiClient.ControllerConfigPanel(); - this.SNESAutofire2Panel = new BizHawk.MultiClient.ControllerConfigPanel(); - this.SNESAutofire3Panel = new BizHawk.MultiClient.ControllerConfigPanel(); - this.SNESAutofire4Panel = new BizHawk.MultiClient.ControllerConfigPanel(); - this.GBController1Panel = new BizHawk.MultiClient.ControllerConfigPanel(); - this.GBAutofire1Panel = new BizHawk.MultiClient.ControllerConfigPanel(); - this.GenesisController1Panel = new BizHawk.MultiClient.ControllerConfigPanel(); - this.GenesisConsoleButtons = new BizHawk.MultiClient.ControllerConfigPanel(); - this.GenesisAutofire1Panel = new BizHawk.MultiClient.ControllerConfigPanel(); - this.SMSController1Panel = new BizHawk.MultiClient.ControllerConfigPanel(); - this.SMSController2Panel = new BizHawk.MultiClient.ControllerConfigPanel(); - this.SMSConsoleButtons = new BizHawk.MultiClient.ControllerConfigPanel(); - this.SMSAutofire1Panel = new BizHawk.MultiClient.ControllerConfigPanel(); - this.SMSAutofire2Panel = new BizHawk.MultiClient.ControllerConfigPanel(); - this.PCEController1Panel = new BizHawk.MultiClient.ControllerConfigPanel(); - this.PCEController2Panel = new BizHawk.MultiClient.ControllerConfigPanel(); - this.PCEController3Panel = new BizHawk.MultiClient.ControllerConfigPanel(); - this.PCEController4Panel = new BizHawk.MultiClient.ControllerConfigPanel(); - this.PCEController5Panel = new BizHawk.MultiClient.ControllerConfigPanel(); - this.PCEAutofire1Panel = new BizHawk.MultiClient.ControllerConfigPanel(); - this.PCEAutofire2Panel = new BizHawk.MultiClient.ControllerConfigPanel(); - this.PCEAutofire3Panel = new BizHawk.MultiClient.ControllerConfigPanel(); - this.PCEAutofire4Panel = new BizHawk.MultiClient.ControllerConfigPanel(); - this.PCEAutofire5Panel = new BizHawk.MultiClient.ControllerConfigPanel(); - this.Atari2600Controller1Panel = new BizHawk.MultiClient.ControllerConfigPanel(); - this.Atari2600Controller2Panel = new BizHawk.MultiClient.ControllerConfigPanel(); - this.Atari2600ConsoleButtons = new BizHawk.MultiClient.ControllerConfigPanel(); - this.Atari2600Autofire1Panel = new BizHawk.MultiClient.ControllerConfigPanel(); - this.Atari2600Autofire2Panel = new BizHawk.MultiClient.ControllerConfigPanel(); - this.C64Controller1Panel = new BizHawk.MultiClient.ControllerConfigPanel(); - this.C64Controller2Panel = new BizHawk.MultiClient.ControllerConfigPanel(); - this.C64Autofire1Panel = new BizHawk.MultiClient.ControllerConfigPanel(); - this.C64Autofire2Panel = new BizHawk.MultiClient.ControllerConfigPanel(); - this.C64KeyboardPanel = new BizHawk.MultiClient.ControllerConfigPanel(); - this.COLController1Panel = new BizHawk.MultiClient.ControllerConfigPanel(); - this.COLAutofire1Panel = new BizHawk.MultiClient.ControllerConfigPanel(); - this.COLController2Panel = new BizHawk.MultiClient.ControllerConfigPanel(); - this.COLAutofire2Panel = new BizHawk.MultiClient.ControllerConfigPanel(); - this.TI83ControllerPanel = new BizHawk.MultiClient.ControllerConfigPanel(); this.AutoTab = new System.Windows.Forms.CheckBox(); + this.tabPageGBA = new System.Windows.Forms.TabPage(); + this.pictureBox13 = new System.Windows.Forms.PictureBox(); + this.tabControl1 = new System.Windows.Forms.TabControl(); + this.tabPage1 = new System.Windows.Forms.TabPage(); + this.GBAController1Panel = new BizHawk.MultiClient.ControllerConfigPanel(); + this.tabPage2 = new System.Windows.Forms.TabPage(); + this.GBAAutofire1Panel = new BizHawk.MultiClient.ControllerConfigPanel(); this.PlatformTabControl.SuspendLayout(); this.tabPageNES.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox14)).BeginInit(); @@ -251,8 +258,6 @@ ((System.ComponentModel.ISupportInitialize)(this.pictureBox11)).BeginInit(); this.tabPage12.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox12)).BeginInit(); - this.tabPageTI83.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).BeginInit(); this.tabPageColeco.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox15)).BeginInit(); this.tabControl10.SuspendLayout(); @@ -260,6 +265,13 @@ this.tabPage61.SuspendLayout(); this.tabPage62.SuspendLayout(); this.tabPage63.SuspendLayout(); + this.tabPageTI83.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).BeginInit(); + this.tabPageGBA.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox13)).BeginInit(); + this.tabControl1.SuspendLayout(); + this.tabPage1.SuspendLayout(); + this.tabPage2.SuspendLayout(); this.SuspendLayout(); // // PlatformTabControl @@ -270,6 +282,7 @@ this.PlatformTabControl.Controls.Add(this.tabPageNES); this.PlatformTabControl.Controls.Add(this.tabPageSNES); this.PlatformTabControl.Controls.Add(this.tabPageGameboy); + this.PlatformTabControl.Controls.Add(this.tabPageGBA); this.PlatformTabControl.Controls.Add(this.tabPageGenesis); this.PlatformTabControl.Controls.Add(this.tabPageSMS); this.PlatformTabControl.Controls.Add(this.tabPagePCE); @@ -337,6 +350,13 @@ this.tabPage13.Text = "Pad 1"; this.tabPage13.UseVisualStyleBackColor = true; // + // NESController1Panel + // + this.NESController1Panel.Location = new System.Drawing.Point(10, 10); + this.NESController1Panel.Name = "NESController1Panel"; + this.NESController1Panel.Size = new System.Drawing.Size(392, 332); + this.NESController1Panel.TabIndex = 0; + // // tabPage14 // this.tabPage14.Controls.Add(this.NESController2Panel); @@ -348,6 +368,13 @@ this.tabPage14.Text = "Pad 2"; this.tabPage14.UseVisualStyleBackColor = true; // + // NESController2Panel + // + this.NESController2Panel.Location = new System.Drawing.Point(10, 10); + this.NESController2Panel.Name = "NESController2Panel"; + this.NESController2Panel.Size = new System.Drawing.Size(392, 332); + this.NESController2Panel.TabIndex = 0; + // // tabPage15 // this.tabPage15.Controls.Add(this.NESController3Panel); @@ -358,6 +385,13 @@ this.tabPage15.Text = "Pad 3"; this.tabPage15.UseVisualStyleBackColor = true; // + // NESController3Panel + // + this.NESController3Panel.Location = new System.Drawing.Point(10, 10); + this.NESController3Panel.Name = "NESController3Panel"; + this.NESController3Panel.Size = new System.Drawing.Size(392, 332); + this.NESController3Panel.TabIndex = 0; + // // tabPage16 // this.tabPage16.Controls.Add(this.NESController4Panel); @@ -368,6 +402,13 @@ this.tabPage16.Text = "Pad 4"; this.tabPage16.UseVisualStyleBackColor = true; // + // NESController4Panel + // + this.NESController4Panel.Location = new System.Drawing.Point(10, 10); + this.NESController4Panel.Name = "NESController4Panel"; + this.NESController4Panel.Size = new System.Drawing.Size(392, 332); + this.NESController4Panel.TabIndex = 0; + // // tabPage17 // this.tabPage17.Controls.Add(this.NESConsoleButtons); @@ -378,6 +419,13 @@ this.tabPage17.Text = "Console"; this.tabPage17.UseVisualStyleBackColor = true; // + // NESConsoleButtons + // + this.NESConsoleButtons.Location = new System.Drawing.Point(10, 10); + this.NESConsoleButtons.Name = "NESConsoleButtons"; + this.NESConsoleButtons.Size = new System.Drawing.Size(368, 341); + this.NESConsoleButtons.TabIndex = 0; + // // tabPage18 // this.tabPage18.Controls.Add(this.NESAutofire1Panel); @@ -388,6 +436,13 @@ this.tabPage18.Text = "Autofire 1"; this.tabPage18.UseVisualStyleBackColor = true; // + // NESAutofire1Panel + // + this.NESAutofire1Panel.Location = new System.Drawing.Point(10, 10); + this.NESAutofire1Panel.Name = "NESAutofire1Panel"; + this.NESAutofire1Panel.Size = new System.Drawing.Size(392, 332); + this.NESAutofire1Panel.TabIndex = 0; + // // tabPage19 // this.tabPage19.Controls.Add(this.NESAutofire2Panel); @@ -398,6 +453,13 @@ this.tabPage19.Text = "Autofire 2"; this.tabPage19.UseVisualStyleBackColor = true; // + // NESAutofire2Panel + // + this.NESAutofire2Panel.Location = new System.Drawing.Point(10, 10); + this.NESAutofire2Panel.Name = "NESAutofire2Panel"; + this.NESAutofire2Panel.Size = new System.Drawing.Size(392, 332); + this.NESAutofire2Panel.TabIndex = 0; + // // tabPage20 // this.tabPage20.Controls.Add(this.NESAutofire3Panel); @@ -408,6 +470,13 @@ this.tabPage20.Text = "Autofire 3"; this.tabPage20.UseVisualStyleBackColor = true; // + // NESAutofire3Panel + // + this.NESAutofire3Panel.Location = new System.Drawing.Point(10, 10); + this.NESAutofire3Panel.Name = "NESAutofire3Panel"; + this.NESAutofire3Panel.Size = new System.Drawing.Size(392, 332); + this.NESAutofire3Panel.TabIndex = 0; + // // tabPage21 // this.tabPage21.Controls.Add(this.NESAutofire4Panel); @@ -418,6 +487,13 @@ this.tabPage21.Text = "Autofire 4"; this.tabPage21.UseVisualStyleBackColor = true; // + // NESAutofire4Panel + // + this.NESAutofire4Panel.Location = new System.Drawing.Point(10, 10); + this.NESAutofire4Panel.Name = "NESAutofire4Panel"; + this.NESAutofire4Panel.Size = new System.Drawing.Size(392, 332); + this.NESAutofire4Panel.TabIndex = 0; + // // tabPageSNES // this.tabPageSNES.Controls.Add(this.pictureBox1); @@ -474,6 +550,13 @@ this.tabPage22.Text = "Pad 1"; this.tabPage22.UseVisualStyleBackColor = true; // + // SNESController1Panel + // + this.SNESController1Panel.Location = new System.Drawing.Point(10, 10); + this.SNESController1Panel.Name = "SNESController1Panel"; + this.SNESController1Panel.Size = new System.Drawing.Size(392, 360); + this.SNESController1Panel.TabIndex = 1; + // // tabPage23 // this.tabPage23.Controls.Add(this.SNESController2Panel); @@ -485,6 +568,13 @@ this.tabPage23.Text = "Pad 2"; this.tabPage23.UseVisualStyleBackColor = true; // + // SNESController2Panel + // + this.SNESController2Panel.Location = new System.Drawing.Point(10, 10); + this.SNESController2Panel.Name = "SNESController2Panel"; + this.SNESController2Panel.Size = new System.Drawing.Size(392, 332); + this.SNESController2Panel.TabIndex = 2; + // // tabPage24 // this.tabPage24.Controls.Add(this.SNESController3Panel); @@ -495,6 +585,13 @@ this.tabPage24.Text = "Pad 3"; this.tabPage24.UseVisualStyleBackColor = true; // + // SNESController3Panel + // + this.SNESController3Panel.Location = new System.Drawing.Point(10, 10); + this.SNESController3Panel.Name = "SNESController3Panel"; + this.SNESController3Panel.Size = new System.Drawing.Size(392, 332); + this.SNESController3Panel.TabIndex = 3; + // // tabPage25 // this.tabPage25.Controls.Add(this.SNESController4Panel); @@ -505,6 +602,13 @@ this.tabPage25.Text = "Pad 4"; this.tabPage25.UseVisualStyleBackColor = true; // + // SNESController4Panel + // + this.SNESController4Panel.Location = new System.Drawing.Point(10, 10); + this.SNESController4Panel.Name = "SNESController4Panel"; + this.SNESController4Panel.Size = new System.Drawing.Size(392, 332); + this.SNESController4Panel.TabIndex = 3; + // // tabPage26 // this.tabPage26.Controls.Add(this.SNESConsoleButtons); @@ -515,6 +619,13 @@ this.tabPage26.Text = "Console"; this.tabPage26.UseVisualStyleBackColor = true; // + // SNESConsoleButtons + // + this.SNESConsoleButtons.Location = new System.Drawing.Point(10, 10); + this.SNESConsoleButtons.Name = "SNESConsoleButtons"; + this.SNESConsoleButtons.Size = new System.Drawing.Size(368, 125); + this.SNESConsoleButtons.TabIndex = 1; + // // tabPage27 // this.tabPage27.Controls.Add(this.SNESAutofire1Panel); @@ -525,6 +636,13 @@ this.tabPage27.Text = "Autofire 1"; this.tabPage27.UseVisualStyleBackColor = true; // + // SNESAutofire1Panel + // + this.SNESAutofire1Panel.Location = new System.Drawing.Point(10, 10); + this.SNESAutofire1Panel.Name = "SNESAutofire1Panel"; + this.SNESAutofire1Panel.Size = new System.Drawing.Size(392, 332); + this.SNESAutofire1Panel.TabIndex = 3; + // // tabPage28 // this.tabPage28.Controls.Add(this.SNESAutofire2Panel); @@ -535,6 +653,13 @@ this.tabPage28.Text = "Autofire 2"; this.tabPage28.UseVisualStyleBackColor = true; // + // SNESAutofire2Panel + // + this.SNESAutofire2Panel.Location = new System.Drawing.Point(10, 10); + this.SNESAutofire2Panel.Name = "SNESAutofire2Panel"; + this.SNESAutofire2Panel.Size = new System.Drawing.Size(392, 332); + this.SNESAutofire2Panel.TabIndex = 3; + // // tabPage29 // this.tabPage29.Controls.Add(this.SNESAutofire3Panel); @@ -545,6 +670,13 @@ this.tabPage29.Text = "Autofire 3"; this.tabPage29.UseVisualStyleBackColor = true; // + // SNESAutofire3Panel + // + this.SNESAutofire3Panel.Location = new System.Drawing.Point(10, 10); + this.SNESAutofire3Panel.Name = "SNESAutofire3Panel"; + this.SNESAutofire3Panel.Size = new System.Drawing.Size(392, 332); + this.SNESAutofire3Panel.TabIndex = 3; + // // tabPage30 // this.tabPage30.Controls.Add(this.SNESAutofire4Panel); @@ -555,6 +687,13 @@ this.tabPage30.Text = "Autofire 4"; this.tabPage30.UseVisualStyleBackColor = true; // + // SNESAutofire4Panel + // + this.SNESAutofire4Panel.Location = new System.Drawing.Point(10, 10); + this.SNESAutofire4Panel.Name = "SNESAutofire4Panel"; + this.SNESAutofire4Panel.Size = new System.Drawing.Size(392, 332); + this.SNESAutofire4Panel.TabIndex = 3; + // // tabPageGameboy // this.tabPageGameboy.Controls.Add(this.pictureBox2); @@ -601,6 +740,13 @@ this.tabPage31.Text = "Controller 1"; this.tabPage31.UseVisualStyleBackColor = true; // + // GBController1Panel + // + this.GBController1Panel.Location = new System.Drawing.Point(6, 6); + this.GBController1Panel.Name = "GBController1Panel"; + this.GBController1Panel.Size = new System.Drawing.Size(359, 332); + this.GBController1Panel.TabIndex = 1; + // // tabPage32 // this.tabPage32.Controls.Add(this.GBAutofire1Panel); @@ -612,6 +758,13 @@ this.tabPage32.Text = "Autofire 1"; this.tabPage32.UseVisualStyleBackColor = true; // + // GBAutofire1Panel + // + this.GBAutofire1Panel.Location = new System.Drawing.Point(6, 6); + this.GBAutofire1Panel.Name = "GBAutofire1Panel"; + this.GBAutofire1Panel.Size = new System.Drawing.Size(359, 332); + this.GBAutofire1Panel.TabIndex = 2; + // // tabPageGenesis // this.tabPageGenesis.Controls.Add(this.pictureBox6); @@ -663,6 +816,13 @@ this.tabPage52.Text = "Pad 1"; this.tabPage52.UseVisualStyleBackColor = true; // + // GenesisController1Panel + // + this.GenesisController1Panel.Location = new System.Drawing.Point(10, 10); + this.GenesisController1Panel.Name = "GenesisController1Panel"; + this.GenesisController1Panel.Size = new System.Drawing.Size(392, 332); + this.GenesisController1Panel.TabIndex = 1; + // // tabPage53 // this.tabPage53.Location = new System.Drawing.Point(4, 22); @@ -683,6 +843,13 @@ this.tabPage54.Text = "Console"; this.tabPage54.UseVisualStyleBackColor = true; // + // GenesisConsoleButtons + // + this.GenesisConsoleButtons.Location = new System.Drawing.Point(10, 10); + this.GenesisConsoleButtons.Name = "GenesisConsoleButtons"; + this.GenesisConsoleButtons.Size = new System.Drawing.Size(368, 125); + this.GenesisConsoleButtons.TabIndex = 1; + // // tabPage55 // this.tabPage55.Controls.Add(this.GenesisAutofire1Panel); @@ -693,6 +860,13 @@ this.tabPage55.Text = "Autofire 1"; this.tabPage55.UseVisualStyleBackColor = true; // + // GenesisAutofire1Panel + // + this.GenesisAutofire1Panel.Location = new System.Drawing.Point(10, 10); + this.GenesisAutofire1Panel.Name = "GenesisAutofire1Panel"; + this.GenesisAutofire1Panel.Size = new System.Drawing.Size(392, 332); + this.GenesisAutofire1Panel.TabIndex = 2; + // // tabPage56 // this.tabPage56.Location = new System.Drawing.Point(4, 22); @@ -753,6 +927,13 @@ this.tabPage33.Text = "Pad 1"; this.tabPage33.UseVisualStyleBackColor = true; // + // SMSController1Panel + // + this.SMSController1Panel.Location = new System.Drawing.Point(6, 6); + this.SMSController1Panel.Name = "SMSController1Panel"; + this.SMSController1Panel.Size = new System.Drawing.Size(326, 332); + this.SMSController1Panel.TabIndex = 1; + // // tabPage34 // this.tabPage34.Controls.Add(this.SMSController2Panel); @@ -764,6 +945,13 @@ this.tabPage34.Text = "Pad 1"; this.tabPage34.UseVisualStyleBackColor = true; // + // SMSController2Panel + // + this.SMSController2Panel.Location = new System.Drawing.Point(6, 6); + this.SMSController2Panel.Name = "SMSController2Panel"; + this.SMSController2Panel.Size = new System.Drawing.Size(326, 332); + this.SMSController2Panel.TabIndex = 2; + // // Console // this.Console.Controls.Add(this.SMSConsoleButtons); @@ -774,6 +962,13 @@ this.Console.Text = "Console"; this.Console.UseVisualStyleBackColor = true; // + // SMSConsoleButtons + // + this.SMSConsoleButtons.Location = new System.Drawing.Point(6, 6); + this.SMSConsoleButtons.Name = "SMSConsoleButtons"; + this.SMSConsoleButtons.Size = new System.Drawing.Size(322, 125); + this.SMSConsoleButtons.TabIndex = 1; + // // tabPage51 // this.tabPage51.Controls.Add(this.SMSAutofire1Panel); @@ -784,6 +979,13 @@ this.tabPage51.Text = "Autofire 1"; this.tabPage51.UseVisualStyleBackColor = true; // + // SMSAutofire1Panel + // + this.SMSAutofire1Panel.Location = new System.Drawing.Point(6, 6); + this.SMSAutofire1Panel.Name = "SMSAutofire1Panel"; + this.SMSAutofire1Panel.Size = new System.Drawing.Size(326, 332); + this.SMSAutofire1Panel.TabIndex = 3; + // // tabPage57 // this.tabPage57.Controls.Add(this.SMSAutofire2Panel); @@ -794,6 +996,13 @@ this.tabPage57.Text = "Autofire 2"; this.tabPage57.UseVisualStyleBackColor = true; // + // SMSAutofire2Panel + // + this.SMSAutofire2Panel.Location = new System.Drawing.Point(6, 6); + this.SMSAutofire2Panel.Name = "SMSAutofire2Panel"; + this.SMSAutofire2Panel.Size = new System.Drawing.Size(326, 332); + this.SMSAutofire2Panel.TabIndex = 4; + // // tabPagePCE // this.tabPagePCE.Controls.Add(this.pictureBox4); @@ -851,6 +1060,13 @@ this.tabPage36.Text = "Pad 1"; this.tabPage36.UseVisualStyleBackColor = true; // + // PCEController1Panel + // + this.PCEController1Panel.Location = new System.Drawing.Point(10, 10); + this.PCEController1Panel.Name = "PCEController1Panel"; + this.PCEController1Panel.Size = new System.Drawing.Size(326, 332); + this.PCEController1Panel.TabIndex = 2; + // // tabPage37 // this.tabPage37.Controls.Add(this.PCEController2Panel); @@ -862,6 +1078,13 @@ this.tabPage37.Text = "Pad 2"; this.tabPage37.UseVisualStyleBackColor = true; // + // PCEController2Panel + // + this.PCEController2Panel.Location = new System.Drawing.Point(10, 10); + this.PCEController2Panel.Name = "PCEController2Panel"; + this.PCEController2Panel.Size = new System.Drawing.Size(326, 332); + this.PCEController2Panel.TabIndex = 2; + // // tabPage38 // this.tabPage38.Controls.Add(this.PCEController3Panel); @@ -872,6 +1095,13 @@ this.tabPage38.Text = "Pad 3"; this.tabPage38.UseVisualStyleBackColor = true; // + // PCEController3Panel + // + this.PCEController3Panel.Location = new System.Drawing.Point(10, 10); + this.PCEController3Panel.Name = "PCEController3Panel"; + this.PCEController3Panel.Size = new System.Drawing.Size(326, 332); + this.PCEController3Panel.TabIndex = 2; + // // tabPage39 // this.tabPage39.Controls.Add(this.PCEController4Panel); @@ -882,6 +1112,13 @@ this.tabPage39.Text = "Pad 4"; this.tabPage39.UseVisualStyleBackColor = true; // + // PCEController4Panel + // + this.PCEController4Panel.Location = new System.Drawing.Point(10, 10); + this.PCEController4Panel.Name = "PCEController4Panel"; + this.PCEController4Panel.Size = new System.Drawing.Size(326, 332); + this.PCEController4Panel.TabIndex = 2; + // // tabPage40 // this.tabPage40.Controls.Add(this.PCEController5Panel); @@ -892,6 +1129,13 @@ this.tabPage40.Text = "Pad 5"; this.tabPage40.UseVisualStyleBackColor = true; // + // PCEController5Panel + // + this.PCEController5Panel.Location = new System.Drawing.Point(10, 10); + this.PCEController5Panel.Name = "PCEController5Panel"; + this.PCEController5Panel.Size = new System.Drawing.Size(326, 332); + this.PCEController5Panel.TabIndex = 2; + // // tabPage41 // this.tabPage41.Controls.Add(this.PCEAutofire1Panel); @@ -902,6 +1146,13 @@ this.tabPage41.Text = "Autofire 1"; this.tabPage41.UseVisualStyleBackColor = true; // + // PCEAutofire1Panel + // + this.PCEAutofire1Panel.Location = new System.Drawing.Point(10, 10); + this.PCEAutofire1Panel.Name = "PCEAutofire1Panel"; + this.PCEAutofire1Panel.Size = new System.Drawing.Size(326, 332); + this.PCEAutofire1Panel.TabIndex = 2; + // // tabPage42 // this.tabPage42.Controls.Add(this.PCEAutofire2Panel); @@ -912,6 +1163,13 @@ this.tabPage42.Text = "Autofire 2"; this.tabPage42.UseVisualStyleBackColor = true; // + // PCEAutofire2Panel + // + this.PCEAutofire2Panel.Location = new System.Drawing.Point(10, 10); + this.PCEAutofire2Panel.Name = "PCEAutofire2Panel"; + this.PCEAutofire2Panel.Size = new System.Drawing.Size(326, 332); + this.PCEAutofire2Panel.TabIndex = 2; + // // tabPage43 // this.tabPage43.Controls.Add(this.PCEAutofire3Panel); @@ -922,6 +1180,13 @@ this.tabPage43.Text = "Autofire 3"; this.tabPage43.UseVisualStyleBackColor = true; // + // PCEAutofire3Panel + // + this.PCEAutofire3Panel.Location = new System.Drawing.Point(10, 10); + this.PCEAutofire3Panel.Name = "PCEAutofire3Panel"; + this.PCEAutofire3Panel.Size = new System.Drawing.Size(326, 332); + this.PCEAutofire3Panel.TabIndex = 2; + // // tabPage44 // this.tabPage44.Controls.Add(this.PCEAutofire4Panel); @@ -932,6 +1197,13 @@ this.tabPage44.Text = "Autofire 4"; this.tabPage44.UseVisualStyleBackColor = true; // + // PCEAutofire4Panel + // + this.PCEAutofire4Panel.Location = new System.Drawing.Point(10, 10); + this.PCEAutofire4Panel.Name = "PCEAutofire4Panel"; + this.PCEAutofire4Panel.Size = new System.Drawing.Size(326, 332); + this.PCEAutofire4Panel.TabIndex = 2; + // // tabPage45 // this.tabPage45.Controls.Add(this.PCEAutofire5Panel); @@ -942,6 +1214,13 @@ this.tabPage45.Text = "Autofire 5"; this.tabPage45.UseVisualStyleBackColor = true; // + // PCEAutofire5Panel + // + this.PCEAutofire5Panel.Location = new System.Drawing.Point(20, 11); + this.PCEAutofire5Panel.Name = "PCEAutofire5Panel"; + this.PCEAutofire5Panel.Size = new System.Drawing.Size(326, 332); + this.PCEAutofire5Panel.TabIndex = 2; + // // tabPageAtari2600 // this.tabPageAtari2600.Controls.Add(this.pictureBox5); @@ -993,6 +1272,13 @@ this.tabPage46.Text = "Joystick 1"; this.tabPage46.UseVisualStyleBackColor = true; // + // Atari2600Controller1Panel + // + this.Atari2600Controller1Panel.Location = new System.Drawing.Point(10, 10); + this.Atari2600Controller1Panel.Name = "Atari2600Controller1Panel"; + this.Atari2600Controller1Panel.Size = new System.Drawing.Size(365, 332); + this.Atari2600Controller1Panel.TabIndex = 1; + // // tabPage47 // this.tabPage47.Controls.Add(this.Atari2600Controller2Panel); @@ -1004,6 +1290,13 @@ this.tabPage47.Text = "Joystick 2"; this.tabPage47.UseVisualStyleBackColor = true; // + // Atari2600Controller2Panel + // + this.Atari2600Controller2Panel.Location = new System.Drawing.Point(10, 10); + this.Atari2600Controller2Panel.Name = "Atari2600Controller2Panel"; + this.Atari2600Controller2Panel.Size = new System.Drawing.Size(365, 332); + this.Atari2600Controller2Panel.TabIndex = 2; + // // tabPage48 // this.tabPage48.Controls.Add(this.Atari2600ConsoleButtons); @@ -1014,6 +1307,13 @@ this.tabPage48.Text = "Console"; this.tabPage48.UseVisualStyleBackColor = true; // + // Atari2600ConsoleButtons + // + this.Atari2600ConsoleButtons.Location = new System.Drawing.Point(10, 10); + this.Atari2600ConsoleButtons.Name = "Atari2600ConsoleButtons"; + this.Atari2600ConsoleButtons.Size = new System.Drawing.Size(359, 125); + this.Atari2600ConsoleButtons.TabIndex = 1; + // // tabPage35 // this.tabPage35.Controls.Add(this.Atari2600Autofire1Panel); @@ -1024,6 +1324,13 @@ this.tabPage35.Text = "Autofire 1"; this.tabPage35.UseVisualStyleBackColor = true; // + // Atari2600Autofire1Panel + // + this.Atari2600Autofire1Panel.Location = new System.Drawing.Point(10, 10); + this.Atari2600Autofire1Panel.Name = "Atari2600Autofire1Panel"; + this.Atari2600Autofire1Panel.Size = new System.Drawing.Size(368, 332); + this.Atari2600Autofire1Panel.TabIndex = 3; + // // tabPage58 // this.tabPage58.Controls.Add(this.Atari2600Autofire2Panel); @@ -1034,6 +1341,13 @@ this.tabPage58.Text = "Autofire 2"; this.tabPage58.UseVisualStyleBackColor = true; // + // Atari2600Autofire2Panel + // + this.Atari2600Autofire2Panel.Location = new System.Drawing.Point(10, 10); + this.Atari2600Autofire2Panel.Name = "Atari2600Autofire2Panel"; + this.Atari2600Autofire2Panel.Size = new System.Drawing.Size(368, 332); + this.Atari2600Autofire2Panel.TabIndex = 3; + // // tabPageC64 // this.tabPageC64.Controls.Add(this.tabControl8); @@ -1084,6 +1398,13 @@ this.pictureBox8.TabIndex = 5; this.pictureBox8.TabStop = false; // + // C64Controller1Panel + // + this.C64Controller1Panel.Location = new System.Drawing.Point(10, 10); + this.C64Controller1Panel.Name = "C64Controller1Panel"; + this.C64Controller1Panel.Size = new System.Drawing.Size(369, 332); + this.C64Controller1Panel.TabIndex = 2; + // // tabPage50 // this.tabPage50.Controls.Add(this.pictureBox9); @@ -1108,6 +1429,13 @@ this.pictureBox9.TabIndex = 6; this.pictureBox9.TabStop = false; // + // C64Controller2Panel + // + this.C64Controller2Panel.Location = new System.Drawing.Point(10, 10); + this.C64Controller2Panel.Name = "C64Controller2Panel"; + this.C64Controller2Panel.Size = new System.Drawing.Size(369, 332); + this.C64Controller2Panel.TabIndex = 3; + // // tabPage10 // this.tabPage10.Controls.Add(this.pictureBox10); @@ -1131,6 +1459,13 @@ this.pictureBox10.TabIndex = 7; this.pictureBox10.TabStop = false; // + // C64Autofire1Panel + // + this.C64Autofire1Panel.Location = new System.Drawing.Point(10, 10); + this.C64Autofire1Panel.Name = "C64Autofire1Panel"; + this.C64Autofire1Panel.Size = new System.Drawing.Size(369, 332); + this.C64Autofire1Panel.TabIndex = 4; + // // tabPage11 // this.tabPage11.Controls.Add(this.pictureBox11); @@ -1154,6 +1489,13 @@ this.pictureBox11.TabIndex = 8; this.pictureBox11.TabStop = false; // + // C64Autofire2Panel + // + this.C64Autofire2Panel.Location = new System.Drawing.Point(10, 10); + this.C64Autofire2Panel.Name = "C64Autofire2Panel"; + this.C64Autofire2Panel.Size = new System.Drawing.Size(369, 332); + this.C64Autofire2Panel.TabIndex = 4; + // // tabPage12 // this.tabPage12.Controls.Add(this.C64KeyboardPanel); @@ -1165,6 +1507,16 @@ this.tabPage12.Text = "Keyboard"; this.tabPage12.UseVisualStyleBackColor = true; // + // C64KeyboardPanel + // + this.C64KeyboardPanel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.C64KeyboardPanel.Location = new System.Drawing.Point(4, 131); + this.C64KeyboardPanel.Name = "C64KeyboardPanel"; + this.C64KeyboardPanel.Size = new System.Drawing.Size(754, 259); + this.C64KeyboardPanel.TabIndex = 10; + // // pictureBox12 // this.pictureBox12.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -1177,30 +1529,6 @@ this.pictureBox12.TabIndex = 9; this.pictureBox12.TabStop = false; // - // tabPageTI83 - // - this.tabPageTI83.Controls.Add(this.pictureBox7); - this.tabPageTI83.Controls.Add(this.TI83ControllerPanel); - this.tabPageTI83.Location = new System.Drawing.Point(4, 22); - this.tabPageTI83.Name = "tabPageTI83"; - this.tabPageTI83.Size = new System.Drawing.Size(787, 425); - this.tabPageTI83.TabIndex = 7; - this.tabPageTI83.Text = "TI-83"; - this.tabPageTI83.UseVisualStyleBackColor = true; - // - // pictureBox7 - // - this.pictureBox7.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Right))); - this.pictureBox7.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.pictureBox7.Image = global::BizHawk.MultiClient.Properties.Resources.TI83_Controller; - this.pictureBox7.Location = new System.Drawing.Point(593, 11); - this.pictureBox7.Name = "pictureBox7"; - this.pictureBox7.Size = new System.Drawing.Size(186, 273); - this.pictureBox7.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.pictureBox7.TabIndex = 4; - this.pictureBox7.TabStop = false; - // // tabPageColeco // this.tabPageColeco.Controls.Add(this.pictureBox15); @@ -1247,6 +1575,13 @@ this.tabPage60.Text = "Controller 1"; this.tabPage60.UseVisualStyleBackColor = true; // + // COLController1Panel + // + this.COLController1Panel.Location = new System.Drawing.Point(10, 10); + this.COLController1Panel.Name = "COLController1Panel"; + this.COLController1Panel.Size = new System.Drawing.Size(355, 332); + this.COLController1Panel.TabIndex = 1; + // // tabPage61 // this.tabPage61.Controls.Add(this.COLAutofire1Panel); @@ -1258,6 +1593,13 @@ this.tabPage61.Text = "Autofire 1"; this.tabPage61.UseVisualStyleBackColor = true; // + // COLAutofire1Panel + // + this.COLAutofire1Panel.Location = new System.Drawing.Point(10, 10); + this.COLAutofire1Panel.Name = "COLAutofire1Panel"; + this.COLAutofire1Panel.Size = new System.Drawing.Size(359, 332); + this.COLAutofire1Panel.TabIndex = 2; + // // tabPage62 // this.tabPage62.Controls.Add(this.COLController2Panel); @@ -1268,6 +1610,13 @@ this.tabPage62.Text = "Controller 2"; this.tabPage62.UseVisualStyleBackColor = true; // + // COLController2Panel + // + this.COLController2Panel.Location = new System.Drawing.Point(10, 10); + this.COLController2Panel.Name = "COLController2Panel"; + this.COLController2Panel.Size = new System.Drawing.Size(358, 332); + this.COLController2Panel.TabIndex = 2; + // // tabPage63 // this.tabPage63.Controls.Add(this.COLAutofire2Panel); @@ -1278,6 +1627,47 @@ this.tabPage63.Text = "Autofire 2"; this.tabPage63.UseVisualStyleBackColor = true; // + // COLAutofire2Panel + // + this.COLAutofire2Panel.Location = new System.Drawing.Point(10, 10); + this.COLAutofire2Panel.Name = "COLAutofire2Panel"; + this.COLAutofire2Panel.Size = new System.Drawing.Size(358, 332); + this.COLAutofire2Panel.TabIndex = 3; + // + // tabPageTI83 + // + this.tabPageTI83.Controls.Add(this.pictureBox7); + this.tabPageTI83.Controls.Add(this.TI83ControllerPanel); + this.tabPageTI83.Location = new System.Drawing.Point(4, 22); + this.tabPageTI83.Name = "tabPageTI83"; + this.tabPageTI83.Size = new System.Drawing.Size(787, 425); + this.tabPageTI83.TabIndex = 7; + this.tabPageTI83.Text = "TI-83"; + this.tabPageTI83.UseVisualStyleBackColor = true; + // + // pictureBox7 + // + this.pictureBox7.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Right))); + this.pictureBox7.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; + this.pictureBox7.Image = global::BizHawk.MultiClient.Properties.Resources.TI83_Controller; + this.pictureBox7.Location = new System.Drawing.Point(593, 11); + this.pictureBox7.Name = "pictureBox7"; + this.pictureBox7.Size = new System.Drawing.Size(186, 273); + this.pictureBox7.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.pictureBox7.TabIndex = 4; + this.pictureBox7.TabStop = false; + // + // TI83ControllerPanel + // + this.TI83ControllerPanel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.TI83ControllerPanel.Location = new System.Drawing.Point(11, 8); + this.TI83ControllerPanel.Name = "TI83ControllerPanel"; + this.TI83ControllerPanel.Size = new System.Drawing.Size(567, 414); + this.TI83ControllerPanel.TabIndex = 1; + // // Cancel // this.Cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); @@ -1322,383 +1712,6 @@ this.AllowLR.Text = "Allow L+R / U+D"; this.AllowLR.UseVisualStyleBackColor = true; // - // NESController1Panel - // - this.NESController1Panel.Location = new System.Drawing.Point(10, 10); - this.NESController1Panel.Name = "NESController1Panel"; - this.NESController1Panel.Size = new System.Drawing.Size(392, 332); - this.NESController1Panel.TabIndex = 0; - // - // NESController2Panel - // - this.NESController2Panel.Location = new System.Drawing.Point(10, 10); - this.NESController2Panel.Name = "NESController2Panel"; - this.NESController2Panel.Size = new System.Drawing.Size(392, 332); - this.NESController2Panel.TabIndex = 0; - // - // NESController3Panel - // - this.NESController3Panel.Location = new System.Drawing.Point(10, 10); - this.NESController3Panel.Name = "NESController3Panel"; - this.NESController3Panel.Size = new System.Drawing.Size(392, 332); - this.NESController3Panel.TabIndex = 0; - // - // NESController4Panel - // - this.NESController4Panel.Location = new System.Drawing.Point(10, 10); - this.NESController4Panel.Name = "NESController4Panel"; - this.NESController4Panel.Size = new System.Drawing.Size(392, 332); - this.NESController4Panel.TabIndex = 0; - // - // NESConsoleButtons - // - this.NESConsoleButtons.Location = new System.Drawing.Point(10, 10); - this.NESConsoleButtons.Name = "NESConsoleButtons"; - this.NESConsoleButtons.Size = new System.Drawing.Size(368, 341); - this.NESConsoleButtons.TabIndex = 0; - // - // NESAutofire1Panel - // - this.NESAutofire1Panel.Location = new System.Drawing.Point(10, 10); - this.NESAutofire1Panel.Name = "NESAutofire1Panel"; - this.NESAutofire1Panel.Size = new System.Drawing.Size(392, 332); - this.NESAutofire1Panel.TabIndex = 0; - // - // NESAutofire2Panel - // - this.NESAutofire2Panel.Location = new System.Drawing.Point(10, 10); - this.NESAutofire2Panel.Name = "NESAutofire2Panel"; - this.NESAutofire2Panel.Size = new System.Drawing.Size(392, 332); - this.NESAutofire2Panel.TabIndex = 0; - // - // NESAutofire3Panel - // - this.NESAutofire3Panel.Location = new System.Drawing.Point(10, 10); - this.NESAutofire3Panel.Name = "NESAutofire3Panel"; - this.NESAutofire3Panel.Size = new System.Drawing.Size(392, 332); - this.NESAutofire3Panel.TabIndex = 0; - // - // NESAutofire4Panel - // - this.NESAutofire4Panel.Location = new System.Drawing.Point(10, 10); - this.NESAutofire4Panel.Name = "NESAutofire4Panel"; - this.NESAutofire4Panel.Size = new System.Drawing.Size(392, 332); - this.NESAutofire4Panel.TabIndex = 0; - // - // SNESController1Panel - // - this.SNESController1Panel.Location = new System.Drawing.Point(10, 10); - this.SNESController1Panel.Name = "SNESController1Panel"; - this.SNESController1Panel.Size = new System.Drawing.Size(392, 360); - this.SNESController1Panel.TabIndex = 1; - // - // SNESController2Panel - // - this.SNESController2Panel.Location = new System.Drawing.Point(10, 10); - this.SNESController2Panel.Name = "SNESController2Panel"; - this.SNESController2Panel.Size = new System.Drawing.Size(392, 332); - this.SNESController2Panel.TabIndex = 2; - // - // SNESController3Panel - // - this.SNESController3Panel.Location = new System.Drawing.Point(10, 10); - this.SNESController3Panel.Name = "SNESController3Panel"; - this.SNESController3Panel.Size = new System.Drawing.Size(392, 332); - this.SNESController3Panel.TabIndex = 3; - // - // SNESController4Panel - // - this.SNESController4Panel.Location = new System.Drawing.Point(10, 10); - this.SNESController4Panel.Name = "SNESController4Panel"; - this.SNESController4Panel.Size = new System.Drawing.Size(392, 332); - this.SNESController4Panel.TabIndex = 3; - // - // SNESConsoleButtons - // - this.SNESConsoleButtons.Location = new System.Drawing.Point(10, 10); - this.SNESConsoleButtons.Name = "SNESConsoleButtons"; - this.SNESConsoleButtons.Size = new System.Drawing.Size(368, 125); - this.SNESConsoleButtons.TabIndex = 1; - // - // SNESAutofire1Panel - // - this.SNESAutofire1Panel.Location = new System.Drawing.Point(10, 10); - this.SNESAutofire1Panel.Name = "SNESAutofire1Panel"; - this.SNESAutofire1Panel.Size = new System.Drawing.Size(392, 332); - this.SNESAutofire1Panel.TabIndex = 3; - // - // SNESAutofire2Panel - // - this.SNESAutofire2Panel.Location = new System.Drawing.Point(10, 10); - this.SNESAutofire2Panel.Name = "SNESAutofire2Panel"; - this.SNESAutofire2Panel.Size = new System.Drawing.Size(392, 332); - this.SNESAutofire2Panel.TabIndex = 3; - // - // SNESAutofire3Panel - // - this.SNESAutofire3Panel.Location = new System.Drawing.Point(10, 10); - this.SNESAutofire3Panel.Name = "SNESAutofire3Panel"; - this.SNESAutofire3Panel.Size = new System.Drawing.Size(392, 332); - this.SNESAutofire3Panel.TabIndex = 3; - // - // SNESAutofire4Panel - // - this.SNESAutofire4Panel.Location = new System.Drawing.Point(10, 10); - this.SNESAutofire4Panel.Name = "SNESAutofire4Panel"; - this.SNESAutofire4Panel.Size = new System.Drawing.Size(392, 332); - this.SNESAutofire4Panel.TabIndex = 3; - // - // GBController1Panel - // - this.GBController1Panel.Location = new System.Drawing.Point(6, 6); - this.GBController1Panel.Name = "GBController1Panel"; - this.GBController1Panel.Size = new System.Drawing.Size(359, 332); - this.GBController1Panel.TabIndex = 1; - // - // GBAutofire1Panel - // - this.GBAutofire1Panel.Location = new System.Drawing.Point(6, 6); - this.GBAutofire1Panel.Name = "GBAutofire1Panel"; - this.GBAutofire1Panel.Size = new System.Drawing.Size(359, 332); - this.GBAutofire1Panel.TabIndex = 2; - // - // GenesisController1Panel - // - this.GenesisController1Panel.Location = new System.Drawing.Point(10, 10); - this.GenesisController1Panel.Name = "GenesisController1Panel"; - this.GenesisController1Panel.Size = new System.Drawing.Size(392, 332); - this.GenesisController1Panel.TabIndex = 1; - // - // GenesisConsoleButtons - // - this.GenesisConsoleButtons.Location = new System.Drawing.Point(10, 10); - this.GenesisConsoleButtons.Name = "GenesisConsoleButtons"; - this.GenesisConsoleButtons.Size = new System.Drawing.Size(368, 125); - this.GenesisConsoleButtons.TabIndex = 1; - // - // GenesisAutofire1Panel - // - this.GenesisAutofire1Panel.Location = new System.Drawing.Point(10, 10); - this.GenesisAutofire1Panel.Name = "GenesisAutofire1Panel"; - this.GenesisAutofire1Panel.Size = new System.Drawing.Size(392, 332); - this.GenesisAutofire1Panel.TabIndex = 2; - // - // SMSController1Panel - // - this.SMSController1Panel.Location = new System.Drawing.Point(6, 6); - this.SMSController1Panel.Name = "SMSController1Panel"; - this.SMSController1Panel.Size = new System.Drawing.Size(326, 332); - this.SMSController1Panel.TabIndex = 1; - // - // SMSController2Panel - // - this.SMSController2Panel.Location = new System.Drawing.Point(6, 6); - this.SMSController2Panel.Name = "SMSController2Panel"; - this.SMSController2Panel.Size = new System.Drawing.Size(326, 332); - this.SMSController2Panel.TabIndex = 2; - // - // SMSConsoleButtons - // - this.SMSConsoleButtons.Location = new System.Drawing.Point(6, 6); - this.SMSConsoleButtons.Name = "SMSConsoleButtons"; - this.SMSConsoleButtons.Size = new System.Drawing.Size(322, 125); - this.SMSConsoleButtons.TabIndex = 1; - // - // SMSAutofire1Panel - // - this.SMSAutofire1Panel.Location = new System.Drawing.Point(6, 6); - this.SMSAutofire1Panel.Name = "SMSAutofire1Panel"; - this.SMSAutofire1Panel.Size = new System.Drawing.Size(326, 332); - this.SMSAutofire1Panel.TabIndex = 3; - // - // SMSAutofire2Panel - // - this.SMSAutofire2Panel.Location = new System.Drawing.Point(6, 6); - this.SMSAutofire2Panel.Name = "SMSAutofire2Panel"; - this.SMSAutofire2Panel.Size = new System.Drawing.Size(326, 332); - this.SMSAutofire2Panel.TabIndex = 4; - // - // PCEController1Panel - // - this.PCEController1Panel.Location = new System.Drawing.Point(10, 10); - this.PCEController1Panel.Name = "PCEController1Panel"; - this.PCEController1Panel.Size = new System.Drawing.Size(326, 332); - this.PCEController1Panel.TabIndex = 2; - // - // PCEController2Panel - // - this.PCEController2Panel.Location = new System.Drawing.Point(10, 10); - this.PCEController2Panel.Name = "PCEController2Panel"; - this.PCEController2Panel.Size = new System.Drawing.Size(326, 332); - this.PCEController2Panel.TabIndex = 2; - // - // PCEController3Panel - // - this.PCEController3Panel.Location = new System.Drawing.Point(10, 10); - this.PCEController3Panel.Name = "PCEController3Panel"; - this.PCEController3Panel.Size = new System.Drawing.Size(326, 332); - this.PCEController3Panel.TabIndex = 2; - // - // PCEController4Panel - // - this.PCEController4Panel.Location = new System.Drawing.Point(10, 10); - this.PCEController4Panel.Name = "PCEController4Panel"; - this.PCEController4Panel.Size = new System.Drawing.Size(326, 332); - this.PCEController4Panel.TabIndex = 2; - // - // PCEController5Panel - // - this.PCEController5Panel.Location = new System.Drawing.Point(10, 10); - this.PCEController5Panel.Name = "PCEController5Panel"; - this.PCEController5Panel.Size = new System.Drawing.Size(326, 332); - this.PCEController5Panel.TabIndex = 2; - // - // PCEAutofire1Panel - // - this.PCEAutofire1Panel.Location = new System.Drawing.Point(10, 10); - this.PCEAutofire1Panel.Name = "PCEAutofire1Panel"; - this.PCEAutofire1Panel.Size = new System.Drawing.Size(326, 332); - this.PCEAutofire1Panel.TabIndex = 2; - // - // PCEAutofire2Panel - // - this.PCEAutofire2Panel.Location = new System.Drawing.Point(10, 10); - this.PCEAutofire2Panel.Name = "PCEAutofire2Panel"; - this.PCEAutofire2Panel.Size = new System.Drawing.Size(326, 332); - this.PCEAutofire2Panel.TabIndex = 2; - // - // PCEAutofire3Panel - // - this.PCEAutofire3Panel.Location = new System.Drawing.Point(10, 10); - this.PCEAutofire3Panel.Name = "PCEAutofire3Panel"; - this.PCEAutofire3Panel.Size = new System.Drawing.Size(326, 332); - this.PCEAutofire3Panel.TabIndex = 2; - // - // PCEAutofire4Panel - // - this.PCEAutofire4Panel.Location = new System.Drawing.Point(10, 10); - this.PCEAutofire4Panel.Name = "PCEAutofire4Panel"; - this.PCEAutofire4Panel.Size = new System.Drawing.Size(326, 332); - this.PCEAutofire4Panel.TabIndex = 2; - // - // PCEAutofire5Panel - // - this.PCEAutofire5Panel.Location = new System.Drawing.Point(20, 11); - this.PCEAutofire5Panel.Name = "PCEAutofire5Panel"; - this.PCEAutofire5Panel.Size = new System.Drawing.Size(326, 332); - this.PCEAutofire5Panel.TabIndex = 2; - // - // Atari2600Controller1Panel - // - this.Atari2600Controller1Panel.Location = new System.Drawing.Point(10, 10); - this.Atari2600Controller1Panel.Name = "Atari2600Controller1Panel"; - this.Atari2600Controller1Panel.Size = new System.Drawing.Size(365, 332); - this.Atari2600Controller1Panel.TabIndex = 1; - // - // Atari2600Controller2Panel - // - this.Atari2600Controller2Panel.Location = new System.Drawing.Point(10, 10); - this.Atari2600Controller2Panel.Name = "Atari2600Controller2Panel"; - this.Atari2600Controller2Panel.Size = new System.Drawing.Size(365, 332); - this.Atari2600Controller2Panel.TabIndex = 2; - // - // Atari2600ConsoleButtons - // - this.Atari2600ConsoleButtons.Location = new System.Drawing.Point(10, 10); - this.Atari2600ConsoleButtons.Name = "Atari2600ConsoleButtons"; - this.Atari2600ConsoleButtons.Size = new System.Drawing.Size(359, 125); - this.Atari2600ConsoleButtons.TabIndex = 1; - // - // Atari2600Autofire1Panel - // - this.Atari2600Autofire1Panel.Location = new System.Drawing.Point(10, 10); - this.Atari2600Autofire1Panel.Name = "Atari2600Autofire1Panel"; - this.Atari2600Autofire1Panel.Size = new System.Drawing.Size(368, 332); - this.Atari2600Autofire1Panel.TabIndex = 3; - // - // Atari2600Autofire2Panel - // - this.Atari2600Autofire2Panel.Location = new System.Drawing.Point(10, 10); - this.Atari2600Autofire2Panel.Name = "Atari2600Autofire2Panel"; - this.Atari2600Autofire2Panel.Size = new System.Drawing.Size(368, 332); - this.Atari2600Autofire2Panel.TabIndex = 3; - // - // C64Controller1Panel - // - this.C64Controller1Panel.Location = new System.Drawing.Point(10, 10); - this.C64Controller1Panel.Name = "C64Controller1Panel"; - this.C64Controller1Panel.Size = new System.Drawing.Size(369, 332); - this.C64Controller1Panel.TabIndex = 2; - // - // C64Controller2Panel - // - this.C64Controller2Panel.Location = new System.Drawing.Point(10, 10); - this.C64Controller2Panel.Name = "C64Controller2Panel"; - this.C64Controller2Panel.Size = new System.Drawing.Size(369, 332); - this.C64Controller2Panel.TabIndex = 3; - // - // C64Autofire1Panel - // - this.C64Autofire1Panel.Location = new System.Drawing.Point(10, 10); - this.C64Autofire1Panel.Name = "C64Autofire1Panel"; - this.C64Autofire1Panel.Size = new System.Drawing.Size(369, 332); - this.C64Autofire1Panel.TabIndex = 4; - // - // C64Autofire2Panel - // - this.C64Autofire2Panel.Location = new System.Drawing.Point(10, 10); - this.C64Autofire2Panel.Name = "C64Autofire2Panel"; - this.C64Autofire2Panel.Size = new System.Drawing.Size(369, 332); - this.C64Autofire2Panel.TabIndex = 4; - // - // C64KeyboardPanel - // - this.C64KeyboardPanel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.C64KeyboardPanel.Location = new System.Drawing.Point(4, 131); - this.C64KeyboardPanel.Name = "C64KeyboardPanel"; - this.C64KeyboardPanel.Size = new System.Drawing.Size(754, 259); - this.C64KeyboardPanel.TabIndex = 10; - // - // COLController1Panel - // - this.COLController1Panel.Location = new System.Drawing.Point(10, 10); - this.COLController1Panel.Name = "COLController1Panel"; - this.COLController1Panel.Size = new System.Drawing.Size(355, 332); - this.COLController1Panel.TabIndex = 1; - // - // COLAutofire1Panel - // - this.COLAutofire1Panel.Location = new System.Drawing.Point(10, 10); - this.COLAutofire1Panel.Name = "COLAutofire1Panel"; - this.COLAutofire1Panel.Size = new System.Drawing.Size(359, 332); - this.COLAutofire1Panel.TabIndex = 2; - // - // COLController2Panel - // - this.COLController2Panel.Location = new System.Drawing.Point(10, 10); - this.COLController2Panel.Name = "COLController2Panel"; - this.COLController2Panel.Size = new System.Drawing.Size(358, 332); - this.COLController2Panel.TabIndex = 2; - // - // COLAutofire2Panel - // - this.COLAutofire2Panel.Location = new System.Drawing.Point(10, 10); - this.COLAutofire2Panel.Name = "COLAutofire2Panel"; - this.COLAutofire2Panel.Size = new System.Drawing.Size(358, 332); - this.COLAutofire2Panel.TabIndex = 3; - // - // TI83ControllerPanel - // - this.TI83ControllerPanel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.TI83ControllerPanel.Location = new System.Drawing.Point(11, 8); - this.TI83ControllerPanel.Name = "TI83ControllerPanel"; - this.TI83ControllerPanel.Size = new System.Drawing.Size(567, 414); - this.TI83ControllerPanel.TabIndex = 1; - // // AutoTab // this.AutoTab.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); @@ -1711,6 +1724,77 @@ this.AutoTab.UseVisualStyleBackColor = true; this.AutoTab.CheckedChanged += new System.EventHandler(this.AutoTab_CheckedChanged); // + // tabPageGBA + // + this.tabPageGBA.Controls.Add(this.pictureBox13); + this.tabPageGBA.Controls.Add(this.tabControl1); + this.tabPageGBA.Location = new System.Drawing.Point(4, 22); + this.tabPageGBA.Name = "tabPageGBA"; + this.tabPageGBA.Size = new System.Drawing.Size(787, 425); + this.tabPageGBA.TabIndex = 10; + this.tabPageGBA.Text = "GBA"; + this.tabPageGBA.UseVisualStyleBackColor = true; + // + // pictureBox13 + // + this.pictureBox13.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.pictureBox13.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; + this.pictureBox13.Image = global::BizHawk.MultiClient.Properties.Resources.GBA_Controller; + this.pictureBox13.Location = new System.Drawing.Point(419, 37); + this.pictureBox13.Name = "pictureBox13"; + this.pictureBox13.Size = new System.Drawing.Size(236, 138); + this.pictureBox13.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.pictureBox13.TabIndex = 6; + this.pictureBox13.TabStop = false; + // + // tabControl1 + // + this.tabControl1.Controls.Add(this.tabPage1); + this.tabControl1.Controls.Add(this.tabPage2); + this.tabControl1.Location = new System.Drawing.Point(17, 15); + this.tabControl1.Name = "tabControl1"; + this.tabControl1.SelectedIndex = 0; + this.tabControl1.Size = new System.Drawing.Size(379, 398); + this.tabControl1.TabIndex = 5; + // + // tabPage1 + // + this.tabPage1.Controls.Add(this.GBAController1Panel); + this.tabPage1.Location = new System.Drawing.Point(4, 22); + this.tabPage1.Name = "tabPage1"; + this.tabPage1.Padding = new System.Windows.Forms.Padding(3); + this.tabPage1.Size = new System.Drawing.Size(371, 372); + this.tabPage1.TabIndex = 0; + this.tabPage1.Text = "Controller 1"; + this.tabPage1.UseVisualStyleBackColor = true; + // + // GBAController1Panel + // + this.GBAController1Panel.Location = new System.Drawing.Point(6, 6); + this.GBAController1Panel.Name = "GBAController1Panel"; + this.GBAController1Panel.Size = new System.Drawing.Size(359, 332); + this.GBAController1Panel.TabIndex = 1; + // + // tabPage2 + // + this.tabPage2.Controls.Add(this.GBAAutofire1Panel); + this.tabPage2.Location = new System.Drawing.Point(4, 22); + this.tabPage2.Name = "tabPage2"; + this.tabPage2.Padding = new System.Windows.Forms.Padding(3); + this.tabPage2.Size = new System.Drawing.Size(371, 372); + this.tabPage2.TabIndex = 1; + this.tabPage2.Text = "Autofire 1"; + this.tabPage2.UseVisualStyleBackColor = true; + // + // GBAAutofire1Panel + // + this.GBAAutofire1Panel.Location = new System.Drawing.Point(6, 6); + this.GBAAutofire1Panel.Name = "GBAAutofire1Panel"; + this.GBAAutofire1Panel.Size = new System.Drawing.Size(359, 332); + this.GBAAutofire1Panel.TabIndex = 2; + // // ControllerConfig // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -1804,8 +1888,6 @@ ((System.ComponentModel.ISupportInitialize)(this.pictureBox11)).EndInit(); this.tabPage12.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox12)).EndInit(); - this.tabPageTI83.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).EndInit(); this.tabPageColeco.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox15)).EndInit(); this.tabControl10.ResumeLayout(false); @@ -1813,6 +1895,13 @@ this.tabPage61.ResumeLayout(false); this.tabPage62.ResumeLayout(false); this.tabPage63.ResumeLayout(false); + this.tabPageTI83.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).EndInit(); + this.tabPageGBA.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox13)).EndInit(); + this.tabControl1.ResumeLayout(false); + this.tabPage1.ResumeLayout(false); + this.tabPage2.ResumeLayout(false); this.ResumeLayout(false); this.PerformLayout(); @@ -1966,5 +2055,12 @@ private ControllerConfigPanel COLController2Panel; private ControllerConfigPanel COLAutofire2Panel; private System.Windows.Forms.CheckBox AutoTab; + private System.Windows.Forms.TabPage tabPageGBA; + private System.Windows.Forms.PictureBox pictureBox13; + private System.Windows.Forms.TabControl tabControl1; + private System.Windows.Forms.TabPage tabPage1; + private ControllerConfigPanel GBAController1Panel; + private System.Windows.Forms.TabPage tabPage2; + private ControllerConfigPanel GBAAutofire1Panel; } } \ No newline at end of file diff --git a/BizHawk.MultiClient/config/ControllerConfig.cs b/BizHawk.MultiClient/config/ControllerConfig.cs index 64b87df5ce..b1e6707e6c 100644 --- a/BizHawk.MultiClient/config/ControllerConfig.cs +++ b/BizHawk.MultiClient/config/ControllerConfig.cs @@ -53,6 +53,9 @@ namespace BizHawk.MultiClient GBController1Panel.LoadSettings(Global.Config.GBController[0]); GBAutofire1Panel.LoadSettings(Global.Config.GBAutoController[0]); + GBAController1Panel.LoadSettings(Global.Config.GBAController[0]); + GBAAutofire1Panel.LoadSettings(Global.Config.GBAAutoController[0]); + GenesisController1Panel.LoadSettings(Global.Config.GenesisController[0]); GenesisAutofire1Panel.LoadSettings(Global.Config.GenesisAutoController[0]); GenesisConsoleButtons.LoadSettings(Global.Config.GenesisConsoleButtons); @@ -124,6 +127,7 @@ namespace BizHawk.MultiClient if (!Global.MainForm.INTERIM) { PlatformTabControl.Controls.Remove(tabPageC64); + PlatformTabControl.Controls.Remove(tabPageGBA); } AutoTab.Checked = Global.Config.InputConfigAutoTab; @@ -146,6 +150,9 @@ namespace BizHawk.MultiClient case "GBC": PlatformTabControl.SelectTab(tabPageGameboy); break; + case "GBA": + PlatformTabControl.SelectTab(tabPageGBA); + break; case "GEN": PlatformTabControl.SelectTab(tabPageGenesis); break; diff --git a/BizHawk.MultiClient/config/ControllerImages/GBA_Controller.png b/BizHawk.MultiClient/config/ControllerImages/GBA_Controller.png new file mode 100644 index 0000000000..9eee422dc5 Binary files /dev/null and b/BizHawk.MultiClient/config/ControllerImages/GBA_Controller.png differ