Merge pull request #234 from Linkaaaaa/account-column

gw2scratch · Jun 4, 2024 · d657dc9 · d657dc9
2 parents 1f3c372 + 4ca4816
commit d657dc9
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 1 deletion.
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.1</Version>
+        <Version>1.11.1.2</Version>
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="DebounceThrottle" Version="2.0.0" />

diff --git a/ArcdpsLogManager/Configuration/Settings.cs b/ArcdpsLogManager/Configuration/Settings.cs
@@ -21,6 +21,7 @@ public static class Settings
 		private static readonly List<ISettingsMigration> Migrations =
 		[
 			new NullVersionSettingsMigration(settings => settings.HiddenLogListColumns.Add("Instabilities")),
+			new MaxVersionSettingsMigration(new Version(1, 11, 1, 2), settings => settings.HiddenLogListColumns.Add("Account"))
 		];
 
 		private static StoredSettings Values => Stored.Value;

diff --git a/ArcdpsLogManager/Configuration/StoredSettings.cs b/ArcdpsLogManager/Configuration/StoredSettings.cs
@@ -27,6 +27,7 @@ public class StoredSettings
 	public List<string> HiddenLogListColumns { get; set; } =
 	[
 		"Character",
+		"Account",
 		"Map ID",
 		"Game Version",
 		"arcdps Version",

diff --git a/ArcdpsLogManager/Sections/LogList.cs b/ArcdpsLogManager/Sections/LogList.cs
@@ -346,6 +346,15 @@ private GridView<LogData> ConstructLogGridView(LogDetailPanel detailPanel, Multi
 				}
 			});
 
+			gridView.Columns.Add(new GridColumn
+			{
+				HeaderText = "Account",
+				DataCell = new TextBoxCell
+				{
+					Binding = new DelegateBinding<LogData, string>(x => x.PointOfView?.AccountName.TrimStart(':') ?? "Unknown")
+				}
+			});
+
 			var compositionCell = new DrawableCell();
 			compositionCell.Paint += (sender, args) =>
 			{