From c403e7b45b25686b55e030eaa77d066c0dca85a7 Mon Sep 17 00:00:00 2001
From: Stanley Dimant <stanley.dimant@varian.com>
Date: Mon, 30 Jan 2023 11:16:43 +0100
Subject: [PATCH] add show player name instead of notes

---
 .../MareConfiguration/MareConfig.cs           |  1 +
 MareSynchronos/UI/CompactUI.cs                |  9 ++++++++-
 MareSynchronos/UI/SettingsUi.cs               | 19 +++++++++++++++++++
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/MareSynchronos/MareConfiguration/MareConfig.cs b/MareSynchronos/MareConfiguration/MareConfig.cs
index 1f6c1ba..3cb437f 100644
--- a/MareSynchronos/MareConfiguration/MareConfig.cs
+++ b/MareSynchronos/MareConfiguration/MareConfig.cs
@@ -27,4 +27,5 @@ public class MareConfig : IPluginConfiguration
     public string CurrentServer { get; set; } = string.Empty;
     public bool ShowOnlineNotifications { get; set; } = false;
     public bool ShowOnlineNotificationsOnlyForIndividualPairs { get; set; } = true;
+    public bool ShowCharacterNameInsteadOfNotesForVisible { get; set; } = false;
 }
\ No newline at end of file
diff --git a/MareSynchronos/UI/CompactUI.cs b/MareSynchronos/UI/CompactUI.cs
index 0c48dcc..34d4fe5 100644
--- a/MareSynchronos/UI/CompactUI.cs
+++ b/MareSynchronos/UI/CompactUI.cs
@@ -413,6 +413,12 @@ public class CompactUi : Window, IDisposable
             playerText = entryUID;
         }
 
+        if (_configService.Current.ShowCharacterNameInsteadOfNotesForVisible && entry.IsVisible && !showUidInsteadOfName)
+        {
+            playerText = entry.PlayerName;
+            textIsUid = false;
+        }
+
         ImGui.SameLine();
         if (!string.Equals(EditNickEntry, entry.UserData.UID, StringComparison.Ordinal))
         {
@@ -530,7 +536,8 @@ public class CompactUi : Window, IDisposable
         var users = GetFilteredUsers();
 
         ImGui.BeginChild("list", new Vector2(WindowContentWidth, ySize), border: false);
-        var visibleUsers = users.Where(u => u.IsVisible && u.UserPair!.OtherPermissions.IsPaired()).OrderBy(u => u.GetNote() ?? u.UserData.AliasOrUID, StringComparer.OrdinalIgnoreCase).ToList();
+        var visibleUsers = users.Where(u => u.IsVisible && u.UserPair!.OtherPermissions.IsPaired()).OrderBy(u => _configService.Current.ShowCharacterNameInsteadOfNotesForVisible ?
+            u.PlayerName : (u.GetNote() ?? u.UserData.AliasOrUID), StringComparer.OrdinalIgnoreCase).ToList();
         var onlineUsers = users.Where(u => u.IsOnline && !u.IsVisible && u.UserPair!.OtherPermissions.IsPaired()).OrderBy(u => u.GetNote() ?? u.UserData.AliasOrUID, StringComparer.OrdinalIgnoreCase).ToList();
         var offlineUsers = users.Where(u => !u.IsOnline && !u.IsVisible || !u.UserPair!.OtherPermissions.IsPaired()).OrderBy(u => u.GetNote() ?? u.UserData.AliasOrUID, StringComparer.OrdinalIgnoreCase).ToList();
 
diff --git a/MareSynchronos/UI/SettingsUi.cs b/MareSynchronos/UI/SettingsUi.cs
index 423a722..916894e 100644
--- a/MareSynchronos/UI/SettingsUi.cs
+++ b/MareSynchronos/UI/SettingsUi.cs
@@ -458,6 +458,25 @@ public class SettingsUi : Window, IDisposable
         UiShared.DrawHelpText("This will open a popup that allows you to set the notes for a user after successfully adding them to your individual pairs.");
 
         ImGui.Separator();
+        UiShared.FontText("UI", _uiShared.UidFont);
+        var showNameInsteadOfNotes = _configService.Current.ShowCharacterNameInsteadOfNotesForVisible;
+        var reverseUserSort = _configService.Current.ReverseUserSort;
+        if (ImGui.Checkbox("Show player name instead of note for visible players", ref showNameInsteadOfNotes))
+        {
+            _configService.Current.ShowCharacterNameInsteadOfNotesForVisible = showNameInsteadOfNotes;
+            _configService.Save();
+        }
+        UiShared.DrawHelpText("This will show the character name instead of custom set note when visible");
+
+        if (ImGui.Checkbox("Reverse user sort", ref reverseUserSort))
+        {
+            _configService.Current.ReverseUserSort = reverseUserSort;
+            _configService.Save();
+        }
+        UiShared.DrawHelpText("This reverses the user sort from A->Z to Z->A");
+
+        ImGui.Separator();
+
         UiShared.FontText("Server Messages", _uiShared.UidFont);
         if (ImGui.Checkbox("Hide Server Info Messages", ref hideInfoMessages))
         {