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

Minor tweaks

Browse Source 
Fixes conversion compatibility override being reverted when settings is reloaded by user (via GUI)
This commit is contained in:
Kurt
2025-08-13 22:05:43 -05:00
parent 93a381bfde
commit d658da44c6
2 changed files with 32 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
PKHeX.WinForms/MainWindow/Main.cs
View File

@@ -22,7 +22,7 @@ namespace PKHeX.WinForms;
public partial class Main : Form
{
public Main(ProgramInit init, StartupArguments args)
public Main()
{
InitializeComponent();
if (Settings.Display.DisableScalingDpi)
@@ -37,26 +37,10 @@ public Main(ProgramInit init, StartupArguments args)
}
#endif
FormInitializeSecond();
FormLoadCheckForUpdates();
if (Settings.Startup.PluginLoadEnable)
FormLoadPlugins();
FormLoadInitialFiles(args);
if (HaX)
{
EntityConverter.AllowIncompatibleConversion = EntityCompatibilitySetting.AllowIncompatibleAll;
WinFormsUtil.Alert(MsgProgramIllegalModeActive, MsgProgramIllegalModeBehave);
}
else if (init.ShowChangelog)
{
ShowAboutDialog(AboutPage.Changelog);
}
if (init.BackupPrompt && !Directory.Exists(BackupPath))
PromptBackup();
}
public void AnimateStartup()
{
BringToFront();
WindowState = FormWindowState.Minimized;
Show();
@@ -114,7 +98,7 @@ private void FormLoadAddEvents()
C_SAV.EnableDragDrop(Main_DragEnter, Main_DragDrop);
// ToolTips for Drag&Drop
toolTip.SetToolTip(dragout, "PKM QuickSave");
toolTip.SetToolTip(dragout, "Drag to Save");
// Box to Tabs D&D
dragout.AllowDrop = true;
@@ -128,7 +112,7 @@ private void FormLoadAddEvents()
C_SAV.menu.RequestEditorLegality = DisplayLegalityReport;
}
private void FormLoadInitialFiles(StartupArguments args)
public void LoadInitialFiles(StartupArguments args)
{
var sav = args.SAV!;
var path = sav.Metadata.FilePath ?? string.Empty;
@@ -157,7 +141,7 @@ private void LoadBlankSaveFile(GameVersion version)
C_SAV!.SAV.State.Edited = false; // Prevents form close warning from showing until changes are made
}
private void FormLoadCheckForUpdates()
public void CheckForUpdates()
{
Task.Run(async () =>
{
@@ -187,26 +171,6 @@ private void NotifyNewVersionAvailable(Version version)
lbl.Visible = lbl.TabStop = lbl.Enabled = true;
}
private static void FormLoadConfig(out bool BAKprompt, out bool showChangelog)
{
BAKprompt = false;
showChangelog = false;
// Version Check
var ver = Program.CurrentVersion;
var startup = Settings.Startup;
if (startup.ShowChangelogOnUpdate && startup.Version.Length != 0) // already run on system
{
bool parsed = Version.TryParse(startup.Version, out var lastrev);
showChangelog = parsed && lastrev < ver;
}
startup.Version = ver.ToString(); // set current version so this doesn't happen until the user updates next time
// BAK Prompt
if (!Settings.Backup.BAKPrompt)
BAKprompt = Settings.Backup.BAKPrompt = true;
}
public static DrawConfig Draw { get; private set; } = new();
private void FormInitializeSecond()
@@ -226,7 +190,7 @@ private void FormInitializeSecond()
CB_MainLanguage.SelectedIndex = GameLanguage.GetLanguageIndex(settings.Startup.Language);
}
private void FormLoadPlugins()
public void AttachPlugins()
{
if (Plugins.Count != 0)
return; // already loaded
@@ -287,7 +251,7 @@ private void MainMenuExit(object sender, EventArgs e)
private void MainMenuAbout(object sender, EventArgs e) => ShowAboutDialog(AboutPage.Shortcuts);
private static void ShowAboutDialog(AboutPage index)
public void ShowAboutDialog(AboutPage index)
{
using var form = new About(index);
form.ShowDialog();
@@ -408,7 +372,12 @@ private void ReloadProgramSettings(PKHeXSettings settings, bool skipCore = false
WinFormsUtil.DetectSaveFileOnFileOpen = settings.Startup.TryDetectRecentSave;
SelectablePictureBox.FocusBorderDeflate = GenderToggle.FocusBorderDeflate = settings.Display.FocusBorderDeflate;
if (HaX)
{
EntityConverter.AllowIncompatibleConversion = EntityCompatibilitySetting.AllowIncompatibleAll;
}
SpriteBuilder.LoadSettings(settings.Sprite);
WinFormsUtil.AddSaveFileExtensions(settings.Backup.OtherSaveFileExtensions);
}
private void MainMenuBoxLoad(object sender, EventArgs e)
@@ -1316,7 +1285,7 @@ private void ClickSaveFileName(object sender, EventArgs e)
}
}
private static void PromptBackup()
public void PromptBackup()
{
if (DialogResult.Yes != WinFormsUtil.Prompt(MessageBoxButtons.YesNo, string.Format(MsgBackupCreateLocation, BackupPath), MsgBackupCreateQuestion))
return;
@@ -1334,4 +1303,9 @@ private static void PromptBackup()
private void ClickUndo(object sender, EventArgs e) => C_SAV.ClickUndo();
private void ClickRedo(object sender, EventArgs e) => C_SAV.ClickRedo();
#endregion
public void WarnBehavior()
{
WinFormsUtil.Alert(MsgProgramIllegalModeActive, MsgProgramIllegalModeBehave);
}
}

14
PKHeX.WinForms/Program.cs
View File

@@ -54,14 +54,24 @@ private static void Main()
new Task(() => splash.ShowDialog()).Start();
// Prepare init values that used to be calculated in Main
WinFormsUtil.AddSaveFileExtensions(settings.Backup.OtherSaveFileExtensions);
var startup = StartupUtil.GetStartup(args, settings.Startup, settings.LocalResources);
var init = StartupUtil.FormLoadInitialActions(args, settings.Startup, settings.Backup, CurrentVersion);
HaX = init.HaX;
var main = new Main(init, startup);
var main = new Main();
// Setup complete.
main.CheckForUpdates();
if (Settings.Startup.PluginLoadEnable)
main.AttachPlugins();
main.LoadInitialFiles(startup);
splash.BeginInvoke(splash.ForceClose);
if (init.HaX)
main.WarnBehavior();
else if (init.ShowChangelog)
main.ShowAboutDialog(AboutPage.Changelog);
else if (init.BackupPrompt && !Directory.Exists(settings.LocalResources.GetBackupPath()))
main.PromptBackup();
main.AnimateStartup();
Application.Run(main);
}