From bc6cde48de296bb78163b71f2265c0257e74a893 Mon Sep 17 00:00:00 2001 From: SirConstance Date: Sun, 31 Aug 2025 12:27:50 +0200 Subject: [PATCH] PimpMyMod --- MareSynchronos/UI/CompactUI.cs | 13 +++++-------- MareSynchronos/UI/SettingsUi.cs | 14 +++++++------- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/MareSynchronos/UI/CompactUI.cs b/MareSynchronos/UI/CompactUI.cs index 8655573..69fa74f 100644 --- a/MareSynchronos/UI/CompactUI.cs +++ b/MareSynchronos/UI/CompactUI.cs @@ -80,11 +80,11 @@ public class CompactUi : WindowMediatorSubscriberBase #if DEBUG string dev = "Dev Build"; var ver = Assembly.GetExecutingAssembly().GetName().Version!; - WindowName = $"UmbraSync Sync {dev} ({ver.Major}.{ver.Minor}.{ver.Build})###UmbraSyncSyncMainUIDev"; + WindowName = $"UmbraSync {dev} ({ver.Major}.{ver.Minor}.{ver.Build})###UmbraSyncSyncMainUIDev"; Toggle(); #else var ver = Assembly.GetExecutingAssembly().GetName().Version!; - WindowName = "UmbraSync Sync " + ver.Major + "." + ver.Minor + "." + ver.Build + "###UmbraSyncSyncMainUI"; + WindowName = "UmbraSync " + ver.Major + "." + ver.Minor + "." + ver.Build + "###UmbraSyncSyncMainUI"; #endif Mediator.Subscribe(this, (_) => IsOpen = true); Mediator.Subscribe(this, (_) => IsOpen = false); @@ -104,10 +104,7 @@ public class CompactUi : WindowMediatorSubscriberBase protected override void DrawInternal() { - if (_serverManager.CurrentApiUrl.Equals(ApiController.UmbraSyncServiceUri, StringComparison.Ordinal)) - UiSharedService.AccentColor = new Vector4(1.0f, 0.8666f, 0.06666f, 1.0f); - else - UiSharedService.AccentColor = ImGuiColors.ParsedGreen; + UiSharedService.AccentColor = new Vector4(0.2f, 0.6f, 1f, 1f); // custom blue ImGui.SetCursorPosY(ImGui.GetCursorPosY() - ImGui.GetStyle().WindowPadding.Y - 1f * ImGuiHelpers.GlobalScale + ImGui.GetStyle().ItemSpacing.Y); WindowContentWidth = UiSharedService.GetWindowContentRegionWidth(); if (!_apiController.IsCurrentVersion) @@ -387,7 +384,7 @@ public class CompactUi : WindowMediatorSubscriberBase { ImGui.SetCursorPosX((ImGui.GetWindowContentRegionMin().X + UiSharedService.GetWindowContentRegionWidth()) / 2 - (userSize.X + textSize.X) / 2 - ImGui.GetStyle().ItemSpacing.X / 2); if (!printShard) ImGui.AlignTextToFramePadding(); - ImGui.TextColored(ImGuiColors.ParsedGreen, userCount); + ImGui.TextColored(ImGuiColors.ParsedBlue, userCount); ImGui.SameLine(); if (!printShard) ImGui.AlignTextToFramePadding(); ImGui.TextUnformatted("Users Online"); @@ -595,7 +592,7 @@ public class CompactUi : WindowMediatorSubscriberBase { ServerState.Connecting => ImGuiColors.DalamudYellow, ServerState.Reconnecting => ImGuiColors.DalamudRed, - ServerState.Connected => UiSharedService.AccentColor, + ServerState.Connected => new Vector4(0.2f, 0.6f, 1f, 1f), // custom blue ServerState.Disconnected => ImGuiColors.DalamudYellow, ServerState.Disconnecting => ImGuiColors.DalamudYellow, ServerState.Unauthorized => ImGuiColors.DalamudRed, diff --git a/MareSynchronos/UI/SettingsUi.cs b/MareSynchronos/UI/SettingsUi.cs index 383cdff..7858d09 100644 --- a/MareSynchronos/UI/SettingsUi.cs +++ b/MareSynchronos/UI/SettingsUi.cs @@ -581,32 +581,32 @@ public class SettingsUi : WindowMediatorSubscriberBase _uiShared.BigText("Advanced"); bool mareApi = _configService.Current.MareAPI; - if (ImGui.Checkbox("Enable Mare Synchronos API", ref mareApi)) + if (ImGui.Checkbox("Enable Umbra Synchronos API", ref mareApi)) { _configService.Current.MareAPI = mareApi; _configService.Save(); _ipcProvider.HandleMareImpersonation(); } - _uiShared.DrawHelpText("Enables handling of the Mare Synchronos API. This currently includes:\n\n" + + _uiShared.DrawHelpText("Enables handling of the UmbraSync API. This currently includes:\n\n" + " - MCDF loading support for other plugins\n" + " - Blocking Moodles applications to paired users\n\n" + - "If the Mare Synchronos plugin is loaded while this option is enabled, control of its API will be relinquished."); + "If the UmbraSync plugin is loaded while this option is enabled, control of its API will be relinquished."); using (_ = ImRaii.PushIndent()) { ImGui.SameLine(300.0f * ImGuiHelpers.GlobalScale); if (_ipcProvider.ImpersonationActive) { - UiSharedService.ColorTextWrapped("Mare API active!", ImGuiColors.HealerGreen); + UiSharedService.ColorTextWrapped("Umbra API active!", ImGuiColors.HealerGreen); } else { if (!mareApi) - UiSharedService.ColorTextWrapped("Mare API inactive: Option is disabled", ImGuiColors.DalamudYellow); + UiSharedService.ColorTextWrapped("Umbra API inactive: Option is disabled", ImGuiColors.DalamudYellow); else if (_ipcProvider.MarePluginEnabled) - UiSharedService.ColorTextWrapped("Mare API inactive: Mare plugin is loaded", ImGuiColors.DalamudYellow); + UiSharedService.ColorTextWrapped("Umbra API inactive: Umbra plugin is loaded", ImGuiColors.DalamudYellow); else - UiSharedService.ColorTextWrapped("Mare API inactive: Unknown reason", ImGuiColors.DalamudRed); + UiSharedService.ColorTextWrapped("Umbra API inactive: Unknown reason", ImGuiColors.DalamudRed); } }