From 64b3b7346497002b291f154c2944bdf768690bc3 Mon Sep 17 00:00:00 2001 From: adelikat Date: Sun, 30 Sep 2012 21:31:32 +0000 Subject: [PATCH] Bizhawk - progress on new controller config --- BizHawk.MultiClient/MainForm.MenuItems.cs | 2 +- BizHawk.MultiClient/MainForm.cs | 2 +- .../config/ControllerConfig.Designer.cs | 523 ++++++++++-------- 3 files changed, 286 insertions(+), 241 deletions(-) diff --git a/BizHawk.MultiClient/MainForm.MenuItems.cs b/BizHawk.MultiClient/MainForm.MenuItems.cs index 14ea6f62a0..52e7f07617 100644 --- a/BizHawk.MultiClient/MainForm.MenuItems.cs +++ b/BizHawk.MultiClient/MainForm.MenuItems.cs @@ -410,7 +410,7 @@ namespace BizHawk.MultiClient private void controllersToolStripMenuItem_Click(object sender, EventArgs e) { - if (INTERIM && false) + if (false) { ControllerConfig c = new ControllerConfig(); c.ShowDialog(); diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs index 8cab021cad..b2a3c499e2 100644 --- a/BizHawk.MultiClient/MainForm.cs +++ b/BizHawk.MultiClient/MainForm.cs @@ -23,7 +23,7 @@ namespace BizHawk.MultiClient public partial class MainForm : Form { - public bool INTERIM = false; + public bool INTERIM = true; public const string EMUVERSION = "Version 1.1.1 interim"; public const string RELEASEDATE = "September 23, 2012"; private Control renderTarget; diff --git a/BizHawk.MultiClient/config/ControllerConfig.Designer.cs b/BizHawk.MultiClient/config/ControllerConfig.Designer.cs index df439e8c64..422931a083 100644 --- a/BizHawk.MultiClient/config/ControllerConfig.Designer.cs +++ b/BizHawk.MultiClient/config/ControllerConfig.Designer.cs @@ -41,16 +41,6 @@ this.tabPage20 = new System.Windows.Forms.TabPage(); this.tabPage21 = new System.Windows.Forms.TabPage(); this.tabPage2 = new System.Windows.Forms.TabPage(); - this.tabPage3 = new System.Windows.Forms.TabPage(); - this.tabPage4 = new System.Windows.Forms.TabPage(); - this.tabPage5 = new System.Windows.Forms.TabPage(); - this.tabPage6 = new System.Windows.Forms.TabPage(); - this.tabPage7 = new System.Windows.Forms.TabPage(); - this.tabPage8 = new System.Windows.Forms.TabPage(); - this.tabPage9 = new System.Windows.Forms.TabPage(); - this.tabPage10 = new System.Windows.Forms.TabPage(); - this.tabPage11 = new System.Windows.Forms.TabPage(); - this.tabPage12 = new System.Windows.Forms.TabPage(); this.tabControl3 = new System.Windows.Forms.TabControl(); this.tabPage22 = new System.Windows.Forms.TabPage(); this.tabPage23 = new System.Windows.Forms.TabPage(); @@ -61,13 +51,16 @@ this.tabPage28 = new System.Windows.Forms.TabPage(); this.tabPage29 = new System.Windows.Forms.TabPage(); this.tabPage30 = new System.Windows.Forms.TabPage(); + this.tabPage3 = new System.Windows.Forms.TabPage(); this.tabControl4 = new System.Windows.Forms.TabControl(); this.tabPage31 = new System.Windows.Forms.TabPage(); this.tabPage32 = new System.Windows.Forms.TabPage(); + this.tabPage4 = new System.Windows.Forms.TabPage(); this.tabControl5 = new System.Windows.Forms.TabControl(); this.tabPage33 = new System.Windows.Forms.TabPage(); this.tabPage34 = new System.Windows.Forms.TabPage(); - this.tabPage35 = new System.Windows.Forms.TabPage(); + this.Console = new System.Windows.Forms.TabPage(); + this.tabPage5 = new System.Windows.Forms.TabPage(); this.tabControl6 = new System.Windows.Forms.TabControl(); this.tabPage36 = new System.Windows.Forms.TabPage(); this.tabPage37 = new System.Windows.Forms.TabPage(); @@ -79,57 +72,66 @@ this.tabPage43 = new System.Windows.Forms.TabPage(); this.tabPage44 = new System.Windows.Forms.TabPage(); this.tabPage45 = new System.Windows.Forms.TabPage(); + this.tabPage6 = new System.Windows.Forms.TabPage(); this.tabControl7 = new System.Windows.Forms.TabControl(); this.tabPage46 = new System.Windows.Forms.TabPage(); this.tabPage47 = new System.Windows.Forms.TabPage(); this.tabPage48 = new System.Windows.Forms.TabPage(); + this.tabPage7 = new System.Windows.Forms.TabPage(); this.tabControl8 = new System.Windows.Forms.TabControl(); this.tabPage49 = new System.Windows.Forms.TabPage(); this.tabPage50 = new System.Windows.Forms.TabPage(); - this.tabPage51 = new System.Windows.Forms.TabPage(); + this.tabPage8 = new System.Windows.Forms.TabPage(); + this.tabPage9 = new System.Windows.Forms.TabPage(); this.tabControl9 = new System.Windows.Forms.TabControl(); this.tabPage52 = new System.Windows.Forms.TabPage(); this.tabPage53 = new System.Windows.Forms.TabPage(); this.tabPage54 = new System.Windows.Forms.TabPage(); this.tabPage55 = new System.Windows.Forms.TabPage(); this.tabPage56 = new System.Windows.Forms.TabPage(); + this.Cancel = new System.Windows.Forms.Button(); + this.OK = new System.Windows.Forms.Button(); + this.tabPage51 = new System.Windows.Forms.TabPage(); + this.tabPage57 = new System.Windows.Forms.TabPage(); + this.tabPage35 = new System.Windows.Forms.TabPage(); + this.tabPage58 = new System.Windows.Forms.TabPage(); this.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); this.tabControl2.SuspendLayout(); this.tabPage2.SuspendLayout(); - this.tabPage3.SuspendLayout(); - this.tabPage4.SuspendLayout(); - this.tabPage5.SuspendLayout(); - this.tabPage6.SuspendLayout(); - this.tabPage7.SuspendLayout(); - this.tabPage9.SuspendLayout(); this.tabControl3.SuspendLayout(); + this.tabPage3.SuspendLayout(); this.tabControl4.SuspendLayout(); + this.tabPage4.SuspendLayout(); this.tabControl5.SuspendLayout(); + this.tabPage5.SuspendLayout(); this.tabControl6.SuspendLayout(); + this.tabPage6.SuspendLayout(); this.tabControl7.SuspendLayout(); + this.tabPage7.SuspendLayout(); this.tabControl8.SuspendLayout(); + this.tabPage9.SuspendLayout(); this.tabControl9.SuspendLayout(); this.SuspendLayout(); // // tabControl1 // + this.tabControl1.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.tabControl1.Controls.Add(this.tabPage1); this.tabControl1.Controls.Add(this.tabPage2); this.tabControl1.Controls.Add(this.tabPage3); + this.tabControl1.Controls.Add(this.tabPage9); this.tabControl1.Controls.Add(this.tabPage4); this.tabControl1.Controls.Add(this.tabPage5); this.tabControl1.Controls.Add(this.tabPage6); this.tabControl1.Controls.Add(this.tabPage7); this.tabControl1.Controls.Add(this.tabPage8); - this.tabControl1.Controls.Add(this.tabPage9); - this.tabControl1.Controls.Add(this.tabPage10); - this.tabControl1.Controls.Add(this.tabPage11); - this.tabControl1.Controls.Add(this.tabPage12); this.tabControl1.Location = new System.Drawing.Point(12, 21); this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; - this.tabControl1.Size = new System.Drawing.Size(703, 343); + this.tabControl1.Size = new System.Drawing.Size(795, 451); this.tabControl1.TabIndex = 0; // // tabPage1 @@ -138,13 +140,15 @@ 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(695, 317); + this.tabPage1.Size = new System.Drawing.Size(787, 425); this.tabPage1.TabIndex = 0; this.tabPage1.Text = "NES"; this.tabPage1.UseVisualStyleBackColor = true; // // tabControl2 // + this.tabControl2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left))); this.tabControl2.Controls.Add(this.tabPage13); this.tabControl2.Controls.Add(this.tabPage14); this.tabControl2.Controls.Add(this.tabPage15); @@ -157,7 +161,7 @@ this.tabControl2.Location = new System.Drawing.Point(17, 15); this.tabControl2.Name = "tabControl2"; this.tabControl2.SelectedIndex = 0; - this.tabControl2.Size = new System.Drawing.Size(532, 278); + this.tabControl2.Size = new System.Drawing.Size(546, 404); this.tabControl2.TabIndex = 0; // // tabPage13 @@ -165,9 +169,9 @@ this.tabPage13.Location = new System.Drawing.Point(4, 22); this.tabPage13.Name = "tabPage13"; this.tabPage13.Padding = new System.Windows.Forms.Padding(3); - this.tabPage13.Size = new System.Drawing.Size(524, 252); + this.tabPage13.Size = new System.Drawing.Size(320, 252); this.tabPage13.TabIndex = 0; - this.tabPage13.Text = "tabPage13"; + this.tabPage13.Text = "Controller 1"; this.tabPage13.UseVisualStyleBackColor = true; // // tabPage14 @@ -175,72 +179,72 @@ this.tabPage14.Location = new System.Drawing.Point(4, 22); this.tabPage14.Name = "tabPage14"; this.tabPage14.Padding = new System.Windows.Forms.Padding(3); - this.tabPage14.Size = new System.Drawing.Size(524, 252); + this.tabPage14.Size = new System.Drawing.Size(320, 252); this.tabPage14.TabIndex = 1; - this.tabPage14.Text = "tabPage14"; + this.tabPage14.Text = "Controller 2"; this.tabPage14.UseVisualStyleBackColor = true; // // tabPage15 // this.tabPage15.Location = new System.Drawing.Point(4, 22); this.tabPage15.Name = "tabPage15"; - this.tabPage15.Size = new System.Drawing.Size(524, 252); + this.tabPage15.Size = new System.Drawing.Size(320, 252); this.tabPage15.TabIndex = 2; - this.tabPage15.Text = "tabPage15"; + this.tabPage15.Text = "Controller 3"; this.tabPage15.UseVisualStyleBackColor = true; // // tabPage16 // this.tabPage16.Location = new System.Drawing.Point(4, 22); this.tabPage16.Name = "tabPage16"; - this.tabPage16.Size = new System.Drawing.Size(524, 252); + this.tabPage16.Size = new System.Drawing.Size(320, 252); this.tabPage16.TabIndex = 3; - this.tabPage16.Text = "tabPage16"; + this.tabPage16.Text = "Controller 4"; this.tabPage16.UseVisualStyleBackColor = true; // // tabPage17 // this.tabPage17.Location = new System.Drawing.Point(4, 22); this.tabPage17.Name = "tabPage17"; - this.tabPage17.Size = new System.Drawing.Size(524, 252); + this.tabPage17.Size = new System.Drawing.Size(538, 378); this.tabPage17.TabIndex = 4; - this.tabPage17.Text = "tabPage17"; + this.tabPage17.Text = "Console"; this.tabPage17.UseVisualStyleBackColor = true; // // tabPage18 // this.tabPage18.Location = new System.Drawing.Point(4, 22); this.tabPage18.Name = "tabPage18"; - this.tabPage18.Size = new System.Drawing.Size(524, 252); + this.tabPage18.Size = new System.Drawing.Size(320, 252); this.tabPage18.TabIndex = 5; - this.tabPage18.Text = "tabPage18"; + this.tabPage18.Text = "Autofire 1"; this.tabPage18.UseVisualStyleBackColor = true; // // tabPage19 // this.tabPage19.Location = new System.Drawing.Point(4, 22); this.tabPage19.Name = "tabPage19"; - this.tabPage19.Size = new System.Drawing.Size(524, 252); + this.tabPage19.Size = new System.Drawing.Size(320, 252); this.tabPage19.TabIndex = 6; - this.tabPage19.Text = "tabPage19"; + this.tabPage19.Text = "Autofire 2"; this.tabPage19.UseVisualStyleBackColor = true; // // tabPage20 // this.tabPage20.Location = new System.Drawing.Point(4, 22); this.tabPage20.Name = "tabPage20"; - this.tabPage20.Size = new System.Drawing.Size(524, 252); + this.tabPage20.Size = new System.Drawing.Size(320, 252); this.tabPage20.TabIndex = 7; - this.tabPage20.Text = "tabPage20"; + this.tabPage20.Text = "Autofire 3"; this.tabPage20.UseVisualStyleBackColor = true; // // tabPage21 // this.tabPage21.Location = new System.Drawing.Point(4, 22); this.tabPage21.Name = "tabPage21"; - this.tabPage21.Size = new System.Drawing.Size(524, 252); + this.tabPage21.Size = new System.Drawing.Size(320, 252); this.tabPage21.TabIndex = 8; - this.tabPage21.Text = "tabPage21"; + this.tabPage21.Text = "Autofire 4"; this.tabPage21.UseVisualStyleBackColor = true; // // tabPage2 @@ -249,109 +253,15 @@ 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(695, 317); + this.tabPage2.Size = new System.Drawing.Size(787, 425); this.tabPage2.TabIndex = 1; this.tabPage2.Text = "SNES"; this.tabPage2.UseVisualStyleBackColor = true; // - // tabPage3 - // - this.tabPage3.Controls.Add(this.tabControl4); - this.tabPage3.Location = new System.Drawing.Point(4, 22); - this.tabPage3.Name = "tabPage3"; - this.tabPage3.Size = new System.Drawing.Size(695, 317); - this.tabPage3.TabIndex = 2; - this.tabPage3.Text = "GB/GBC"; - this.tabPage3.UseVisualStyleBackColor = true; - // - // tabPage4 - // - this.tabPage4.Controls.Add(this.tabControl5); - this.tabPage4.Location = new System.Drawing.Point(4, 22); - this.tabPage4.Name = "tabPage4"; - this.tabPage4.Size = new System.Drawing.Size(695, 317); - this.tabPage4.TabIndex = 3; - this.tabPage4.Text = "SMS/GG/SG"; - this.tabPage4.UseVisualStyleBackColor = true; - // - // tabPage5 - // - this.tabPage5.Controls.Add(this.tabControl6); - this.tabPage5.Location = new System.Drawing.Point(4, 22); - this.tabPage5.Name = "tabPage5"; - this.tabPage5.Size = new System.Drawing.Size(695, 317); - this.tabPage5.TabIndex = 4; - this.tabPage5.Text = "PCE"; - this.tabPage5.UseVisualStyleBackColor = true; - // - // tabPage6 - // - this.tabPage6.Controls.Add(this.tabControl7); - this.tabPage6.Location = new System.Drawing.Point(4, 22); - this.tabPage6.Name = "tabPage6"; - this.tabPage6.Size = new System.Drawing.Size(695, 317); - this.tabPage6.TabIndex = 5; - this.tabPage6.Text = "Atari"; - this.tabPage6.UseVisualStyleBackColor = true; - // - // tabPage7 - // - this.tabPage7.Controls.Add(this.tabControl8); - this.tabPage7.Location = new System.Drawing.Point(4, 22); - this.tabPage7.Name = "tabPage7"; - this.tabPage7.Size = new System.Drawing.Size(695, 317); - this.tabPage7.TabIndex = 6; - this.tabPage7.Text = "Int. V"; - this.tabPage7.UseVisualStyleBackColor = true; - // - // tabPage8 - // - this.tabPage8.Location = new System.Drawing.Point(4, 22); - this.tabPage8.Name = "tabPage8"; - this.tabPage8.Size = new System.Drawing.Size(695, 317); - this.tabPage8.TabIndex = 7; - this.tabPage8.Text = "TI-83"; - this.tabPage8.UseVisualStyleBackColor = true; - // - // tabPage9 - // - this.tabPage9.Controls.Add(this.tabControl9); - this.tabPage9.Location = new System.Drawing.Point(4, 22); - this.tabPage9.Name = "tabPage9"; - this.tabPage9.Size = new System.Drawing.Size(695, 317); - this.tabPage9.TabIndex = 8; - this.tabPage9.Text = "Genesis"; - this.tabPage9.UseVisualStyleBackColor = true; - // - // tabPage10 - // - this.tabPage10.Location = new System.Drawing.Point(4, 22); - this.tabPage10.Name = "tabPage10"; - this.tabPage10.Size = new System.Drawing.Size(695, 317); - this.tabPage10.TabIndex = 9; - this.tabPage10.Text = "tabPage10"; - this.tabPage10.UseVisualStyleBackColor = true; - // - // tabPage11 - // - this.tabPage11.Location = new System.Drawing.Point(4, 22); - this.tabPage11.Name = "tabPage11"; - this.tabPage11.Size = new System.Drawing.Size(695, 317); - this.tabPage11.TabIndex = 10; - this.tabPage11.Text = "tabPage11"; - this.tabPage11.UseVisualStyleBackColor = true; - // - // tabPage12 - // - this.tabPage12.Location = new System.Drawing.Point(4, 22); - this.tabPage12.Name = "tabPage12"; - this.tabPage12.Size = new System.Drawing.Size(695, 317); - this.tabPage12.TabIndex = 11; - this.tabPage12.Text = "tabPage12"; - this.tabPage12.UseVisualStyleBackColor = true; - // // tabControl3 // + this.tabControl3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left))); this.tabControl3.Controls.Add(this.tabPage22); this.tabControl3.Controls.Add(this.tabPage23); this.tabControl3.Controls.Add(this.tabPage24); @@ -361,10 +271,10 @@ this.tabControl3.Controls.Add(this.tabPage28); this.tabControl3.Controls.Add(this.tabPage29); this.tabControl3.Controls.Add(this.tabPage30); - this.tabControl3.Location = new System.Drawing.Point(15, 19); + this.tabControl3.Location = new System.Drawing.Point(12, 21); this.tabControl3.Name = "tabControl3"; this.tabControl3.SelectedIndex = 0; - this.tabControl3.Size = new System.Drawing.Size(554, 264); + this.tabControl3.Size = new System.Drawing.Size(546, 398); this.tabControl3.TabIndex = 0; // // tabPage22 @@ -372,9 +282,9 @@ 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(546, 238); + this.tabPage22.Size = new System.Drawing.Size(538, 372); this.tabPage22.TabIndex = 0; - this.tabPage22.Text = "tabPage22"; + this.tabPage22.Text = "Controller 1"; this.tabPage22.UseVisualStyleBackColor = true; // // tabPage23 @@ -384,7 +294,7 @@ this.tabPage23.Padding = new System.Windows.Forms.Padding(3); this.tabPage23.Size = new System.Drawing.Size(546, 238); this.tabPage23.TabIndex = 1; - this.tabPage23.Text = "tabPage23"; + this.tabPage23.Text = "Controller 2"; this.tabPage23.UseVisualStyleBackColor = true; // // tabPage24 @@ -393,7 +303,7 @@ this.tabPage24.Name = "tabPage24"; this.tabPage24.Size = new System.Drawing.Size(546, 238); this.tabPage24.TabIndex = 2; - this.tabPage24.Text = "tabPage24"; + this.tabPage24.Text = "Controller 3"; this.tabPage24.UseVisualStyleBackColor = true; // // tabPage25 @@ -402,7 +312,7 @@ this.tabPage25.Name = "tabPage25"; this.tabPage25.Size = new System.Drawing.Size(546, 238); this.tabPage25.TabIndex = 3; - this.tabPage25.Text = "tabPage25"; + this.tabPage25.Text = "Controller 4"; this.tabPage25.UseVisualStyleBackColor = true; // // tabPage26 @@ -411,7 +321,7 @@ this.tabPage26.Name = "tabPage26"; this.tabPage26.Size = new System.Drawing.Size(546, 238); this.tabPage26.TabIndex = 4; - this.tabPage26.Text = "tabPage26"; + this.tabPage26.Text = "Console"; this.tabPage26.UseVisualStyleBackColor = true; // // tabPage27 @@ -420,7 +330,7 @@ this.tabPage27.Name = "tabPage27"; this.tabPage27.Size = new System.Drawing.Size(546, 238); this.tabPage27.TabIndex = 5; - this.tabPage27.Text = "tabPage27"; + this.tabPage27.Text = "Autofire 1"; this.tabPage27.UseVisualStyleBackColor = true; // // tabPage28 @@ -429,7 +339,7 @@ this.tabPage28.Name = "tabPage28"; this.tabPage28.Size = new System.Drawing.Size(546, 238); this.tabPage28.TabIndex = 6; - this.tabPage28.Text = "tabPage28"; + this.tabPage28.Text = "Autofire 2"; this.tabPage28.UseVisualStyleBackColor = true; // // tabPage29 @@ -438,7 +348,7 @@ this.tabPage29.Name = "tabPage29"; this.tabPage29.Size = new System.Drawing.Size(546, 238); this.tabPage29.TabIndex = 7; - this.tabPage29.Text = "tabPage29"; + this.tabPage29.Text = "Autofire 3"; this.tabPage29.UseVisualStyleBackColor = true; // // tabPage30 @@ -447,18 +357,27 @@ this.tabPage30.Name = "tabPage30"; this.tabPage30.Size = new System.Drawing.Size(546, 238); this.tabPage30.TabIndex = 8; - this.tabPage30.Text = "tabPage30"; + this.tabPage30.Text = "Autofire 4"; this.tabPage30.UseVisualStyleBackColor = true; // + // tabPage3 + // + this.tabPage3.Controls.Add(this.tabControl4); + this.tabPage3.Location = new System.Drawing.Point(4, 22); + this.tabPage3.Name = "tabPage3"; + this.tabPage3.Size = new System.Drawing.Size(787, 425); + this.tabPage3.TabIndex = 2; + this.tabPage3.Text = "GB/GBC"; + this.tabPage3.UseVisualStyleBackColor = true; + // // tabControl4 // this.tabControl4.Controls.Add(this.tabPage31); this.tabControl4.Controls.Add(this.tabPage32); - this.tabControl4.Controls.Add(this.tabPage51); this.tabControl4.Location = new System.Drawing.Point(18, 24); this.tabControl4.Name = "tabControl4"; this.tabControl4.SelectedIndex = 0; - this.tabControl4.Size = new System.Drawing.Size(200, 100); + this.tabControl4.Size = new System.Drawing.Size(379, 398); this.tabControl4.TabIndex = 0; // // tabPage31 @@ -466,9 +385,9 @@ this.tabPage31.Location = new System.Drawing.Point(4, 22); this.tabPage31.Name = "tabPage31"; this.tabPage31.Padding = new System.Windows.Forms.Padding(3); - this.tabPage31.Size = new System.Drawing.Size(192, 74); + this.tabPage31.Size = new System.Drawing.Size(371, 372); this.tabPage31.TabIndex = 0; - this.tabPage31.Text = "tabPage31"; + this.tabPage31.Text = "Controller 1"; this.tabPage31.UseVisualStyleBackColor = true; // // tabPage32 @@ -476,20 +395,34 @@ this.tabPage32.Location = new System.Drawing.Point(4, 22); this.tabPage32.Name = "tabPage32"; this.tabPage32.Padding = new System.Windows.Forms.Padding(3); - this.tabPage32.Size = new System.Drawing.Size(192, 74); + this.tabPage32.Size = new System.Drawing.Size(545, 232); this.tabPage32.TabIndex = 1; - this.tabPage32.Text = "tabPage32"; + this.tabPage32.Text = "Autofire 1"; this.tabPage32.UseVisualStyleBackColor = true; // + // tabPage4 + // + this.tabPage4.Controls.Add(this.tabControl5); + this.tabPage4.Location = new System.Drawing.Point(4, 22); + this.tabPage4.Name = "tabPage4"; + this.tabPage4.Size = new System.Drawing.Size(787, 425); + this.tabPage4.TabIndex = 3; + this.tabPage4.Text = "SMS/GG/SG"; + this.tabPage4.UseVisualStyleBackColor = true; + // // tabControl5 // + this.tabControl5.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left))); this.tabControl5.Controls.Add(this.tabPage33); this.tabControl5.Controls.Add(this.tabPage34); - this.tabControl5.Controls.Add(this.tabPage35); - this.tabControl5.Location = new System.Drawing.Point(34, 33); + this.tabControl5.Controls.Add(this.Console); + this.tabControl5.Controls.Add(this.tabPage51); + this.tabControl5.Controls.Add(this.tabPage57); + this.tabControl5.Location = new System.Drawing.Point(12, 21); this.tabControl5.Name = "tabControl5"; this.tabControl5.SelectedIndex = 0; - this.tabControl5.Size = new System.Drawing.Size(200, 100); + this.tabControl5.Size = new System.Drawing.Size(346, 401); this.tabControl5.TabIndex = 0; // // tabPage33 @@ -497,9 +430,9 @@ 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(192, 74); + this.tabPage33.Size = new System.Drawing.Size(338, 375); this.tabPage33.TabIndex = 0; - this.tabPage33.Text = "tabPage33"; + this.tabPage33.Text = "Controller 1"; this.tabPage33.UseVisualStyleBackColor = true; // // tabPage34 @@ -507,22 +440,34 @@ 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(192, 74); + this.tabPage34.Size = new System.Drawing.Size(338, 363); this.tabPage34.TabIndex = 1; - this.tabPage34.Text = "tabPage34"; + this.tabPage34.Text = "Controller 1"; this.tabPage34.UseVisualStyleBackColor = true; // - // tabPage35 + // Console // - this.tabPage35.Location = new System.Drawing.Point(4, 22); - this.tabPage35.Name = "tabPage35"; - this.tabPage35.Size = new System.Drawing.Size(192, 74); - this.tabPage35.TabIndex = 2; - this.tabPage35.Text = "tabPage35"; - this.tabPage35.UseVisualStyleBackColor = true; + this.Console.Location = new System.Drawing.Point(4, 22); + this.Console.Name = "Console"; + this.Console.Size = new System.Drawing.Size(338, 363); + this.Console.TabIndex = 2; + this.Console.Text = "Console"; + this.Console.UseVisualStyleBackColor = true; + // + // tabPage5 + // + this.tabPage5.Controls.Add(this.tabControl6); + this.tabPage5.Location = new System.Drawing.Point(4, 22); + this.tabPage5.Name = "tabPage5"; + this.tabPage5.Size = new System.Drawing.Size(787, 425); + this.tabPage5.TabIndex = 4; + this.tabPage5.Text = "PCE"; + this.tabPage5.UseVisualStyleBackColor = true; // // tabControl6 // + this.tabControl6.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left))); this.tabControl6.Controls.Add(this.tabPage36); this.tabControl6.Controls.Add(this.tabPage37); this.tabControl6.Controls.Add(this.tabPage38); @@ -533,20 +478,21 @@ this.tabControl6.Controls.Add(this.tabPage43); this.tabControl6.Controls.Add(this.tabPage44); this.tabControl6.Controls.Add(this.tabPage45); - this.tabControl6.Location = new System.Drawing.Point(27, 36); + this.tabControl6.Location = new System.Drawing.Point(13, 14); + this.tabControl6.Multiline = true; this.tabControl6.Name = "tabControl6"; this.tabControl6.SelectedIndex = 0; - this.tabControl6.Size = new System.Drawing.Size(554, 246); + this.tabControl6.Size = new System.Drawing.Size(374, 398); this.tabControl6.TabIndex = 0; // // tabPage36 // - this.tabPage36.Location = new System.Drawing.Point(4, 22); + this.tabPage36.Location = new System.Drawing.Point(4, 40); this.tabPage36.Name = "tabPage36"; this.tabPage36.Padding = new System.Windows.Forms.Padding(3); - this.tabPage36.Size = new System.Drawing.Size(546, 220); + this.tabPage36.Size = new System.Drawing.Size(366, 354); this.tabPage36.TabIndex = 0; - this.tabPage36.Text = "tabPage36"; + this.tabPage36.Text = "Controller 1"; this.tabPage36.UseVisualStyleBackColor = true; // // tabPage37 @@ -554,92 +500,106 @@ this.tabPage37.Location = new System.Drawing.Point(4, 22); this.tabPage37.Name = "tabPage37"; this.tabPage37.Padding = new System.Windows.Forms.Padding(3); - this.tabPage37.Size = new System.Drawing.Size(546, 220); + this.tabPage37.Size = new System.Drawing.Size(366, 372); this.tabPage37.TabIndex = 1; - this.tabPage37.Text = "tabPage37"; + this.tabPage37.Text = "Controller 2"; this.tabPage37.UseVisualStyleBackColor = true; // // tabPage38 // this.tabPage38.Location = new System.Drawing.Point(4, 22); this.tabPage38.Name = "tabPage38"; - this.tabPage38.Size = new System.Drawing.Size(546, 220); + this.tabPage38.Size = new System.Drawing.Size(366, 372); this.tabPage38.TabIndex = 2; - this.tabPage38.Text = "tabPage38"; + this.tabPage38.Text = "Controller 3"; this.tabPage38.UseVisualStyleBackColor = true; // // tabPage39 // this.tabPage39.Location = new System.Drawing.Point(4, 22); this.tabPage39.Name = "tabPage39"; - this.tabPage39.Size = new System.Drawing.Size(546, 220); + this.tabPage39.Size = new System.Drawing.Size(366, 372); this.tabPage39.TabIndex = 3; - this.tabPage39.Text = "tabPage39"; + this.tabPage39.Text = "Controller 4"; this.tabPage39.UseVisualStyleBackColor = true; // // tabPage40 // this.tabPage40.Location = new System.Drawing.Point(4, 22); this.tabPage40.Name = "tabPage40"; - this.tabPage40.Size = new System.Drawing.Size(546, 220); + this.tabPage40.Size = new System.Drawing.Size(366, 372); this.tabPage40.TabIndex = 4; - this.tabPage40.Text = "tabPage40"; + this.tabPage40.Text = "Controller 5"; this.tabPage40.UseVisualStyleBackColor = true; // // tabPage41 // - this.tabPage41.Location = new System.Drawing.Point(4, 22); + this.tabPage41.Location = new System.Drawing.Point(4, 40); this.tabPage41.Name = "tabPage41"; - this.tabPage41.Size = new System.Drawing.Size(546, 220); + this.tabPage41.Size = new System.Drawing.Size(366, 354); this.tabPage41.TabIndex = 5; - this.tabPage41.Text = "tabPage41"; + this.tabPage41.Text = "Autofire 1"; this.tabPage41.UseVisualStyleBackColor = true; // // tabPage42 // - this.tabPage42.Location = new System.Drawing.Point(4, 22); + this.tabPage42.Location = new System.Drawing.Point(4, 40); this.tabPage42.Name = "tabPage42"; - this.tabPage42.Size = new System.Drawing.Size(546, 220); + this.tabPage42.Size = new System.Drawing.Size(366, 354); this.tabPage42.TabIndex = 6; - this.tabPage42.Text = "tabPage42"; + this.tabPage42.Text = "Autofire 2"; this.tabPage42.UseVisualStyleBackColor = true; // // tabPage43 // - this.tabPage43.Location = new System.Drawing.Point(4, 22); + this.tabPage43.Location = new System.Drawing.Point(4, 40); this.tabPage43.Name = "tabPage43"; - this.tabPage43.Size = new System.Drawing.Size(546, 220); + this.tabPage43.Size = new System.Drawing.Size(366, 354); this.tabPage43.TabIndex = 7; - this.tabPage43.Text = "tabPage43"; + this.tabPage43.Text = "Autofire 3"; this.tabPage43.UseVisualStyleBackColor = true; // // tabPage44 // - this.tabPage44.Location = new System.Drawing.Point(4, 22); + this.tabPage44.Location = new System.Drawing.Point(4, 40); this.tabPage44.Name = "tabPage44"; - this.tabPage44.Size = new System.Drawing.Size(546, 220); + this.tabPage44.Size = new System.Drawing.Size(366, 354); this.tabPage44.TabIndex = 8; - this.tabPage44.Text = "tabPage44"; + this.tabPage44.Text = "Autofire 4"; this.tabPage44.UseVisualStyleBackColor = true; // // tabPage45 // - this.tabPage45.Location = new System.Drawing.Point(4, 22); + this.tabPage45.Location = new System.Drawing.Point(4, 40); this.tabPage45.Name = "tabPage45"; - this.tabPage45.Size = new System.Drawing.Size(546, 220); + this.tabPage45.Size = new System.Drawing.Size(366, 354); this.tabPage45.TabIndex = 9; - this.tabPage45.Text = "tabPage45"; + this.tabPage45.Text = "Autofire 5"; this.tabPage45.UseVisualStyleBackColor = true; // + // tabPage6 + // + this.tabPage6.Controls.Add(this.tabControl7); + this.tabPage6.Location = new System.Drawing.Point(4, 22); + this.tabPage6.Name = "tabPage6"; + this.tabPage6.Size = new System.Drawing.Size(787, 425); + this.tabPage6.TabIndex = 5; + this.tabPage6.Text = "Atari"; + this.tabPage6.UseVisualStyleBackColor = true; + // // tabControl7 // + this.tabControl7.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left))); this.tabControl7.Controls.Add(this.tabPage46); this.tabControl7.Controls.Add(this.tabPage47); this.tabControl7.Controls.Add(this.tabPage48); - this.tabControl7.Location = new System.Drawing.Point(112, 82); + this.tabControl7.Controls.Add(this.tabPage35); + this.tabControl7.Controls.Add(this.tabPage58); + this.tabControl7.Location = new System.Drawing.Point(12, 21); this.tabControl7.Name = "tabControl7"; this.tabControl7.SelectedIndex = 0; - this.tabControl7.Size = new System.Drawing.Size(200, 100); + this.tabControl7.Size = new System.Drawing.Size(440, 401); this.tabControl7.TabIndex = 0; // // tabPage46 @@ -647,9 +607,9 @@ this.tabPage46.Location = new System.Drawing.Point(4, 22); this.tabPage46.Name = "tabPage46"; this.tabPage46.Padding = new System.Windows.Forms.Padding(3); - this.tabPage46.Size = new System.Drawing.Size(192, 74); + this.tabPage46.Size = new System.Drawing.Size(432, 375); this.tabPage46.TabIndex = 0; - this.tabPage46.Text = "tabPage46"; + this.tabPage46.Text = "Joystick 1"; this.tabPage46.UseVisualStyleBackColor = true; // // tabPage47 @@ -657,20 +617,30 @@ this.tabPage47.Location = new System.Drawing.Point(4, 22); this.tabPage47.Name = "tabPage47"; this.tabPage47.Padding = new System.Windows.Forms.Padding(3); - this.tabPage47.Size = new System.Drawing.Size(192, 74); + this.tabPage47.Size = new System.Drawing.Size(432, 375); this.tabPage47.TabIndex = 1; - this.tabPage47.Text = "tabPage47"; + this.tabPage47.Text = "Joystick 2"; this.tabPage47.UseVisualStyleBackColor = true; // // tabPage48 // this.tabPage48.Location = new System.Drawing.Point(4, 22); this.tabPage48.Name = "tabPage48"; - this.tabPage48.Size = new System.Drawing.Size(192, 74); + this.tabPage48.Size = new System.Drawing.Size(432, 375); this.tabPage48.TabIndex = 2; - this.tabPage48.Text = "tabPage48"; + this.tabPage48.Text = "Console"; this.tabPage48.UseVisualStyleBackColor = true; // + // tabPage7 + // + this.tabPage7.Controls.Add(this.tabControl8); + this.tabPage7.Location = new System.Drawing.Point(4, 22); + this.tabPage7.Name = "tabPage7"; + this.tabPage7.Size = new System.Drawing.Size(787, 425); + this.tabPage7.TabIndex = 6; + this.tabPage7.Text = "Int. V"; + this.tabPage7.UseVisualStyleBackColor = true; + // // tabControl8 // this.tabControl8.Controls.Add(this.tabPage49); @@ -701,26 +671,38 @@ this.tabPage50.Text = "tabPage50"; this.tabPage50.UseVisualStyleBackColor = true; // - // tabPage51 + // tabPage8 // - this.tabPage51.Location = new System.Drawing.Point(4, 22); - this.tabPage51.Name = "tabPage51"; - this.tabPage51.Size = new System.Drawing.Size(192, 74); - this.tabPage51.TabIndex = 2; - this.tabPage51.Text = "tabPage51"; - this.tabPage51.UseVisualStyleBackColor = true; + this.tabPage8.Location = new System.Drawing.Point(4, 22); + this.tabPage8.Name = "tabPage8"; + this.tabPage8.Size = new System.Drawing.Size(787, 425); + this.tabPage8.TabIndex = 7; + this.tabPage8.Text = "TI-83"; + this.tabPage8.UseVisualStyleBackColor = true; + // + // tabPage9 + // + this.tabPage9.Controls.Add(this.tabControl9); + this.tabPage9.Location = new System.Drawing.Point(4, 22); + this.tabPage9.Name = "tabPage9"; + this.tabPage9.Size = new System.Drawing.Size(787, 425); + this.tabPage9.TabIndex = 8; + this.tabPage9.Text = "Genesis"; + this.tabPage9.UseVisualStyleBackColor = true; // // tabControl9 // + this.tabControl9.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left))); this.tabControl9.Controls.Add(this.tabPage52); this.tabControl9.Controls.Add(this.tabPage53); this.tabControl9.Controls.Add(this.tabPage54); this.tabControl9.Controls.Add(this.tabPage55); this.tabControl9.Controls.Add(this.tabPage56); - this.tabControl9.Location = new System.Drawing.Point(53, 46); + this.tabControl9.Location = new System.Drawing.Point(12, 21); this.tabControl9.Name = "tabControl9"; this.tabControl9.SelectedIndex = 0; - this.tabControl9.Size = new System.Drawing.Size(442, 100); + this.tabControl9.Size = new System.Drawing.Size(442, 401); this.tabControl9.TabIndex = 0; // // tabPage52 @@ -728,9 +710,9 @@ this.tabPage52.Location = new System.Drawing.Point(4, 22); this.tabPage52.Name = "tabPage52"; this.tabPage52.Padding = new System.Windows.Forms.Padding(3); - this.tabPage52.Size = new System.Drawing.Size(434, 74); + this.tabPage52.Size = new System.Drawing.Size(434, 375); this.tabPage52.TabIndex = 0; - this.tabPage52.Text = "tabPage52"; + this.tabPage52.Text = "Controller 1"; this.tabPage52.UseVisualStyleBackColor = true; // // tabPage53 @@ -738,43 +720,104 @@ this.tabPage53.Location = new System.Drawing.Point(4, 22); this.tabPage53.Name = "tabPage53"; this.tabPage53.Padding = new System.Windows.Forms.Padding(3); - this.tabPage53.Size = new System.Drawing.Size(192, 74); + this.tabPage53.Size = new System.Drawing.Size(434, 375); this.tabPage53.TabIndex = 1; - this.tabPage53.Text = "tabPage53"; + this.tabPage53.Text = "Controller 2"; this.tabPage53.UseVisualStyleBackColor = true; // // tabPage54 // this.tabPage54.Location = new System.Drawing.Point(4, 22); this.tabPage54.Name = "tabPage54"; - this.tabPage54.Size = new System.Drawing.Size(192, 74); + this.tabPage54.Size = new System.Drawing.Size(434, 375); this.tabPage54.TabIndex = 2; - this.tabPage54.Text = "tabPage54"; + this.tabPage54.Text = "Console"; this.tabPage54.UseVisualStyleBackColor = true; // // tabPage55 // this.tabPage55.Location = new System.Drawing.Point(4, 22); this.tabPage55.Name = "tabPage55"; - this.tabPage55.Size = new System.Drawing.Size(192, 74); + this.tabPage55.Size = new System.Drawing.Size(434, 375); this.tabPage55.TabIndex = 3; - this.tabPage55.Text = "tabPage55"; + this.tabPage55.Text = "Autofire 1"; this.tabPage55.UseVisualStyleBackColor = true; // // tabPage56 // this.tabPage56.Location = new System.Drawing.Point(4, 22); this.tabPage56.Name = "tabPage56"; - this.tabPage56.Size = new System.Drawing.Size(192, 74); + this.tabPage56.Size = new System.Drawing.Size(434, 375); this.tabPage56.TabIndex = 4; - this.tabPage56.Text = "tabPage56"; + this.tabPage56.Text = "Autofire 2"; this.tabPage56.UseVisualStyleBackColor = true; // + // Cancel + // + this.Cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.Cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.Cancel.Location = new System.Drawing.Point(732, 478); + this.Cancel.Name = "Cancel"; + this.Cancel.Size = new System.Drawing.Size(75, 23); + this.Cancel.TabIndex = 1; + this.Cancel.Text = "&Cancel"; + this.Cancel.UseVisualStyleBackColor = true; + // + // OK + // + this.OK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.OK.Location = new System.Drawing.Point(651, 478); + this.OK.Name = "OK"; + this.OK.Size = new System.Drawing.Size(75, 23); + this.OK.TabIndex = 2; + this.OK.Text = "&Ok"; + this.OK.UseVisualStyleBackColor = true; + // + // tabPage51 + // + this.tabPage51.Location = new System.Drawing.Point(4, 22); + this.tabPage51.Name = "tabPage51"; + this.tabPage51.Size = new System.Drawing.Size(338, 363); + this.tabPage51.TabIndex = 3; + this.tabPage51.Text = "Autofire 1"; + this.tabPage51.UseVisualStyleBackColor = true; + // + // tabPage57 + // + this.tabPage57.Location = new System.Drawing.Point(4, 22); + this.tabPage57.Name = "tabPage57"; + this.tabPage57.Size = new System.Drawing.Size(338, 363); + this.tabPage57.TabIndex = 4; + this.tabPage57.Text = "Autofire 2"; + this.tabPage57.UseVisualStyleBackColor = true; + // + // tabPage35 + // + this.tabPage35.Location = new System.Drawing.Point(4, 22); + this.tabPage35.Name = "tabPage35"; + this.tabPage35.Size = new System.Drawing.Size(432, 375); + this.tabPage35.TabIndex = 3; + this.tabPage35.Text = "Autofire 1"; + this.tabPage35.UseVisualStyleBackColor = true; + // + // tabPage58 + // + this.tabPage58.Location = new System.Drawing.Point(4, 22); + this.tabPage58.Name = "tabPage58"; + this.tabPage58.Size = new System.Drawing.Size(432, 375); + this.tabPage58.TabIndex = 4; + this.tabPage58.Text = "Autofire 2"; + this.tabPage58.UseVisualStyleBackColor = true; + // // ControllerConfig // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(741, 376); + this.CancelButton = this.Cancel; + this.ClientSize = new System.Drawing.Size(823, 513); + this.ControlBox = false; + this.Controls.Add(this.OK); + this.Controls.Add(this.Cancel); this.Controls.Add(this.tabControl1); this.Name = "ControllerConfig"; this.Text = "ControllerConfig"; @@ -783,18 +826,18 @@ this.tabPage1.ResumeLayout(false); this.tabControl2.ResumeLayout(false); this.tabPage2.ResumeLayout(false); - this.tabPage3.ResumeLayout(false); - this.tabPage4.ResumeLayout(false); - this.tabPage5.ResumeLayout(false); - this.tabPage6.ResumeLayout(false); - this.tabPage7.ResumeLayout(false); - this.tabPage9.ResumeLayout(false); this.tabControl3.ResumeLayout(false); + this.tabPage3.ResumeLayout(false); this.tabControl4.ResumeLayout(false); + this.tabPage4.ResumeLayout(false); this.tabControl5.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); + this.tabPage9.ResumeLayout(false); this.tabControl9.ResumeLayout(false); this.ResumeLayout(false); @@ -812,9 +855,6 @@ private System.Windows.Forms.TabPage tabPage7; private System.Windows.Forms.TabPage tabPage8; private System.Windows.Forms.TabPage tabPage9; - private System.Windows.Forms.TabPage tabPage10; - private System.Windows.Forms.TabPage tabPage11; - private System.Windows.Forms.TabPage tabPage12; private System.Windows.Forms.TabControl tabControl2; private System.Windows.Forms.TabPage tabPage13; private System.Windows.Forms.TabPage tabPage14; @@ -841,7 +881,7 @@ private System.Windows.Forms.TabControl tabControl5; private System.Windows.Forms.TabPage tabPage33; private System.Windows.Forms.TabPage tabPage34; - private System.Windows.Forms.TabPage tabPage35; + private System.Windows.Forms.TabPage Console; private System.Windows.Forms.TabControl tabControl6; private System.Windows.Forms.TabPage tabPage36; private System.Windows.Forms.TabPage tabPage37; @@ -857,7 +897,6 @@ private System.Windows.Forms.TabPage tabPage46; private System.Windows.Forms.TabPage tabPage47; private System.Windows.Forms.TabPage tabPage48; - private System.Windows.Forms.TabPage tabPage51; private System.Windows.Forms.TabControl tabControl8; private System.Windows.Forms.TabPage tabPage49; private System.Windows.Forms.TabPage tabPage50; @@ -867,5 +906,11 @@ private System.Windows.Forms.TabPage tabPage54; private System.Windows.Forms.TabPage tabPage55; private System.Windows.Forms.TabPage tabPage56; + private System.Windows.Forms.Button Cancel; + private System.Windows.Forms.Button OK; + private System.Windows.Forms.TabPage tabPage51; + private System.Windows.Forms.TabPage tabPage57; + private System.Windows.Forms.TabPage tabPage35; + private System.Windows.Forms.TabPage tabPage58; } } \ No newline at end of file