diff --git a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
index 4d1f1800d2..e7b6553439 100644
--- a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
+++ b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
@@ -453,6 +453,9 @@
Form
+
+ Component
+
Component
diff --git a/BizHawk.Client.EmuHawk/CustomControls/MenuButton.cs b/BizHawk.Client.EmuHawk/CustomControls/MenuButton.cs
new file mode 100644
index 0000000000..e958b51710
--- /dev/null
+++ b/BizHawk.Client.EmuHawk/CustomControls/MenuButton.cs
@@ -0,0 +1,37 @@
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+using System.ComponentModel;
+
+namespace BizHawk.Client.EmuHawk
+{
+ public class MenuButton : Button
+ {
+ public MenuButton() { }
+
+ [DefaultValue(null)]
+ public ContextMenuStrip Menu { get; set; }
+
+ protected override void OnMouseDown(MouseEventArgs mevent)
+ {
+ base.OnMouseDown(mevent);
+
+ if (Menu != null && mevent.Button == MouseButtons.Left)
+ {
+ Menu.Show(this, mevent.Location);
+ }
+ }
+
+ protected override void OnPaint(PaintEventArgs pevent)
+ {
+ base.OnPaint(pevent);
+
+ int arrowX = ClientRectangle.Width - 14;
+ int arrowY = ClientRectangle.Height / 2 - 1;
+
+ Brush brush = Enabled ? SystemBrushes.ControlText : SystemBrushes.ButtonShadow;
+ Point[] arrows = new Point[] { new Point(arrowX, arrowY), new Point(arrowX + 7, arrowY), new Point(arrowX + 3, arrowY + 4) };
+ pevent.Graphics.FillPolygon(brush, arrows);
+ }
+ }
+}
\ No newline at end of file
diff --git a/BizHawk.Client.EmuHawk/config/ControllerConfig.Designer.cs b/BizHawk.Client.EmuHawk/config/ControllerConfig.Designer.cs
index 8715c2645d..e165947ea0 100644
--- a/BizHawk.Client.EmuHawk/config/ControllerConfig.Designer.cs
+++ b/BizHawk.Client.EmuHawk/config/ControllerConfig.Designer.cs
@@ -34,21 +34,25 @@
this.NormalControlsTab = new System.Windows.Forms.TabPage();
this.AutofireControlsTab = new System.Windows.Forms.TabPage();
this.AnalogControlsTab = 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.testToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.loadDefaultsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.clearToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
- this.ClearBtn = new System.Windows.Forms.Button();
+ this.btnMisc = new BizHawk.Client.EmuHawk.MenuButton();
+ this.label3 = new System.Windows.Forms.Label();
+ this.label2 = new System.Windows.Forms.Label();
+ this.label38 = new System.Windows.Forms.Label();
this.tabControl1.SuspendLayout();
this.tableLayoutPanel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
+ this.contextMenuStrip1.SuspendLayout();
this.SuspendLayout();
//
// tabControl1
@@ -92,21 +96,11 @@
this.AnalogControlsTab.Text = "Analog Controls";
this.AnalogControlsTab.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.Location = new System.Drawing.Point(394, 520);
this.checkBoxAutoTab.Name = "checkBoxAutoTab";
this.checkBoxAutoTab.Size = new System.Drawing.Size(70, 17);
this.checkBoxAutoTab.TabIndex = 3;
@@ -118,7 +112,7 @@
//
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.Location = new System.Drawing.Point(470, 520);
this.checkBoxUDLR.Name = "checkBoxUDLR";
this.checkBoxUDLR.Size = new System.Drawing.Size(101, 17);
this.checkBoxUDLR.TabIndex = 4;
@@ -176,47 +170,75 @@
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(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.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.testToolStripMenuItem,
+ this.loadDefaultsToolStripMenuItem,
+ this.clearToolStripMenuItem});
this.contextMenuStrip1.Name = "contextMenuStrip1";
- this.contextMenuStrip1.Size = new System.Drawing.Size(61, 4);
+ this.contextMenuStrip1.Size = new System.Drawing.Size(142, 70);
//
- // ClearBtn
+ // testToolStripMenuItem
//
- 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);
+ this.testToolStripMenuItem.Name = "testToolStripMenuItem";
+ this.testToolStripMenuItem.Size = new System.Drawing.Size(141, 22);
+ this.testToolStripMenuItem.Text = "Save Defaults";
+ this.testToolStripMenuItem.Click += new System.EventHandler(this.ButtonSaveDefaults_Click);
+ //
+ // loadDefaultsToolStripMenuItem
+ //
+ this.loadDefaultsToolStripMenuItem.Name = "loadDefaultsToolStripMenuItem";
+ this.loadDefaultsToolStripMenuItem.Size = new System.Drawing.Size(141, 22);
+ this.loadDefaultsToolStripMenuItem.Text = "Load Defaults";
+ this.loadDefaultsToolStripMenuItem.Click += new System.EventHandler(this.ButtonLoadDefaults_Click);
+ //
+ // clearToolStripMenuItem
+ //
+ this.clearToolStripMenuItem.Name = "clearToolStripMenuItem";
+ this.clearToolStripMenuItem.Size = new System.Drawing.Size(141, 22);
+ this.clearToolStripMenuItem.Text = "Clear";
+ this.clearToolStripMenuItem.Click += new System.EventHandler(this.ClearBtn_Click);
+ //
+ // btnMisc
+ //
+ this.btnMisc.Location = new System.Drawing.Point(683, 514);
+ this.btnMisc.Menu = this.contextMenuStrip1;
+ this.btnMisc.Name = "btnMisc";
+ this.btnMisc.Size = new System.Drawing.Size(75, 23);
+ this.btnMisc.TabIndex = 11;
+ this.btnMisc.Text = "Misc...";
+ this.btnMisc.UseVisualStyleBackColor = true;
+ //
+ // label3
+ //
+ this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.label3.AutoSize = true;
+ this.label3.Location = new System.Drawing.Point(11, 522);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(30, 13);
+ this.label3.TabIndex = 112;
+ this.label3.Text = "Tips:";
+ //
+ // 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(206, 522);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(168, 13);
+ this.label2.TabIndex = 111;
+ this.label2.Text = "* Disable Auto Tab to multiply bind";
+ //
+ // 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(47, 522);
+ this.label38.Name = "label38";
+ this.label38.Size = new System.Drawing.Size(153, 13);
+ this.label38.TabIndex = 110;
+ this.label38.Text = "* Escape clears a key mapping";
//
// ControllerConfig
//
@@ -225,15 +247,15 @@
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.label3);
+ this.Controls.Add(this.label2);
+ this.Controls.Add(this.label38);
+ this.Controls.Add(this.btnMisc);
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;
@@ -242,6 +264,7 @@
this.tabControl1.ResumeLayout(false);
this.tableLayoutPanel1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
+ this.contextMenuStrip1.ResumeLayout(false);
this.ResumeLayout(false);
this.PerformLayout();
@@ -252,18 +275,21 @@
private System.Windows.Forms.TabControl tabControl1;
private System.Windows.Forms.TabPage NormalControlsTab;
private System.Windows.Forms.TabPage AutofireControlsTab;
- private System.Windows.Forms.Label label2;
private System.Windows.Forms.CheckBox checkBoxAutoTab;
private System.Windows.Forms.CheckBox checkBoxUDLR;
private System.Windows.Forms.Button buttonOK;
private System.Windows.Forms.Button buttonCancel;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
private System.Windows.Forms.PictureBox pictureBox1;
- private System.Windows.Forms.Button buttonLoadDefaults;
private System.Windows.Forms.TabPage AnalogControlsTab;
- private System.Windows.Forms.Button buttonSaveDefaults;
private System.Windows.Forms.ContextMenuStrip contextMenuStrip1;
private System.Windows.Forms.ToolTip toolTip1;
- private System.Windows.Forms.Button ClearBtn;
+ private MenuButton btnMisc;
+ private System.Windows.Forms.ToolStripMenuItem testToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem loadDefaultsToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem clearToolStripMenuItem;
+ private System.Windows.Forms.Label label3;
+ private System.Windows.Forms.Label label2;
+ private System.Windows.Forms.Label label38;
}
}
\ No newline at end of file
diff --git a/BizHawk.Client.EmuHawk/config/ControllerConfig.resx b/BizHawk.Client.EmuHawk/config/ControllerConfig.resx
index 670e3a2375..47c65361ff 100644
--- a/BizHawk.Client.EmuHawk/config/ControllerConfig.resx
+++ b/BizHawk.Client.EmuHawk/config/ControllerConfig.resx
@@ -117,12 +117,12 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 172, 17
-
17, 17
+
+ 172, 17
+
diff --git a/BizHawk.Client.EmuHawk/config/HotkeyConfig.Designer.cs b/BizHawk.Client.EmuHawk/config/HotkeyConfig.Designer.cs
index c87d4abd7c..fa00704bb6 100644
--- a/BizHawk.Client.EmuHawk/config/HotkeyConfig.Designer.cs
+++ b/BizHawk.Client.EmuHawk/config/HotkeyConfig.Designer.cs
@@ -28,143 +28,167 @@
///
private void InitializeComponent()
{
- System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(HotkeyConfig));
- this.label38 = new System.Windows.Forms.Label();
- this.AutoTabCheckBox = new System.Windows.Forms.CheckBox();
- this.HotkeyTabControl = new System.Windows.Forms.TabControl();
- this.tabPage1 = new System.Windows.Forms.TabPage();
- this.IDB_CANCEL = new System.Windows.Forms.Button();
- this.IDB_SAVE = new System.Windows.Forms.Button();
- this.RestoreDefaults = new System.Windows.Forms.Button();
- this.SearchBox = new System.Windows.Forms.TextBox();
- this.label1 = new System.Windows.Forms.Label();
- this.HotkeyTabControl.SuspendLayout();
- this.SuspendLayout();
- //
- // 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(12, 441);
- this.label38.Name = "label38";
- this.label38.Size = new System.Drawing.Size(153, 13);
- this.label38.TabIndex = 4;
- this.label38.Text = "* Escape clears a key mapping";
- //
- // AutoTabCheckBox
- //
- this.AutoTabCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.AutoTabCheckBox.AutoSize = true;
- this.AutoTabCheckBox.Location = new System.Drawing.Point(453, 440);
- this.AutoTabCheckBox.Name = "AutoTabCheckBox";
- this.AutoTabCheckBox.Size = new System.Drawing.Size(70, 17);
- this.AutoTabCheckBox.TabIndex = 101;
- this.AutoTabCheckBox.Text = "Auto Tab";
- this.AutoTabCheckBox.UseVisualStyleBackColor = true;
- this.AutoTabCheckBox.CheckedChanged += new System.EventHandler(this.AutoTabCheckBox_CheckedChanged);
- //
- // HotkeyTabControl
- //
- this.HotkeyTabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(HotkeyConfig));
+ this.label38 = new System.Windows.Forms.Label();
+ this.AutoTabCheckBox = new System.Windows.Forms.CheckBox();
+ this.HotkeyTabControl = new System.Windows.Forms.TabControl();
+ this.tabPage1 = new System.Windows.Forms.TabPage();
+ this.IDB_CANCEL = new System.Windows.Forms.Button();
+ this.IDB_SAVE = new System.Windows.Forms.Button();
+ this.RestoreDefaults = new System.Windows.Forms.Button();
+ this.SearchBox = new System.Windows.Forms.TextBox();
+ this.label1 = new System.Windows.Forms.Label();
+ this.label2 = new System.Windows.Forms.Label();
+ this.label3 = new System.Windows.Forms.Label();
+ this.HotkeyTabControl.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // 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(45, 441);
+ this.label38.Name = "label38";
+ this.label38.Size = new System.Drawing.Size(153, 13);
+ this.label38.TabIndex = 4;
+ this.label38.Text = "* Escape clears a key mapping";
+ //
+ // AutoTabCheckBox
+ //
+ this.AutoTabCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.AutoTabCheckBox.AutoSize = true;
+ this.AutoTabCheckBox.Location = new System.Drawing.Point(453, 440);
+ this.AutoTabCheckBox.Name = "AutoTabCheckBox";
+ this.AutoTabCheckBox.Size = new System.Drawing.Size(70, 17);
+ this.AutoTabCheckBox.TabIndex = 101;
+ this.AutoTabCheckBox.Text = "Auto Tab";
+ this.AutoTabCheckBox.UseVisualStyleBackColor = true;
+ this.AutoTabCheckBox.CheckedChanged += new System.EventHandler(this.AutoTabCheckBox_CheckedChanged);
+ //
+ // HotkeyTabControl
+ //
+ this.HotkeyTabControl.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.HotkeyTabControl.Controls.Add(this.tabPage1);
- this.HotkeyTabControl.Location = new System.Drawing.Point(12, 28);
- this.HotkeyTabControl.Name = "HotkeyTabControl";
- this.HotkeyTabControl.SelectedIndex = 0;
- this.HotkeyTabControl.Size = new System.Drawing.Size(729, 396);
- this.HotkeyTabControl.TabIndex = 102;
- this.HotkeyTabControl.SelectedIndexChanged += new System.EventHandler(this.HotkeyTabControl_SelectedIndexChanged);
- //
- // 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(721, 370);
- this.tabPage1.TabIndex = 0;
- this.tabPage1.Text = "For designer";
- this.tabPage1.UseVisualStyleBackColor = true;
- //
- // IDB_CANCEL
- //
- this.IDB_CANCEL.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.IDB_CANCEL.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.IDB_CANCEL.Location = new System.Drawing.Point(681, 436);
- this.IDB_CANCEL.Name = "IDB_CANCEL";
- this.IDB_CANCEL.Size = new System.Drawing.Size(60, 22);
- this.IDB_CANCEL.TabIndex = 103;
- this.IDB_CANCEL.TabStop = false;
- this.IDB_CANCEL.Text = "&Cancel";
- this.IDB_CANCEL.UseVisualStyleBackColor = true;
- this.IDB_CANCEL.Click += new System.EventHandler(this.IDB_CANCEL_Click);
- //
- // IDB_SAVE
- //
- this.IDB_SAVE.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.IDB_SAVE.Location = new System.Drawing.Point(615, 436);
- this.IDB_SAVE.Name = "IDB_SAVE";
- this.IDB_SAVE.Size = new System.Drawing.Size(60, 22);
- this.IDB_SAVE.TabIndex = 104;
- this.IDB_SAVE.TabStop = false;
- this.IDB_SAVE.Text = "&Save";
- this.IDB_SAVE.UseVisualStyleBackColor = true;
- this.IDB_SAVE.Click += new System.EventHandler(this.IDB_SAVE_Click);
- //
- // RestoreDefaults
- //
- this.RestoreDefaults.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.RestoreDefaults.Location = new System.Drawing.Point(529, 436);
- this.RestoreDefaults.Name = "RestoreDefaults";
- this.RestoreDefaults.Size = new System.Drawing.Size(60, 22);
- this.RestoreDefaults.TabIndex = 105;
- this.RestoreDefaults.TabStop = false;
- this.RestoreDefaults.Text = "&Defaults";
- this.RestoreDefaults.UseVisualStyleBackColor = true;
- this.RestoreDefaults.Click += new System.EventHandler(this.RestoreDefaults_Click);
- //
- // SearchBox
- //
- this.SearchBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ this.HotkeyTabControl.Controls.Add(this.tabPage1);
+ this.HotkeyTabControl.Location = new System.Drawing.Point(12, 28);
+ this.HotkeyTabControl.Name = "HotkeyTabControl";
+ this.HotkeyTabControl.SelectedIndex = 0;
+ this.HotkeyTabControl.Size = new System.Drawing.Size(729, 396);
+ this.HotkeyTabControl.TabIndex = 102;
+ this.HotkeyTabControl.SelectedIndexChanged += new System.EventHandler(this.HotkeyTabControl_SelectedIndexChanged);
+ //
+ // 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(721, 370);
+ this.tabPage1.TabIndex = 0;
+ this.tabPage1.Text = "For designer";
+ this.tabPage1.UseVisualStyleBackColor = true;
+ //
+ // IDB_CANCEL
+ //
+ this.IDB_CANCEL.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.IDB_CANCEL.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+ this.IDB_CANCEL.Location = new System.Drawing.Point(681, 436);
+ this.IDB_CANCEL.Name = "IDB_CANCEL";
+ this.IDB_CANCEL.Size = new System.Drawing.Size(60, 22);
+ this.IDB_CANCEL.TabIndex = 103;
+ this.IDB_CANCEL.TabStop = false;
+ this.IDB_CANCEL.Text = "&Cancel";
+ this.IDB_CANCEL.UseVisualStyleBackColor = true;
+ this.IDB_CANCEL.Click += new System.EventHandler(this.IDB_CANCEL_Click);
+ //
+ // IDB_SAVE
+ //
+ this.IDB_SAVE.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.IDB_SAVE.Location = new System.Drawing.Point(615, 436);
+ this.IDB_SAVE.Name = "IDB_SAVE";
+ this.IDB_SAVE.Size = new System.Drawing.Size(60, 22);
+ this.IDB_SAVE.TabIndex = 104;
+ this.IDB_SAVE.TabStop = false;
+ this.IDB_SAVE.Text = "&Save";
+ this.IDB_SAVE.UseVisualStyleBackColor = true;
+ this.IDB_SAVE.Click += new System.EventHandler(this.IDB_SAVE_Click);
+ //
+ // RestoreDefaults
+ //
+ this.RestoreDefaults.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.RestoreDefaults.Location = new System.Drawing.Point(529, 436);
+ this.RestoreDefaults.Name = "RestoreDefaults";
+ this.RestoreDefaults.Size = new System.Drawing.Size(60, 22);
+ this.RestoreDefaults.TabIndex = 105;
+ this.RestoreDefaults.TabStop = false;
+ this.RestoreDefaults.Text = "&Defaults";
+ this.RestoreDefaults.UseVisualStyleBackColor = true;
+ this.RestoreDefaults.Click += new System.EventHandler(this.RestoreDefaults_Click);
+ //
+ // SearchBox
+ //
+ this.SearchBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
- this.SearchBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
- this.SearchBox.Location = new System.Drawing.Point(592, 9);
- this.SearchBox.Name = "SearchBox";
- this.SearchBox.Size = new System.Drawing.Size(149, 20);
- this.SearchBox.TabIndex = 106;
- this.SearchBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.SearchBox_KeyDown);
- //
- // label1
- //
- this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(556, 12);
- this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(30, 13);
- this.label1.TabIndex = 107;
- this.label1.Text = "Find:";
- //
- // HotkeyConfig
- //
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.CancelButton = this.IDB_CANCEL;
- this.ClientSize = new System.Drawing.Size(753, 463);
- this.Controls.Add(this.label1);
- this.Controls.Add(this.SearchBox);
- this.Controls.Add(this.RestoreDefaults);
- this.Controls.Add(this.IDB_SAVE);
- this.Controls.Add(this.IDB_CANCEL);
- this.Controls.Add(this.HotkeyTabControl);
- this.Controls.Add(this.AutoTabCheckBox);
- this.Controls.Add(this.label38);
- this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
- this.Name = "HotkeyConfig";
- this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
- this.Text = "Configure Hotkeys";
- this.Load += new System.EventHandler(this.NewHotkeyWindow_Load);
- this.HotkeyTabControl.ResumeLayout(false);
- this.ResumeLayout(false);
- this.PerformLayout();
+ this.SearchBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
+ this.SearchBox.Location = new System.Drawing.Point(592, 9);
+ this.SearchBox.Name = "SearchBox";
+ this.SearchBox.Size = new System.Drawing.Size(149, 20);
+ this.SearchBox.TabIndex = 106;
+ this.SearchBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.SearchBox_KeyDown);
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Location = new System.Drawing.Point(556, 12);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(30, 13);
+ this.label1.TabIndex = 107;
+ this.label1.Text = "Find:";
+ //
+ // 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(204, 441);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(168, 13);
+ this.label2.TabIndex = 108;
+ this.label2.Text = "* Disable Auto Tab to multiply bind";
+ //
+ // label3
+ //
+ this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.label3.AutoSize = true;
+ this.label3.Location = new System.Drawing.Point(9, 441);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(30, 13);
+ this.label3.TabIndex = 109;
+ this.label3.Text = "Tips:";
+ //
+ // HotkeyConfig
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.CancelButton = this.IDB_CANCEL;
+ this.ClientSize = new System.Drawing.Size(753, 463);
+ this.Controls.Add(this.label3);
+ this.Controls.Add(this.label2);
+ this.Controls.Add(this.label1);
+ this.Controls.Add(this.SearchBox);
+ this.Controls.Add(this.RestoreDefaults);
+ this.Controls.Add(this.IDB_SAVE);
+ this.Controls.Add(this.IDB_CANCEL);
+ this.Controls.Add(this.HotkeyTabControl);
+ this.Controls.Add(this.AutoTabCheckBox);
+ this.Controls.Add(this.label38);
+ this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+ this.Name = "HotkeyConfig";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+ this.Text = "Configure Hotkeys";
+ this.Load += new System.EventHandler(this.NewHotkeyWindow_Load);
+ this.HotkeyTabControl.ResumeLayout(false);
+ this.ResumeLayout(false);
+ this.PerformLayout();
}
@@ -179,5 +203,7 @@
private System.Windows.Forms.Button RestoreDefaults;
private System.Windows.Forms.TextBox SearchBox;
private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.Label label2;
+ private System.Windows.Forms.Label label3;
}
}
\ No newline at end of file