CHecking in a possible better solution for a controller config dialog

This commit is contained in:
adelikat 2012-08-13 01:22:02 +00:00
parent a5e369b872
commit aa2475806a
5 changed files with 3760 additions and 6 deletions

View File

@ -152,6 +152,12 @@
<Compile Include="config\AutofireConfig.Designer.cs">
<DependentUpon>AutofireConfig.cs</DependentUpon>
</Compile>
<Compile Include="config\ControllerConfig.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="config\ControllerConfig.Designer.cs">
<DependentUpon>ControllerConfig.cs</DependentUpon>
</Compile>
<Compile Include="config\GifAnimator.cs">
<SubType>Form</SubType>
</Compile>
@ -376,6 +382,9 @@
<EmbeddedResource Include="AVOut\VideoWriterChooserForm.resx">
<DependentUpon>VideoWriterChooserForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="config\ControllerConfig.resx">
<DependentUpon>ControllerConfig.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="config\GifAnimator.resx">
<DependentUpon>GifAnimator.cs</DependentUpon>
</EmbeddedResource>

View File

@ -392,13 +392,26 @@ 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)
{
InitControls();
SyncControls();
InputConfig i = new InputConfig();
i.ShowDialog();
//re-initialize controls in case anything was changed
if (i.DialogResult == DialogResult.OK)
{
InitControls();
SyncControls();
}
}
else
{
ControllerConfig c = new ControllerConfig();
c.ShowDialog();
if (c.DialogResult == DialogResult.OK)
{
InitControls();
SyncControls();
}
}
}

View File

