Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-08-24 12:14:15 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Simplify Unicode usage

Browse Source 
Now shows current status as a checkbox.
This commit is contained in:
Kaphotics
2016-01-29 17:27:20 -08:00
parent 3c1c6b86ba
commit b95cbbbfce
11 changed files with 47 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
PKX/f1-Main.Designer.cs generated
View File

@@ -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);
//

44
PKX/f1-Main.cs
View File

@@ -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)
{

2
Resources/text/de/lang_de.txt
View File

@@ -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

2
Resources/text/en/lang_en.txt
View File

@@ -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

2
Resources/text/es/lang_es.txt
View File

@@ -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

2
Resources/text/fr/lang_fr.txt
View File

@@ -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

2
Resources/text/it/lang_it.txt
View File

@@ -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

2
Resources/text/ja/lang_ja.txt
View File

@@ -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 = 見る

2
Resources/text/ko/lang_ko.txt
View File

@@ -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 = 보이다

2
Resources/text/other/lang_pt.txt
View File

@@ -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

2
Resources/text/zh/lang_zh.txt
View File

@@ -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 = 看