diff --git a/BizHawk.MultiClient/tools/HotkeyWindow.Designer.cs b/BizHawk.MultiClient/tools/HotkeyWindow.Designer.cs
index 1a1c86207c..2a13b1583b 100644
--- a/BizHawk.MultiClient/tools/HotkeyWindow.Designer.cs
+++ b/BizHawk.MultiClient/tools/HotkeyWindow.Designer.cs
@@ -28,8 +28,13 @@
///
private void InitializeComponent()
{
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(HotkeyWindow));
this.hotkeyTabs = new System.Windows.Forms.TabControl();
this.tabPage1 = new System.Windows.Forms.TabPage();
+ this.label45 = new System.Windows.Forms.Label();
+ this.IDW_FULLSCREEN = new BizHawk.MultiClient.InputWidget();
+ this.IDW_SCREENSHOT = new BizHawk.MultiClient.InputWidget();
+ this.label44 = new System.Windows.Forms.Label();
this.IDW_REWIND = new BizHawk.MultiClient.InputWidget();
this.label37 = new System.Windows.Forms.Label();
this.IDW_FASTFORWARD = new BizHawk.MultiClient.InputWidget();
@@ -119,10 +124,6 @@
this.IDB_SAVE = new System.Windows.Forms.Button();
this.IDB_CANCEL = new System.Windows.Forms.Button();
this.label38 = new System.Windows.Forms.Label();
- this.label44 = new System.Windows.Forms.Label();
- this.IDW_SCREENSHOT = new BizHawk.MultiClient.InputWidget();
- this.IDW_FULLSCREEN = new BizHawk.MultiClient.InputWidget();
- this.label45 = new System.Windows.Forms.Label();
this.hotkeyTabs.SuspendLayout();
this.tabPage1.SuspendLayout();
this.tabPage2.SuspendLayout();
@@ -140,6 +141,7 @@
this.hotkeyTabs.SelectedIndex = 0;
this.hotkeyTabs.Size = new System.Drawing.Size(598, 290);
this.hotkeyTabs.TabIndex = 0;
+ this.hotkeyTabs.TabStop = false;
//
// tabPage1
//
@@ -169,6 +171,42 @@
this.tabPage1.Text = "General";
this.tabPage1.UseVisualStyleBackColor = true;
//
+ // label45
+ //
+ this.label45.AutoSize = true;
+ this.label45.Location = new System.Drawing.Point(207, 83);
+ this.label45.Name = "label45";
+ this.label45.Size = new System.Drawing.Size(60, 13);
+ this.label45.TabIndex = 79;
+ this.label45.Text = "Full Screen";
+ //
+ // IDW_FULLSCREEN
+ //
+ this.IDW_FULLSCREEN.AcceptsTab = true;
+ this.IDW_FULLSCREEN.BackColor = System.Drawing.SystemColors.Window;
+ this.IDW_FULLSCREEN.Location = new System.Drawing.Point(293, 80);
+ this.IDW_FULLSCREEN.Name = "IDW_FULLSCREEN";
+ this.IDW_FULLSCREEN.Size = new System.Drawing.Size(100, 20);
+ this.IDW_FULLSCREEN.TabIndex = 78;
+ //
+ // IDW_SCREENSHOT
+ //
+ this.IDW_SCREENSHOT.AcceptsTab = true;
+ this.IDW_SCREENSHOT.BackColor = System.Drawing.SystemColors.Window;
+ this.IDW_SCREENSHOT.Location = new System.Drawing.Point(293, 56);
+ this.IDW_SCREENSHOT.Name = "IDW_SCREENSHOT";
+ this.IDW_SCREENSHOT.Size = new System.Drawing.Size(100, 20);
+ this.IDW_SCREENSHOT.TabIndex = 76;
+ //
+ // label44
+ //
+ this.label44.AutoSize = true;
+ this.label44.Location = new System.Drawing.Point(207, 59);
+ this.label44.Name = "label44";
+ this.label44.Size = new System.Drawing.Size(61, 13);
+ this.label44.TabIndex = 75;
+ this.label44.Text = "Screenshot";
+ //
// IDW_REWIND
//
this.IDW_REWIND.AcceptsTab = true;
@@ -962,6 +1000,7 @@
this.IDB_SAVE.Name = "IDB_SAVE";
this.IDB_SAVE.Size = new System.Drawing.Size(82, 22);
this.IDB_SAVE.TabIndex = 1;
+ 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);
@@ -972,6 +1011,7 @@
this.IDB_CANCEL.Name = "IDB_CANCEL";
this.IDB_CANCEL.Size = new System.Drawing.Size(80, 22);
this.IDB_CANCEL.TabIndex = 2;
+ this.IDB_CANCEL.TabStop = false;
this.IDB_CANCEL.Text = "Cancel";
this.IDB_CANCEL.UseVisualStyleBackColor = true;
this.IDB_CANCEL.Click += new System.EventHandler(this.button2_Click);
@@ -981,45 +1021,9 @@
this.label38.AutoSize = true;
this.label38.Location = new System.Drawing.Point(22, 305);
this.label38.Name = "label38";
- this.label38.Size = new System.Drawing.Size(160, 13);
+ this.label38.Size = new System.Drawing.Size(153, 13);
this.label38.TabIndex = 3;
- this.label38.Text = "* Escape clears a dialog window";
- //
- // label44
- //
- this.label44.AutoSize = true;
- this.label44.Location = new System.Drawing.Point(207, 59);
- this.label44.Name = "label44";
- this.label44.Size = new System.Drawing.Size(61, 13);
- this.label44.TabIndex = 75;
- this.label44.Text = "Screenshot";
- //
- // IDW_SCREENSHOT
- //
- this.IDW_SCREENSHOT.AcceptsTab = true;
- this.IDW_SCREENSHOT.BackColor = System.Drawing.SystemColors.Window;
- this.IDW_SCREENSHOT.Location = new System.Drawing.Point(293, 56);
- this.IDW_SCREENSHOT.Name = "IDW_SCREENSHOT";
- this.IDW_SCREENSHOT.Size = new System.Drawing.Size(100, 20);
- this.IDW_SCREENSHOT.TabIndex = 76;
- //
- // IDW_FULLSCREEN
- //
- this.IDW_FULLSCREEN.AcceptsTab = true;
- this.IDW_FULLSCREEN.BackColor = System.Drawing.SystemColors.Window;
- this.IDW_FULLSCREEN.Location = new System.Drawing.Point(293, 80);
- this.IDW_FULLSCREEN.Name = "IDW_FULLSCREEN";
- this.IDW_FULLSCREEN.Size = new System.Drawing.Size(100, 20);
- this.IDW_FULLSCREEN.TabIndex = 78;
- //
- // label45
- //
- this.label45.AutoSize = true;
- this.label45.Location = new System.Drawing.Point(207, 83);
- this.label45.Name = "label45";
- this.label45.Size = new System.Drawing.Size(60, 13);
- this.label45.TabIndex = 79;
- this.label45.Text = "Full Screen";
+ this.label38.Text = "* Escape clears a key mapping";
//
// HotkeyWindow
//
@@ -1031,6 +1035,7 @@
this.Controls.Add(this.IDB_SAVE);
this.Controls.Add(this.hotkeyTabs);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
+ this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "HotkeyWindow";
diff --git a/BizHawk.MultiClient/tools/HotkeyWindow.resx b/BizHawk.MultiClient/tools/HotkeyWindow.resx
index ff31a6db56..155d72f2c2 100644
--- a/BizHawk.MultiClient/tools/HotkeyWindow.resx
+++ b/BizHawk.MultiClient/tools/HotkeyWindow.resx
@@ -117,4 +117,30 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+
+ AAABAAEAEBEAAAEAIACsBAAAFgAAACgAAAAQAAAAIgAAAAEAIAAAAAAAAAAAAGEPAABhDwAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAANTMxiCyrZv/nZyJ/5OVg/+Ym5D/ra2t/9LU2BUAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAA3tvJHZyZco5UVjrYPTYe/zUvFP84NBb/Tkss/29rTP+Afma0pqasVwAA
+ AAAAAAAAAAAAAAAAAAAAAAAAyM2sQlVUL+UXEA3/CQYA/wABAP9LTEv/EQ8Q/wUEAP8SFAb/REUo/25r
+ T9WblpVvAAAAAAAAAAAAAAAA0tOwPDw6HvwAAAD/Cw4H/wEFAP86Pjv/z9DP/2dkZv8HAQH/FQ0J/wsF
+ AP8yMBb/cHBK3qijrloAAAAA7e3ZCFVPNd0CAAD/DxUK/woOAP8WGBT/uby2/2NkY/+8vLz/Ozs5/w0O
+ Av8RFQv/BQIF/z04G/+FgWuu087QG52dcv8GBgr/Cg0H/xcXDf8AAAD/fXyD/83Mzv8TEhT/pKOj/6+v
+ rf8MCQT/GRcK/xEODf8NDwb/XV84/62vpv+Hdkr/AAEG/xQTDP8NDQb/Fg8Q/9ja3f+FhYb/AAAA/2Je
+ YP/u7+7/MDIt/xMPBf8ZFgv/AAAG/0REJf+poYv/0aFw/z8qEP8MDQf/AwYB/ysqLf/5+fr/qaao/woD
+ Bv+Df4D//////1taV/8KBAD/GRUG/xMMBf+ngU//tKeL/+iwd/+/kEn/IiMO/wABAv9GRkr/+vn7/+De
+ 3/8zLS7/u7e4//////94dnb/EhYU/xUWDP+Kbjj/6bJu/7eujP/kt2///daQ/5uIS/8YFQn/Ojw//8nF
+ yP/a2dn/OTQ1/6Wio//V2Nj/jY+T/1ZTT/98aTX/89GR/+S4Yv/AvJv/17pu//jaov/03qL/gmcn/xgX
+ GP8gIyb/U1VU/2FfXv+Eh4T/oKam/5+mrv+BeGf/3MaQ///lrf/buWP7ydLGNdbOnP/rznn///vN/9i7
+ e/8jHBX/AgAE/xINDf96fXr/r6+w/8zQ1P/S2Nr/pqej/97Qu//82oL/ysmJrgAAAADj6tYN38x40ezY
+ kv+Hp6P/KTIv/wMdJv8WKTH/am5v/5ucmv/g4uX/6evw/8PExf/ZxHv/5c90293bxDkAAAAAAAAAAOjg
+ vUPCv3XZFJ7N/wCTyP8LbZP/EDM//0JJTv/Gx8X/5+fn/+zq8P+2rpr/1cVo89/aq2kAAAAAAAAAAAAA
+ AAAAAAAA1duzWEOltf8Hkbz/Fkdc/zNDRv9KWFr/kpKW//z7/P/f4dv/qqWCvt3YsV0AAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAADi3tYNj4+Wp8rKzP/x8vD/6PLw/+fo6//b294ImJuRntfZyygAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAN3azx3Gysv/qK+x/8C5uP/Dw8P/wcfJOQAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAPwfAADwDwAA4AcAAMADAACAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAEAAIAD
+ AADABwAA4A8AAPBfAAD4fwAA
+
+
\ No newline at end of file