diff --git a/BizHawk.MultiClient/MainForm.MenuItems.cs b/BizHawk.MultiClient/MainForm.MenuItems.cs index 6e22bcc8e0..cc37e57c70 100644 --- a/BizHawk.MultiClient/MainForm.MenuItems.cs +++ b/BizHawk.MultiClient/MainForm.MenuItems.cs @@ -412,7 +412,7 @@ namespace BizHawk.MultiClient private void controllersToolStripMenuItem_Click(object sender, EventArgs e) { - if (false) + if (true) { ControllerConfig c = new ControllerConfig(); c.ShowDialog(); diff --git a/BizHawk.MultiClient/config/ControllerConfig.Designer.cs b/BizHawk.MultiClient/config/ControllerConfig.Designer.cs index 6ac671541c..84c89460bd 100644 --- a/BizHawk.MultiClient/config/ControllerConfig.Designer.cs +++ b/BizHawk.MultiClient/config/ControllerConfig.Designer.cs @@ -30,6 +30,7 @@ { this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabPage1 = new System.Windows.Forms.TabPage(); + this.ControllerImage = new System.Windows.Forms.PictureBox(); this.tabControl2 = new System.Windows.Forms.TabControl(); this.tabPage13 = new System.Windows.Forms.TabPage(); this.tabPage14 = new System.Windows.Forms.TabPage(); @@ -41,6 +42,7 @@ this.tabPage20 = new System.Windows.Forms.TabPage(); this.tabPage21 = new System.Windows.Forms.TabPage(); 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.tabPage23 = new System.Windows.Forms.TabPage(); @@ -52,6 +54,7 @@ this.tabPage29 = new System.Windows.Forms.TabPage(); this.tabPage30 = new System.Windows.Forms.TabPage(); 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.tabPage32 = new System.Windows.Forms.TabPage(); @@ -95,7 +98,7 @@ this.tabPage8 = new System.Windows.Forms.TabPage(); this.Cancel = new System.Windows.Forms.Button(); this.OK = new System.Windows.Forms.Button(); - this.ControllerImage = new System.Windows.Forms.PictureBox(); + this.label38 = new System.Windows.Forms.Label(); this.NESController1Panel = new BizHawk.MultiClient.ControllerConfigPanel(); this.NESController2Panel = new BizHawk.MultiClient.ControllerConfigPanel(); this.NESController3Panel = new BizHawk.MultiClient.ControllerConfigPanel(); @@ -104,9 +107,24 @@ this.NESAutofire2Panel = new BizHawk.MultiClient.ControllerConfigPanel(); this.NESAutofire3Panel = new BizHawk.MultiClient.ControllerConfigPanel(); this.NESAutofire4Panel = new BizHawk.MultiClient.ControllerConfigPanel(); - this.label38 = new System.Windows.Forms.Label(); + 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.SMSController1Panel = new BizHawk.MultiClient.ControllerConfigPanel(); + this.SMSController2Panel = new BizHawk.MultiClient.ControllerConfigPanel(); + this.SMSAutofire1Panel = new BizHawk.MultiClient.ControllerConfigPanel(); + this.SMSAutofire2Panel = new BizHawk.MultiClient.ControllerConfigPanel(); + this.pictureBox3 = new System.Windows.Forms.PictureBox(); this.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.ControllerImage)).BeginInit(); this.tabControl2.SuspendLayout(); this.tabPage13.SuspendLayout(); this.tabPage14.SuspendLayout(); @@ -117,20 +135,36 @@ this.tabPage20.SuspendLayout(); this.tabPage21.SuspendLayout(); this.tabPage2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.tabControl3.SuspendLayout(); + this.tabPage22.SuspendLayout(); + this.tabPage23.SuspendLayout(); + this.tabPage24.SuspendLayout(); + this.tabPage25.SuspendLayout(); + this.tabPage27.SuspendLayout(); + this.tabPage28.SuspendLayout(); + this.tabPage29.SuspendLayout(); + this.tabPage30.SuspendLayout(); this.tabPage3.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); this.tabControl4.SuspendLayout(); + this.tabPage31.SuspendLayout(); + this.tabPage32.SuspendLayout(); this.tabPage9.SuspendLayout(); this.tabControl9.SuspendLayout(); this.tabPage4.SuspendLayout(); this.tabControl5.SuspendLayout(); + this.tabPage33.SuspendLayout(); + this.tabPage34.SuspendLayout(); + this.tabPage51.SuspendLayout(); + this.tabPage57.SuspendLayout(); this.tabPage5.SuspendLayout(); this.tabControl6.SuspendLayout(); this.tabPage6.SuspendLayout(); this.tabControl7.SuspendLayout(); this.tabPage7.SuspendLayout(); this.tabControl8.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.ControllerImage)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit(); this.SuspendLayout(); // // tabControl1 @@ -165,6 +199,20 @@ this.tabPage1.Text = "NES"; this.tabPage1.UseVisualStyleBackColor = true; // + // ControllerImage + // + this.ControllerImage.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.ControllerImage.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; + this.ControllerImage.Image = global::BizHawk.MultiClient.Properties.Resources.NES_Controller; + this.ControllerImage.Location = new System.Drawing.Point(485, 37); + this.ControllerImage.Name = "ControllerImage"; + this.ControllerImage.Size = new System.Drawing.Size(284, 125); + this.ControllerImage.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.ControllerImage.TabIndex = 4; + this.ControllerImage.TabStop = false; + // // tabControl2 // this.tabControl2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) @@ -277,6 +325,7 @@ // // tabPage2 // + this.tabPage2.Controls.Add(this.pictureBox1); this.tabPage2.Controls.Add(this.tabControl3); this.tabPage2.Location = new System.Drawing.Point(4, 22); this.tabPage2.Name = "tabPage2"; @@ -286,6 +335,20 @@ this.tabPage2.Text = "SNES"; this.tabPage2.UseVisualStyleBackColor = true; // + // pictureBox1 + // + this.pictureBox1.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.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; + this.pictureBox1.Image = global::BizHawk.MultiClient.Properties.Resources.SNES_Controller; + this.pictureBox1.Location = new System.Drawing.Point(509, 21); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(261, 186); + this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.pictureBox1.TabIndex = 4; + this.pictureBox1.TabStop = false; + // // tabControl3 // this.tabControl3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) @@ -302,94 +365,103 @@ this.tabControl3.Location = new System.Drawing.Point(12, 21); this.tabControl3.Name = "tabControl3"; this.tabControl3.SelectedIndex = 0; - this.tabControl3.Size = new System.Drawing.Size(546, 398); + this.tabControl3.Size = new System.Drawing.Size(453, 398); this.tabControl3.TabIndex = 0; // // tabPage22 // + this.tabPage22.Controls.Add(this.SNESController1Panel); this.tabPage22.Location = new System.Drawing.Point(4, 22); this.tabPage22.Name = "tabPage22"; this.tabPage22.Padding = new System.Windows.Forms.Padding(3); - this.tabPage22.Size = new System.Drawing.Size(538, 372); + this.tabPage22.Size = new System.Drawing.Size(445, 372); this.tabPage22.TabIndex = 0; - this.tabPage22.Text = "Controller 1"; + this.tabPage22.Text = "Pad 1"; this.tabPage22.UseVisualStyleBackColor = true; // // tabPage23 // + this.tabPage23.Controls.Add(this.SNESController2Panel); this.tabPage23.Location = new System.Drawing.Point(4, 22); this.tabPage23.Name = "tabPage23"; this.tabPage23.Padding = new System.Windows.Forms.Padding(3); - this.tabPage23.Size = new System.Drawing.Size(538, 372); + this.tabPage23.Size = new System.Drawing.Size(445, 372); this.tabPage23.TabIndex = 1; - this.tabPage23.Text = "Controller 2"; + this.tabPage23.Text = "Pad 2"; this.tabPage23.UseVisualStyleBackColor = true; // // tabPage24 // + this.tabPage24.Controls.Add(this.SNESController3Panel); this.tabPage24.Location = new System.Drawing.Point(4, 22); this.tabPage24.Name = "tabPage24"; - this.tabPage24.Size = new System.Drawing.Size(538, 372); + this.tabPage24.Size = new System.Drawing.Size(445, 372); this.tabPage24.TabIndex = 2; - this.tabPage24.Text = "Controller 3"; + this.tabPage24.Text = "Pad 3"; this.tabPage24.UseVisualStyleBackColor = true; // // tabPage25 // + this.tabPage25.Controls.Add(this.SNESController4Panel); this.tabPage25.Location = new System.Drawing.Point(4, 22); this.tabPage25.Name = "tabPage25"; - this.tabPage25.Size = new System.Drawing.Size(538, 372); + this.tabPage25.Size = new System.Drawing.Size(445, 372); this.tabPage25.TabIndex = 3; - this.tabPage25.Text = "Controller 4"; + this.tabPage25.Text = "Pad 4"; this.tabPage25.UseVisualStyleBackColor = true; // // tabPage26 // this.tabPage26.Location = new System.Drawing.Point(4, 22); this.tabPage26.Name = "tabPage26"; - this.tabPage26.Size = new System.Drawing.Size(538, 372); + this.tabPage26.Size = new System.Drawing.Size(445, 372); this.tabPage26.TabIndex = 4; this.tabPage26.Text = "Console"; this.tabPage26.UseVisualStyleBackColor = true; // // tabPage27 // + this.tabPage27.Controls.Add(this.SNESAutofire1Panel); this.tabPage27.Location = new System.Drawing.Point(4, 22); this.tabPage27.Name = "tabPage27"; - this.tabPage27.Size = new System.Drawing.Size(538, 372); + this.tabPage27.Size = new System.Drawing.Size(445, 372); this.tabPage27.TabIndex = 5; this.tabPage27.Text = "Autofire 1"; this.tabPage27.UseVisualStyleBackColor = true; // // tabPage28 // + this.tabPage28.Controls.Add(this.SNESAutofire2Panel); this.tabPage28.Location = new System.Drawing.Point(4, 22); this.tabPage28.Name = "tabPage28"; - this.tabPage28.Size = new System.Drawing.Size(538, 372); + this.tabPage28.Size = new System.Drawing.Size(445, 372); this.tabPage28.TabIndex = 6; this.tabPage28.Text = "Autofire 2"; this.tabPage28.UseVisualStyleBackColor = true; // // tabPage29 // + this.tabPage29.Controls.Add(this.SNESAutofire3Panel); this.tabPage29.Location = new System.Drawing.Point(4, 22); this.tabPage29.Name = "tabPage29"; - this.tabPage29.Size = new System.Drawing.Size(538, 372); + this.tabPage29.Size = new System.Drawing.Size(445, 372); this.tabPage29.TabIndex = 7; this.tabPage29.Text = "Autofire 3"; this.tabPage29.UseVisualStyleBackColor = true; // // tabPage30 // + this.tabPage30.Controls.Add(this.SNESAutofire4Panel); this.tabPage30.Location = new System.Drawing.Point(4, 22); this.tabPage30.Name = "tabPage30"; - this.tabPage30.Size = new System.Drawing.Size(538, 372); + this.tabPage30.Size = new System.Drawing.Size(445, 372); this.tabPage30.TabIndex = 8; this.tabPage30.Text = "Autofire 4"; this.tabPage30.UseVisualStyleBackColor = true; // // tabPage3 // + this.tabPage3.Controls.Add(this.pictureBox2); this.tabPage3.Controls.Add(this.tabControl4); this.tabPage3.Location = new System.Drawing.Point(4, 22); this.tabPage3.Name = "tabPage3"; @@ -398,6 +470,20 @@ this.tabPage3.Text = "GB/GBC"; this.tabPage3.UseVisualStyleBackColor = true; // + // pictureBox2 + // + this.pictureBox2.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.pictureBox2.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; + this.pictureBox2.Image = global::BizHawk.MultiClient.Properties.Resources.GBController; + this.pictureBox2.Location = new System.Drawing.Point(427, 46); + this.pictureBox2.Name = "pictureBox2"; + this.pictureBox2.Size = new System.Drawing.Size(174, 129); + this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.pictureBox2.TabIndex = 4; + this.pictureBox2.TabStop = false; + // // tabControl4 // this.tabControl4.Controls.Add(this.tabPage31); @@ -410,6 +496,7 @@ // // tabPage31 // + this.tabPage31.Controls.Add(this.GBController1Panel); this.tabPage31.Location = new System.Drawing.Point(4, 22); this.tabPage31.Name = "tabPage31"; this.tabPage31.Padding = new System.Windows.Forms.Padding(3); @@ -420,6 +507,7 @@ // // tabPage32 // + this.tabPage32.Controls.Add(this.GBAutofire1Panel); this.tabPage32.Location = new System.Drawing.Point(4, 22); this.tabPage32.Name = "tabPage32"; this.tabPage32.Padding = new System.Windows.Forms.Padding(3); @@ -502,6 +590,7 @@ // // tabPage4 // + this.tabPage4.Controls.Add(this.pictureBox3); this.tabPage4.Controls.Add(this.tabControl5); this.tabPage4.Location = new System.Drawing.Point(4, 22); this.tabPage4.Name = "tabPage4"; @@ -527,22 +616,24 @@ // // tabPage33 // + this.tabPage33.Controls.Add(this.SMSController1Panel); this.tabPage33.Location = new System.Drawing.Point(4, 22); this.tabPage33.Name = "tabPage33"; this.tabPage33.Padding = new System.Windows.Forms.Padding(3); this.tabPage33.Size = new System.Drawing.Size(338, 375); this.tabPage33.TabIndex = 0; - this.tabPage33.Text = "Controller 1"; + this.tabPage33.Text = "Pad 1"; this.tabPage33.UseVisualStyleBackColor = true; // // tabPage34 // + this.tabPage34.Controls.Add(this.SMSController2Panel); this.tabPage34.Location = new System.Drawing.Point(4, 22); this.tabPage34.Name = "tabPage34"; this.tabPage34.Padding = new System.Windows.Forms.Padding(3); this.tabPage34.Size = new System.Drawing.Size(338, 375); this.tabPage34.TabIndex = 1; - this.tabPage34.Text = "Controller 1"; + this.tabPage34.Text = "Pad 1"; this.tabPage34.UseVisualStyleBackColor = true; // // Console @@ -556,6 +647,7 @@ // // tabPage51 // + this.tabPage51.Controls.Add(this.SMSAutofire1Panel); this.tabPage51.Location = new System.Drawing.Point(4, 22); this.tabPage51.Name = "tabPage51"; this.tabPage51.Size = new System.Drawing.Size(338, 375); @@ -565,6 +657,7 @@ // // tabPage57 // + this.tabPage57.Controls.Add(this.SMSAutofire2Panel); this.tabPage57.Location = new System.Drawing.Point(4, 22); this.tabPage57.Name = "tabPage57"; this.tabPage57.Size = new System.Drawing.Size(338, 375); @@ -839,19 +932,15 @@ this.OK.UseVisualStyleBackColor = true; this.OK.Click += new System.EventHandler(this.OK_Click); // - // ControllerImage + // label38 // - this.ControllerImage.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.ControllerImage.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.ControllerImage.Image = global::BizHawk.MultiClient.Properties.Resources.NES_Controller; - this.ControllerImage.Location = new System.Drawing.Point(485, 37); - this.ControllerImage.Name = "ControllerImage"; - this.ControllerImage.Size = new System.Drawing.Size(284, 125); - this.ControllerImage.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.ControllerImage.TabIndex = 4; - this.ControllerImage.TabStop = false; + this.label38.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.label38.AutoSize = true; + this.label38.Location = new System.Drawing.Point(13, 483); + this.label38.Name = "label38"; + this.label38.Size = new System.Drawing.Size(153, 13); + this.label38.TabIndex = 10; + this.label38.Text = "* Escape clears a key mapping"; // // NESController1Panel // @@ -909,15 +998,117 @@ this.NESAutofire4Panel.Size = new System.Drawing.Size(392, 332); this.NESAutofire4Panel.TabIndex = 0; // - // label38 + // SNESController1Panel // - this.label38.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.label38.AutoSize = true; - this.label38.Location = new System.Drawing.Point(13, 483); - this.label38.Name = "label38"; - this.label38.Size = new System.Drawing.Size(153, 13); - this.label38.TabIndex = 10; - this.label38.Text = "* Escape clears a key mapping"; + 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; + // + // 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; + // + // pictureBox3 + // + this.pictureBox3.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.pictureBox3.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; + this.pictureBox3.Image = global::BizHawk.MultiClient.Properties.Resources.SMSController; + this.pictureBox3.Location = new System.Drawing.Point(393, 43); + this.pictureBox3.Name = "pictureBox3"; + this.pictureBox3.Size = new System.Drawing.Size(285, 238); + this.pictureBox3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.pictureBox3.TabIndex = 4; + this.pictureBox3.TabStop = false; // // ControllerConfig // @@ -935,6 +1126,7 @@ this.Load += new System.EventHandler(this.ControllerConfig_Load); this.tabControl1.ResumeLayout(false); this.tabPage1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.ControllerImage)).EndInit(); this.tabControl2.ResumeLayout(false); this.tabPage13.ResumeLayout(false); this.tabPage14.ResumeLayout(false); @@ -945,20 +1137,36 @@ this.tabPage20.ResumeLayout(false); this.tabPage21.ResumeLayout(false); this.tabPage2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.tabControl3.ResumeLayout(false); + this.tabPage22.ResumeLayout(false); + this.tabPage23.ResumeLayout(false); + this.tabPage24.ResumeLayout(false); + this.tabPage25.ResumeLayout(false); + this.tabPage27.ResumeLayout(false); + this.tabPage28.ResumeLayout(false); + this.tabPage29.ResumeLayout(false); + this.tabPage30.ResumeLayout(false); this.tabPage3.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); this.tabControl4.ResumeLayout(false); + this.tabPage31.ResumeLayout(false); + this.tabPage32.ResumeLayout(false); this.tabPage9.ResumeLayout(false); this.tabControl9.ResumeLayout(false); this.tabPage4.ResumeLayout(false); this.tabControl5.ResumeLayout(false); + this.tabPage33.ResumeLayout(false); + this.tabPage34.ResumeLayout(false); + this.tabPage51.ResumeLayout(false); + this.tabPage57.ResumeLayout(false); this.tabPage5.ResumeLayout(false); this.tabControl6.ResumeLayout(false); this.tabPage6.ResumeLayout(false); this.tabControl7.ResumeLayout(false); this.tabPage7.ResumeLayout(false); this.tabControl8.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.ControllerImage)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -1043,5 +1251,22 @@ private ControllerConfigPanel NESAutofire4Panel; private System.Windows.Forms.PictureBox ControllerImage; private System.Windows.Forms.Label label38; + private ControllerConfigPanel SNESController1Panel; + private ControllerConfigPanel SNESController2Panel; + private ControllerConfigPanel SNESController3Panel; + private ControllerConfigPanel SNESController4Panel; + private ControllerConfigPanel SNESAutofire1Panel; + private ControllerConfigPanel SNESAutofire2Panel; + private ControllerConfigPanel SNESAutofire3Panel; + private ControllerConfigPanel SNESAutofire4Panel; + private System.Windows.Forms.PictureBox pictureBox1; + private ControllerConfigPanel GBController1Panel; + private ControllerConfigPanel GBAutofire1Panel; + private System.Windows.Forms.PictureBox pictureBox2; + private ControllerConfigPanel SMSController1Panel; + private ControllerConfigPanel SMSController2Panel; + private ControllerConfigPanel SMSAutofire1Panel; + private ControllerConfigPanel SMSAutofire2Panel; + private System.Windows.Forms.PictureBox pictureBox3; } } \ No newline at end of file diff --git a/BizHawk.MultiClient/config/ControllerConfig.cs b/BizHawk.MultiClient/config/ControllerConfig.cs index 6816a14d54..115c8629cf 100644 --- a/BizHawk.MultiClient/config/ControllerConfig.cs +++ b/BizHawk.MultiClient/config/ControllerConfig.cs @@ -25,6 +25,27 @@ namespace BizHawk.MultiClient NESController2Panel.LoadSettings(Global.Config.NESController[1]); NESController3Panel.LoadSettings(Global.Config.NESController[2]); NESController4Panel.LoadSettings(Global.Config.NESController[3]); + NESAutofire1Panel.LoadSettings(Global.Config.NESAutoController[0]); + NESAutofire2Panel.LoadSettings(Global.Config.NESAutoController[1]); + NESAutofire3Panel.LoadSettings(Global.Config.NESAutoController[2]); + NESAutofire4Panel.LoadSettings(Global.Config.NESAutoController[3]); + + SNESController1Panel.LoadSettings(Global.Config.SNESController[0]); + SNESController2Panel.LoadSettings(Global.Config.SNESController[1]); + SNESController3Panel.LoadSettings(Global.Config.SNESController[2]); + SNESController4Panel.LoadSettings(Global.Config.SNESController[3]); + SNESAutofire1Panel.LoadSettings(Global.Config.SNESAutoController[0]); + SNESAutofire2Panel.LoadSettings(Global.Config.SNESAutoController[1]); + SNESAutofire3Panel.LoadSettings(Global.Config.SNESAutoController[2]); + SNESAutofire4Panel.LoadSettings(Global.Config.SNESAutoController[3]); + + GBController1Panel.LoadSettings(Global.Config.GBController[0]); + GBAutofire1Panel.LoadSettings(Global.Config.GBAutoController[0]); + + SMSController1Panel.LoadSettings(Global.Config.SMSController[0]); + SMSController2Panel.LoadSettings(Global.Config.SMSController[1]); + SMSAutofire1Panel.LoadSettings(Global.Config.SMSAutoController[0]); + SMSAutofire2Panel.LoadSettings(Global.Config.SMSAutoController[1]); SetAutoTab(true); } @@ -69,14 +90,34 @@ namespace BizHawk.MultiClient { foreach (Control control1 in tabControl1.TabPages) { - if (control1 is TabControl) + if (control1 is TabPage) { - foreach (Control control2 in (control1 as TabControl).TabPages) + foreach (Control control2 in control1.Controls) { if (control2 is ControllerConfigPanel) { (control2 as ControllerConfigPanel).Save(); } + else if (control2 is TabControl) + { + foreach (Control control3 in (control2 as TabControl).TabPages) + { + if (control3 is TabPage) + { + foreach (Control control4 in control3.Controls) + { + if (control4 is ControllerConfigPanel) + { + (control4 as ControllerConfigPanel).Save(); + } + } + } + else if (control3 is ControllerConfigPanel) + { + (control3 as ControllerConfigPanel).Save(); + } + } + } } } else diff --git a/BizHawk.MultiClient/config/ControllerConfig/ControllerConfigPanel.cs b/BizHawk.MultiClient/config/ControllerConfig/ControllerConfigPanel.cs index fffbd24d81..ec81dc8a07 100644 --- a/BizHawk.MultiClient/config/ControllerConfig/ControllerConfigPanel.cs +++ b/BizHawk.MultiClient/config/ControllerConfig/ControllerConfigPanel.cs @@ -14,9 +14,7 @@ namespace BizHawk.MultiClient { object ControllerConfigObject; //Object that values will be saved to (In Config.cs) - public static List buttons = new List(); - public int ControllerNumber = 1; - public bool Autofire = false; + public List buttons = new List(); public int InputMarginLeft = 0; public int LabelPadding = 10;