@ -0,0 +1,905 @@
namespace BizHawk.MultiClient
{
partial class ControllerConfig
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ControllerConfig));
this.ControllerTabs = new System.Windows.Forms.TabControl();
this.NESTab = new System.Windows.Forms.TabPage();
this.NESControllerImage = new System.Windows.Forms.PictureBox();
this.NESJoypadTabs = new System.Windows.Forms.TabControl();
this.NESJoypad1Tab = new System.Windows.Forms.TabPage();
this.label5 = new System.Windows.Forms.Label();
this.label6 = new System.Windows.Forms.Label();
this.NESC1StartBox = new BizHawk.MultiClient.InputWidget();
this.NESC1SelectBox = new BizHawk.MultiClient.InputWidget();
this.label7 = new System.Windows.Forms.Label();
this.label8 = new System.Windows.Forms.Label();
this.NESC1BBox = new BizHawk.MultiClient.InputWidget();
this.NESC1ABox = new BizHawk.MultiClient.InputWidget();
this.label3 = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label();
this.NESC1RightBox = new BizHawk.MultiClient.InputWidget();
this.NESC1LeftBox = new BizHawk.MultiClient.InputWidget();
this.label2 = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label();
this.NESC1DownBox = new BizHawk.MultiClient.InputWidget();
this.NESC1UpBox = new BizHawk.MultiClient.InputWidget();
this.NESJoypad2Tab = new System.Windows.Forms.TabPage();
this.label9 = new System.Windows.Forms.Label();
this.label10 = new System.Windows.Forms.Label();
this.label11 = new System.Windows.Forms.Label();
this.label12 = new System.Windows.Forms.Label();
this.label13 = new System.Windows.Forms.Label();
this.label14 = new System.Windows.Forms.Label();
this.label15 = new System.Windows.Forms.Label();
this.label16 = new System.Windows.Forms.Label();
this.inputWidget1 = new BizHawk.MultiClient.InputWidget();
this.inputWidget2 = new BizHawk.MultiClient.InputWidget();
this.inputWidget3 = new BizHawk.MultiClient.InputWidget();
this.inputWidget4 = new BizHawk.MultiClient.InputWidget();
this.inputWidget5 = new BizHawk.MultiClient.InputWidget();
this.inputWidget6 = new BizHawk.MultiClient.InputWidget();
this.inputWidget7 = new BizHawk.MultiClient.InputWidget();
this.inputWidget8 = new BizHawk.MultiClient.InputWidget();
this.NESJoypad3Tab = new System.Windows.Forms.TabPage();
this.label17 = new System.Windows.Forms.Label();
this.label18 = new System.Windows.Forms.Label();
this.label19 = new System.Windows.Forms.Label();
this.label20 = new System.Windows.Forms.Label();
this.label21 = new System.Windows.Forms.Label();
this.label22 = new System.Windows.Forms.Label();
this.label23 = new System.Windows.Forms.Label();
this.label24 = new System.Windows.Forms.Label();
this.inputWidget9 = new BizHawk.MultiClient.InputWidget();
this.inputWidget10 = new BizHawk.MultiClient.InputWidget();
this.inputWidget11 = new BizHawk.MultiClient.InputWidget();
this.inputWidget12 = new BizHawk.MultiClient.InputWidget();
this.inputWidget13 = new BizHawk.MultiClient.InputWidget();
this.inputWidget14 = new BizHawk.MultiClient.InputWidget();
this.inputWidget15 = new BizHawk.MultiClient.InputWidget();
this.inputWidget16 = new BizHawk.MultiClient.InputWidget();
this.NESJoypad4 = new System.Windows.Forms.TabPage();
this.NESAutopad1 = new System.Windows.Forms.TabPage();
this.NESAutopad2 = new System.Windows.Forms.TabPage();
this.NESAutofire3 = new System.Windows.Forms.TabPage();
this.NESAutofire4 = new System.Windows.Forms.TabPage();
this.GameboyTab = new System.Windows.Forms.TabPage();
this.GenesisTab = new System.Windows.Forms.TabPage();
this.SMSTab = new System.Windows.Forms.TabPage();
this.AutotabCheckbox = new System.Windows.Forms.CheckBox();
this.label38 = new System.Windows.Forms.Label();
this.OK = new System.Windows.Forms.Button();
this.Cancel = new System.Windows.Forms.Button();
this.AllowLR = new System.Windows.Forms.CheckBox();
this.ControllerTabs.SuspendLayout();
this.NESTab.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.NESControllerImage)).BeginInit();
this.NESJoypadTabs.SuspendLayout();
this.NESJoypad1Tab.SuspendLayout();
this.NESJoypad2Tab.SuspendLayout();
this.NESJoypad3Tab.SuspendLayout();
this.SuspendLayout();
//
// ControllerTabs
//
this.ControllerTabs.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.ControllerTabs.Controls.Add(this.NESTab);
this.ControllerTabs.Controls.Add(this.GameboyTab);
this.ControllerTabs.Controls.Add(this.GenesisTab);
this.ControllerTabs.Controls.Add(this.SMSTab);
this.ControllerTabs.Location = new System.Drawing.Point(12, 35);
this.ControllerTabs.Name = "ControllerTabs";
this.ControllerTabs.SelectedIndex = 0;
this.ControllerTabs.Size = new System.Drawing.Size(805, 387);
this.ControllerTabs.TabIndex = 0;
//
// NESTab
//
this.NESTab.Controls.Add(this.NESControllerImage);
this.NESTab.Controls.Add(this.NESJoypadTabs);
this.NESTab.Location = new System.Drawing.Point(4, 22);
this.NESTab.Name = "NESTab";
this.NESTab.Padding = new System.Windows.Forms.Padding(3);
this.NESTab.Size = new System.Drawing.Size(797, 361);
this.NESTab.TabIndex = 0;
this.NESTab.Text = "NES";
this.NESTab.UseVisualStyleBackColor = true;
//
// NESControllerImage
//
this.NESControllerImage.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Right)));
this.NESControllerImage.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
this.NESControllerImage.Image = global::BizHawk.MultiClient.Properties.Resources.NESController;
this.NESControllerImage.Location = new System.Drawing.Point(481, 38);
this.NESControllerImage.Name = "NESControllerImage";
this.NESControllerImage.Size = new System.Drawing.Size(310, 295);
this.NESControllerImage.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
this.NESControllerImage.TabIndex = 4;
this.NESControllerImage.TabStop = false;
//
// NESJoypadTabs
//
this.NESJoypadTabs.Controls.Add(this.NESJoypad1Tab);
this.NESJoypadTabs.Controls.Add(this.NESJoypad2Tab);
this.NESJoypadTabs.Controls.Add(this.NESJoypad3Tab);
this.NESJoypadTabs.Controls.Add(this.NESJoypad4);
this.NESJoypadTabs.Controls.Add(this.NESAutopad1);
this.NESJoypadTabs.Controls.Add(this.NESAutopad2);
this.NESJoypadTabs.Controls.Add(this.NESAutofire3);
this.NESJoypadTabs.Controls.Add(this.NESAutofire4);
this.NESJoypadTabs.Location = new System.Drawing.Point(17, 16);
this.NESJoypadTabs.Name = "NESJoypadTabs";
this.NESJoypadTabs.SelectedIndex = 0;
this.NESJoypadTabs.Size = new System.Drawing.Size(458, 321);
this.NESJoypadTabs.TabIndex = 0;
//
// NESJoypad1Tab
//
this.NESJoypad1Tab.Controls.Add(this.label5);
this.NESJoypad1Tab.Controls.Add(this.label6);
this.NESJoypad1Tab.Controls.Add(this.NESC1StartBox);
this.NESJoypad1Tab.Controls.Add(this.NESC1SelectBox);
this.NESJoypad1Tab.Controls.Add(this.label7);
this.NESJoypad1Tab.Controls.Add(this.label8);
this.NESJoypad1Tab.Controls.Add(this.NESC1BBox);
this.NESJoypad1Tab.Controls.Add(this.NESC1ABox);
this.NESJoypad1Tab.Controls.Add(this.label3);
this.NESJoypad1Tab.Controls.Add(this.label4);
this.NESJoypad1Tab.Controls.Add(this.NESC1RightBox);
this.NESJoypad1Tab.Controls.Add(this.NESC1LeftBox);
this.NESJoypad1Tab.Controls.Add(this.label2);
this.NESJoypad1Tab.Controls.Add(this.label1);
this.NESJoypad1Tab.Controls.Add(this.NESC1DownBox);
this.NESJoypad1Tab.Controls.Add(this.NESC1UpBox);
this.NESJoypad1Tab.Location = new System.Drawing.Point(4, 22);
this.NESJoypad1Tab.Name = "NESJoypad1Tab";
this.NESJoypad1Tab.Padding = new System.Windows.Forms.Padding(3);
this.NESJoypad1Tab.Size = new System.Drawing.Size(450, 295);
this.NESJoypad1Tab.TabIndex = 0;
this.NESJoypad1Tab.Text = "Joypad 1";
this.NESJoypad1Tab.UseVisualStyleBackColor = true;
//
// label5
//
this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(10, 203);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(29, 13);
this.label5.TabIndex = 17;
this.label5.Text = "Start";
//
// label6
//
this.label6.AutoSize = true;
this.label6.Location = new System.Drawing.Point(10, 177);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(37, 13);
this.label6.TabIndex = 16;
this.label6.Text = "Select";
//
// NESC1StartBox
//
this.NESC1StartBox.AcceptsTab = true;
this.NESC1StartBox.BackColor = System.Drawing.SystemColors.Window;
this.NESC1StartBox.Location = new System.Drawing.Point(70, 200);
this.NESC1StartBox.Name = "NESC1StartBox";
this.NESC1StartBox.Size = new System.Drawing.Size(100, 20);
this.NESC1StartBox.TabIndex = 8;
//
// NESC1SelectBox
//
this.NESC1SelectBox.AcceptsTab = true;
this.NESC1SelectBox.BackColor = System.Drawing.SystemColors.Window;
this.NESC1SelectBox.Location = new System.Drawing.Point(70, 174);
this.NESC1SelectBox.Name = "NESC1SelectBox";
this.NESC1SelectBox.Size = new System.Drawing.Size(100, 20);
this.NESC1SelectBox.TabIndex = 7;
//
// label7
//
this.label7.AutoSize = true;
this.label7.Location = new System.Drawing.Point(10, 151);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(14, 13);
this.label7.TabIndex = 13;
this.label7.Text = "B";
//
// label8
//
this.label8.AutoSize = true;
this.label8.Location = new System.Drawing.Point(10, 125);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(14, 13);
this.label8.TabIndex = 12;
this.label8.Text = "A";
//
// NESC1BBox
//
this.NESC1BBox.AcceptsTab = true;
this.NESC1BBox.BackColor = System.Drawing.SystemColors.Window;
this.NESC1BBox.Location = new System.Drawing.Point(70, 148);
this.NESC1BBox.Name = "NESC1BBox";
this.NESC1BBox.Size = new System.Drawing.Size(100, 20);
this.NESC1BBox.TabIndex = 6;
//
// NESC1ABox
//
this.NESC1ABox.AcceptsTab = true;
this.NESC1ABox.BackColor = System.Drawing.SystemColors.Window;
this.NESC1ABox.Location = new System.Drawing.Point(70, 122);
this.NESC1ABox.Name = "NESC1ABox";
this.NESC1ABox.Size = new System.Drawing.Size(100, 20);
this.NESC1ABox.TabIndex = 5;
//
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(10, 99);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(32, 13);
this.label3.TabIndex = 9;
this.label3.Text = "Right";
//
// label4
//
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(10, 73);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(25, 13);
this.label4.TabIndex = 8;
this.label4.Text = "Left";
//
// NESC1RightBox
//
this.NESC1RightBox.AcceptsTab = true;
this.NESC1RightBox.BackColor = System.Drawing.SystemColors.Window;
this.NESC1RightBox.Location = new System.Drawing.Point(70, 96);
this.NESC1RightBox.Name = "NESC1RightBox";
this.NESC1RightBox.Size = new System.Drawing.Size(100, 20);
this.NESC1RightBox.TabIndex = 4;
//
// NESC1LeftBox
//
this.NESC1LeftBox.AcceptsTab = true;
this.NESC1LeftBox.BackColor = System.Drawing.SystemColors.Window;
this.NESC1LeftBox.Location = new System.Drawing.Point(70, 70);
this.NESC1LeftBox.Name = "NESC1LeftBox";
this.NESC1LeftBox.Size = new System.Drawing.Size(100, 20);
this.NESC1LeftBox.TabIndex = 3;
//
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(10, 47);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(35, 13);
this.label2.TabIndex = 5;
this.label2.Text = "Down";
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(10, 21);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(21, 13);
this.label1.TabIndex = 4;
this.label1.Text = "Up";
//
// NESC1DownBox
//
this.NESC1DownBox.AcceptsTab = true;
this.NESC1DownBox.BackColor = System.Drawing.SystemColors.Window;
this.NESC1DownBox.Location = new System.Drawing.Point(70, 44);
this.NESC1DownBox.Name = "NESC1DownBox";
this.NESC1DownBox.Size = new System.Drawing.Size(100, 20);
this.NESC1DownBox.TabIndex = 2;
//
// NESC1UpBox
//
this.NESC1UpBox.AcceptsTab = true;
this.NESC1UpBox.BackColor = System.Drawing.SystemColors.Window;
this.NESC1UpBox.Location = new System.Drawing.Point(70, 18);
this.NESC1UpBox.Name = "NESC1UpBox";
this.NESC1UpBox.Size = new System.Drawing.Size(100, 20);
this.NESC1UpBox.TabIndex = 1;
//
// NESJoypad2Tab
//
this.NESJoypad2Tab.Controls.Add(this.label9);
this.NESJoypad2Tab.Controls.Add(this.label10);
this.NESJoypad2Tab.Controls.Add(this.label11);
this.NESJoypad2Tab.Controls.Add(this.label12);
this.NESJoypad2Tab.Controls.Add(this.label13);
this.NESJoypad2Tab.Controls.Add(this.label14);
this.NESJoypad2Tab.Controls.Add(this.label15);
this.NESJoypad2Tab.Controls.Add(this.label16);
this.NESJoypad2Tab.Controls.Add(this.inputWidget1);
this.NESJoypad2Tab.Controls.Add(this.inputWidget2);
this.NESJoypad2Tab.Controls.Add(this.inputWidget3);
this.NESJoypad2Tab.Controls.Add(this.inputWidget4);
this.NESJoypad2Tab.Controls.Add(this.inputWidget5);
this.NESJoypad2Tab.Controls.Add(this.inputWidget6);
this.NESJoypad2Tab.Controls.Add(this.inputWidget7);
this.NESJoypad2Tab.Controls.Add(this.inputWidget8);
this.NESJoypad2Tab.Location = new System.Drawing.Point(4, 22);
this.NESJoypad2Tab.Name = "NESJoypad2Tab";
this.NESJoypad2Tab.Padding = new System.Windows.Forms.Padding(3);
this.NESJoypad2Tab.Size = new System.Drawing.Size(450, 295);
this.NESJoypad2Tab.TabIndex = 1;
this.NESJoypad2Tab.Text = "Joypad 2";
this.NESJoypad2Tab.UseVisualStyleBackColor = true;
//
// label9
//
this.label9.AutoSize = true;
this.label9.Location = new System.Drawing.Point(15, 202);
this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(29, 13);
this.label9.TabIndex = 33;
this.label9.Text = "Start";
//
// label10
//
this.label10.AutoSize = true;
this.label10.Location = new System.Drawing.Point(15, 176);
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(37, 13);
this.label10.TabIndex = 32;
this.label10.Text = "Select";
//
// label11
//
this.label11.AutoSize = true;
this.label11.Location = new System.Drawing.Point(15, 150);
this.label11.Name = "label11";
this.label11.Size = new System.Drawing.Size(14, 13);
this.label11.TabIndex = 29;
this.label11.Text = "B";
//
// label12
//
this.label12.AutoSize = true;
this.label12.Location = new System.Drawing.Point(15, 124);
this.label12.Name = "label12";
this.label12.Size = new System.Drawing.Size(14, 13);
this.label12.TabIndex = 28;
this.label12.Text = "A";
//
// label13
//
this.label13.AutoSize = true;
this.label13.Location = new System.Drawing.Point(15, 98);
this.label13.Name = "label13";
this.label13.Size = new System.Drawing.Size(32, 13);
this.label13.TabIndex = 25;
this.label13.Text = "Right";
//
// label14
//
this.label14.AutoSize = true;
this.label14.Location = new System.Drawing.Point(15, 72);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(25, 13);
this.label14.TabIndex = 24;
this.label14.Text = "Left";
//
// label15
//
this.label15.AutoSize = true;
this.label15.Location = new System.Drawing.Point(15, 46);
this.label15.Name = "label15";
this.label15.Size = new System.Drawing.Size(35, 13);
this.label15.TabIndex = 21;
this.label15.Text = "Down";
//
// label16
//
this.label16.AutoSize = true;
this.label16.Location = new System.Drawing.Point(15, 20);
this.label16.Name = "label16";
this.label16.Size = new System.Drawing.Size(21, 13);
this.label16.TabIndex = 20;
this.label16.Text = "Up";
//
// inputWidget1
//
this.inputWidget1.AcceptsTab = true;
this.inputWidget1.BackColor = System.Drawing.SystemColors.Window;
this.inputWidget1.Location = new System.Drawing.Point(75, 199);
this.inputWidget1.Name = "inputWidget1";
this.inputWidget1.Size = new System.Drawing.Size(100, 20);
this.inputWidget1.TabIndex = 31;
//
// inputWidget2
//
this.inputWidget2.AcceptsTab = true;
this.inputWidget2.BackColor = System.Drawing.SystemColors.Window;
this.inputWidget2.Location = new System.Drawing.Point(75, 173);
this.inputWidget2.Name = "inputWidget2";
this.inputWidget2.Size = new System.Drawing.Size(100, 20);
this.inputWidget2.TabIndex = 30;
//
// inputWidget3
//
this.inputWidget3.AcceptsTab = true;
this.inputWidget3.BackColor = System.Drawing.SystemColors.Window;
this.inputWidget3.Location = new System.Drawing.Point(75, 147);
this.inputWidget3.Name = "inputWidget3";
this.inputWidget3.Size = new System.Drawing.Size(100, 20);
this.inputWidget3.TabIndex = 27;
//
// inputWidget4
//
this.inputWidget4.AcceptsTab = true;
this.inputWidget4.BackColor = System.Drawing.SystemColors.Window;
this.inputWidget4.Location = new System.Drawing.Point(75, 121);
this.inputWidget4.Name = "inputWidget4";
this.inputWidget4.Size = new System.Drawing.Size(100, 20);
this.inputWidget4.TabIndex = 26;
//
// inputWidget5
//
this.inputWidget5.AcceptsTab = true;
this.inputWidget5.BackColor = System.Drawing.SystemColors.Window;
this.inputWidget5.Location = new System.Drawing.Point(75, 95);
this.inputWidget5.Name = "inputWidget5";
this.inputWidget5.Size = new System.Drawing.Size(100, 20);
this.inputWidget5.TabIndex = 23;
//
// inputWidget6
//
this.inputWidget6.AcceptsTab = true;
this.inputWidget6.BackColor = System.Drawing.SystemColors.Window;
this.inputWidget6.Location = new System.Drawing.Point(75, 69);
this.inputWidget6.Name = "inputWidget6";
this.inputWidget6.Size = new System.Drawing.Size(100, 20);
this.inputWidget6.TabIndex = 22;
//
// inputWidget7
//
this.inputWidget7.AcceptsTab = true;
this.inputWidget7.BackColor = System.Drawing.SystemColors.Window;
this.inputWidget7.Location = new System.Drawing.Point(75, 43);
this.inputWidget7.Name = "inputWidget7";
this.inputWidget7.Size = new System.Drawing.Size(100, 20);
this.inputWidget7.TabIndex = 19;
//
// inputWidget8
//
this.inputWidget8.AcceptsTab = true;
this.inputWidget8.BackColor = System.Drawing.SystemColors.Window;
this.inputWidget8.Location = new System.Drawing.Point(75, 17);
this.inputWidget8.Name = "inputWidget8";
this.inputWidget8.Size = new System.Drawing.Size(100, 20);
this.inputWidget8.TabIndex = 18;
//
// NESJoypad3Tab
//
this.NESJoypad3Tab.Controls.Add(this.label17);
this.NESJoypad3Tab.Controls.Add(this.label18);
this.NESJoypad3Tab.Controls.Add(this.label19);
this.NESJoypad3Tab.Controls.Add(this.label20);
this.NESJoypad3Tab.Controls.Add(this.label21);
this.NESJoypad3Tab.Controls.Add(this.label22);
this.NESJoypad3Tab.Controls.Add(this.label23);
this.NESJoypad3Tab.Controls.Add(this.label24);
this.NESJoypad3Tab.Controls.Add(this.inputWidget9);
this.NESJoypad3Tab.Controls.Add(this.inputWidget10);
this.NESJoypad3Tab.Controls.Add(this.inputWidget11);
this.NESJoypad3Tab.Controls.Add(this.inputWidget12);
this.NESJoypad3Tab.Controls.Add(this.inputWidget13);
this.NESJoypad3Tab.Controls.Add(this.inputWidget14);
this.NESJoypad3Tab.Controls.Add(this.inputWidget15);
this.NESJoypad3Tab.Controls.Add(this.inputWidget16);
this.NESJoypad3Tab.Location = new System.Drawing.Point(4, 22);
this.NESJoypad3Tab.Name = "NESJoypad3Tab";
this.NESJoypad3Tab.Size = new System.Drawing.Size(450, 295);
this.NESJoypad3Tab.TabIndex = 2;
this.NESJoypad3Tab.Text = "Joypad 3";
this.NESJoypad3Tab.UseVisualStyleBackColor = true;
//
// label17
//
this.label17.AutoSize = true;
this.label17.Location = new System.Drawing.Point(24, 204);
this.label17.Name = "label17";
this.label17.Size = new System.Drawing.Size(29, 13);
this.label17.TabIndex = 49;
this.label17.Text = "Start";
//
// label18
//
this.label18.AutoSize = true;
this.label18.Location = new System.Drawing.Point(24, 178);
this.label18.Name = "label18";
this.label18.Size = new System.Drawing.Size(37, 13);
this.label18.TabIndex = 48;
this.label18.Text = "Select";
//
// label19
//
this.label19.AutoSize = true;
this.label19.Location = new System.Drawing.Point(24, 152);
this.label19.Name = "label19";
this.label19.Size = new System.Drawing.Size(14, 13);
this.label19.TabIndex = 45;
this.label19.Text = "B";
//
// label20
//
this.label20.AutoSize = true;
this.label20.Location = new System.Drawing.Point(24, 126);
this.label20.Name = "label20";
this.label20.Size = new System.Drawing.Size(14, 13);
this.label20.TabIndex = 44;
this.label20.Text = "A";
//
// label21
//
this.label21.AutoSize = true;
this.label21.Location = new System.Drawing.Point(24, 100);
this.label21.Name = "label21";
this.label21.Size = new System.Drawing.Size(32, 13);
this.label21.TabIndex = 41;
this.label21.Text = "Right";
//
// label22
//
this.label22.AutoSize = true;
this.label22.Location = new System.Drawing.Point(24, 74);
this.label22.Name = "label22";
this.label22.Size = new System.Drawing.Size(25, 13);
this.label22.TabIndex = 40;
this.label22.Text = "Left";
//
// label23
//
this.label23.AutoSize = true;
this.label23.Location = new System.Drawing.Point(24, 48);
this.label23.Name = "label23";
this.label23.Size = new System.Drawing.Size(35, 13);
this.label23.TabIndex = 37;
this.label23.Text = "Down";
//
// label24
//
this.label24.AutoSize = true;
this.label24.Location = new System.Drawing.Point(24, 22);
this.label24.Name = "label24";
this.label24.Size = new System.Drawing.Size(21, 13);
this.label24.TabIndex = 36;
this.label24.Text = "Up";
//
// inputWidget9
//
this.inputWidget9.AcceptsTab = true;
this.inputWidget9.BackColor = System.Drawing.SystemColors.Window;
this.inputWidget9.Location = new System.Drawing.Point(84, 201);
this.inputWidget9.Name = "inputWidget9";
this.inputWidget9.Size = new System.Drawing.Size(100, 20);
this.inputWidget9.TabIndex = 47;
//
// inputWidget10
//
this.inputWidget10.AcceptsTab = true;
this.inputWidget10.BackColor = System.Drawing.SystemColors.Window;
this.inputWidget10.Location = new System.Drawing.Point(84, 175);
this.inputWidget10.Name = "inputWidget10";
this.inputWidget10.Size = new System.Drawing.Size(100, 20);
this.inputWidget10.TabIndex = 46;
//
// inputWidget11
//
this.inputWidget11.AcceptsTab = true;
this.inputWidget11.BackColor = System.Drawing.SystemColors.Window;
this.inputWidget11.Location = new System.Drawing.Point(84, 149);
this.inputWidget11.Name = "inputWidget11";
this.inputWidget11.Size = new System.Drawing.Size(100, 20);
this.inputWidget11.TabIndex = 43;
//
// inputWidget12
//
this.inputWidget12.AcceptsTab = true;
this.inputWidget12.BackColor = System.Drawing.SystemColors.Window;
this.inputWidget12.Location = new System.Drawing.Point(84, 123);
this.inputWidget12.Name = "inputWidget12";
this.inputWidget12.Size = new System.Drawing.Size(100, 20);
this.inputWidget12.TabIndex = 42;
//
// inputWidget13
//
this.inputWidget13.AcceptsTab = true;
this.inputWidget13.BackColor = System.Drawing.SystemColors.Window;
this.inputWidget13.Location = new System.Drawing.Point(84, 97);
this.inputWidget13.Name = "inputWidget13";
this.inputWidget13.Size = new System.Drawing.Size(100, 20);
this.inputWidget13.TabIndex = 39;
//
// inputWidget14
//
this.inputWidget14.AcceptsTab = true;
this.inputWidget14.BackColor = System.Drawing.SystemColors.Window;
this.inputWidget14.Location = new System.Drawing.Point(84, 71);
this.inputWidget14.Name = "inputWidget14";
this.inputWidget14.Size = new System.Drawing.Size(100, 20);
this.inputWidget14.TabIndex = 38;
//
// inputWidget15
//
this.inputWidget15.AcceptsTab = true;
this.inputWidget15.BackColor = System.Drawing.SystemColors.Window;
this.inputWidget15.Location = new System.Drawing.Point(84, 45);
this.inputWidget15.Name = "inputWidget15";
this.inputWidget15.Size = new System.Drawing.Size(100, 20);
this.inputWidget15.TabIndex = 35;
//
// inputWidget16
//
this.inputWidget16.AcceptsTab = true;
this.inputWidget16.BackColor = System.Drawing.SystemColors.Window;
this.inputWidget16.Location = new System.Drawing.Point(84, 19);
this.inputWidget16.Name = "inputWidget16";
this.inputWidget16.Size = new System.Drawing.Size(100, 20);
this.inputWidget16.TabIndex = 34;
//
// NESJoypad4
//
this.NESJoypad4.Location = new System.Drawing.Point(4, 22);
this.NESJoypad4.Name = "NESJoypad4";
this.NESJoypad4.Size = new System.Drawing.Size(450, 295);
this.NESJoypad4.TabIndex = 3;
this.NESJoypad4.Text = "Joypad 4";
this.NESJoypad4.UseVisualStyleBackColor = true;
//
// NESAutopad1
//
this.NESAutopad1.Location = new System.Drawing.Point(4, 22);
this.NESAutopad1.Name = "NESAutopad1";
this.NESAutopad1.Size = new System.Drawing.Size(450, 295);
this.NESAutopad1.TabIndex = 4;
this.NESAutopad1.Text = "Autofire 1";
this.NESAutopad1.UseVisualStyleBackColor = true;
//
// NESAutopad2
//
this.NESAutopad2.Location = new System.Drawing.Point(4, 22);
this.NESAutopad2.Name = "NESAutopad2";
this.NESAutopad2.Size = new System.Drawing.Size(450, 295);
this.NESAutopad2.TabIndex = 5;
this.NESAutopad2.Text = "Autofire 2";
this.NESAutopad2.UseVisualStyleBackColor = true;
//
// NESAutofire3
//
this.NESAutofire3.Location = new System.Drawing.Point(4, 22);
this.NESAutofire3.Name = "NESAutofire3";
this.NESAutofire3.Size = new System.Drawing.Size(450, 295);
this.NESAutofire3.TabIndex = 6;
this.NESAutofire3.Text = "Autofire 3";
this.NESAutofire3.UseVisualStyleBackColor = true;
//
// NESAutofire4
//
this.NESAutofire4.Location = new System.Drawing.Point(4, 22);
this.NESAutofire4.Name = "NESAutofire4";
this.NESAutofire4.Size = new System.Drawing.Size(450, 295);
this.NESAutofire4.TabIndex = 7;
this.NESAutofire4.Text = "Autofire 4";
this.NESAutofire4.UseVisualStyleBackColor = true;
//
// GameboyTab
//
this.GameboyTab.Location = new System.Drawing.Point(4, 22);
this.GameboyTab.Name = "GameboyTab";
this.GameboyTab.Size = new System.Drawing.Size(797, 361);
this.GameboyTab.TabIndex = 2;
this.GameboyTab.Text = "Gameboy";
this.GameboyTab.UseVisualStyleBackColor = true;
//
// GenesisTab
//
this.GenesisTab.Location = new System.Drawing.Point(4, 22);
this.GenesisTab.Name = "GenesisTab";
this.GenesisTab.Padding = new System.Windows.Forms.Padding(3);
this.GenesisTab.Size = new System.Drawing.Size(797, 361);
this.GenesisTab.TabIndex = 1;
this.GenesisTab.Text = "Genesis";
this.GenesisTab.UseVisualStyleBackColor = true;
//
// SMSTab
//
this.SMSTab.Location = new System.Drawing.Point(4, 22);
this.SMSTab.Name = "SMSTab";
this.SMSTab.Size = new System.Drawing.Size(797, 361);
this.SMSTab.TabIndex = 3;
this.SMSTab.Text = "SMS/GG/SG-1000";
this.SMSTab.UseVisualStyleBackColor = true;
//
// AutotabCheckbox
//
this.AutotabCheckbox.AutoSize = true;
this.AutotabCheckbox.Location = new System.Drawing.Point(12, 12);
this.AutotabCheckbox.Name = "AutotabCheckbox";
this.AutotabCheckbox.Size = new System.Drawing.Size(70, 17);
this.AutotabCheckbox.TabIndex = 1;
this.AutotabCheckbox.Text = "Auto Tab";
this.AutotabCheckbox.UseVisualStyleBackColor = true;
this.AutotabCheckbox.CheckedChanged += new System.EventHandler(this.AutotabCheckbox_CheckedChanged);
//
// label38
//
this.label38.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.label38.AutoSize = true;
this.label38.Location = new System.Drawing.Point(13, 425);
this.label38.Name = "label38";
this.label38.Size = new System.Drawing.Size(153, 13);
this.label38.TabIndex = 10;
this.label38.Text = "* Escape clears a key mapping";
//
// 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(661, 428);
this.OK.Name = "OK";
this.OK.Size = new System.Drawing.Size(75, 23);
this.OK.TabIndex = 11;
this.OK.Text = "&Ok";
this.OK.UseVisualStyleBackColor = true;
this.OK.Click += new System.EventHandler(this.OK_Click);
//
// 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(742, 428);
this.Cancel.Name = "Cancel";
this.Cancel.Size = new System.Drawing.Size(75, 23);
this.Cancel.TabIndex = 12;
this.Cancel.Text = "&Cancel";
this.Cancel.UseVisualStyleBackColor = true;
this.Cancel.Click += new System.EventHandler(this.Cancel_Click);
//
// AllowLR
//
this.AllowLR.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.AllowLR.AutoSize = true;
this.AllowLR.Location = new System.Drawing.Point(548, 431);
this.AllowLR.Name = "AllowLR";
this.AllowLR.Size = new System.Drawing.Size(107, 17);
this.AllowLR.TabIndex = 13;
this.AllowLR.Text = "Allow L+R / U+D";
this.AllowLR.UseVisualStyleBackColor = true;
//
// ControllerConfig
//
this.AcceptButton = this.OK;
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.Cancel;
this.ClientSize = new System.Drawing.Size(833, 461);
this.Controls.Add(this.AllowLR);
this.Controls.Add(this.Cancel);
this.Controls.Add(this.OK);
this.Controls.Add(this.label38);
this.Controls.Add(this.AutotabCheckbox);
this.Controls.Add(this.ControllerTabs);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "ControllerConfig";
this.Text = "ControllerConfig";
this.Load += new System.EventHandler(this.ControllerConfig_Load);
this.ControllerTabs.ResumeLayout(false);
this.NESTab.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.NESControllerImage)).EndInit();
this.NESJoypadTabs.ResumeLayout(false);
this.NESJoypad1Tab.ResumeLayout(false);
this.NESJoypad1Tab.PerformLayout();
this.NESJoypad2Tab.ResumeLayout(false);
this.NESJoypad2Tab.PerformLayout();
this.NESJoypad3Tab.ResumeLayout(false);
this.NESJoypad3Tab.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
private System.Windows.Forms.TabControl ControllerTabs;
private System.Windows.Forms.TabPage NESTab;
private System.Windows.Forms.TabPage GenesisTab;
private System.Windows.Forms.CheckBox AutotabCheckbox;
private System.Windows.Forms.TabPage GameboyTab;
private System.Windows.Forms.TabControl NESJoypadTabs;
private System.Windows.Forms.TabPage NESJoypad1Tab;
private System.Windows.Forms.TabPage NESJoypad2Tab;
private System.Windows.Forms.TabPage NESJoypad3Tab;
private System.Windows.Forms.TabPage NESJoypad4;
private System.Windows.Forms.TabPage NESAutopad1;
private System.Windows.Forms.TabPage NESAutopad2;
private System.Windows.Forms.TabPage NESAutofire3;
private System.Windows.Forms.TabPage NESAutofire4;
private System.Windows.Forms.TabPage SMSTab;
private System.Windows.Forms.Label label38;
private System.Windows.Forms.Button OK;
private System.Windows.Forms.Button Cancel;
private System.Windows.Forms.CheckBox AllowLR;
private System.Windows.Forms.Label label5;
private System.Windows.Forms.Label label6;
private InputWidget NESC1StartBox;
private InputWidget NESC1SelectBox;
private System.Windows.Forms.Label label7;
private System.Windows.Forms.Label label8;
private InputWidget NESC1BBox;
private InputWidget NESC1ABox;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.Label label4;
private InputWidget NESC1RightBox;
private InputWidget NESC1LeftBox;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.Label label1;
private InputWidget NESC1DownBox;
private InputWidget NESC1UpBox;
private System.Windows.Forms.Label label9;
private System.Windows.Forms.Label label10;
private InputWidget inputWidget1;
private InputWidget inputWidget2;
private System.Windows.Forms.Label label11;
private System.Windows.Forms.Label label12;
private InputWidget inputWidget3;
private InputWidget inputWidget4;
private System.Windows.Forms.Label label13;
private System.Windows.Forms.Label label14;
private InputWidget inputWidget5;
private InputWidget inputWidget6;
private System.Windows.Forms.Label label15;
private System.Windows.Forms.Label label16;
private InputWidget inputWidget7;
private InputWidget inputWidget8;
private System.Windows.Forms.Label label17;
private System.Windows.Forms.Label label18;
private InputWidget inputWidget9;
private InputWidget inputWidget10;
private System.Windows.Forms.Label label19;
private System.Windows.Forms.Label label20;
private InputWidget inputWidget11;
private InputWidget inputWidget12;
private System.Windows.Forms.Label label21;
private System.Windows.Forms.Label label22;
private InputWidget inputWidget13;
private InputWidget inputWidget14;
private System.Windows.Forms.Label label23;
private System.Windows.Forms.Label label24;
private InputWidget inputWidget15;
private InputWidget inputWidget16;
private System.Windows.Forms.PictureBox NESControllerImage;
}
}

