diff --git a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj index 7fc0668217..b6329ea68b 100644 --- a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj +++ b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj @@ -418,6 +418,12 @@ PSXControllerConfig.cs + + Form + + + PSXControllerConfigNew.cs + Form @@ -1251,6 +1257,9 @@ PSXControllerConfig.cs + + PSXControllerConfigNew.cs + PSXHashDiscs.cs diff --git a/BizHawk.Client.EmuHawk/config/PSX/PSXControllerConfig.Designer.cs b/BizHawk.Client.EmuHawk/config/PSX/PSXControllerConfig.Designer.cs index 53b63184be..f55c730785 100644 --- a/BizHawk.Client.EmuHawk/config/PSX/PSXControllerConfig.Designer.cs +++ b/BizHawk.Client.EmuHawk/config/PSX/PSXControllerConfig.Designer.cs @@ -31,6 +31,7 @@ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PSXControllerConfig)); this.CancelBtn = new System.Windows.Forms.Button(); this.OkBtn = new System.Windows.Forms.Button(); + this.btnTest = new System.Windows.Forms.Button(); this.SuspendLayout(); // // CancelBtn @@ -56,6 +57,17 @@ this.OkBtn.UseVisualStyleBackColor = true; this.OkBtn.Click += new System.EventHandler(this.OkBtn_Click); // + // btnTest + // + this.btnTest.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.btnTest.Location = new System.Drawing.Point(12, 227); + this.btnTest.Name = "btnTest"; + this.btnTest.Size = new System.Drawing.Size(60, 23); + this.btnTest.TabIndex = 6; + this.btnTest.Text = "Test"; + this.btnTest.UseVisualStyleBackColor = true; + this.btnTest.Click += new System.EventHandler(this.btnTest_Click); + // // PSXControllerConfig // this.AcceptButton = this.OkBtn; @@ -63,6 +75,7 @@ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.CancelButton = this.CancelBtn; this.ClientSize = new System.Drawing.Size(366, 262); + this.Controls.Add(this.btnTest); this.Controls.Add(this.CancelBtn); this.Controls.Add(this.OkBtn); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); @@ -78,5 +91,6 @@ private System.Windows.Forms.Button CancelBtn; private System.Windows.Forms.Button OkBtn; + private System.Windows.Forms.Button btnTest; } } \ No newline at end of file diff --git a/BizHawk.Client.EmuHawk/config/PSX/PSXControllerConfig.cs b/BizHawk.Client.EmuHawk/config/PSX/PSXControllerConfig.cs index 9fa2a81b9f..edafbf1e66 100644 --- a/BizHawk.Client.EmuHawk/config/PSX/PSXControllerConfig.cs +++ b/BizHawk.Client.EmuHawk/config/PSX/PSXControllerConfig.cs @@ -89,5 +89,10 @@ namespace BizHawk.Client.EmuHawk DialogResult = DialogResult.Cancel; Close(); } + + private void btnTest_Click(object sender, EventArgs e) + { + new PSXControllerConfigNew().ShowDialog(); + } } } diff --git a/BizHawk.Client.EmuHawk/config/PSX/PSXControllerConfigNew.Designer.cs b/BizHawk.Client.EmuHawk/config/PSX/PSXControllerConfigNew.Designer.cs new file mode 100644 index 0000000000..36740d6774 --- /dev/null +++ b/BizHawk.Client.EmuHawk/config/PSX/PSXControllerConfigNew.Designer.cs @@ -0,0 +1,475 @@ +namespace BizHawk.Client.EmuHawk +{ + partial class PSXControllerConfigNew + { + /// + /// 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.cbMultitap_1 = new System.Windows.Forms.CheckBox(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.lbl_p_1_4 = new System.Windows.Forms.Label(); + this.lbl_p_1_3 = new System.Windows.Forms.Label(); + this.lbl_p_1_2 = new System.Windows.Forms.Label(); + this.lbl_p_1_1 = new System.Windows.Forms.Label(); + this.lbl_1_4 = new System.Windows.Forms.Label(); + this.lbl_1_3 = new System.Windows.Forms.Label(); + this.lbl_1_2 = new System.Windows.Forms.Label(); + this.lbl_1_1 = new System.Windows.Forms.Label(); + this.combo_1_4 = new System.Windows.Forms.ComboBox(); + this.combo_1_3 = new System.Windows.Forms.ComboBox(); + this.combo_1_2 = new System.Windows.Forms.ComboBox(); + this.combo_1_1 = new System.Windows.Forms.ComboBox(); + this.cbMemcard_1 = new System.Windows.Forms.CheckBox(); + this.btnOK = new System.Windows.Forms.Button(); + this.btnCancel = new System.Windows.Forms.Button(); + this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.lbl_p_2_4 = new System.Windows.Forms.Label(); + this.lbl_p_2_3 = new System.Windows.Forms.Label(); + this.lbl_p_2_2 = new System.Windows.Forms.Label(); + this.lbl_p_2_1 = new System.Windows.Forms.Label(); + this.lbl_2_4 = new System.Windows.Forms.Label(); + this.lbl_2_3 = new System.Windows.Forms.Label(); + this.lbl_2_2 = new System.Windows.Forms.Label(); + this.lbl_2_1 = new System.Windows.Forms.Label(); + this.combo_2_4 = new System.Windows.Forms.ComboBox(); + this.combo_2_3 = new System.Windows.Forms.ComboBox(); + this.combo_2_2 = new System.Windows.Forms.ComboBox(); + this.combo_2_1 = new System.Windows.Forms.ComboBox(); + this.cbMemcard_2 = new System.Windows.Forms.CheckBox(); + this.cbMultitap_2 = new System.Windows.Forms.CheckBox(); + this.groupBox1.SuspendLayout(); + this.groupBox2.SuspendLayout(); + this.SuspendLayout(); + // + // cbMultitap_1 + // + this.cbMultitap_1.AutoSize = true; + this.cbMultitap_1.Location = new System.Drawing.Point(18, 43); + this.cbMultitap_1.Name = "cbMultitap_1"; + this.cbMultitap_1.Size = new System.Drawing.Size(63, 17); + this.cbMultitap_1.TabIndex = 0; + this.cbMultitap_1.Text = "Multitap"; + this.cbMultitap_1.UseVisualStyleBackColor = true; + this.cbMultitap_1.CheckedChanged += new System.EventHandler(this.cb_changed); + // + // groupBox1 + // + this.groupBox1.Controls.Add(this.lbl_p_1_4); + this.groupBox1.Controls.Add(this.lbl_p_1_3); + this.groupBox1.Controls.Add(this.lbl_p_1_2); + this.groupBox1.Controls.Add(this.lbl_p_1_1); + this.groupBox1.Controls.Add(this.lbl_1_4); + this.groupBox1.Controls.Add(this.lbl_1_3); + this.groupBox1.Controls.Add(this.lbl_1_2); + this.groupBox1.Controls.Add(this.lbl_1_1); + this.groupBox1.Controls.Add(this.combo_1_4); + this.groupBox1.Controls.Add(this.combo_1_3); + this.groupBox1.Controls.Add(this.combo_1_2); + this.groupBox1.Controls.Add(this.combo_1_1); + this.groupBox1.Controls.Add(this.cbMemcard_1); + this.groupBox1.Controls.Add(this.cbMultitap_1); + this.groupBox1.Location = new System.Drawing.Point(12, 12); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(273, 136); + this.groupBox1.TabIndex = 1; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "Port 1"; + // + // lbl_p_1_4 + // + this.lbl_p_1_4.AutoSize = true; + this.lbl_p_1_4.Location = new System.Drawing.Point(241, 105); + this.lbl_p_1_4.Name = "lbl_p_1_4"; + this.lbl_p_1_4.Size = new System.Drawing.Size(20, 13); + this.lbl_p_1_4.TabIndex = 12; + this.lbl_p_1_4.Text = "P1"; + this.lbl_p_1_4.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // lbl_p_1_3 + // + this.lbl_p_1_3.AutoSize = true; + this.lbl_p_1_3.Location = new System.Drawing.Point(241, 78); + this.lbl_p_1_3.Name = "lbl_p_1_3"; + this.lbl_p_1_3.Size = new System.Drawing.Size(20, 13); + this.lbl_p_1_3.TabIndex = 11; + this.lbl_p_1_3.Text = "P1"; + this.lbl_p_1_3.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // lbl_p_1_2 + // + this.lbl_p_1_2.AutoSize = true; + this.lbl_p_1_2.Location = new System.Drawing.Point(241, 50); + this.lbl_p_1_2.Name = "lbl_p_1_2"; + this.lbl_p_1_2.Size = new System.Drawing.Size(20, 13); + this.lbl_p_1_2.TabIndex = 10; + this.lbl_p_1_2.Text = "P1"; + this.lbl_p_1_2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // lbl_p_1_1 + // + this.lbl_p_1_1.AutoSize = true; + this.lbl_p_1_1.Location = new System.Drawing.Point(241, 24); + this.lbl_p_1_1.Name = "lbl_p_1_1"; + this.lbl_p_1_1.Size = new System.Drawing.Size(20, 13); + this.lbl_p_1_1.TabIndex = 9; + this.lbl_p_1_1.Text = "P1"; + this.lbl_p_1_1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // lbl_1_4 + // + this.lbl_1_4.AutoSize = true; + this.lbl_1_4.Location = new System.Drawing.Point(94, 105); + this.lbl_1_4.Name = "lbl_1_4"; + this.lbl_1_4.Size = new System.Drawing.Size(15, 13); + this.lbl_1_4.TabIndex = 8; + this.lbl_1_4.Text = "D"; + this.lbl_1_4.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // lbl_1_3 + // + this.lbl_1_3.AutoSize = true; + this.lbl_1_3.Location = new System.Drawing.Point(94, 78); + this.lbl_1_3.Name = "lbl_1_3"; + this.lbl_1_3.Size = new System.Drawing.Size(14, 13); + this.lbl_1_3.TabIndex = 7; + this.lbl_1_3.Text = "C"; + this.lbl_1_3.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // lbl_1_2 + // + this.lbl_1_2.AutoSize = true; + this.lbl_1_2.Location = new System.Drawing.Point(94, 51); + this.lbl_1_2.Name = "lbl_1_2"; + this.lbl_1_2.Size = new System.Drawing.Size(14, 13); + this.lbl_1_2.TabIndex = 6; + this.lbl_1_2.Text = "B"; + this.lbl_1_2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // lbl_1_1 + // + this.lbl_1_1.AutoSize = true; + this.lbl_1_1.Location = new System.Drawing.Point(94, 24); + this.lbl_1_1.Name = "lbl_1_1"; + this.lbl_1_1.Size = new System.Drawing.Size(14, 13); + this.lbl_1_1.TabIndex = 2; + this.lbl_1_1.Text = "A"; + this.lbl_1_1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // combo_1_4 + // + this.combo_1_4.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.combo_1_4.FormattingEnabled = true; + this.combo_1_4.Location = new System.Drawing.Point(114, 102); + this.combo_1_4.Name = "combo_1_4"; + this.combo_1_4.Size = new System.Drawing.Size(121, 21); + this.combo_1_4.TabIndex = 5; + this.combo_1_4.SelectedIndexChanged += new System.EventHandler(this.combo_SelectedIndexChanged); + // + // combo_1_3 + // + this.combo_1_3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.combo_1_3.FormattingEnabled = true; + this.combo_1_3.Location = new System.Drawing.Point(114, 75); + this.combo_1_3.Name = "combo_1_3"; + this.combo_1_3.Size = new System.Drawing.Size(121, 21); + this.combo_1_3.TabIndex = 4; + this.combo_1_3.SelectedIndexChanged += new System.EventHandler(this.combo_SelectedIndexChanged); + // + // combo_1_2 + // + this.combo_1_2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.combo_1_2.FormattingEnabled = true; + this.combo_1_2.Location = new System.Drawing.Point(114, 48); + this.combo_1_2.Name = "combo_1_2"; + this.combo_1_2.Size = new System.Drawing.Size(121, 21); + this.combo_1_2.TabIndex = 3; + this.combo_1_2.SelectedIndexChanged += new System.EventHandler(this.combo_SelectedIndexChanged); + // + // combo_1_1 + // + this.combo_1_1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.combo_1_1.FormattingEnabled = true; + this.combo_1_1.Location = new System.Drawing.Point(114, 21); + this.combo_1_1.Name = "combo_1_1"; + this.combo_1_1.Size = new System.Drawing.Size(121, 21); + this.combo_1_1.TabIndex = 2; + this.combo_1_1.SelectedIndexChanged += new System.EventHandler(this.combo_SelectedIndexChanged); + // + // cbMemcard_1 + // + this.cbMemcard_1.AutoSize = true; + this.cbMemcard_1.Location = new System.Drawing.Point(18, 21); + this.cbMemcard_1.Name = "cbMemcard_1"; + this.cbMemcard_1.Size = new System.Drawing.Size(70, 17); + this.cbMemcard_1.TabIndex = 1; + this.cbMemcard_1.Text = "Memcard"; + this.cbMemcard_1.UseVisualStyleBackColor = true; + this.cbMemcard_1.CheckedChanged += new System.EventHandler(this.cb_changed); + // + // btnOK + // + this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK; + this.btnOK.Location = new System.Drawing.Point(408, 163); + this.btnOK.Name = "btnOK"; + this.btnOK.Size = new System.Drawing.Size(75, 23); + this.btnOK.TabIndex = 2; + this.btnOK.Text = "OK"; + this.btnOK.UseVisualStyleBackColor = true; + // + // btnCancel + // + this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.btnCancel.Location = new System.Drawing.Point(489, 163); + this.btnCancel.Name = "btnCancel"; + this.btnCancel.Size = new System.Drawing.Size(75, 23); + this.btnCancel.TabIndex = 3; + this.btnCancel.Text = "Cancel"; + this.btnCancel.UseVisualStyleBackColor = true; + // + // groupBox2 + // + this.groupBox2.Controls.Add(this.lbl_p_2_4); + this.groupBox2.Controls.Add(this.lbl_p_2_3); + this.groupBox2.Controls.Add(this.lbl_p_2_2); + this.groupBox2.Controls.Add(this.lbl_p_2_1); + this.groupBox2.Controls.Add(this.lbl_2_4); + this.groupBox2.Controls.Add(this.lbl_2_3); + this.groupBox2.Controls.Add(this.lbl_2_2); + this.groupBox2.Controls.Add(this.lbl_2_1); + this.groupBox2.Controls.Add(this.combo_2_4); + this.groupBox2.Controls.Add(this.combo_2_3); + this.groupBox2.Controls.Add(this.combo_2_2); + this.groupBox2.Controls.Add(this.combo_2_1); + this.groupBox2.Controls.Add(this.cbMemcard_2); + this.groupBox2.Controls.Add(this.cbMultitap_2); + this.groupBox2.Location = new System.Drawing.Point(291, 12); + this.groupBox2.Name = "groupBox2"; + this.groupBox2.Size = new System.Drawing.Size(273, 136); + this.groupBox2.TabIndex = 13; + this.groupBox2.TabStop = false; + this.groupBox2.Text = "Port 2"; + // + // lbl_p_2_4 + // + this.lbl_p_2_4.AutoSize = true; + this.lbl_p_2_4.Location = new System.Drawing.Point(241, 105); + this.lbl_p_2_4.Name = "lbl_p_2_4"; + this.lbl_p_2_4.Size = new System.Drawing.Size(20, 13); + this.lbl_p_2_4.TabIndex = 12; + this.lbl_p_2_4.Text = "P1"; + this.lbl_p_2_4.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // lbl_p_2_3 + // + this.lbl_p_2_3.AutoSize = true; + this.lbl_p_2_3.Location = new System.Drawing.Point(241, 78); + this.lbl_p_2_3.Name = "lbl_p_2_3"; + this.lbl_p_2_3.Size = new System.Drawing.Size(20, 13); + this.lbl_p_2_3.TabIndex = 11; + this.lbl_p_2_3.Text = "P1"; + this.lbl_p_2_3.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // lbl_p_2_2 + // + this.lbl_p_2_2.AutoSize = true; + this.lbl_p_2_2.Location = new System.Drawing.Point(241, 50); + this.lbl_p_2_2.Name = "lbl_p_2_2"; + this.lbl_p_2_2.Size = new System.Drawing.Size(20, 13); + this.lbl_p_2_2.TabIndex = 10; + this.lbl_p_2_2.Text = "P1"; + this.lbl_p_2_2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // lbl_p_2_1 + // + this.lbl_p_2_1.AutoSize = true; + this.lbl_p_2_1.Location = new System.Drawing.Point(241, 24); + this.lbl_p_2_1.Name = "lbl_p_2_1"; + this.lbl_p_2_1.Size = new System.Drawing.Size(20, 13); + this.lbl_p_2_1.TabIndex = 9; + this.lbl_p_2_1.Text = "P1"; + this.lbl_p_2_1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // lbl_2_4 + // + this.lbl_2_4.AutoSize = true; + this.lbl_2_4.Location = new System.Drawing.Point(94, 105); + this.lbl_2_4.Name = "lbl_2_4"; + this.lbl_2_4.Size = new System.Drawing.Size(15, 13); + this.lbl_2_4.TabIndex = 8; + this.lbl_2_4.Text = "D"; + this.lbl_2_4.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // lbl_2_3 + // + this.lbl_2_3.AutoSize = true; + this.lbl_2_3.Location = new System.Drawing.Point(94, 78); + this.lbl_2_3.Name = "lbl_2_3"; + this.lbl_2_3.Size = new System.Drawing.Size(14, 13); + this.lbl_2_3.TabIndex = 7; + this.lbl_2_3.Text = "C"; + this.lbl_2_3.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // lbl_2_2 + // + this.lbl_2_2.AutoSize = true; + this.lbl_2_2.Location = new System.Drawing.Point(94, 51); + this.lbl_2_2.Name = "lbl_2_2"; + this.lbl_2_2.Size = new System.Drawing.Size(14, 13); + this.lbl_2_2.TabIndex = 6; + this.lbl_2_2.Text = "B"; + this.lbl_2_2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // lbl_2_1 + // + this.lbl_2_1.AutoSize = true; + this.lbl_2_1.Location = new System.Drawing.Point(94, 24); + this.lbl_2_1.Name = "lbl_2_1"; + this.lbl_2_1.Size = new System.Drawing.Size(14, 13); + this.lbl_2_1.TabIndex = 2; + this.lbl_2_1.Text = "A"; + this.lbl_2_1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // combo_2_4 + // + this.combo_2_4.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.combo_2_4.FormattingEnabled = true; + this.combo_2_4.Location = new System.Drawing.Point(114, 102); + this.combo_2_4.Name = "combo_2_4"; + this.combo_2_4.Size = new System.Drawing.Size(121, 21); + this.combo_2_4.TabIndex = 5; + this.combo_2_4.SelectedIndexChanged += new System.EventHandler(this.combo_SelectedIndexChanged); + // + // combo_2_3 + // + this.combo_2_3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.combo_2_3.FormattingEnabled = true; + this.combo_2_3.Location = new System.Drawing.Point(114, 75); + this.combo_2_3.Name = "combo_2_3"; + this.combo_2_3.Size = new System.Drawing.Size(121, 21); + this.combo_2_3.TabIndex = 4; + this.combo_2_3.SelectedIndexChanged += new System.EventHandler(this.combo_SelectedIndexChanged); + // + // combo_2_2 + // + this.combo_2_2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.combo_2_2.FormattingEnabled = true; + this.combo_2_2.Location = new System.Drawing.Point(114, 48); + this.combo_2_2.Name = "combo_2_2"; + this.combo_2_2.Size = new System.Drawing.Size(121, 21); + this.combo_2_2.TabIndex = 3; + this.combo_2_2.SelectedIndexChanged += new System.EventHandler(this.combo_SelectedIndexChanged); + // + // combo_2_1 + // + this.combo_2_1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.combo_2_1.FormattingEnabled = true; + this.combo_2_1.Location = new System.Drawing.Point(114, 21); + this.combo_2_1.Name = "combo_2_1"; + this.combo_2_1.Size = new System.Drawing.Size(121, 21); + this.combo_2_1.TabIndex = 2; + this.combo_2_1.SelectedIndexChanged += new System.EventHandler(this.combo_SelectedIndexChanged); + // + // cbMemcard_2 + // + this.cbMemcard_2.AutoSize = true; + this.cbMemcard_2.Location = new System.Drawing.Point(18, 21); + this.cbMemcard_2.Name = "cbMemcard_2"; + this.cbMemcard_2.Size = new System.Drawing.Size(70, 17); + this.cbMemcard_2.TabIndex = 1; + this.cbMemcard_2.Text = "Memcard"; + this.cbMemcard_2.UseVisualStyleBackColor = true; + this.cbMemcard_2.CheckedChanged += new System.EventHandler(this.cb_changed); + // + // cbMultitap_2 + // + this.cbMultitap_2.AutoSize = true; + this.cbMultitap_2.Location = new System.Drawing.Point(18, 43); + this.cbMultitap_2.Name = "cbMultitap_2"; + this.cbMultitap_2.Size = new System.Drawing.Size(63, 17); + this.cbMultitap_2.TabIndex = 0; + this.cbMultitap_2.Text = "Multitap"; + this.cbMultitap_2.UseVisualStyleBackColor = true; + this.cbMultitap_2.CheckedChanged += new System.EventHandler(this.cb_changed); + // + // PSXControllerConfigNew + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(586, 201); + this.Controls.Add(this.groupBox2); + this.Controls.Add(this.btnCancel); + this.Controls.Add(this.btnOK); + this.Controls.Add(this.groupBox1); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.MaximizeBox = false; + this.MinimizeBox = false; + this.Name = "PSXControllerConfigNew"; + this.Text = "PSX FrontIO Configuration"; + this.Load += new System.EventHandler(this.PSXControllerConfigNew_Load); + this.groupBox1.ResumeLayout(false); + this.groupBox1.PerformLayout(); + this.groupBox2.ResumeLayout(false); + this.groupBox2.PerformLayout(); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.CheckBox cbMultitap_1; + private System.Windows.Forms.GroupBox groupBox1; + private System.Windows.Forms.Label lbl_p_1_4; + private System.Windows.Forms.Label lbl_p_1_3; + private System.Windows.Forms.Label lbl_p_1_2; + private System.Windows.Forms.Label lbl_p_1_1; + private System.Windows.Forms.Label lbl_1_4; + private System.Windows.Forms.Label lbl_1_3; + private System.Windows.Forms.Label lbl_1_2; + private System.Windows.Forms.Label lbl_1_1; + private System.Windows.Forms.ComboBox combo_1_4; + private System.Windows.Forms.ComboBox combo_1_3; + private System.Windows.Forms.ComboBox combo_1_2; + private System.Windows.Forms.ComboBox combo_1_1; + private System.Windows.Forms.CheckBox cbMemcard_1; + private System.Windows.Forms.Button btnOK; + private System.Windows.Forms.Button btnCancel; + private System.Windows.Forms.GroupBox groupBox2; + private System.Windows.Forms.Label lbl_p_2_4; + private System.Windows.Forms.Label lbl_p_2_3; + private System.Windows.Forms.Label lbl_p_2_2; + private System.Windows.Forms.Label lbl_p_2_1; + private System.Windows.Forms.Label lbl_2_4; + private System.Windows.Forms.Label lbl_2_3; + private System.Windows.Forms.Label lbl_2_2; + private System.Windows.Forms.Label lbl_2_1; + private System.Windows.Forms.ComboBox combo_2_4; + private System.Windows.Forms.ComboBox combo_2_3; + private System.Windows.Forms.ComboBox combo_2_2; + private System.Windows.Forms.ComboBox combo_2_1; + private System.Windows.Forms.CheckBox cbMemcard_2; + private System.Windows.Forms.CheckBox cbMultitap_2; + } +} \ No newline at end of file diff --git a/BizHawk.Client.EmuHawk/config/PSX/PSXControllerConfigNew.cs b/BizHawk.Client.EmuHawk/config/PSX/PSXControllerConfigNew.cs new file mode 100644 index 0000000000..9922ba0bae --- /dev/null +++ b/BizHawk.Client.EmuHawk/config/PSX/PSXControllerConfigNew.cs @@ -0,0 +1,105 @@ +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; + +using BizHawk.Common; +using BizHawk.Emulation.Cores.Sony.PSX; +using BizHawk.Client.Common; +using BizHawk.Client.EmuHawk.WinFormExtensions; +using BizHawk.Common.ReflectionExtensions; + +namespace BizHawk.Client.EmuHawk +{ + public partial class PSXControllerConfigNew : Form + { + public PSXControllerConfigNew() + { + InitializeComponent(); + } + + private void PSXControllerConfigNew_Load(object sender, EventArgs e) + { + //populate combo boxes + foreach(var combo in new[]{combo_1_1,combo_1_2,combo_1_3,combo_1_4,combo_2_1,combo_2_2,combo_2_3,combo_2_4}) + { + combo.Items.Add("-Nothing-"); + combo.Items.Add("Gamepad"); + combo.Items.Add("Dual Shock"); + combo.Items.Add("Dual Analog"); + combo.SelectedIndex = 0; + } + + RefreshLabels(); + } + + void RefreshLabels() + { + bool multitap_1 = cbMultitap_1.Checked; + bool multitap_2 = cbMultitap_2.Checked; + + bool b1 = multitap_1; + lbl_1_1.Visible = b1; + lbl_1_2.Visible = b1; + lbl_1_3.Visible = b1; + lbl_1_4.Visible = b1; + combo_1_2.Enabled = b1; + combo_1_3.Enabled = b1; + combo_1_4.Enabled = b1; + lbl_p_1_2.Visible = b1; + lbl_p_1_3.Visible = b1; + lbl_p_1_4.Visible = b1; + + bool b2 = multitap_2; + lbl_2_1.Visible = b2; + lbl_2_2.Visible = b2; + lbl_2_3.Visible = b2; + lbl_2_4.Visible = b2; + combo_2_2.Enabled = b2; + combo_2_3.Enabled = b2; + combo_2_4.Enabled = b2; + lbl_p_2_2.Visible = b2; + lbl_p_2_3.Visible = b2; + lbl_p_2_4.Visible = b2; + + int id = 1; + List Assignments = new List(); + if (combo_1_1.SelectedIndex == 0) Assignments.Add(-1); else Assignments.Add(id++); + if (combo_1_2.SelectedIndex == 0 || !multitap_1) Assignments.Add(-1); else Assignments.Add(id++); + if (combo_1_3.SelectedIndex == 0 || !multitap_1) Assignments.Add(-1); else Assignments.Add(id++); + if (combo_1_4.SelectedIndex == 0 || !multitap_1) Assignments.Add(-1); else Assignments.Add(id++); + if (combo_2_1.SelectedIndex == 0) Assignments.Add(-1); else Assignments.Add(id++); + if (combo_2_2.SelectedIndex == 0 || !multitap_2) Assignments.Add(-1); else Assignments.Add(id++); + if (combo_2_3.SelectedIndex == 0 || !multitap_2) Assignments.Add(-1); else Assignments.Add(id++); + if (combo_2_4.SelectedIndex == 0 || !multitap_2) Assignments.Add(-1); else Assignments.Add(id++); + + var p_labels = new[] { lbl_p_1_1,lbl_p_1_2,lbl_p_1_3,lbl_p_1_4,lbl_p_2_1,lbl_p_2_2,lbl_p_2_3,lbl_p_2_4}; + for (int i = 0; i < 8; i++) + { + var lbl = p_labels[i]; + if (Assignments[i] == -1) + lbl.Visible = false; + else + { + lbl.Text = "P" + Assignments[i]; + lbl.Visible = true; + } + } + + } + + private void cb_changed(object sender, EventArgs e) + { + RefreshLabels(); + } + + private void combo_SelectedIndexChanged(object sender, EventArgs e) + { + RefreshLabels(); + } + } +} diff --git a/BizHawk.Client.EmuHawk/config/PSX/PSXControllerConfigNew.resx b/BizHawk.Client.EmuHawk/config/PSX/PSXControllerConfigNew.resx new file mode 100644 index 0000000000..1af7de150c --- /dev/null +++ b/BizHawk.Client.EmuHawk/config/PSX/PSXControllerConfigNew.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