diff --git a/BizHawk.MultiClient/BizHawk.MultiClient.csproj b/BizHawk.MultiClient/BizHawk.MultiClient.csproj index a3e5fa72cd..4eea55c768 100644 --- a/BizHawk.MultiClient/BizHawk.MultiClient.csproj +++ b/BizHawk.MultiClient/BizHawk.MultiClient.csproj @@ -160,6 +160,15 @@ AutofireConfig.cs + + Form + + + ControllerConfig.cs + + + Component + Form @@ -415,6 +424,9 @@ VideoWriterChooserForm.cs + + ControllerConfig.cs + GifAnimator.cs diff --git a/BizHawk.MultiClient/MainForm.MenuItems.cs b/BizHawk.MultiClient/MainForm.MenuItems.cs index 26154a4aa9..14ea6f62a0 100644 --- a/BizHawk.MultiClient/MainForm.MenuItems.cs +++ b/BizHawk.MultiClient/MainForm.MenuItems.cs @@ -410,13 +410,21 @@ namespace BizHawk.MultiClient private void controllersToolStripMenuItem_Click(object sender, EventArgs e) { - InputConfig i = new InputConfig(); - i.ShowDialog(); - //re-initialize controls in case anything was changed - if (i.DialogResult == DialogResult.OK) + if (INTERIM && false) { - InitControls(); - SyncControls(); + ControllerConfig c = new ControllerConfig(); + c.ShowDialog(); + } + else + { + InputConfig i = new InputConfig(); + i.ShowDialog(); + //re-initialize controls in case anything was changed + if (i.DialogResult == DialogResult.OK) + { + InitControls(); + SyncControls(); + } } } diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs index b2a3c499e2..8cab021cad 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 = true; + public bool INTERIM = false; 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 new file mode 100644 index 0000000000..df439e8c64 --- /dev/null +++ b/BizHawk.MultiClient/config/ControllerConfig.Designer.cs @@ -0,0 +1,871 @@ +namespace BizHawk.MultiClient +{ + partial class ControllerConfig + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.tabControl1 = new System.Windows.Forms.TabControl(); + this.tabPage1 = new System.Windows.Forms.TabPage(); + this.tabControl2 = new System.Windows.Forms.TabControl(); + this.tabPage13 = new System.Windows.Forms.TabPage(); + this.tabPage14 = new System.Windows.Forms.TabPage(); + this.tabPage15 = new System.Windows.Forms.TabPage(); + this.tabPage16 = new System.Windows.Forms.TabPage(); + this.tabPage17 = new System.Windows.Forms.TabPage(); + this.tabPage18 = new System.Windows.Forms.TabPage(); + this.tabPage19 = new System.Windows.Forms.TabPage(); + 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(); + this.tabPage24 = new System.Windows.Forms.TabPage(); + this.tabPage25 = new System.Windows.Forms.TabPage(); + this.tabPage26 = new System.Windows.Forms.TabPage(); + this.tabPage27 = new System.Windows.Forms.TabPage(); + this.tabPage28 = new System.Windows.Forms.TabPage(); + this.tabPage29 = new System.Windows.Forms.TabPage(); + this.tabPage30 = 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.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.tabControl6 = new System.Windows.Forms.TabControl(); + this.tabPage36 = new System.Windows.Forms.TabPage(); + this.tabPage37 = new System.Windows.Forms.TabPage(); + this.tabPage38 = new System.Windows.Forms.TabPage(); + this.tabPage39 = new System.Windows.Forms.TabPage(); + this.tabPage40 = new System.Windows.Forms.TabPage(); + this.tabPage41 = new System.Windows.Forms.TabPage(); + this.tabPage42 = new System.Windows.Forms.TabPage(); + this.tabPage43 = new System.Windows.Forms.TabPage(); + this.tabPage44 = new System.Windows.Forms.TabPage(); + this.tabPage45 = 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.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.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.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.tabControl4.SuspendLayout(); + this.tabControl5.SuspendLayout(); + this.tabControl6.SuspendLayout(); + this.tabControl7.SuspendLayout(); + this.tabControl8.SuspendLayout(); + this.tabControl9.SuspendLayout(); + this.SuspendLayout(); + // + // tabControl1 + // + this.tabControl1.Controls.Add(this.tabPage1); + this.tabControl1.Controls.Add(this.tabPage2); + this.tabControl1.Controls.Add(this.tabPage3); + 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.TabIndex = 0; + // + // tabPage1 + // + this.tabPage1.Controls.Add(this.tabControl2); + 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.TabIndex = 0; + this.tabPage1.Text = "NES"; + this.tabPage1.UseVisualStyleBackColor = true; + // + // tabControl2 + // + this.tabControl2.Controls.Add(this.tabPage13); + this.tabControl2.Controls.Add(this.tabPage14); + this.tabControl2.Controls.Add(this.tabPage15); + this.tabControl2.Controls.Add(this.tabPage16); + this.tabControl2.Controls.Add(this.tabPage17); + this.tabControl2.Controls.Add(this.tabPage18); + this.tabControl2.Controls.Add(this.tabPage19); + this.tabControl2.Controls.Add(this.tabPage20); + this.tabControl2.Controls.Add(this.tabPage21); + 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.TabIndex = 0; + // + // tabPage13 + // + 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.TabIndex = 0; + this.tabPage13.Text = "tabPage13"; + this.tabPage13.UseVisualStyleBackColor = true; + // + // tabPage14 + // + 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.TabIndex = 1; + this.tabPage14.Text = "tabPage14"; + 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.TabIndex = 2; + this.tabPage15.Text = "tabPage15"; + 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.TabIndex = 3; + this.tabPage16.Text = "tabPage16"; + 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.TabIndex = 4; + this.tabPage17.Text = "tabPage17"; + 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.TabIndex = 5; + this.tabPage18.Text = "tabPage18"; + 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.TabIndex = 6; + this.tabPage19.Text = "tabPage19"; + 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.TabIndex = 7; + this.tabPage20.Text = "tabPage20"; + 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.TabIndex = 8; + this.tabPage21.Text = "tabPage21"; + this.tabPage21.UseVisualStyleBackColor = true; + // + // tabPage2 + // + this.tabPage2.Controls.Add(this.tabControl3); + 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.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.Controls.Add(this.tabPage22); + this.tabControl3.Controls.Add(this.tabPage23); + this.tabControl3.Controls.Add(this.tabPage24); + this.tabControl3.Controls.Add(this.tabPage25); + this.tabControl3.Controls.Add(this.tabPage26); + this.tabControl3.Controls.Add(this.tabPage27); + 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.Name = "tabControl3"; + this.tabControl3.SelectedIndex = 0; + this.tabControl3.Size = new System.Drawing.Size(554, 264); + this.tabControl3.TabIndex = 0; + // + // tabPage22 + // + 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.TabIndex = 0; + this.tabPage22.Text = "tabPage22"; + this.tabPage22.UseVisualStyleBackColor = true; + // + // tabPage23 + // + 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(546, 238); + this.tabPage23.TabIndex = 1; + this.tabPage23.Text = "tabPage23"; + this.tabPage23.UseVisualStyleBackColor = true; + // + // tabPage24 + // + this.tabPage24.Location = new System.Drawing.Point(4, 22); + this.tabPage24.Name = "tabPage24"; + this.tabPage24.Size = new System.Drawing.Size(546, 238); + this.tabPage24.TabIndex = 2; + this.tabPage24.Text = "tabPage24"; + this.tabPage24.UseVisualStyleBackColor = true; + // + // tabPage25 + // + this.tabPage25.Location = new System.Drawing.Point(4, 22); + this.tabPage25.Name = "tabPage25"; + this.tabPage25.Size = new System.Drawing.Size(546, 238); + this.tabPage25.TabIndex = 3; + this.tabPage25.Text = "tabPage25"; + 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(546, 238); + this.tabPage26.TabIndex = 4; + this.tabPage26.Text = "tabPage26"; + this.tabPage26.UseVisualStyleBackColor = true; + // + // tabPage27 + // + this.tabPage27.Location = new System.Drawing.Point(4, 22); + this.tabPage27.Name = "tabPage27"; + this.tabPage27.Size = new System.Drawing.Size(546, 238); + this.tabPage27.TabIndex = 5; + this.tabPage27.Text = "tabPage27"; + this.tabPage27.UseVisualStyleBackColor = true; + // + // tabPage28 + // + this.tabPage28.Location = new System.Drawing.Point(4, 22); + this.tabPage28.Name = "tabPage28"; + this.tabPage28.Size = new System.Drawing.Size(546, 238); + this.tabPage28.TabIndex = 6; + this.tabPage28.Text = "tabPage28"; + this.tabPage28.UseVisualStyleBackColor = true; + // + // tabPage29 + // + this.tabPage29.Location = new System.Drawing.Point(4, 22); + this.tabPage29.Name = "tabPage29"; + this.tabPage29.Size = new System.Drawing.Size(546, 238); + this.tabPage29.TabIndex = 7; + this.tabPage29.Text = "tabPage29"; + this.tabPage29.UseVisualStyleBackColor = true; + // + // tabPage30 + // + this.tabPage30.Location = new System.Drawing.Point(4, 22); + this.tabPage30.Name = "tabPage30"; + this.tabPage30.Size = new System.Drawing.Size(546, 238); + this.tabPage30.TabIndex = 8; + this.tabPage30.Text = "tabPage30"; + this.tabPage30.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.TabIndex = 0; + // + // tabPage31 + // + 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.TabIndex = 0; + this.tabPage31.Text = "tabPage31"; + this.tabPage31.UseVisualStyleBackColor = true; + // + // tabPage32 + // + 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.TabIndex = 1; + this.tabPage32.Text = "tabPage32"; + this.tabPage32.UseVisualStyleBackColor = true; + // + // tabControl5 + // + 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.Name = "tabControl5"; + this.tabControl5.SelectedIndex = 0; + this.tabControl5.Size = new System.Drawing.Size(200, 100); + this.tabControl5.TabIndex = 0; + // + // tabPage33 + // + 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.TabIndex = 0; + this.tabPage33.Text = "tabPage33"; + this.tabPage33.UseVisualStyleBackColor = true; + // + // tabPage34 + // + 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.TabIndex = 1; + this.tabPage34.Text = "tabPage34"; + this.tabPage34.UseVisualStyleBackColor = true; + // + // tabPage35 + // + 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; + // + // tabControl6 + // + this.tabControl6.Controls.Add(this.tabPage36); + this.tabControl6.Controls.Add(this.tabPage37); + this.tabControl6.Controls.Add(this.tabPage38); + this.tabControl6.Controls.Add(this.tabPage39); + this.tabControl6.Controls.Add(this.tabPage40); + this.tabControl6.Controls.Add(this.tabPage41); + this.tabControl6.Controls.Add(this.tabPage42); + 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.Name = "tabControl6"; + this.tabControl6.SelectedIndex = 0; + this.tabControl6.Size = new System.Drawing.Size(554, 246); + this.tabControl6.TabIndex = 0; + // + // tabPage36 + // + this.tabPage36.Location = new System.Drawing.Point(4, 22); + this.tabPage36.Name = "tabPage36"; + this.tabPage36.Padding = new System.Windows.Forms.Padding(3); + this.tabPage36.Size = new System.Drawing.Size(546, 220); + this.tabPage36.TabIndex = 0; + this.tabPage36.Text = "tabPage36"; + this.tabPage36.UseVisualStyleBackColor = true; + // + // tabPage37 + // + 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.TabIndex = 1; + this.tabPage37.Text = "tabPage37"; + 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.TabIndex = 2; + this.tabPage38.Text = "tabPage38"; + 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.TabIndex = 3; + this.tabPage39.Text = "tabPage39"; + 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.TabIndex = 4; + this.tabPage40.Text = "tabPage40"; + this.tabPage40.UseVisualStyleBackColor = true; + // + // tabPage41 + // + this.tabPage41.Location = new System.Drawing.Point(4, 22); + this.tabPage41.Name = "tabPage41"; + this.tabPage41.Size = new System.Drawing.Size(546, 220); + this.tabPage41.TabIndex = 5; + this.tabPage41.Text = "tabPage41"; + this.tabPage41.UseVisualStyleBackColor = true; + // + // tabPage42 + // + this.tabPage42.Location = new System.Drawing.Point(4, 22); + this.tabPage42.Name = "tabPage42"; + this.tabPage42.Size = new System.Drawing.Size(546, 220); + this.tabPage42.TabIndex = 6; + this.tabPage42.Text = "tabPage42"; + this.tabPage42.UseVisualStyleBackColor = true; + // + // tabPage43 + // + this.tabPage43.Location = new System.Drawing.Point(4, 22); + this.tabPage43.Name = "tabPage43"; + this.tabPage43.Size = new System.Drawing.Size(546, 220); + this.tabPage43.TabIndex = 7; + this.tabPage43.Text = "tabPage43"; + this.tabPage43.UseVisualStyleBackColor = true; + // + // tabPage44 + // + this.tabPage44.Location = new System.Drawing.Point(4, 22); + this.tabPage44.Name = "tabPage44"; + this.tabPage44.Size = new System.Drawing.Size(546, 220); + this.tabPage44.TabIndex = 8; + this.tabPage44.Text = "tabPage44"; + this.tabPage44.UseVisualStyleBackColor = true; + // + // tabPage45 + // + this.tabPage45.Location = new System.Drawing.Point(4, 22); + this.tabPage45.Name = "tabPage45"; + this.tabPage45.Size = new System.Drawing.Size(546, 220); + this.tabPage45.TabIndex = 9; + this.tabPage45.Text = "tabPage45"; + this.tabPage45.UseVisualStyleBackColor = true; + // + // tabControl7 + // + 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.Name = "tabControl7"; + this.tabControl7.SelectedIndex = 0; + this.tabControl7.Size = new System.Drawing.Size(200, 100); + this.tabControl7.TabIndex = 0; + // + // tabPage46 + // + 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.TabIndex = 0; + this.tabPage46.Text = "tabPage46"; + this.tabPage46.UseVisualStyleBackColor = true; + // + // tabPage47 + // + 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.TabIndex = 1; + this.tabPage47.Text = "tabPage47"; + 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.TabIndex = 2; + this.tabPage48.Text = "tabPage48"; + this.tabPage48.UseVisualStyleBackColor = true; + // + // tabControl8 + // + this.tabControl8.Controls.Add(this.tabPage49); + this.tabControl8.Controls.Add(this.tabPage50); + this.tabControl8.Location = new System.Drawing.Point(46, 38); + this.tabControl8.Name = "tabControl8"; + this.tabControl8.SelectedIndex = 0; + this.tabControl8.Size = new System.Drawing.Size(200, 100); + this.tabControl8.TabIndex = 0; + // + // tabPage49 + // + this.tabPage49.Location = new System.Drawing.Point(4, 22); + this.tabPage49.Name = "tabPage49"; + this.tabPage49.Padding = new System.Windows.Forms.Padding(3); + this.tabPage49.Size = new System.Drawing.Size(192, 74); + this.tabPage49.TabIndex = 0; + this.tabPage49.Text = "tabPage49"; + this.tabPage49.UseVisualStyleBackColor = true; + // + // tabPage50 + // + this.tabPage50.Location = new System.Drawing.Point(4, 22); + this.tabPage50.Name = "tabPage50"; + this.tabPage50.Padding = new System.Windows.Forms.Padding(3); + this.tabPage50.Size = new System.Drawing.Size(192, 74); + this.tabPage50.TabIndex = 1; + this.tabPage50.Text = "tabPage50"; + this.tabPage50.UseVisualStyleBackColor = true; + // + // tabPage51 + // + 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; + // + // tabControl9 + // + 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.Name = "tabControl9"; + this.tabControl9.SelectedIndex = 0; + this.tabControl9.Size = new System.Drawing.Size(442, 100); + this.tabControl9.TabIndex = 0; + // + // tabPage52 + // + 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.TabIndex = 0; + this.tabPage52.Text = "tabPage52"; + this.tabPage52.UseVisualStyleBackColor = true; + // + // tabPage53 + // + 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.TabIndex = 1; + this.tabPage53.Text = "tabPage53"; + 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.TabIndex = 2; + this.tabPage54.Text = "tabPage54"; + 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.TabIndex = 3; + this.tabPage55.Text = "tabPage55"; + 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.TabIndex = 4; + this.tabPage56.Text = "tabPage56"; + this.tabPage56.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.Controls.Add(this.tabControl1); + this.Name = "ControllerConfig"; + this.Text = "ControllerConfig"; + this.Load += new System.EventHandler(this.ControllerConfig_Load); + this.tabControl1.ResumeLayout(false); + 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.tabControl4.ResumeLayout(false); + this.tabControl5.ResumeLayout(false); + this.tabControl6.ResumeLayout(false); + this.tabControl7.ResumeLayout(false); + this.tabControl8.ResumeLayout(false); + this.tabControl9.ResumeLayout(false); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.TabControl tabControl1; + private System.Windows.Forms.TabPage tabPage1; + private System.Windows.Forms.TabPage tabPage2; + private System.Windows.Forms.TabPage tabPage3; + private System.Windows.Forms.TabPage tabPage4; + private System.Windows.Forms.TabPage tabPage5; + private System.Windows.Forms.TabPage tabPage6; + 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; + private System.Windows.Forms.TabPage tabPage15; + private System.Windows.Forms.TabPage tabPage16; + private System.Windows.Forms.TabPage tabPage17; + private System.Windows.Forms.TabPage tabPage18; + private System.Windows.Forms.TabPage tabPage19; + private System.Windows.Forms.TabPage tabPage20; + private System.Windows.Forms.TabPage tabPage21; + private System.Windows.Forms.TabControl tabControl3; + private System.Windows.Forms.TabPage tabPage22; + private System.Windows.Forms.TabPage tabPage23; + private System.Windows.Forms.TabPage tabPage24; + private System.Windows.Forms.TabPage tabPage25; + private System.Windows.Forms.TabPage tabPage26; + private System.Windows.Forms.TabPage tabPage27; + private System.Windows.Forms.TabPage tabPage28; + private System.Windows.Forms.TabPage tabPage29; + private System.Windows.Forms.TabPage tabPage30; + private System.Windows.Forms.TabControl tabControl4; + private System.Windows.Forms.TabPage tabPage31; + private System.Windows.Forms.TabPage tabPage32; + 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.TabControl tabControl6; + private System.Windows.Forms.TabPage tabPage36; + private System.Windows.Forms.TabPage tabPage37; + private System.Windows.Forms.TabPage tabPage38; + private System.Windows.Forms.TabPage tabPage39; + private System.Windows.Forms.TabPage tabPage40; + private System.Windows.Forms.TabPage tabPage41; + private System.Windows.Forms.TabPage tabPage42; + private System.Windows.Forms.TabPage tabPage43; + private System.Windows.Forms.TabPage tabPage44; + private System.Windows.Forms.TabPage tabPage45; + private System.Windows.Forms.TabControl tabControl7; + 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; + private System.Windows.Forms.TabControl tabControl9; + private System.Windows.Forms.TabPage tabPage52; + private System.Windows.Forms.TabPage tabPage53; + private System.Windows.Forms.TabPage tabPage54; + private System.Windows.Forms.TabPage tabPage55; + private System.Windows.Forms.TabPage tabPage56; + } +} \ No newline at end of file diff --git a/BizHawk.MultiClient/config/ControllerConfig.cs b/BizHawk.MultiClient/config/ControllerConfig.cs new file mode 100644 index 0000000000..026800d2be --- /dev/null +++ b/BizHawk.MultiClient/config/ControllerConfig.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; + +namespace BizHawk.MultiClient +{ + public partial class ControllerConfig : Form + { + public ControllerConfig() + { + InitializeComponent(); + } + + private void ControllerConfig_Load(object sender, EventArgs e) + { + + } + } +} diff --git a/BizHawk.MultiClient/config/ControllerConfig.resx b/BizHawk.MultiClient/config/ControllerConfig.resx new file mode 100644 index 0000000000..29dcb1b3a3 --- /dev/null +++ b/BizHawk.MultiClient/config/ControllerConfig.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/BizHawk.MultiClient/config/ControllerConfig/NESGamePad.cs b/BizHawk.MultiClient/config/ControllerConfig/NESGamePad.cs new file mode 100644 index 0000000000..9c613fbf12 --- /dev/null +++ b/BizHawk.MultiClient/config/ControllerConfig/NESGamePad.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Windows.Forms; +using System.Drawing; + +namespace BizHawk.MultiClient.config.ControllerConfig +{ + class NESGamePad : Panel + { + InputWidget UpBox = new InputWidget(); + public int ControllerNumber = 1; + public bool Autofire = false; + + public NESGamePad() + { + this.BorderStyle = BorderStyle.Fixed3D; + this.Size = new Size(174, 74); + ControllerNumber = 1; + + UpBox.Location = new Point(15, 15); + } + + + } +}