diff --git a/BizHawk.MultiClient/config/ControllerConfig.Designer.cs b/BizHawk.MultiClient/config/ControllerConfig.Designer.cs index 79f30b588b..dd46b54763 100644 --- a/BizHawk.MultiClient/config/ControllerConfig.Designer.cs +++ b/BizHawk.MultiClient/config/ControllerConfig.Designer.cs @@ -33,105 +33,67 @@ this.ControllerImage = 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.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.tabPage2 = 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.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.tabPage3 = 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.tabPage9 = new System.Windows.Forms.TabPage(); 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.tabPage55 = new System.Windows.Forms.TabPage(); - this.GenesisAutofire1Panel = new BizHawk.MultiClient.ControllerConfigPanel(); this.tabPage56 = new System.Windows.Forms.TabPage(); this.tabPage4 = 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.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.tabPage5 = 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.tabPage6 = 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.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.tabPage7 = new System.Windows.Forms.TabPage(); this.tabControl8 = new System.Windows.Forms.TabControl(); this.tabPage49 = new System.Windows.Forms.TabPage(); @@ -141,6 +103,47 @@ this.OK = new System.Windows.Forms.Button(); this.label38 = new System.Windows.Forms.Label(); this.pictureBox6 = new System.Windows.Forms.PictureBox(); + 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.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.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.GenesisAutofire1Panel = new BizHawk.MultiClient.ControllerConfigPanel(); + this.SMSController1Panel = new BizHawk.MultiClient.ControllerConfigPanel(); + this.SMSController2Panel = 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.Atari2600Autofire1Panel = new BizHawk.MultiClient.ControllerConfigPanel(); + this.Atari2600Autofire2Panel = new BizHawk.MultiClient.ControllerConfigPanel(); + this.TI83ControllerPanel = new BizHawk.MultiClient.ControllerConfigPanel(); + this.pictureBox7 = new System.Windows.Forms.PictureBox(); this.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.ControllerImage)).BeginInit(); @@ -202,7 +205,9 @@ this.tabPage58.SuspendLayout(); this.tabPage7.SuspendLayout(); this.tabControl8.SuspendLayout(); + this.tabPage8.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox6)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).BeginInit(); this.SuspendLayout(); // // tabControl1 @@ -281,13 +286,6 @@ 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); @@ -299,13 +297,6 @@ 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); @@ -316,13 +307,6 @@ 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); @@ -333,13 +317,6 @@ 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.Location = new System.Drawing.Point(4, 22); @@ -359,13 +336,6 @@ 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); @@ -376,13 +346,6 @@ 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); @@ -393,13 +356,6 @@ 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); @@ -410,13 +366,6 @@ 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; - // // tabPage2 // this.tabPage2.Controls.Add(this.pictureBox1); @@ -473,13 +422,6 @@ this.tabPage22.Text = "Pad 1"; this.tabPage22.UseVisualStyleBackColor = true; // - // SNESController1Panel - // - this.SNESController1Panel.Location = new System.Drawing.Point(6, 6); - this.SNESController1Panel.Name = "SNESController1Panel"; - this.SNESController1Panel.Size = new System.Drawing.Size(392, 360); - this.SNESController1Panel.TabIndex = 1; - // // tabPage23 // this.tabPage23.Controls.Add(this.SNESController2Panel); @@ -491,13 +433,6 @@ this.tabPage23.Text = "Pad 2"; this.tabPage23.UseVisualStyleBackColor = true; // - // SNESController2Panel - // - this.SNESController2Panel.Location = new System.Drawing.Point(15, 15); - this.SNESController2Panel.Name = "SNESController2Panel"; - this.SNESController2Panel.Size = new System.Drawing.Size(392, 332); - this.SNESController2Panel.TabIndex = 2; - // // tabPage24 // this.tabPage24.Controls.Add(this.SNESController3Panel); @@ -508,13 +443,6 @@ this.tabPage24.Text = "Pad 3"; this.tabPage24.UseVisualStyleBackColor = true; // - // SNESController3Panel - // - this.SNESController3Panel.Location = new System.Drawing.Point(17, 19); - this.SNESController3Panel.Name = "SNESController3Panel"; - this.SNESController3Panel.Size = new System.Drawing.Size(392, 332); - this.SNESController3Panel.TabIndex = 3; - // // tabPage25 // this.tabPage25.Controls.Add(this.SNESController4Panel); @@ -525,13 +453,6 @@ this.tabPage25.Text = "Pad 4"; this.tabPage25.UseVisualStyleBackColor = true; // - // SNESController4Panel - // - this.SNESController4Panel.Location = new System.Drawing.Point(20, 21); - this.SNESController4Panel.Name = "SNESController4Panel"; - this.SNESController4Panel.Size = new System.Drawing.Size(392, 332); - this.SNESController4Panel.TabIndex = 3; - // // tabPage26 // this.tabPage26.Location = new System.Drawing.Point(4, 22); @@ -551,13 +472,6 @@ this.tabPage27.Text = "Autofire 1"; this.tabPage27.UseVisualStyleBackColor = true; // - // SNESAutofire1Panel - // - this.SNESAutofire1Panel.Location = new System.Drawing.Point(16, 19); - this.SNESAutofire1Panel.Name = "SNESAutofire1Panel"; - this.SNESAutofire1Panel.Size = new System.Drawing.Size(392, 332); - this.SNESAutofire1Panel.TabIndex = 3; - // // tabPage28 // this.tabPage28.Controls.Add(this.SNESAutofire2Panel); @@ -568,13 +482,6 @@ this.tabPage28.Text = "Autofire 2"; this.tabPage28.UseVisualStyleBackColor = true; // - // SNESAutofire2Panel - // - this.SNESAutofire2Panel.Location = new System.Drawing.Point(21, 15); - this.SNESAutofire2Panel.Name = "SNESAutofire2Panel"; - this.SNESAutofire2Panel.Size = new System.Drawing.Size(392, 332); - this.SNESAutofire2Panel.TabIndex = 3; - // // tabPage29 // this.tabPage29.Controls.Add(this.SNESAutofire3Panel); @@ -585,13 +492,6 @@ this.tabPage29.Text = "Autofire 3"; this.tabPage29.UseVisualStyleBackColor = true; // - // SNESAutofire3Panel - // - this.SNESAutofire3Panel.Location = new System.Drawing.Point(17, 18); - this.SNESAutofire3Panel.Name = "SNESAutofire3Panel"; - this.SNESAutofire3Panel.Size = new System.Drawing.Size(392, 332); - this.SNESAutofire3Panel.TabIndex = 3; - // // tabPage30 // this.tabPage30.Controls.Add(this.SNESAutofire4Panel); @@ -602,13 +502,6 @@ this.tabPage30.Text = "Autofire 4"; this.tabPage30.UseVisualStyleBackColor = true; // - // SNESAutofire4Panel - // - this.SNESAutofire4Panel.Location = new System.Drawing.Point(16, 16); - this.SNESAutofire4Panel.Name = "SNESAutofire4Panel"; - this.SNESAutofire4Panel.Size = new System.Drawing.Size(392, 332); - this.SNESAutofire4Panel.TabIndex = 3; - // // tabPage3 // this.tabPage3.Controls.Add(this.pictureBox2); @@ -655,13 +548,6 @@ 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); @@ -673,13 +559,6 @@ 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; - // // tabPage9 // this.tabPage9.Controls.Add(this.pictureBox6); @@ -717,13 +596,6 @@ this.tabPage52.Text = "Pad 1"; this.tabPage52.UseVisualStyleBackColor = true; // - // GenesisController1Panel - // - this.GenesisController1Panel.Location = new System.Drawing.Point(21, 21); - 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); @@ -753,13 +625,6 @@ this.tabPage55.Text = "Autofire 1"; this.tabPage55.UseVisualStyleBackColor = true; // - // GenesisAutofire1Panel - // - this.GenesisAutofire1Panel.Location = new System.Drawing.Point(21, 21); - 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); @@ -820,13 +685,6 @@ 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); @@ -838,13 +696,6 @@ 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.Location = new System.Drawing.Point(4, 22); @@ -864,13 +715,6 @@ this.tabPage51.Text = "Autofire 1"; this.tabPage51.UseVisualStyleBackColor = true; // - // SMSAutofire1Panel - // - this.SMSAutofire1Panel.Location = new System.Drawing.Point(3, 3); - this.SMSAutofire1Panel.Name = "SMSAutofire1Panel"; - this.SMSAutofire1Panel.Size = new System.Drawing.Size(326, 332); - this.SMSAutofire1Panel.TabIndex = 3; - // // tabPage57 // this.tabPage57.Controls.Add(this.SMSAutofire2Panel); @@ -881,13 +725,6 @@ this.tabPage57.Text = "Autofire 2"; this.tabPage57.UseVisualStyleBackColor = true; // - // SMSAutofire2Panel - // - this.SMSAutofire2Panel.Location = new System.Drawing.Point(3, 13); - this.SMSAutofire2Panel.Name = "SMSAutofire2Panel"; - this.SMSAutofire2Panel.Size = new System.Drawing.Size(326, 332); - this.SMSAutofire2Panel.TabIndex = 4; - // // tabPage5 // this.tabPage5.Controls.Add(this.pictureBox4); @@ -945,13 +782,6 @@ this.tabPage36.Text = "Pad 1"; this.tabPage36.UseVisualStyleBackColor = true; // - // PCEController1Panel - // - this.PCEController1Panel.Location = new System.Drawing.Point(20, 11); - this.PCEController1Panel.Name = "PCEController1Panel"; - this.PCEController1Panel.Size = new System.Drawing.Size(326, 332); - this.PCEController1Panel.TabIndex = 2; - // // tabPage37 // this.tabPage37.Controls.Add(this.PCEController2Panel); @@ -963,13 +793,6 @@ this.tabPage37.Text = "Pad 2"; this.tabPage37.UseVisualStyleBackColor = true; // - // PCEController2Panel - // - this.PCEController2Panel.Location = new System.Drawing.Point(20, 11); - this.PCEController2Panel.Name = "PCEController2Panel"; - this.PCEController2Panel.Size = new System.Drawing.Size(326, 332); - this.PCEController2Panel.TabIndex = 2; - // // tabPage38 // this.tabPage38.Controls.Add(this.PCEController3Panel); @@ -980,13 +803,6 @@ this.tabPage38.Text = "Pad 3"; this.tabPage38.UseVisualStyleBackColor = true; // - // PCEController3Panel - // - this.PCEController3Panel.Location = new System.Drawing.Point(20, 11); - this.PCEController3Panel.Name = "PCEController3Panel"; - this.PCEController3Panel.Size = new System.Drawing.Size(326, 332); - this.PCEController3Panel.TabIndex = 2; - // // tabPage39 // this.tabPage39.Controls.Add(this.PCEController4Panel); @@ -997,13 +813,6 @@ this.tabPage39.Text = "Pad 4"; this.tabPage39.UseVisualStyleBackColor = true; // - // PCEController4Panel - // - this.PCEController4Panel.Location = new System.Drawing.Point(20, 11); - this.PCEController4Panel.Name = "PCEController4Panel"; - this.PCEController4Panel.Size = new System.Drawing.Size(326, 332); - this.PCEController4Panel.TabIndex = 2; - // // tabPage40 // this.tabPage40.Controls.Add(this.PCEController5Panel); @@ -1014,13 +823,6 @@ this.tabPage40.Text = "Pad 5"; this.tabPage40.UseVisualStyleBackColor = true; // - // PCEController5Panel - // - this.PCEController5Panel.Location = new System.Drawing.Point(20, 11); - this.PCEController5Panel.Name = "PCEController5Panel"; - this.PCEController5Panel.Size = new System.Drawing.Size(326, 332); - this.PCEController5Panel.TabIndex = 2; - // // tabPage41 // this.tabPage41.Controls.Add(this.PCEAutofire1Panel); @@ -1031,13 +833,6 @@ this.tabPage41.Text = "Autofire 1"; this.tabPage41.UseVisualStyleBackColor = true; // - // PCEAutofire1Panel - // - this.PCEAutofire1Panel.Location = new System.Drawing.Point(20, 11); - this.PCEAutofire1Panel.Name = "PCEAutofire1Panel"; - this.PCEAutofire1Panel.Size = new System.Drawing.Size(326, 332); - this.PCEAutofire1Panel.TabIndex = 2; - // // tabPage42 // this.tabPage42.Controls.Add(this.PCEAutofire2Panel); @@ -1048,13 +843,6 @@ this.tabPage42.Text = "Autofire 2"; this.tabPage42.UseVisualStyleBackColor = true; // - // PCEAutofire2Panel - // - this.PCEAutofire2Panel.Location = new System.Drawing.Point(20, 11); - this.PCEAutofire2Panel.Name = "PCEAutofire2Panel"; - this.PCEAutofire2Panel.Size = new System.Drawing.Size(326, 332); - this.PCEAutofire2Panel.TabIndex = 2; - // // tabPage43 // this.tabPage43.Controls.Add(this.PCEAutofire3Panel); @@ -1065,13 +853,6 @@ this.tabPage43.Text = "Autofire 3"; this.tabPage43.UseVisualStyleBackColor = true; // - // PCEAutofire3Panel - // - this.PCEAutofire3Panel.Location = new System.Drawing.Point(20, 11); - this.PCEAutofire3Panel.Name = "PCEAutofire3Panel"; - this.PCEAutofire3Panel.Size = new System.Drawing.Size(326, 332); - this.PCEAutofire3Panel.TabIndex = 2; - // // tabPage44 // this.tabPage44.Controls.Add(this.PCEAutofire4Panel); @@ -1082,13 +863,6 @@ this.tabPage44.Text = "Autofire 4"; this.tabPage44.UseVisualStyleBackColor = true; // - // PCEAutofire4Panel - // - this.PCEAutofire4Panel.Location = new System.Drawing.Point(20, 11); - this.PCEAutofire4Panel.Name = "PCEAutofire4Panel"; - this.PCEAutofire4Panel.Size = new System.Drawing.Size(326, 332); - this.PCEAutofire4Panel.TabIndex = 2; - // // tabPage45 // this.tabPage45.Controls.Add(this.PCEAutofire5Panel); @@ -1099,13 +873,6 @@ 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; - // // tabPage6 // this.tabPage6.Controls.Add(this.pictureBox5); @@ -1157,13 +924,6 @@ this.tabPage46.Text = "Joystick 1"; this.tabPage46.UseVisualStyleBackColor = true; // - // Atari2600Controller1Panel - // - this.Atari2600Controller1Panel.Location = new System.Drawing.Point(6, 18); - this.Atari2600Controller1Panel.Name = "Atari2600Controller1Panel"; - this.Atari2600Controller1Panel.Size = new System.Drawing.Size(369, 332); - this.Atari2600Controller1Panel.TabIndex = 1; - // // tabPage47 // this.tabPage47.Controls.Add(this.Atari2600Controller2Panel); @@ -1175,13 +935,6 @@ this.tabPage47.Text = "Joystick 2"; this.tabPage47.UseVisualStyleBackColor = true; // - // Atari2600Controller2Panel - // - this.Atari2600Controller2Panel.Location = new System.Drawing.Point(6, 21); - this.Atari2600Controller2Panel.Name = "Atari2600Controller2Panel"; - this.Atari2600Controller2Panel.Size = new System.Drawing.Size(369, 332); - this.Atari2600Controller2Panel.TabIndex = 2; - // // tabPage48 // this.tabPage48.Location = new System.Drawing.Point(4, 22); @@ -1201,13 +954,6 @@ this.tabPage35.Text = "Autofire 1"; this.tabPage35.UseVisualStyleBackColor = true; // - // Atari2600Autofire1Panel - // - this.Atari2600Autofire1Panel.Location = new System.Drawing.Point(6, 21); - this.Atari2600Autofire1Panel.Name = "Atari2600Autofire1Panel"; - this.Atari2600Autofire1Panel.Size = new System.Drawing.Size(369, 332); - this.Atari2600Autofire1Panel.TabIndex = 3; - // // tabPage58 // this.tabPage58.Controls.Add(this.Atari2600Autofire2Panel); @@ -1218,13 +964,6 @@ this.tabPage58.Text = "Autofire 2"; this.tabPage58.UseVisualStyleBackColor = true; // - // Atari2600Autofire2Panel - // - this.Atari2600Autofire2Panel.Location = new System.Drawing.Point(6, 21); - this.Atari2600Autofire2Panel.Name = "Atari2600Autofire2Panel"; - this.Atari2600Autofire2Panel.Size = new System.Drawing.Size(369, 332); - this.Atari2600Autofire2Panel.TabIndex = 3; - // // tabPage7 // this.tabPage7.Controls.Add(this.tabControl8); @@ -1267,6 +1006,8 @@ // // tabPage8 // + this.tabPage8.Controls.Add(this.pictureBox7); + this.tabPage8.Controls.Add(this.TI83ControllerPanel); this.tabPage8.Location = new System.Drawing.Point(4, 22); this.tabPage8.Name = "tabPage8"; this.tabPage8.Size = new System.Drawing.Size(787, 425); @@ -1321,6 +1062,304 @@ this.pictureBox6.TabIndex = 4; this.pictureBox6.TabStop = false; // + // AllowLR + // + this.AllowLR.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.AllowLR.AutoSize = true; + this.AllowLR.Location = new System.Drawing.Point(488, 482); + this.AllowLR.Name = "AllowLR"; + this.AllowLR.Size = new System.Drawing.Size(107, 17); + this.AllowLR.TabIndex = 11; + 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; + // + // 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(6, 6); + 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(15, 15); + 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(17, 19); + 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(20, 21); + this.SNESController4Panel.Name = "SNESController4Panel"; + this.SNESController4Panel.Size = new System.Drawing.Size(392, 332); + this.SNESController4Panel.TabIndex = 3; + // + // SNESAutofire1Panel + // + this.SNESAutofire1Panel.Location = new System.Drawing.Point(16, 19); + 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(21, 15); + 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(17, 18); + 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(16, 16); + 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(21, 21); + this.GenesisController1Panel.Name = "GenesisController1Panel"; + this.GenesisController1Panel.Size = new System.Drawing.Size(392, 332); + this.GenesisController1Panel.TabIndex = 1; + // + // GenesisAutofire1Panel + // + this.GenesisAutofire1Panel.Location = new System.Drawing.Point(21, 21); + 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; + // + // SMSAutofire1Panel + // + this.SMSAutofire1Panel.Location = new System.Drawing.Point(3, 3); + 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(3, 13); + 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(20, 11); + 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(20, 11); + 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(20, 11); + 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(20, 11); + 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(20, 11); + 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(20, 11); + 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(20, 11); + 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(20, 11); + 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(20, 11); + 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(6, 18); + this.Atari2600Controller1Panel.Name = "Atari2600Controller1Panel"; + this.Atari2600Controller1Panel.Size = new System.Drawing.Size(369, 332); + this.Atari2600Controller1Panel.TabIndex = 1; + // + // Atari2600Controller2Panel + // + this.Atari2600Controller2Panel.Location = new System.Drawing.Point(6, 21); + this.Atari2600Controller2Panel.Name = "Atari2600Controller2Panel"; + this.Atari2600Controller2Panel.Size = new System.Drawing.Size(369, 332); + this.Atari2600Controller2Panel.TabIndex = 2; + // + // Atari2600Autofire1Panel + // + this.Atari2600Autofire1Panel.Location = new System.Drawing.Point(6, 21); + this.Atari2600Autofire1Panel.Name = "Atari2600Autofire1Panel"; + this.Atari2600Autofire1Panel.Size = new System.Drawing.Size(369, 332); + this.Atari2600Autofire1Panel.TabIndex = 3; + // + // Atari2600Autofire2Panel + // + this.Atari2600Autofire2Panel.Location = new System.Drawing.Point(6, 21); + this.Atari2600Autofire2Panel.Name = "Atari2600Autofire2Panel"; + this.Atari2600Autofire2Panel.Size = new System.Drawing.Size(369, 332); + this.Atari2600Autofire2Panel.TabIndex = 3; + // + // TI83ControllerPanel + // + this.TI83ControllerPanel.Location = new System.Drawing.Point(12, 18); + this.TI83ControllerPanel.Name = "TI83ControllerPanel"; + this.TI83ControllerPanel.Size = new System.Drawing.Size(567, 404); + this.TI83ControllerPanel.TabIndex = 1; + // + // pictureBox7 + // + this.pictureBox7.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.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, 18); + 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; + // // ControllerConfig // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -1328,6 +1367,7 @@ this.CancelButton = this.Cancel; this.ClientSize = new System.Drawing.Size(823, 513); this.ControlBox = false; + this.Controls.Add(this.AllowLR); this.Controls.Add(this.label38); this.Controls.Add(this.OK); this.Controls.Add(this.Cancel); @@ -1396,7 +1436,9 @@ this.tabPage58.ResumeLayout(false); this.tabPage7.ResumeLayout(false); this.tabControl8.ResumeLayout(false); + this.tabPage8.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox6)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -1517,5 +1559,8 @@ private ControllerConfigPanel GenesisController1Panel; private ControllerConfigPanel GenesisAutofire1Panel; private System.Windows.Forms.PictureBox pictureBox6; + private System.Windows.Forms.CheckBox AllowLR; + private ControllerConfigPanel TI83ControllerPanel; + private System.Windows.Forms.PictureBox pictureBox7; } } \ No newline at end of file diff --git a/BizHawk.MultiClient/config/ControllerConfig.cs b/BizHawk.MultiClient/config/ControllerConfig.cs index 44999ab73b..7edc9d063d 100644 --- a/BizHawk.MultiClient/config/ControllerConfig.cs +++ b/BizHawk.MultiClient/config/ControllerConfig.cs @@ -12,8 +12,7 @@ namespace BizHawk.MultiClient public partial class ControllerConfig : Form { //TODO: autoab - //enable L+R - + public ControllerConfig() { InitializeComponent(); @@ -21,6 +20,8 @@ namespace BizHawk.MultiClient private void ControllerConfig_Load(object sender, EventArgs e) { + AllowLR.Checked = Global.Config.AllowUD_LR; + NESController1Panel.LoadSettings(Global.Config.NESController[0]); NESController2Panel.LoadSettings(Global.Config.NESController[1]); NESController3Panel.LoadSettings(Global.Config.NESController[2]); @@ -61,12 +62,13 @@ namespace BizHawk.MultiClient PCEAutofire4Panel.LoadSettings(Global.Config.PCEAutoController[3]); PCEAutofire5Panel.LoadSettings(Global.Config.PCEAutoController[4]); - Atari2600Controller1Panel.LoadSettings(Global.Config.Atari2600Controller[0]); Atari2600Controller2Panel.LoadSettings(Global.Config.Atari2600Controller[1]); Atari2600Autofire1Panel.LoadSettings(Global.Config.Atari2600AutoController[0]); Atari2600Autofire2Panel.LoadSettings(Global.Config.Atari2600AutoController[1]); + TI83ControllerPanel.LoadSettings(Global.Config.TI83Controller[0]); + SetAutoTab(true); } @@ -108,6 +110,8 @@ namespace BizHawk.MultiClient private void OK_Click(object sender, EventArgs e) { + Global.Config.AllowUD_LR = AllowLR.Checked; + foreach (Control control1 in tabControl1.TabPages) { if (control1 is TabPage)