View File

@ -0,0 +1,94 @@
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)
{
LoadInputSettings();
}
private void AutotabCheckbox_CheckedChanged(object sender, EventArgs e)
{
}
private void OK_Click(object sender, EventArgs e)
{
SaveInputSettings();
Close();
}
private void Cancel_Click(object sender, EventArgs e)
{
Close();
}
private void SaveDialogSettings()
{
Global.Config.HotkeyConfigAutoTab = AutotabCheckbox.Checked; //TODO: use its own variable not hotkey dialog!
}
private void LoadDialogSettings()
{
AutotabCheckbox.Checked = Global.Config.HotkeyConfigAutoTab;
SetAutoTab();
}
private void SetAutoTab()
{
for (int i = 0; i < ControllerTabs.Controls.Count; i++)
{
if (ControllerTabs.Controls[i] is TabControl)
{
TabControl tc = ControllerTabs.Controls[i] as TabControl;
for (int j = 0; j < tc.TabPages[i].Controls.Count; j++)
{
if (tc.Controls[i].Controls[j] is InputWidget)
{
InputWidget w = tc.Controls[i].Controls[j] as InputWidget;
w.AutoTab = AutotabCheckbox.Checked;
}
}
}
}
}
private void LoadInputSettings()
{
NESC1UpBox.SetBindings(Global.Config.NESController[0].Up);
NESC1DownBox.SetBindings(Global.Config.NESController[0].Down);
NESC1LeftBox.SetBindings(Global.Config.NESController[0].Left);
NESC1RightBox.SetBindings(Global.Config.NESController[0].Right);
NESC1ABox.SetBindings(Global.Config.NESController[0].A);
NESC1BBox.SetBindings(Global.Config.NESController[0].B);
NESC1SelectBox.SetBindings(Global.Config.NESController[0].Select);
NESC1StartBox.SetBindings(Global.Config.NESController[0].Start);
}
private void SaveInputSettings()
{
Global.Config.NESController[0].Up = NESC1UpBox.Text;
Global.Config.NESController[0].Down = NESC1DownBox.Text;
Global.Config.NESController[0].Left = NESC1LeftBox.Text;
Global.Config.NESController[0].Right = NESC1RightBox.Text;
Global.Config.NESController[0].A = NESC1ABox.Text;
Global.Config.NESController[0].B = NESC1BBox.Text;
Global.Config.NESController[0].Select = NESC1SelectBox.Text;
Global.Config.NESController[0].Start = NESC1StartBox.Text;
}
}
}

File diff suppressed because it is too large Load Diff