From d8c0c4b4fe9824ca8ec7b961b441ade5161dcaf1 Mon Sep 17 00:00:00 2001 From: RisaDev <151885272+RisaDev@users.noreply.github.com> Date: Mon, 24 Jun 2024 01:52:02 +0300 Subject: [PATCH] Move support button, improve text alignment in support log --- .../Core/Services/SupportLogBuilderService.cs | 63 +++++++++---------- .../UI/Windows/MainWindow/Tabs/SettingsTab.cs | 16 ++--- 2 files changed, 39 insertions(+), 40 deletions(-) diff --git a/CustomizePlus/Core/Services/SupportLogBuilderService.cs b/CustomizePlus/Core/Services/SupportLogBuilderService.cs index 5570422..5dc84a0 100644 --- a/CustomizePlus/Core/Services/SupportLogBuilderService.cs +++ b/CustomizePlus/Core/Services/SupportLogBuilderService.cs @@ -42,65 +42,64 @@ public class SupportLogBuilderService { var sb = new StringBuilder(10240); sb.AppendLine("**Settings**"); - sb.Append($"> **`Plugin Version: `** {Plugin.Version}\n"); - sb.Append($"> **`Commit Hash: `** {ThisAssembly.Git.Commit}+{ThisAssembly.Git.Sha}\n"); - sb.Append($"> **`Root editing: `** {_configuration.EditorConfiguration.RootPositionEditingEnabled}\n"); + sb.Append($"> **`Plugin Version: `** {Plugin.Version}\n"); + sb.Append($"> **`Commit Hash: `** {ThisAssembly.Git.Commit}+{ThisAssembly.Git.Sha}\n"); + sb.Append($"> **`Root editing: `** {_configuration.EditorConfiguration.RootPositionEditingEnabled}\n"); sb.AppendLine("**Settings -> Editor Settings**"); - sb.Append($"> **`Limit to my creatures (editor): `** {_configuration.EditorConfiguration.LimitLookupToOwnedObjects}\n"); - sb.Append($"> **`Preview character (editor): `** {_configuration.EditorConfiguration.PreviewCharacterName?.Incognify() ?? "Not set"}\n"); + sb.Append($"> **`Limit to my creatures (editor): `** {_configuration.EditorConfiguration.LimitLookupToOwnedObjects}\n"); + sb.Append($"> **`Preview character (editor): `** {_configuration.EditorConfiguration.PreviewCharacterName?.Incognify() ?? "Not set"}\n"); sb.AppendLine("**Settings -> Profile application**"); - sb.Append($"> **`Character window: `** {_configuration.ProfileApplicationSettings.ApplyInCharacterWindow}\n"); - sb.Append($"> **`Try On: `** {_configuration.ProfileApplicationSettings.ApplyInTryOn}\n"); - sb.Append($"> **`Cards: `** {_configuration.ProfileApplicationSettings.ApplyInCards}\n"); - sb.Append($"> **`Inspect: `** {_configuration.ProfileApplicationSettings.ApplyInInspect}\n"); - sb.Append($"> **`Lobby: `** {_configuration.ProfileApplicationSettings.ApplyInLobby}\n"); + sb.Append($"> **`Character window: `** {_configuration.ProfileApplicationSettings.ApplyInCharacterWindow}\n"); + sb.Append($"> **`Try On: `** {_configuration.ProfileApplicationSettings.ApplyInTryOn}\n"); + sb.Append($"> **`Cards: `** {_configuration.ProfileApplicationSettings.ApplyInCards}\n"); + sb.Append($"> **`Inspect: `** {_configuration.ProfileApplicationSettings.ApplyInInspect}\n"); + sb.Append($"> **`Lobby: `** {_configuration.ProfileApplicationSettings.ApplyInLobby}\n"); sb.AppendLine("**Relevant plugins**"); GatherRelevantPlugins(sb); sb.AppendLine("**Templates**"); - sb.Append($"> **`Count: `** {_templateManager.Templates.Count}\n"); + sb.Append($"> **`Count: `** {_templateManager.Templates.Count}\n"); foreach (var template in _templateManager.Templates) { - sb.Append($"> > **`{template.ToString(),-29}`**\n"); + sb.Append($"> > **`{template.ToString(),-32}`**\n"); } sb.AppendLine("**Profiles**"); - sb.Append($"> **`Count: `** {_profileManager.Profiles.Count}\n"); + sb.Append($"> **`Count: `** {_profileManager.Profiles.Count}\n"); foreach (var profile in _profileManager.Profiles) { sb.Append($"> > =====\n"); - sb.Append($"> > **`{profile.ToString(),-29}`*\n"); - sb.Append($"> > **`Name: {profile.Name.Text.Incognify()}`**\n"); - sb.Append($"> > **`Type: {profile.ProfileType}`**\n"); - sb.Append($"> > **`Character name: {profile.CharacterName.Text.Incognify()}`**\n"); - sb.Append($"> > **`Limit to my creatures: {profile.LimitLookupToOwnedObjects}`**\n"); + sb.Append($"> > **`{profile.ToString(),-32}`*\n"); + sb.Append($"> > **`Name: `** {profile.Name.Text.Incognify()}\n"); + sb.Append($"> > **`Type: `** {profile.ProfileType} \n"); + sb.Append($"> > **`Character name: `** {profile.CharacterName.Text.Incognify()}\n"); + sb.Append($"> > **`Limit to my creatures: `** {profile.LimitLookupToOwnedObjects}\n"); sb.Append($"> > **`Templates:`**\n"); - sb.Append($"> > > **`Count: {profile.Templates.Count}`**\n"); + sb.Append($"> > > **`Count: `** {profile.Templates.Count}\n"); foreach (var template in profile.Templates) { - sb.Append($"> > > **`{template.ToString()}`**\n"); + sb.Append($"> > > **`{template.ToString(), -32}`**\n"); } sb.Append($"> > **`Armatures:`**\n"); - sb.Append($"> > > **`Count: {profile.Armatures.Count}`**\n"); + sb.Append($"> > > **`Count: `** {profile.Armatures.Count}\n"); foreach (var armature in profile.Armatures) { - sb.Append($"> > > **`{armature.ToString()}`**\n"); + sb.Append($"> > > **`{armature.ToString(), -32}`**\n"); } sb.Append($"> > =====\n"); } sb.AppendLine("**Armatures**"); - sb.Append($"> **`Count: `** {_armatureManager.Armatures.Count}\n"); + sb.Append($"> **`Count: `** {_armatureManager.Armatures.Count}\n"); foreach (var kvPair in _armatureManager.Armatures) { var identifier = kvPair.Key; var armature = kvPair.Value; sb.Append($"> > =====\n"); - sb.Append($"> > **`{armature.ToString(),-29}`**\n"); - sb.Append($"> > **`Actor: {armature.ActorIdentifier.Incognito(null) ?? "None"}`**\n"); - sb.Append($"> > **`Built: {armature.IsBuilt}`**\n"); - sb.Append($"> > **`Visible: {armature.IsVisible}`**\n"); - sb.Append($"> > **`Pending rebind: {armature.IsPendingProfileRebind}`**\n"); - sb.Append($"> > **`Last seen: {armature.LastSeen}`**\n"); - sb.Append($"> > **`Profile: {armature.Profile?.ToString() ?? "None"}`**\n"); - sb.Append($"> > **`Main Root Bone/Total Bones/Partial Skeleton Count: {armature.MainRootBone}/{armature.TotalBoneCount}/{armature.PartialSkeletonCount}`**\n"); + sb.Append($"> > **`{armature.ToString(),-32}`**\n"); + sb.Append($"> > **`Actor: `** {armature.ActorIdentifier.Incognito(null) ?? "None"}\n"); + sb.Append($"> > **`Built: `** {armature.IsBuilt}\n"); + sb.Append($"> > **`Visible: `** {armature.IsVisible}\n"); + sb.Append($"> > **`Pending rebind: `** {armature.IsPendingProfileRebind}\n"); + sb.Append($"> > **`Last seen: `** {armature.LastSeen}\n"); + sb.Append($"> > **`Profile: `** {armature.Profile?.ToString() ?? "None"}\n"); sb.Append($"> > **`Bone template bindings:`**\n"); foreach (var bindingKvPair in armature.BoneTemplateBinding) { @@ -128,7 +127,7 @@ public class SupportLogBuilderService foreach (var plugin in relevantPlugins) { if (plugins.TryGetValue(plugin, out var data)) - sb.Append($"> **`{data.Name + ':',-29}`** {data.Version}{(data.IsLoaded ? string.Empty : " (Disabled)")}\n"); + sb.Append($"> **`{data.Name + ':',-32}`** {data.Version}{(data.IsLoaded ? string.Empty : " (Disabled)")}\n"); } } } diff --git a/CustomizePlus/UI/Windows/MainWindow/Tabs/SettingsTab.cs b/CustomizePlus/UI/Windows/MainWindow/Tabs/SettingsTab.cs index f4581ee..d56b663 100644 --- a/CustomizePlus/UI/Windows/MainWindow/Tabs/SettingsTab.cs +++ b/CustomizePlus/UI/Windows/MainWindow/Tabs/SettingsTab.cs @@ -313,16 +313,16 @@ public class SettingsTab DrawDiscordButton(width); ImGui.SetCursorPos(new Vector2(xPos, 1 * ImGui.GetFrameHeightWithSpacing())); - if (ImGui.Button("Show update history", new Vector2(width, 0))) - _changeLog.Changelog.ForceOpen = true; + if (ImGui.Button("Copy Support Info to Clipboard")) + { + var text = _supportLogBuilderService.BuildSupportLog(); + ImGui.SetClipboardText(text); + _messageService.NotificationMessage($"Copied Support Info to Clipboard.", NotificationType.Success, false); + } ImGui.SetCursorPos(new Vector2(xPos, 2 * ImGui.GetFrameHeightWithSpacing())); - if (!ImGui.Button("Copy Support Info to Clipboard")) - return; - - var text = _supportLogBuilderService.BuildSupportLog(); - ImGui.SetClipboardText(text); - _messageService.NotificationMessage($"Copied Support Info to Clipboard.", NotificationType.Success, false); + if (ImGui.Button("Show update history", new Vector2(width, 0))) + _changeLog.Changelog.ForceOpen = true; } /// Draw a button to open the official discord server.