Manager: Fix hiding icon column by default

gw2scratch · May 3, 2024 · bdd3f2f · bdd3f2f
1 parent 05abd15
commit bdd3f2f
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 28 deletions.
diff --git a/ArcdpsLogManager/ArcdpsLogManager.csproj b/ArcdpsLogManager/ArcdpsLogManager.csproj
@@ -17,7 +17,7 @@
         Each new log data update causes a revision increase.
         See LogDataUpdater for the updates.
         -->
-        <Version>1.11.1.0</Version>
+        <Version>1.11.1.1</Version>
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="DebounceThrottle" Version="2.0.0" />

diff --git a/ArcdpsLogManager/Configuration/Migrations/MaxVersionSettingsMigration.cs b/ArcdpsLogManager/Configuration/Migrations/MaxVersionSettingsMigration.cs
@@ -2,17 +2,8 @@
 
 namespace GW2Scratch.ArcdpsLogManager.Configuration.Migrations;
 
-public class MaxVersionSettingsMigration : ISettingsMigration
+public class MaxVersionSettingsMigration(Version maxVersion, Action<StoredSettings> migration) : ISettingsMigration
 {
-	private readonly Version maxVersion;
-	private readonly Action<StoredSettings> migration;
-
-	public MaxVersionSettingsMigration(Version minVersion, Action<StoredSettings> migration)
-	{
-		this.maxVersion = minVersion;
-		this.migration = migration;
-	}
-
 	public bool Applies(Version version)
 	{
 		return version < maxVersion;

diff --git a/ArcdpsLogManager/Configuration/Migrations/NullVersionSettingsMigration.cs b/ArcdpsLogManager/Configuration/Migrations/NullVersionSettingsMigration.cs
@@ -2,15 +2,8 @@
 
 namespace GW2Scratch.ArcdpsLogManager.Configuration.Migrations;
 
-public class NullVersionSettingsMigration : ISettingsMigration
+public class NullVersionSettingsMigration(Action<StoredSettings> migration) : ISettingsMigration
 {
-	private readonly Action<StoredSettings> migration;
-
-	public NullVersionSettingsMigration(Action<StoredSettings> migration)
-	{
-		this.migration = migration;
-	}
-
 	public bool Applies(Version version)
 	{
 		return version == null;

diff --git a/ArcdpsLogManager/Configuration/Settings.cs b/ArcdpsLogManager/Configuration/Settings.cs
@@ -18,11 +18,12 @@ public static class Settings
 
 		private static readonly object WriteLock = new object();
 
-		private static readonly List<ISettingsMigration> Migrations = new List<ISettingsMigration>()
-		{
-			// Null version is pre-1.4.0.0
-			new NullVersionSettingsMigration(settings => settings.HiddenLogListColumns.Add("Instabilities"))
-		};
+		private static readonly List<ISettingsMigration> Migrations =
+		[
+			new NullVersionSettingsMigration(settings => settings.HiddenLogListColumns.Add("Instabilities")),
+			// Adds the icon column to hidden 
+			new MaxVersionSettingsMigration(new Version(1, 11, 1, 0), settings => settings.HiddenLogListColumns.Add(""))
+		];
 
 		private static StoredSettings Values => Stored.Value;
 

diff --git a/ArcdpsLogManager/Configuration/StoredSettings.cs b/ArcdpsLogManager/Configuration/StoredSettings.cs
@@ -23,9 +23,21 @@ public class StoredSettings
 	public bool DpsReportAutoUpload { get; set; } = false;
 	public bool DpsReportUploadDetailedWvw { get; set; } = false;
 	public int? MinimumLogDurationSeconds { get; set; } = null;
-	public List<string> HiddenLogListColumns { get; set; } = new List<string>() {"Character", "Map ID", "Game Version", "arcdps Version", "Instabilities", "Scale"};
-	public List<string> IgnoredUpdateVersions { get; set; } = new List<string>();
-	public List<string> PlayerAccountNames { get; set; } = new List<string>();
+
+	public List<string> HiddenLogListColumns { get; set; } =
+	[
+		"Character",
+		"Map ID",
+		"Game Version",
+		"arcdps Version",
+		"Instabilities",
+		"Scale",
+		""
+	];
+
+	public List<string> IgnoredUpdateVersions { get; set; } = [];
+	public List<string> PlayerAccountNames { get; set; } = [];
+
 	public List<EncounterCategory> WeeklyClearGroups { get; set; } =
 		[EncounterCategory.Raids, EncounterCategory.StrikeEndOfDragons, EncounterCategory.StrikeSecretsOfTheObscure];
 }
diff --git a/ArcdpsLogManager/Sections/LogList.cs b/ArcdpsLogManager/Sections/LogList.cs
@@ -167,7 +167,6 @@ private GridView<LogData> ConstructLogGridView(LogDetailPanel detailPanel, Multi
 			{
 				HeaderText = "",
 				DataCell = encounterIconCell,
-				Visible = false,
 			});
 
 			gridView.Columns.Add(new GridColumn()