From e58ebfdfbab85b104db23aa5442d047e725d7095 Mon Sep 17 00:00:00 2001 From: goaaats <16760685+goaaats@users.noreply.github.com> Date: Wed, 20 Oct 2021 18:00:06 +0200 Subject: [PATCH] feat: transfer styles from non-polymorphic configuration --- Dalamud/Dalamud.cs | 3 ++- Dalamud/Interface/Internal/InterfaceManager.cs | 2 ++ Dalamud/Interface/Style/StyleModel.cs | 17 +++++++++++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/Dalamud/Dalamud.cs b/Dalamud/Dalamud.cs index 0fa16b0d9..4e1110969 100644 --- a/Dalamud/Dalamud.cs +++ b/Dalamud/Dalamud.cs @@ -125,7 +125,7 @@ namespace Dalamud framework.Enable(); - Log.Information("[T1] Framework ENABLE!"); + Log.Information("[T1] Load complete!"); } catch (Exception ex) { @@ -233,6 +233,7 @@ namespace Dalamud Service.Set().Enable(); this.IsReady = true; + Log.Information("[T2] Load complete!"); } catch (Exception ex) { diff --git a/Dalamud/Interface/Internal/InterfaceManager.cs b/Dalamud/Interface/Internal/InterfaceManager.cs index 4284c876b..de477ae0d 100644 --- a/Dalamud/Interface/Internal/InterfaceManager.cs +++ b/Dalamud/Interface/Internal/InterfaceManager.cs @@ -369,6 +369,8 @@ namespace Dalamud.Interface.Internal this.SetupFonts(); + StyleModel.TransferOldModels(); + if (configuration.SavedStyles == null || configuration.SavedStyles.All(x => x.Name != StyleModelV1.DalamudStandard.Name)) { configuration.SavedStyles = new List { StyleModelV1.DalamudStandard, StyleModelV1.DalamudClassic }; diff --git a/Dalamud/Interface/Style/StyleModel.cs b/Dalamud/Interface/Style/StyleModel.cs index a397454eb..b7082e05e 100644 --- a/Dalamud/Interface/Style/StyleModel.cs +++ b/Dalamud/Interface/Style/StyleModel.cs @@ -70,6 +70,23 @@ namespace Dalamud.Interface.Style throw new ArgumentException("Was not a compressed style model."); } + /// + /// [TEMPORARY] Transfer old non-polymorphic style models to the new format. + /// + public static void TransferOldModels() + { + var configuration = Service.Get(); + + if (configuration.SavedStylesOld == null) + return; + + configuration.SavedStyles = new List(); + configuration.SavedStyles.AddRange(configuration.SavedStylesOld); + + configuration.SavedStylesOld = null; + configuration.Save(); + } + /// /// Serialize this style model. ///