diff --git a/Misc/QR.cs b/Misc/QR.cs
index e64c9985b..5fa72ea19 100644
--- a/Misc/QR.cs
+++ b/Misc/QR.cs
@@ -14,7 +14,7 @@ public partial class QR : Form
public QR(Image qr, Image pkm, string top, string bottom, string left, string right)
{
InitializeComponent();
- Font font = FontLabel.Font;
+ Font font = (Form1.unicode) ? FontLabel.Font : PKX.getPKXFont((float)8.25);
Image preview = new Bitmap(45, 45);
using (Graphics gfx = Graphics.FromImage(preview))
{
diff --git a/PKX/f1-Main.Designer.cs b/PKX/f1-Main.Designer.cs
index d453c6225..1a2184468 100644
--- a/PKX/f1-Main.Designer.cs
+++ b/PKX/f1-Main.Designer.cs
@@ -2673,7 +2673,7 @@ public void InitializeComponent()
this.Menu_Language.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.CB_MainLanguage});
this.Menu_Language.Name = "Menu_Language";
- this.Menu_Language.Size = new System.Drawing.Size(183, 22);
+ this.Menu_Language.Size = new System.Drawing.Size(152, 22);
this.Menu_Language.Text = "Language";
//
// CB_MainLanguage
@@ -2688,15 +2688,15 @@ public void InitializeComponent()
this.Menu_About.Name = "Menu_About";
this.Menu_About.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.B)));
this.Menu_About.ShowShortcutKeys = false;
- this.Menu_About.Size = new System.Drawing.Size(183, 22);
+ this.Menu_About.Size = new System.Drawing.Size(152, 22);
this.Menu_About.Text = "A&bout PKHeX";
this.Menu_About.Click += new System.EventHandler(this.mainMenuAbout);
//
// Menu_Unicode
//
this.Menu_Unicode.Name = "Menu_Unicode";
- this.Menu_Unicode.Size = new System.Drawing.Size(183, 22);
- this.Menu_Unicode.Text = "Toggle Unicode Text";
+ this.Menu_Unicode.Size = new System.Drawing.Size(152, 22);
+ this.Menu_Unicode.Text = "Toggle Font";
this.Menu_Unicode.Click += new System.EventHandler(this.mainMenuUnicode);
//
// testToolStripMenuItem
@@ -3772,7 +3772,6 @@ public void InitializeComponent()
this.RTB_T.ReadOnly = true;
this.RTB_T.Size = new System.Drawing.Size(300, 130);
this.RTB_T.TabIndex = 1;
- this.RTB_T.Text = "";
this.RTB_T.WordWrap = false;
//
// Tab_SAV
@@ -3861,7 +3860,6 @@ public void InitializeComponent()
this.RTB_S.ReadOnly = true;
this.RTB_S.Size = new System.Drawing.Size(300, 130);
this.RTB_S.TabIndex = 0;
- this.RTB_S.Text = "";
this.RTB_S.WordWrap = false;
//
// B_OpenHallofFame
diff --git a/PKX/f1-Main.cs b/PKX/f1-Main.cs
index a44ca5154..3ddacec31 100644
--- a/PKX/f1-Main.cs
+++ b/PKX/f1-Main.cs
@@ -245,6 +245,7 @@ public Form1()
public static string origintrack;
public static string curlanguage;
public volatile bool init = false;
+ public static bool unicode = false;
public ToolTip Tip1 = new ToolTip();
public ToolTip Tip2 = new ToolTip();
public ToolTip Tip3 = new ToolTip();
@@ -384,11 +385,13 @@ private void mainMenuUnicode(object sender, EventArgs e)
{
gendersymbols = new string[] { "M", "F", "-" };
BTN_Shinytize.Text = "*";
+ TB_Nickname.Font = TB_OT.Font = TB_OTt2.Font = Label_TID.Font;
}
else
{
gendersymbols = new string[] { "♂", "♀", "-" };
BTN_Shinytize.Text = "☆";
+ TB_Nickname.Font = TB_OT.Font = TB_OTt2.Font = PKX.getPKXFont(11);
}
// Switch active gender labels to new if they are active.
if (PKX.getGender(Label_Gender.Text) < 2)
@@ -398,7 +401,6 @@ private void mainMenuUnicode(object sender, EventArgs e)
if (PKX.getGender(Label_CTGender.Text) < 2)
Label_CTGender.Text = gendersymbols[PKX.getGender(Label_CTGender.Text)];
}
- bool unicode = false;
// Main Menu Subfunctions
private void openQuick(string path)
diff --git a/PKX/f1-Main.resx b/PKX/f1-Main.resx
index a0ef8fc4c..bd4c222dd 100644
--- a/PKX/f1-Main.resx
+++ b/PKX/f1-Main.resx
@@ -243,6 +243,279 @@
True
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
True
@@ -399,6 +672,60 @@
True
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
True
@@ -471,9 +798,51 @@
True
+
+ True
+
+
+ True
+
+
+ True
+
True
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
True
@@ -522,9 +891,75 @@
True
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
True
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
True
@@ -564,12 +999,18 @@
True
+
+ True
+
True
True
+
+ True
+
True
@@ -579,6 +1020,27 @@
True
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
True
diff --git a/Resources/text/shortcuts.txt b/Resources/text/shortcuts.txt
index 0fce4b9fb..30a4b447d 100644
--- a/Resources/text/shortcuts.txt
+++ b/Resources/text/shortcuts.txt
@@ -1,4 +1,4 @@
-If you are having issues viewing certain symbols: Options -> Toggle Unicode Text.
+If you are having issues viewing certain symbols/text: Options -> Toggle Font.
// Main Window
@@ -11,6 +11,7 @@ Randomize IVs: Set all IVs to max.
Randomize EVs: Set all EVs to 0.
PP Ups Label: Set all PP Ups to 3.
Friendship Label: Reset Friendship
+QR! to wrap text around QR code.
Click on the OT label to set relevant details to that of the save file.
diff --git a/SAV/SAV_Trainer.cs b/SAV/SAV_Trainer.cs
index b3faf795d..371da148b 100644
--- a/SAV/SAV_Trainer.cs
+++ b/SAV/SAV_Trainer.cs
@@ -20,7 +20,7 @@ public partial class SAV_Trainer : Form
public SAV_Trainer(Form1 frm1)
{
InitializeComponent();
-
+ if (!Form1.unicode)
try { TB_OTName.Font = PKX.getPKXFont(11); }
catch (Exception e) { Util.Alert("Font loading failed...", e.ToString()); }