From 500bbaf3c10e2feb5d80f657f715e88de2d1d0d2 Mon Sep 17 00:00:00 2001 From: adelikat Date: Wed, 4 Jun 2014 15:00:53 +0000 Subject: [PATCH] Controller Config - add a Clear button --- .../config/ControllerConfig.Designer.cs | 412 +++++++++--------- .../config/ControllerConfig.cs | 35 ++ .../AnalogBindControl.Designer.cs | 2 +- .../ControllerConfig/AnalogBindControl.cs | 2 +- .../config/InputCompositeWidget.cs | 2 +- BizHawk.Client.EmuHawk/config/InputWidget.cs | 6 + 6 files changed, 257 insertions(+), 202 deletions(-) diff --git a/BizHawk.Client.EmuHawk/config/ControllerConfig.Designer.cs b/BizHawk.Client.EmuHawk/config/ControllerConfig.Designer.cs index df398291c6..ce3089a047 100644 --- a/BizHawk.Client.EmuHawk/config/ControllerConfig.Designer.cs +++ b/BizHawk.Client.EmuHawk/config/ControllerConfig.Designer.cs @@ -28,209 +28,222 @@ /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ControllerConfig)); - this.tabControl1 = new System.Windows.Forms.TabControl(); - this.tabPage1 = new System.Windows.Forms.TabPage(); - this.tabPage2 = new System.Windows.Forms.TabPage(); - this.tabPage3 = new System.Windows.Forms.TabPage(); - this.label2 = new System.Windows.Forms.Label(); - this.checkBoxAutoTab = new System.Windows.Forms.CheckBox(); - this.checkBoxUDLR = new System.Windows.Forms.CheckBox(); - this.buttonOK = new System.Windows.Forms.Button(); - this.buttonCancel = new System.Windows.Forms.Button(); - this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.buttonLoadDefaults = new System.Windows.Forms.Button(); - this.buttonSaveDefaults = new System.Windows.Forms.Button(); - this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); - this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); - this.tabControl1.SuspendLayout(); - this.tableLayoutPanel1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); - this.SuspendLayout(); - // - // tabControl1 - // - this.tabControl1.Controls.Add(this.tabPage1); - this.tabControl1.Controls.Add(this.tabPage2); - this.tabControl1.Controls.Add(this.tabPage3); - this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tabControl1.Location = new System.Drawing.Point(3, 3); - this.tabControl1.Name = "tabControl1"; - this.tabControl1.SelectedIndex = 0; - this.tabControl1.Size = new System.Drawing.Size(562, 493); - this.tabControl1.TabIndex = 1; - // - // tabPage1 - // - 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(554, 467); - this.tabPage1.TabIndex = 0; - this.tabPage1.Text = "Normal Controls"; - this.tabPage1.UseVisualStyleBackColor = true; - // - // tabPage2 - // - 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(554, 467); - this.tabPage2.TabIndex = 1; - this.tabPage2.Text = "Autofire Controls"; - this.tabPage2.UseVisualStyleBackColor = true; - // - // tabPage3 - // - this.tabPage3.Location = new System.Drawing.Point(4, 22); - this.tabPage3.Name = "tabPage3"; - this.tabPage3.Size = new System.Drawing.Size(554, 467); - this.tabPage3.TabIndex = 2; - this.tabPage3.Text = "Analog Controls"; - this.tabPage3.UseVisualStyleBackColor = true; - // - // label2 - // - this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(12, 519); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(140, 13); - this.label2.TabIndex = 2; - this.label2.Text = "Escape clears a keybinding."; - // - // checkBoxAutoTab - // - this.checkBoxAutoTab.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.checkBoxAutoTab.AutoSize = true; - this.checkBoxAutoTab.Location = new System.Drawing.Point(187, 517); - this.checkBoxAutoTab.Name = "checkBoxAutoTab"; - this.checkBoxAutoTab.Size = new System.Drawing.Size(70, 17); - this.checkBoxAutoTab.TabIndex = 3; - this.checkBoxAutoTab.Text = "Auto Tab"; - this.checkBoxAutoTab.UseVisualStyleBackColor = true; - this.checkBoxAutoTab.CheckedChanged += new System.EventHandler(this.CheckBoxAutoTab_CheckedChanged); - // - // checkBoxUDLR - // - this.checkBoxUDLR.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.checkBoxUDLR.AutoSize = true; - this.checkBoxUDLR.Location = new System.Drawing.Point(263, 517); - this.checkBoxUDLR.Name = "checkBoxUDLR"; - this.checkBoxUDLR.Size = new System.Drawing.Size(101, 17); - this.checkBoxUDLR.TabIndex = 4; - this.checkBoxUDLR.Text = "Allow U+D/L+R"; - this.checkBoxUDLR.UseVisualStyleBackColor = true; - // - // buttonOK - // - this.buttonOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.buttonOK.Location = new System.Drawing.Point(764, 514); - this.buttonOK.Name = "buttonOK"; - this.buttonOK.Size = new System.Drawing.Size(75, 23); - this.buttonOK.TabIndex = 5; - this.buttonOK.Text = "&Save"; - this.buttonOK.UseVisualStyleBackColor = true; - this.buttonOK.Click += new System.EventHandler(this.ButtonOk_Click); - // - // buttonCancel - // - this.buttonCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.buttonCancel.Location = new System.Drawing.Point(845, 514); - this.buttonCancel.Name = "buttonCancel"; - this.buttonCancel.Size = new System.Drawing.Size(75, 23); - this.buttonCancel.TabIndex = 6; - this.buttonCancel.Text = "&Cancel"; - this.buttonCancel.UseVisualStyleBackColor = true; - this.buttonCancel.Click += new System.EventHandler(this.ButtonCancel_Click); - // - // tableLayoutPanel1 - // - this.tableLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ControllerConfig)); + this.tabControl1 = new System.Windows.Forms.TabControl(); + this.tabPage1 = new System.Windows.Forms.TabPage(); + this.tabPage2 = new System.Windows.Forms.TabPage(); + this.tabPage3 = new System.Windows.Forms.TabPage(); + this.label2 = new System.Windows.Forms.Label(); + this.checkBoxAutoTab = new System.Windows.Forms.CheckBox(); + this.checkBoxUDLR = new System.Windows.Forms.CheckBox(); + this.buttonOK = new System.Windows.Forms.Button(); + this.buttonCancel = new System.Windows.Forms.Button(); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); + this.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.buttonLoadDefaults = new System.Windows.Forms.Button(); + this.buttonSaveDefaults = new System.Windows.Forms.Button(); + this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); + this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); + this.ClearBtn = new System.Windows.Forms.Button(); + this.tabControl1.SuspendLayout(); + this.tableLayoutPanel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + this.SuspendLayout(); + // + // tabControl1 + // + this.tabControl1.Controls.Add(this.tabPage1); + this.tabControl1.Controls.Add(this.tabPage2); + this.tabControl1.Controls.Add(this.tabPage3); + this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tabControl1.Location = new System.Drawing.Point(3, 3); + this.tabControl1.Name = "tabControl1"; + this.tabControl1.SelectedIndex = 0; + this.tabControl1.Size = new System.Drawing.Size(562, 493); + this.tabControl1.TabIndex = 1; + // + // tabPage1 + // + 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(554, 467); + this.tabPage1.TabIndex = 0; + this.tabPage1.Text = "Normal Controls"; + this.tabPage1.UseVisualStyleBackColor = true; + // + // tabPage2 + // + 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(554, 467); + this.tabPage2.TabIndex = 1; + this.tabPage2.Text = "Autofire Controls"; + this.tabPage2.UseVisualStyleBackColor = true; + // + // tabPage3 + // + this.tabPage3.Location = new System.Drawing.Point(4, 22); + this.tabPage3.Name = "tabPage3"; + this.tabPage3.Size = new System.Drawing.Size(554, 467); + this.tabPage3.TabIndex = 2; + this.tabPage3.Text = "Analog Controls"; + this.tabPage3.UseVisualStyleBackColor = true; + // + // label2 + // + this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(12, 519); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(140, 13); + this.label2.TabIndex = 2; + this.label2.Text = "Escape clears a keybinding."; + // + // checkBoxAutoTab + // + this.checkBoxAutoTab.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.checkBoxAutoTab.AutoSize = true; + this.checkBoxAutoTab.Location = new System.Drawing.Point(187, 517); + this.checkBoxAutoTab.Name = "checkBoxAutoTab"; + this.checkBoxAutoTab.Size = new System.Drawing.Size(70, 17); + this.checkBoxAutoTab.TabIndex = 3; + this.checkBoxAutoTab.Text = "Auto Tab"; + this.checkBoxAutoTab.UseVisualStyleBackColor = true; + this.checkBoxAutoTab.CheckedChanged += new System.EventHandler(this.CheckBoxAutoTab_CheckedChanged); + // + // checkBoxUDLR + // + this.checkBoxUDLR.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.checkBoxUDLR.AutoSize = true; + this.checkBoxUDLR.Location = new System.Drawing.Point(263, 517); + this.checkBoxUDLR.Name = "checkBoxUDLR"; + this.checkBoxUDLR.Size = new System.Drawing.Size(101, 17); + this.checkBoxUDLR.TabIndex = 4; + this.checkBoxUDLR.Text = "Allow U+D/L+R"; + this.checkBoxUDLR.UseVisualStyleBackColor = true; + // + // buttonOK + // + this.buttonOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonOK.Location = new System.Drawing.Point(764, 514); + this.buttonOK.Name = "buttonOK"; + this.buttonOK.Size = new System.Drawing.Size(75, 23); + this.buttonOK.TabIndex = 5; + this.buttonOK.Text = "&Save"; + this.buttonOK.UseVisualStyleBackColor = true; + this.buttonOK.Click += new System.EventHandler(this.ButtonOk_Click); + // + // buttonCancel + // + this.buttonCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.buttonCancel.Location = new System.Drawing.Point(845, 514); + this.buttonCancel.Name = "buttonCancel"; + this.buttonCancel.Size = new System.Drawing.Size(75, 23); + this.buttonCancel.TabIndex = 6; + this.buttonCancel.Text = "&Cancel"; + this.buttonCancel.UseVisualStyleBackColor = true; + this.buttonCancel.Click += new System.EventHandler(this.ButtonCancel_Click); + // + // tableLayoutPanel1 + // + this.tableLayoutPanel1.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.tableLayoutPanel1.ColumnCount = 2; - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 340F)); - this.tableLayoutPanel1.Controls.Add(this.tabControl1, 0, 0); - this.tableLayoutPanel1.Controls.Add(this.pictureBox1, 1, 0); - this.tableLayoutPanel1.Location = new System.Drawing.Point(12, 12); - this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - this.tableLayoutPanel1.RowCount = 1; - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(908, 499); - this.tableLayoutPanel1.TabIndex = 7; - // - // pictureBox1 - // - this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Fill; - this.pictureBox1.Location = new System.Drawing.Point(571, 23); - this.pictureBox1.Margin = new System.Windows.Forms.Padding(3, 23, 3, 3); - this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(334, 473); - this.pictureBox1.TabIndex = 2; - this.pictureBox1.TabStop = false; - // - // buttonLoadDefaults - // - this.buttonLoadDefaults.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.buttonLoadDefaults.Location = new System.Drawing.Point(465, 514); - this.buttonLoadDefaults.Name = "buttonLoadDefaults"; - this.buttonLoadDefaults.Size = new System.Drawing.Size(75, 23); - this.buttonLoadDefaults.TabIndex = 8; - this.buttonLoadDefaults.Text = "Defaults"; - this.toolTip1.SetToolTip(this.buttonLoadDefaults, "Set the default controller configuration to the current. Note: this affects all " + + this.tableLayoutPanel1.ColumnCount = 2; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 340F)); + this.tableLayoutPanel1.Controls.Add(this.tabControl1, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.pictureBox1, 1, 0); + this.tableLayoutPanel1.Location = new System.Drawing.Point(12, 12); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.RowCount = 1; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(908, 499); + this.tableLayoutPanel1.TabIndex = 7; + // + // pictureBox1 + // + this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Fill; + this.pictureBox1.Location = new System.Drawing.Point(571, 23); + this.pictureBox1.Margin = new System.Windows.Forms.Padding(3, 23, 3, 3); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(334, 473); + this.pictureBox1.TabIndex = 2; + this.pictureBox1.TabStop = false; + // + // buttonLoadDefaults + // + this.buttonLoadDefaults.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.buttonLoadDefaults.Location = new System.Drawing.Point(504, 514); + this.buttonLoadDefaults.Name = "buttonLoadDefaults"; + this.buttonLoadDefaults.Size = new System.Drawing.Size(70, 23); + this.buttonLoadDefaults.TabIndex = 8; + this.buttonLoadDefaults.Text = "Defaults"; + this.toolTip1.SetToolTip(this.buttonLoadDefaults, "Set the default controller configuration to the current. Note: this affects all " + "controllers!"); - this.buttonLoadDefaults.UseVisualStyleBackColor = true; - this.buttonLoadDefaults.Click += new System.EventHandler(this.ButtonLoadDefaults_Click); - // - // buttonSaveDefaults - // - this.buttonSaveDefaults.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.buttonSaveDefaults.Location = new System.Drawing.Point(384, 514); - this.buttonSaveDefaults.Name = "buttonSaveDefaults"; - this.buttonSaveDefaults.Size = new System.Drawing.Size(75, 23); - this.buttonSaveDefaults.TabIndex = 9; - this.buttonSaveDefaults.Text = "Save Defs"; - this.toolTip1.SetToolTip(this.buttonSaveDefaults, "Save the current configuration as your default controls. Note: this saves ALL con" + + this.buttonLoadDefaults.UseVisualStyleBackColor = true; + this.buttonLoadDefaults.Click += new System.EventHandler(this.ButtonLoadDefaults_Click); + // + // buttonSaveDefaults + // + this.buttonSaveDefaults.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.buttonSaveDefaults.Location = new System.Drawing.Point(374, 514); + this.buttonSaveDefaults.Name = "buttonSaveDefaults"; + this.buttonSaveDefaults.Size = new System.Drawing.Size(70, 23); + this.buttonSaveDefaults.TabIndex = 9; + this.buttonSaveDefaults.Text = "Save Defs"; + this.toolTip1.SetToolTip(this.buttonSaveDefaults, "Save the current configuration as your default controls. Note: this saves ALL con" + "troller information!"); - this.buttonSaveDefaults.UseVisualStyleBackColor = true; - this.buttonSaveDefaults.Click += new System.EventHandler(this.ButtonSaveDefaults_Click); - // - // contextMenuStrip1 - // - this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(61, 4); - // - // ControllerConfig - // - this.AcceptButton = this.buttonOK; - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.CancelButton = this.buttonCancel; - this.ClientSize = new System.Drawing.Size(932, 544); - this.Controls.Add(this.buttonSaveDefaults); - this.Controls.Add(this.buttonLoadDefaults); - this.Controls.Add(this.checkBoxUDLR); - this.Controls.Add(this.tableLayoutPanel1); - this.Controls.Add(this.buttonCancel); - this.Controls.Add(this.buttonOK); - this.Controls.Add(this.checkBoxAutoTab); - this.Controls.Add(this.label2); - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.Name = "ControllerConfig"; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = "Controller Config"; - this.Load += new System.EventHandler(this.NewControllerConfig_Load); - this.tabControl1.ResumeLayout(false); - this.tableLayoutPanel1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); - this.ResumeLayout(false); - this.PerformLayout(); + this.buttonSaveDefaults.UseVisualStyleBackColor = true; + this.buttonSaveDefaults.Click += new System.EventHandler(this.ButtonSaveDefaults_Click); + // + // contextMenuStrip1 + // + this.contextMenuStrip1.Name = "contextMenuStrip1"; + this.contextMenuStrip1.Size = new System.Drawing.Size(61, 4); + // + // ClearBtn + // + this.ClearBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.ClearBtn.Location = new System.Drawing.Point(580, 514); + this.ClearBtn.Name = "ClearBtn"; + this.ClearBtn.Size = new System.Drawing.Size(75, 23); + this.ClearBtn.TabIndex = 10; + this.ClearBtn.Text = "&Clear"; + this.ClearBtn.UseVisualStyleBackColor = true; + this.ClearBtn.Click += new System.EventHandler(this.ClearBtn_Click); + // + // ControllerConfig + // + this.AcceptButton = this.buttonOK; + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.CancelButton = this.buttonCancel; + this.ClientSize = new System.Drawing.Size(932, 544); + this.Controls.Add(this.ClearBtn); + this.Controls.Add(this.buttonSaveDefaults); + this.Controls.Add(this.buttonLoadDefaults); + this.Controls.Add(this.checkBoxUDLR); + this.Controls.Add(this.tableLayoutPanel1); + this.Controls.Add(this.buttonCancel); + this.Controls.Add(this.buttonOK); + this.Controls.Add(this.checkBoxAutoTab); + this.Controls.Add(this.label2); + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.Name = "ControllerConfig"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; + this.Text = "Controller Config"; + this.Load += new System.EventHandler(this.NewControllerConfig_Load); + this.tabControl1.ResumeLayout(false); + this.tableLayoutPanel1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); } @@ -251,5 +264,6 @@ private System.Windows.Forms.Button buttonSaveDefaults; private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; private System.Windows.Forms.ToolTip toolTip1; + private System.Windows.Forms.Button ClearBtn; } } \ No newline at end of file diff --git a/BizHawk.Client.EmuHawk/config/ControllerConfig.cs b/BizHawk.Client.EmuHawk/config/ControllerConfig.cs index 2c7990c928..799c6d7799 100644 --- a/BizHawk.Client.EmuHawk/config/ControllerConfig.cs +++ b/BizHawk.Client.EmuHawk/config/ControllerConfig.cs @@ -379,5 +379,40 @@ namespace BizHawk.Client.EmuHawk ConfigService.Save(Config.ControlDefaultPath, cd); } } + + private void ClearWidgetAndChildren(Control c) + { + if (c is InputCompositeWidget) + { + (c as InputCompositeWidget).Clear(); + } + + if (c is InputWidget) + { + (c as InputWidget).ClearAll(); + } + + if (c is AnalogBindControl) + { + (c as AnalogBindControl).Unbind_Click(null, null); + } + + if (c.Controls.Count > 0) + { + foreach (Control child in c.Controls.OfType()) + { + ClearWidgetAndChildren(child); + } + } + } + + private void ClearBtn_Click(object sender, EventArgs e) + { + // TODO: make this recursive to not depend on the current structure + foreach (var c in Controls.OfType()) + { + ClearWidgetAndChildren(c); + } + } } } diff --git a/BizHawk.Client.EmuHawk/config/ControllerConfig/AnalogBindControl.Designer.cs b/BizHawk.Client.EmuHawk/config/ControllerConfig/AnalogBindControl.Designer.cs index 2c94949e65..d059d13fdf 100644 --- a/BizHawk.Client.EmuHawk/config/ControllerConfig/AnalogBindControl.Designer.cs +++ b/BizHawk.Client.EmuHawk/config/ControllerConfig/AnalogBindControl.Designer.cs @@ -132,7 +132,7 @@ this.buttonUnbind.TabIndex = 8; this.buttonUnbind.Text = "Unbind!"; this.buttonUnbind.UseVisualStyleBackColor = true; - this.buttonUnbind.Click += new System.EventHandler(this.buttonUnbind_Click); + this.buttonUnbind.Click += new System.EventHandler(this.Unbind_Click); // // AnalogBindControl // diff --git a/BizHawk.Client.EmuHawk/config/ControllerConfig/AnalogBindControl.cs b/BizHawk.Client.EmuHawk/config/ControllerConfig/AnalogBindControl.cs index 4e943482a8..70d2fb33c4 100644 --- a/BizHawk.Client.EmuHawk/config/ControllerConfig/AnalogBindControl.cs +++ b/BizHawk.Client.EmuHawk/config/ControllerConfig/AnalogBindControl.cs @@ -84,7 +84,7 @@ namespace BizHawk.Client.EmuHawk trackBarSensitivity.Value *= -1; } - private void buttonUnbind_Click(object sender, EventArgs e) + public void Unbind_Click(object sender, EventArgs e) { Bind.Value = ""; textBox1.Text = ""; diff --git a/BizHawk.Client.EmuHawk/config/InputCompositeWidget.cs b/BizHawk.Client.EmuHawk/config/InputCompositeWidget.cs index 72e3f20966..5d1c59f648 100644 --- a/BizHawk.Client.EmuHawk/config/InputCompositeWidget.cs +++ b/BizHawk.Client.EmuHawk/config/InputCompositeWidget.cs @@ -51,7 +51,7 @@ namespace BizHawk.Client.EmuHawk public void Clear() { - widget.Clear(); + widget.ClearAll(); } private void btnSpecial_Click(object sender, EventArgs e) diff --git a/BizHawk.Client.EmuHawk/config/InputWidget.cs b/BizHawk.Client.EmuHawk/config/InputWidget.cs index 862ada7bfa..e73fbc5bd7 100644 --- a/BizHawk.Client.EmuHawk/config/InputWidget.cs +++ b/BizHawk.Client.EmuHawk/config/InputWidget.cs @@ -83,6 +83,12 @@ namespace BizHawk.Client.EmuHawk base.OnMouseClick(e); } + public void ClearAll() + { + ClearBindings(); + Clear(); + } + private void ClearBindings() { for (var i = 0; i < _maxBind; i++)