From 6321428feb565dee3653e56a121d74fbd5906db8 Mon Sep 17 00:00:00 2001 From: "andres.delikat" Date: Sat, 10 Sep 2011 21:24:15 +0000 Subject: [PATCH] Hotkey & Controller config - set accept & cancel button properties --- BizHawk.MultiClient/config/HotkeyWindow.Designer.cs | 3 +++ BizHawk.MultiClient/config/HotkeyWindow.resx | 6 +++--- BizHawk.MultiClient/config/InputConfig.Designer.cs | 2 ++ BizHawk.MultiClient/config/InputConfig.resx | 6 +++--- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/BizHawk.MultiClient/config/HotkeyWindow.Designer.cs b/BizHawk.MultiClient/config/HotkeyWindow.Designer.cs index aeb30630d3..991a79f628 100644 --- a/BizHawk.MultiClient/config/HotkeyWindow.Designer.cs +++ b/BizHawk.MultiClient/config/HotkeyWindow.Designer.cs @@ -1636,6 +1636,7 @@ // // IDB_CANCEL // + this.IDB_CANCEL.DialogResult = System.Windows.Forms.DialogResult.Cancel; this.IDB_CANCEL.Location = new System.Drawing.Point(528, 9); this.IDB_CANCEL.Name = "IDB_CANCEL"; this.IDB_CANCEL.Size = new System.Drawing.Size(80, 22); @@ -1667,8 +1668,10 @@ // // HotkeyWindow // + this.AcceptButton = this.IDB_SAVE; 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(637, 380); this.Controls.Add(this.AutoTabCheckBox); this.Controls.Add(this.label38); diff --git a/BizHawk.MultiClient/config/HotkeyWindow.resx b/BizHawk.MultiClient/config/HotkeyWindow.resx index d350ddfacb..2188b909e4 100644 --- a/BizHawk.MultiClient/config/HotkeyWindow.resx +++ b/BizHawk.MultiClient/config/HotkeyWindow.resx @@ -112,12 +112,12 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + AAABAAwAMDAQAAEABABoBgAAxgAAACAgEAABAAQA6AIAAC4HAAAQEBAAAQAEACgBAAAWCgAAMDAAAAEA diff --git a/BizHawk.MultiClient/config/InputConfig.Designer.cs b/BizHawk.MultiClient/config/InputConfig.Designer.cs index 3f718a651f..80858e2a72 100644 --- a/BizHawk.MultiClient/config/InputConfig.Designer.cs +++ b/BizHawk.MultiClient/config/InputConfig.Designer.cs @@ -179,8 +179,10 @@ // // InputConfig // + 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(440, 355); this.Controls.Add(this.AutoTab); this.Controls.Add(this.AllowLR); diff --git a/BizHawk.MultiClient/config/InputConfig.resx b/BizHawk.MultiClient/config/InputConfig.resx index b0ea69e455..83e80fc712 100644 --- a/BizHawk.MultiClient/config/InputConfig.resx +++ b/BizHawk.MultiClient/config/InputConfig.resx @@ -112,12 +112,12 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + AAABAA8AMDAQAAEABABoBgAA9gAAACAgEAABAAQA6AIAAF4HAAAYGBAAAQAEAOgBAABGCgAAEBAQAAEA