diff --git a/ChatTwo/ChatTwo.csproj b/ChatTwo/ChatTwo.csproj index 28c7abf..c8a8829 100755 --- a/ChatTwo/ChatTwo.csproj +++ b/ChatTwo/ChatTwo.csproj @@ -1,7 +1,7 @@ - 1.20.1 + 1.20.2 net8.0-windows enable enable diff --git a/ChatTwo/Plugin.cs b/ChatTwo/Plugin.cs index 3a06b03..8aadb58 100755 --- a/ChatTwo/Plugin.cs +++ b/ChatTwo/Plugin.cs @@ -1,5 +1,6 @@ using System.Diagnostics; using System.Globalization; +using System.Reflection; using ChatTwo.Ipc; using ChatTwo.Resources; using ChatTwo.Ui; @@ -37,8 +38,10 @@ public sealed class Plugin : IDalamudPlugin { [PluginService] internal static INotificationManager Notification { get; private set; } = null!; [PluginService] internal static IAddonLifecycle AddonLifecycle { get; private set; } = null!; - public readonly WindowSystem WindowSystem = new(PluginName); + public const string Authors = "Infi, Anna"; + public static readonly string Version = Assembly.GetExecutingAssembly().GetName().Version?.ToString(3) ?? "Unknown"; + public readonly WindowSystem WindowSystem = new(PluginName); public SettingsWindow SettingsWindow { get; } public ChatLogWindow ChatLogWindow { get; } public CommandHelpWindow CommandHelpWindow { get; } diff --git a/ChatTwo/Resources/Language.Designer.cs b/ChatTwo/Resources/Language.Designer.cs index 8696c23..c4faac5 100755 --- a/ChatTwo/Resources/Language.Designer.cs +++ b/ChatTwo/Resources/Language.Designer.cs @@ -1059,14 +1059,6 @@ namespace ChatTwo.Resources { } /// - /// Looks up a localized string similar to Copied message to clipboard. - /// - internal static string Context_CopySuccess { - get { - return ResourceManager.GetString("Context_CopySuccess", resourceCulture); - } - } - /// Looks up a localized string similar to Copy link to clipboard. /// internal static string Context_CopyLink { @@ -1084,6 +1076,15 @@ namespace ChatTwo.Resources { } } + /// + /// Looks up a localized string similar to Copied message to clipboard. + /// + internal static string Context_CopySuccess { + get { + return ResourceManager.GetString("Context_CopySuccess", resourceCulture); + } + } + /// /// Looks up a localized string similar to Hide chat. /// @@ -1426,6 +1427,15 @@ namespace ChatTwo.Resources { } } + /// + /// Looks up a localized string similar to Authors: . + /// + internal static string Options_About_Authors { + get { + return ResourceManager.GetString("Options_About_Authors", resourceCulture); + } + } + /// /// Looks up a localized string similar to Click the button to the left to see what's being worked on and what's next.. /// @@ -1436,7 +1446,7 @@ namespace ChatTwo.Resources { } /// - /// Looks up a localized string similar to Click the button to the left to help translate {0}.. + /// Looks up a localized string similar to Help to translate: . /// internal static string Options_About_CrowdIn { get { @@ -1444,6 +1454,33 @@ namespace ChatTwo.Resources { } } + /// + /// Looks up a localized string similar to Discord: . + /// + internal static string Options_About_Discord { + get { + return ResourceManager.GetString("Options_About_Discord", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Get help in the discord thread: . + /// + internal static string Options_About_Discord_Thread { + get { + return ResourceManager.GetString("Options_About_Discord_Thread", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Get help through github issues: . + /// + internal static string Options_About_Github_Issues { + get { + return ResourceManager.GetString("Options_About_Github_Issues", resourceCulture); + } + } + /// /// Looks up a localized string similar to {0} is a project to completely recreate the in-game chat and make it even better.. /// @@ -1471,6 +1508,15 @@ namespace ChatTwo.Resources { } } + /// + /// Looks up a localized string similar to Version: . + /// + internal static string Options_About_Version { + get { + return ResourceManager.GetString("Options_About_Version", resourceCulture); + } + } + /// /// Looks up a localized string similar to Allow moving chat. /// diff --git a/ChatTwo/Resources/Language.resx b/ChatTwo/Resources/Language.resx index 374e688..33959a2 100644 --- a/ChatTwo/Resources/Language.resx +++ b/ChatTwo/Resources/Language.resx @@ -377,7 +377,7 @@ Click the button to the left to see what's being worked on and what's next. - Click the button to the left to help translate {0}. + Help to translate: Translators @@ -871,7 +871,7 @@ Use this option if you experience cut-off tooltips. - + Copy content @@ -899,4 +899,19 @@ Only open URLs from websites you trust + + Authors: + + + Discord: + + + Version: + + + Get help through github issues: + + + Get help in the discord thread: + diff --git a/ChatTwo/Ui/SeStringDebugger.cs b/ChatTwo/Ui/SeStringDebugger.cs index 4bddcc3..06cc665 100644 --- a/ChatTwo/Ui/SeStringDebugger.cs +++ b/ChatTwo/Ui/SeStringDebugger.cs @@ -37,14 +37,14 @@ public class SeStringDebugger : Window ImGui.TextUnformatted("SeString Content"); ImGui.Spacing(); - if (Plugin.Store.LastMessage.Sender == null) + if (Plugin.Store.LastMessage.Message == null) { ImGui.TextUnformatted("Nothing to show"); return; } // TODO: Make SeString freely selectable through chat - foreach (var payload in Plugin.Store.LastMessage.Sender.Payloads) + foreach (var payload in Plugin.Store.LastMessage.Message.Payloads) { switch (payload) { @@ -316,4 +316,4 @@ public class SeStringDebugger : Window ImGui.PopStyleVar(); } -} \ No newline at end of file +} diff --git a/ChatTwo/Ui/SettingsTabs/About.cs b/ChatTwo/Ui/SettingsTabs/About.cs index 4c212e2..d7b0927 100755 --- a/ChatTwo/Ui/SettingsTabs/About.cs +++ b/ChatTwo/Ui/SettingsTabs/About.cs @@ -2,6 +2,8 @@ using System.Numerics; using ChatTwo.Resources; using ChatTwo.Util; using Dalamud.Interface; +using Dalamud.Interface.Colors; +using Dalamud.Interface.Utility; using ImGuiNET; namespace ChatTwo.Ui.SettingsTabs; @@ -31,23 +33,40 @@ internal sealed class About : ISettingsTab { ImGui.TextUnformatted(string.Format(Language.Options_About_Opening, Plugin.PluginName)); + ImGuiHelpers.ScaledDummy(10.0f); + + ImGui.TextUnformatted(Language.Options_About_Authors); + ImGui.SameLine(); + ImGui.TextColored(ImGuiColors.ParsedGold, Plugin.Authors); + + ImGui.TextUnformatted(Language.Options_About_Discord); + ImGui.SameLine(); + ImGui.TextColored(ImGuiColors.ParsedGold, "@infi"); + + ImGui.TextUnformatted(Language.Options_About_Version); + ImGui.SameLine(); + ImGui.TextColored(ImGuiColors.ParsedOrange, Plugin.Version); + + ImGuiHelpers.ScaledDummy(10.0f); + + ImGui.TextUnformatted(Language.Options_About_Discord_Thread); + ImGui.SameLine(); + if (ImGuiUtil.IconButton(FontAwesomeIcon.ExternalLinkAlt, "discordThread")) + Dalamud.Utility.Util.OpenLink("https://canary.discord.com/channels/581875019861328007/1224865018789761126"); + ImGui.Spacing(); - if (ImGuiUtil.IconButton(FontAwesomeIcon.ExternalLinkAlt, "clickup")) - { - Dalamud.Utility.Util.OpenLink("https://sharing.clickup.com/b/h/6-122378074-2/1047d21a39a4140"); - } - + ImGui.TextUnformatted(Language.Options_About_Github_Issues); ImGui.SameLine(); - ImGui.TextUnformatted(Language.Options_About_ClickUp); + if (ImGuiUtil.IconButton(FontAwesomeIcon.ExternalLinkAlt, "githubIssues")) + Dalamud.Utility.Util.OpenLink("https://github.com/Infiziert90/ChatTwo/issues"); + ImGuiHelpers.ScaledDummy(10.0f); + + ImGui.TextUnformatted(Language.Options_About_CrowdIn); + ImGui.SameLine(); if (ImGuiUtil.IconButton(FontAwesomeIcon.ExternalLinkAlt, "crowdin")) - { Dalamud.Utility.Util.OpenLink("https://crowdin.com/project/chattwo"); - } - - ImGui.SameLine(); - ImGui.TextUnformatted(string.Format(Language.Options_About_CrowdIn, Plugin.PluginName)); ImGui.Spacing(); @@ -68,7 +87,6 @@ internal sealed class About : ISettingsTab { ImGui.EndChild(); } - ImGuiUtil.HelpText($"{Plugin.PluginName} v{GetType().Assembly.GetName().Version?.ToString(3)}"); ImGui.PopTextWrapPos(); } }