From b95cbbbfce272a473e4c9f3bc04d727c7dd570f5 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Fri, 29 Jan 2016 17:27:20 -0800 Subject: [PATCH] Simplify Unicode usage Now shows current status as a checkbox. --- PKX/f1-Main.Designer.cs | 25 ++++++++++-------- PKX/f1-Main.cs | 44 +++++++++++++++++--------------- Resources/text/de/lang_de.txt | 2 +- Resources/text/en/lang_en.txt | 2 +- Resources/text/es/lang_es.txt | 2 +- Resources/text/fr/lang_fr.txt | 2 +- Resources/text/it/lang_it.txt | 2 +- Resources/text/ja/lang_ja.txt | 2 +- Resources/text/ko/lang_ko.txt | 2 +- Resources/text/other/lang_pt.txt | 2 +- Resources/text/zh/lang_zh.txt | 2 +- 11 files changed, 47 insertions(+), 40 deletions(-) diff --git a/PKX/f1-Main.Designer.cs b/PKX/f1-Main.Designer.cs index 39313aea2..b71345e82 100644 --- a/PKX/f1-Main.Designer.cs +++ b/PKX/f1-Main.Designer.cs @@ -2627,7 +2627,7 @@ public void InitializeComponent() this.Menu_Open.Name = "Menu_Open"; this.Menu_Open.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); this.Menu_Open.ShowShortcutKeys = false; - this.Menu_Open.Size = new System.Drawing.Size(152, 22); + this.Menu_Open.Size = new System.Drawing.Size(139, 22); this.Menu_Open.Text = "&Open..."; this.Menu_Open.Click += new System.EventHandler(this.mainMenuOpen); // @@ -2636,7 +2636,7 @@ public void InitializeComponent() this.Menu_Save.Name = "Menu_Save"; this.Menu_Save.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S))); this.Menu_Save.ShowShortcutKeys = false; - this.Menu_Save.Size = new System.Drawing.Size(152, 22); + this.Menu_Save.Size = new System.Drawing.Size(139, 22); this.Menu_Save.Text = "&Save PK6..."; this.Menu_Save.Click += new System.EventHandler(this.mainMenuSave); // @@ -2647,7 +2647,7 @@ public void InitializeComponent() this.Menu_ExportBAK}); this.Menu_ExportSAV.Enabled = false; this.Menu_ExportSAV.Name = "Menu_ExportSAV"; - this.Menu_ExportSAV.Size = new System.Drawing.Size(152, 22); + this.Menu_ExportSAV.Size = new System.Drawing.Size(139, 22); this.Menu_ExportSAV.Text = "&Export SAV..."; // // Menu_ExportMAIN @@ -2655,7 +2655,7 @@ public void InitializeComponent() this.Menu_ExportMAIN.Name = "Menu_ExportMAIN"; this.Menu_ExportMAIN.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.E))); this.Menu_ExportMAIN.ShowShortcutKeys = false; - this.Menu_ExportMAIN.Size = new System.Drawing.Size(152, 22); + this.Menu_ExportMAIN.Size = new System.Drawing.Size(130, 22); this.Menu_ExportMAIN.Text = "&Export main"; this.Menu_ExportMAIN.Click += new System.EventHandler(this.clickExportSAV); // @@ -2664,7 +2664,7 @@ public void InitializeComponent() this.Menu_ExportBAK.Name = "Menu_ExportBAK"; this.Menu_ExportBAK.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.B))); this.Menu_ExportBAK.ShowShortcutKeys = false; - this.Menu_ExportBAK.Size = new System.Drawing.Size(152, 22); + this.Menu_ExportBAK.Size = new System.Drawing.Size(130, 22); this.Menu_ExportBAK.Text = "Export &BAK"; this.Menu_ExportBAK.Click += new System.EventHandler(this.clickExportSAVBAK); // @@ -2673,7 +2673,7 @@ public void InitializeComponent() this.Menu_Exit.Name = "Menu_Exit"; this.Menu_Exit.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Q))); this.Menu_Exit.ShowShortcutKeys = false; - this.Menu_Exit.Size = new System.Drawing.Size(152, 22); + this.Menu_Exit.Size = new System.Drawing.Size(139, 22); this.Menu_Exit.Text = "&Quit"; this.Menu_Exit.Click += new System.EventHandler(this.mainMenuExit); // @@ -2840,7 +2840,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(139, 22); + this.Menu_Language.Size = new System.Drawing.Size(152, 22); this.Menu_Language.Text = "Language"; // // CB_MainLanguage @@ -2856,7 +2856,7 @@ public void InitializeComponent() this.Menu_ModifyDex, this.Menu_ModifyPK6}); this.Menu_Modify.Name = "Menu_Modify"; - this.Menu_Modify.Size = new System.Drawing.Size(139, 22); + this.Menu_Modify.Size = new System.Drawing.Size(152, 22); this.Menu_Modify.Text = "Set to SAV"; // // Menu_ModifyDex @@ -2881,9 +2881,12 @@ public void InitializeComponent() // // Menu_Unicode // + this.Menu_Unicode.Checked = true; + this.Menu_Unicode.CheckOnClick = true; + this.Menu_Unicode.CheckState = System.Windows.Forms.CheckState.Checked; this.Menu_Unicode.Name = "Menu_Unicode"; - this.Menu_Unicode.Size = new System.Drawing.Size(139, 22); - this.Menu_Unicode.Text = "Toggle Font"; + this.Menu_Unicode.Size = new System.Drawing.Size(152, 22); + this.Menu_Unicode.Text = "Unicode"; this.Menu_Unicode.Click += new System.EventHandler(this.mainMenuUnicode); // // Menu_About @@ -2891,7 +2894,7 @@ 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.P))); this.Menu_About.ShowShortcutKeys = false; - this.Menu_About.Size = new System.Drawing.Size(139, 22); + this.Menu_About.Size = new System.Drawing.Size(152, 22); this.Menu_About.Text = "About &PKHeX"; this.Menu_About.Click += new System.EventHandler(this.mainMenuAbout); // diff --git a/PKX/f1-Main.cs b/PKX/f1-Main.cs index 325aa0705..87aeba244 100644 --- a/PKX/f1-Main.cs +++ b/PKX/f1-Main.cs @@ -300,26 +300,8 @@ private void mainMenuBoxReport(object sender, EventArgs e) } private void mainMenuUnicode(object sender, EventArgs e) { - unicode = gendersymbols[0] == "♂"; - if (unicode) - { - gendersymbols = new[] { "M", "F", "-" }; - BTN_Shinytize.Text = "*"; - TB_Nickname.Font = TB_OT.Font = TB_OTt2.Font = Label_TID.Font; - } - else - { - gendersymbols = new[] { "♂", "♀", "-" }; - 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) - Label_Gender.Text = gendersymbols[PKX.getGender(Label_Gender.Text)]; - if (PKX.getGender(Label_OTGender.Text) < 2) - Label_OTGender.Text = gendersymbols[PKX.getGender(Label_OTGender.Text)]; - if (PKX.getGender(Label_CTGender.Text) < 2) - Label_CTGender.Text = gendersymbols[PKX.getGender(Label_CTGender.Text)]; + unicode = Menu_Unicode.Checked; + updateUnicode(); } private void mainMenuModifyDex(object sender, EventArgs e) { @@ -2126,6 +2108,28 @@ private void updateStats() labarray[decr].ForeColor = Color.Blue; } } + private void updateUnicode() + { + if (!unicode) + { + gendersymbols = new[] { "M", "F", "-" }; + BTN_Shinytize.Text = "*"; + TB_Nickname.Font = TB_OT.Font = TB_OTt2.Font = Label_TID.Font; + } + else + { + gendersymbols = new[] { "♂", "♀", "-" }; + 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) + Label_Gender.Text = gendersymbols[PKX.getGender(Label_Gender.Text)]; + if (PKX.getGender(Label_OTGender.Text) < 2) + Label_OTGender.Text = gendersymbols[PKX.getGender(Label_OTGender.Text)]; + if (PKX.getGender(Label_CTGender.Text) < 2) + Label_CTGender.Text = gendersymbols[PKX.getGender(Label_CTGender.Text)]; + } // Secondary Windows for Ribbons/Amie/Memories private void openRibbons(object sender, EventArgs e) { diff --git a/Resources/text/de/lang_de.txt b/Resources/text/de/lang_de.txt index aebb621dd..f6ee6a1c7 100644 --- a/Resources/text/de/lang_de.txt +++ b/Resources/text/de/lang_de.txt @@ -48,7 +48,7 @@ Menu_Language = Sprache Menu_Modify = Bei Einstellung auf SAV Menu_ModifyDex = Ändern Pokédex Menu_ModifyPK6 = Ändern PK6 Info -Menu_Unicode = Toggle Font +Menu_Unicode = Unicode Menu_About = Über PKHeX --------------------Context Menus---------------------- mnuView = Zeige diff --git a/Resources/text/en/lang_en.txt b/Resources/text/en/lang_en.txt index 5d55e677e..504181dba 100644 --- a/Resources/text/en/lang_en.txt +++ b/Resources/text/en/lang_en.txt @@ -48,7 +48,7 @@ Menu_Language = Language Menu_Modify = Set to SAV Menu_ModifyDex = Modify Pokédex Menu_ModifyPK6 = Modify PK6 Info -Menu_Unicode = Toggle Font +Menu_Unicode = Unicode Menu_About = About PKHeX --------------------Context Menus---------------------- mnuView = View diff --git a/Resources/text/es/lang_es.txt b/Resources/text/es/lang_es.txt index 8230eaef9..9d3024263 100644 --- a/Resources/text/es/lang_es.txt +++ b/Resources/text/es/lang_es.txt @@ -48,7 +48,7 @@ Menu_Language = Idioma Menu_Modify = Ajuste a SAV Menu_ModifyDex = Modificar Pokédex Menu_ModifyPK6 = Modificar PK6 Info -Menu_Unicode = Cambiar Fuente +Menu_Unicode = Unicode Menu_About = Sobre PKHeX --------------------Context Menus---------------------- mnuView = Ver diff --git a/Resources/text/fr/lang_fr.txt b/Resources/text/fr/lang_fr.txt index 587efd5d5..e20cbf98d 100644 --- a/Resources/text/fr/lang_fr.txt +++ b/Resources/text/fr/lang_fr.txt @@ -48,7 +48,7 @@ Menu_Language = Langue Menu_Modify = Réglez SAV Menu_ModifyDex = Modifier Pokédex Infos Menu_ModifyPK6 = Modifier PK6 Infos -Menu_Unicode = Basculer la police +Menu_Unicode = Unicode Menu_About = A propos de PKHeX --------------------Context Menus---------------------- mnuView = Voir diff --git a/Resources/text/it/lang_it.txt b/Resources/text/it/lang_it.txt index 8145eaebf..81c5dd8a9 100644 --- a/Resources/text/it/lang_it.txt +++ b/Resources/text/it/lang_it.txt @@ -48,7 +48,7 @@ Menu_Language = Language Menu_Modify = Set to SAV Menu_ModifyDex = Modify Pokédex Menu_ModifyPK6 = Modify PK6 Info -Menu_Unicode = Toggle Font +Menu_Unicode = Unicode Menu_About = About PKHeX --------------------Context Menus---------------------- mnuView = Vedi diff --git a/Resources/text/ja/lang_ja.txt b/Resources/text/ja/lang_ja.txt index cbbed9fe1..20db50e0c 100644 --- a/Resources/text/ja/lang_ja.txt +++ b/Resources/text/ja/lang_ja.txt @@ -48,7 +48,7 @@ Menu_Language = 言語 Menu_Modify = SAVに設定 Menu_ModifyDex = ポケモン図鑑を変更 Menu_ModifyPK6 = PK6情報の変更 -Menu_Unicode = トグルフォント +Menu_Unicode = Unicode Menu_About = PKHeXについて --------------------Context Menus---------------------- mnuView = 見る diff --git a/Resources/text/ko/lang_ko.txt b/Resources/text/ko/lang_ko.txt index 764cda256..2c160ed33 100644 --- a/Resources/text/ko/lang_ko.txt +++ b/Resources/text/ko/lang_ko.txt @@ -48,7 +48,7 @@ Menu_Language = 언어 Menu_Modify = SAV로 설정 Menu_ModifyDex = 포켓몬 도감 수정 Menu_ModifyPK6 = PK6 정보 수정 -Menu_Unicode = 폰트 변경 +Menu_Unicode = Unicode Menu_About = PKHeX에 대하여 --------------------Context Menus---------------------- mnuView = 보이다 diff --git a/Resources/text/other/lang_pt.txt b/Resources/text/other/lang_pt.txt index 9afde152e..39a6a25aa 100644 --- a/Resources/text/other/lang_pt.txt +++ b/Resources/text/other/lang_pt.txt @@ -48,7 +48,7 @@ Menu_Language = Idioma Menu_Modify = Defina para SAV Menu_ModifyDex = Modificar Pokédex Menu_ModifyPK6 = Modificar PK6 Info -Menu_Unicode = Mudar Fonte +Menu_Unicode = Unicode Menu_About = Sobre o PKHeX --------------------Context Menus---------------------- mnuView = Ver diff --git a/Resources/text/zh/lang_zh.txt b/Resources/text/zh/lang_zh.txt index 9ef5c4f58..e1a335b68 100644 --- a/Resources/text/zh/lang_zh.txt +++ b/Resources/text/zh/lang_zh.txt @@ -48,7 +48,7 @@ Menu_Language = 语言 Menu_Modify = 设置为SAV Menu_ModifyDex = 修改图鉴 Menu_ModifyPK6 = 修改PK6信息 -Menu_Unicode = 切换的Unicode +Menu_Unicode = Unicode Menu_About = 关于PKHeX --------------------Context Menus---------------------- mnuView = 看