From b41ad0653723319f0b42ca31bc36792f95066879 Mon Sep 17 00:00:00 2001
From: Kurt <kaphotics@gmail.com>
Date: Tue, 27 Jan 2015 23:28:44 -0800
Subject: [PATCH] Main Form Trainer Name special chars

Adjusted shortcut to control clicking on the textbox; easier than right
click.
---
 PKX/f1-Main.Designer.cs      |  3 ++-
 PKX/f1-Main.cs               | 10 ++++++----
 Resources/text/shortcuts.txt |  2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/PKX/f1-Main.Designer.cs b/PKX/f1-Main.Designer.cs
index 169ab5384..b0e290111 100644
--- a/PKX/f1-Main.Designer.cs
+++ b/PKX/f1-Main.Designer.cs
@@ -549,7 +549,6 @@
             this.CHK_Nicknamed.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
             this.CHK_Nicknamed.UseVisualStyleBackColor = true;
             this.CHK_Nicknamed.CheckedChanged += new System.EventHandler(this.updateNickname);
-            this.CHK_Nicknamed.MouseDown += new System.Windows.Forms.MouseEventHandler(this.updateNicknameClick);
             // 
             // Label_Gender
             // 
@@ -2199,6 +2198,7 @@
             this.TB_OTt2.TabIndex = 6;
             this.TB_OTt2.WordWrap = false;
             this.TB_OTt2.TextChanged += new System.EventHandler(this.updateNotOT);
+            this.TB_OTt2.MouseDown += new System.Windows.Forms.MouseEventHandler(this.updateNicknameClick);
             // 
             // Label_PrevOT
             // 
@@ -2484,6 +2484,7 @@
             this.TB_OT.Name = "TB_OT";
             this.TB_OT.Size = new System.Drawing.Size(94, 20);
             this.TB_OT.TabIndex = 3;
+            this.TB_OT.MouseDown += new System.Windows.Forms.MouseEventHandler(this.updateNicknameClick);
             // 
             // TB_SID
             // 
diff --git a/PKX/f1-Main.cs b/PKX/f1-Main.cs
index b426fd793..fe8029048 100644
--- a/PKX/f1-Main.cs
+++ b/PKX/f1-Main.cs
@@ -167,8 +167,8 @@ namespace PKHeX
             GB_OT.Click += clickGT;
             GB_nOT.Click += clickGT;
             GB_Daycare.Click += switchDaycare;
-
-            TB_Nickname.Font = PKX.getPKXFont(10F);
+            gameFont = PKX.getPKXFont(11F);
+            TB_Nickname.Font = TB_OT.Font = TB_OTt2.Font = gameFont;
             // Close splash screen.  
             init = true;
             SplashSCR.Join();
@@ -197,6 +197,7 @@ namespace PKHeX
 
         public static bool HaX = false;
         public static bool specialChars = false; // Open Form Tracking
+        public static Font gameFont;
         public static Color defaultControlWhite;
         public static Color defaultControlText;
         public static int colorizedbox = 32;
@@ -2122,9 +2123,10 @@ namespace PKHeX
         }
         private void updateNicknameClick(object sender, MouseEventArgs e)
         {
+            TextBox tb = (!(sender is TextBox)) ? TB_Nickname : (sender as TextBox);
             // Special Character Form
-            if (e.Button == MouseButtons.Right && !specialChars)
-                (new f2_Text(TB_Nickname)).Show();
+            if (ModifierKeys == Keys.Control && !specialChars)
+                (new f2_Text(tb)).Show();
         }
         private void updateNotOT(object sender, EventArgs e)
         {
diff --git a/Resources/text/shortcuts.txt b/Resources/text/shortcuts.txt
index ea79be534..a5ca2cea2 100644
--- a/Resources/text/shortcuts.txt
+++ b/Resources/text/shortcuts.txt
@@ -4,7 +4,7 @@
 // Main Window
 
 Hold Control when dragging out the Tab PKM to save as ekx.
-Right Click on Nickname/Nickname box to bring up the ingame-special characters.
+Control Click on Nickname/OT box to bring up the ingame-special characters.
 
 Control + Click on...
 Randomize IVs: Set all IVs to max.