From 39d11f5f2f6750c4e8dbd5aaa03ba17d75a47bb0 Mon Sep 17 00:00:00 2001 From: Kurt Date: Sat, 26 Oct 2019 23:14:00 -0700 Subject: [PATCH] Simplify font logic dont bother trycatching stuff that shouldn't fail --- .../Controls/PKM Editor/PKMEditor.cs | 4 +- PKHeX.WinForms/Misc/QR.cs | 2 +- PKHeX.WinForms/Subforms/PKM Editors/Text.cs | 2 +- PKHeX.WinForms/Subforms/SAV_Database.cs | 38 ++++++++----------- .../Save Editors/Gen6/SAV_HallOfFame.cs | 3 +- .../Save Editors/Gen6/SAV_SecretBase.cs | 2 +- .../Subforms/Save Editors/Gen6/SAV_Trainer.cs | 10 ++--- .../Save Editors/Gen7/SAV_FestivalPlaza.cs | 3 +- .../Save Editors/Gen7/SAV_Trainer7.cs | 3 +- .../Save Editors/Gen7/SAV_Trainer7GG.cs | 3 +- .../Save Editors/Gen8/SAV_Trainer8.cs | 3 +- PKHeX.WinForms/Util/FontUtil.cs | 2 +- 12 files changed, 29 insertions(+), 46 deletions(-) diff --git a/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs b/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs index 4d0f249db..d70a8a280 100644 --- a/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs +++ b/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs @@ -22,7 +22,7 @@ public PKMEditor() GB_CurrentMoves.Click += ClickMoves; GB_RelearnMoves.Click += ClickMoves; - TB_Nickname.Font = FontUtil.GetPKXFont(11); + TB_Nickname.Font = FontUtil.GetPKXFont(); TB_OT.Font = (Font)TB_Nickname.Font.Clone(); TB_OTt2.Font = (Font)TB_Nickname.Font.Clone(); @@ -312,7 +312,7 @@ public void UpdateUnicode(IReadOnlyList symbols) else { BTN_Shinytize.Text = Draw.ShinyUnicode; - TB_Nickname.Font = TB_OT.Font = TB_OTt2.Font = FontUtil.GetPKXFont(11); + TB_Nickname.Font = TB_OT.Font = TB_OTt2.Font = FontUtil.GetPKXFont(); } // Switch active gender labels to new if they are active. diff --git a/PKHeX.WinForms/Misc/QR.cs b/PKHeX.WinForms/Misc/QR.cs index a564539ee..7c21a87cc 100644 --- a/PKHeX.WinForms/Misc/QR.cs +++ b/PKHeX.WinForms/Misc/QR.cs @@ -62,7 +62,7 @@ private void RefreshImage() { SuspendLayout(); ResumeLayout(); - Font font = !Main.Unicode ? Font : FontUtil.GetPKXFont((float)8.25); + Font font = !Main.Unicode ? Font : FontUtil.GetPKXFont(8.25f); PB_QR.BackgroundImage = QRImageUtil.GetQRImageExtended(font, qr, icon, PB_QR.Width, PB_QR.Height, Lines, extraText); } diff --git a/PKHeX.WinForms/Subforms/PKM Editors/Text.cs b/PKHeX.WinForms/Subforms/PKM Editors/Text.cs index fbbef1fbb..4fd7e3c45 100644 --- a/PKHeX.WinForms/Subforms/PKM Editors/Text.cs +++ b/PKHeX.WinForms/Subforms/PKM Editors/Text.cs @@ -23,7 +23,7 @@ public TrashEditor(TextBoxBase TB_NN, byte[] raw, SaveFile sav) if (raw != null) AddTrashEditing(raw.Length); - var f = FontUtil.GetPKXFont(12F); + var f = FontUtil.GetPKXFont(); AddCharEditing(f); TB_Text.MaxLength = TB_NN.MaxLength; TB_Text.Text = TB_NN.Text; diff --git a/PKHeX.WinForms/Subforms/SAV_Database.cs b/PKHeX.WinForms/Subforms/SAV_Database.cs index 44235f22f..1c0abf7bf 100644 --- a/PKHeX.WinForms/Subforms/SAV_Database.cs +++ b/PKHeX.WinForms/Subforms/SAV_Database.cs @@ -353,32 +353,24 @@ private static void TryAddPKMsFromFolder(ConcurrentBag dbTemp, string file, private static void TryAddPKMsFromSaveFilePath(ConcurrentBag dbTemp, string file, string externalFilePrefix) { - try + var sav = SaveUtil.GetVariantSAV(file); + if (sav == null) { - var sav = SaveUtil.GetVariantSAV(file); - if (sav == null) - { - Console.WriteLine("Unable to load SaveFile: " + file); - return; - } - - var path = externalFilePrefix + Path.GetFileName(file); - if (sav.HasBox) - { - foreach (var pk in sav.BoxData) - addPKM(pk); - } - - void addPKM(PKM pk) - { - pk.Identifier = Path.Combine(path, pk.Identifier); - dbTemp.Add(pk); - } + Console.WriteLine("Unable to load SaveFile: " + file); + return; } - catch (Exception ex) + + var path = externalFilePrefix + Path.GetFileName(file); + if (sav.HasBox) { - Console.WriteLine("ERROR: Unable to load SaveFile: " + file); - Console.WriteLine(ex.Message); + foreach (var pk in sav.BoxData) + addPKM(pk); + } + + void addPKM(PKM pk) + { + pk.Identifier = Path.Combine(path, pk.Identifier); + dbTemp.Add(pk); } } diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_HallOfFame.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_HallOfFame.cs index b2f4623be..cb8217c59 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_HallOfFame.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_HallOfFame.cs @@ -24,8 +24,7 @@ public SAV_HallOfFame(SaveFile sav) Setup(); LB_DataEntry.SelectedIndex = 0; NUP_PartyIndex_ValueChanged(null, EventArgs.Empty); - try { TB_Nickname.Font = TB_OT.Font = FontUtil.GetPKXFont(11); } - catch (Exception e) { WinFormsUtil.Alert("Font loading failed...", e.ToString()); } + TB_Nickname.Font = TB_OT.Font = FontUtil.GetPKXFont(); editing = true; } diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_SecretBase.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_SecretBase.cs index c065f8845..7212079a5 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_SecretBase.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_SecretBase.cs @@ -22,7 +22,7 @@ public SAV_SecretBase(SaveFile sav) SetupComboBoxes(); PopFavorite(); PopFavorite(); - TB_FOT.Font = TB_FT1.Font = TB_FT2.Font = TB_FSay1.Font = TB_FSay2.Font = TB_FSay3.Font = TB_FSay4.Font = LB_Favorite.Font = FontUtil.GetPKXFont(11); + TB_FOT.Font = TB_FT1.Font = TB_FT2.Font = TB_FSay1.Font = TB_FSay2.Font = TB_FSay3.Font = TB_FSay4.Font = LB_Favorite.Font = FontUtil.GetPKXFont(); CB_Ability.InitializeBinding(); LB_Favorite.SelectedIndex = 0; diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_Trainer.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_Trainer.cs index c89bf3299..4e0259af8 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_Trainer.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_Trainer.cs @@ -18,13 +18,9 @@ public SAV_Trainer(SaveFile sav) SAV = (SAV6)(Origin = sav).Clone(); if (Main.Unicode) { - try - { - TB_OTName.Font = FontUtil.GetPKXFont(11); - if (SAV is SAV6XY) - TB_TRNick.Font = TB_OTName.Font; - } - catch (Exception e) { WinFormsUtil.Alert("Font loading failed...", e.ToString()); } + TB_OTName.Font = FontUtil.GetPKXFont(); + if (SAV is SAV6XY) + TB_TRNick.Font = TB_OTName.Font; } B_MaxCash.Click += (sender, e) => MT_Money.Text = "9,999,999"; diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_FestivalPlaza.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_FestivalPlaza.cs index ba1c156af..7a37872d4 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_FestivalPlaza.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_FestivalPlaza.cs @@ -33,8 +33,7 @@ public SAV_FestivalPlaza(SaveFile sav) if (Main.Unicode) { - try { TB_OTName.Font = FontUtil.GetPKXFont(11); } - catch (Exception e) { WinFormsUtil.Alert("Font loading failed...", e.ToString()); } + TB_OTName.Font = FontUtil.GetPKXFont(); } var cc = SAV.Festa.FestaCoins; diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_Trainer7.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_Trainer7.cs index 77a0e6595..5057a7b1f 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_Trainer7.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_Trainer7.cs @@ -19,8 +19,7 @@ public SAV_Trainer7(SaveFile sav) Loading = true; if (Main.Unicode) { - try { TB_OTName.Font = FontUtil.GetPKXFont(11); } - catch (Exception e) { WinFormsUtil.Alert("Font loading failed...", e.ToString()); } + TB_OTName.Font = FontUtil.GetPKXFont(); } B_MaxCash.Click += (sender, e) => MT_Money.Text = "9,999,999"; diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_Trainer7GG.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_Trainer7GG.cs index 204f81e39..2e55ebcd9 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_Trainer7GG.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_Trainer7GG.cs @@ -23,8 +23,7 @@ public SAV_Trainer7GG(SaveFile sav) if (Main.Unicode) { - try { TB_OTName.Font = TB_RivalName.Font = FontUtil.GetPKXFont(11); } - catch (Exception e) { WinFormsUtil.Alert("Font loading failed...", e.ToString()); } + TB_OTName.Font = TB_RivalName.Font = FontUtil.GetPKXFont(); } B_MaxCash.Click += (sender, e) => MT_Money.Text = "9,999,999"; diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_Trainer8.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_Trainer8.cs index 8c4ac5acf..3363d1093 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_Trainer8.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_Trainer8.cs @@ -18,8 +18,7 @@ public SAV_Trainer8(SaveFile sav) Loading = true; if (Main.Unicode) { - try { TB_OTName.Font = FontUtil.GetPKXFont(11); } - catch (Exception e) { WinFormsUtil.Alert("Font loading failed...", e.ToString()); } + TB_OTName.Font = FontUtil.GetPKXFont(); } B_MaxCash.Click += (sender, e) => MT_Money.Text = SAV.MaxMoney.ToString(); diff --git a/PKHeX.WinForms/Util/FontUtil.cs b/PKHeX.WinForms/Util/FontUtil.cs index a1938d24f..2dccef6f3 100644 --- a/PKHeX.WinForms/Util/FontUtil.cs +++ b/PKHeX.WinForms/Util/FontUtil.cs @@ -29,7 +29,7 @@ static FontUtil() CustomFonts.AddFontFile(g6path); } - public static Font GetPKXFont(float size) + public static Font GetPKXFont(float size = 11f) { if (GeneratedFonts.TryGetValue(size, out var f)) return f;