diff --git a/ActionTimelineEx/Configurations/UiString.cs b/ActionTimelineEx/Configurations/UiString.cs index 988c3b8..32c8d72 100644 --- a/ActionTimelineEx/Configurations/UiString.cs +++ b/ActionTimelineEx/Configurations/UiString.cs @@ -10,7 +10,6 @@ internal enum UiString [Description("Don't record these statuses")] NotStatues, - Help, [Description("Please wait for a second.")] Wait, diff --git a/ActionTimelineEx/Localization/Localization.json b/ActionTimelineEx/Localization/Localization.json index 24fe54a..0cd308b 100644 --- a/ActionTimelineEx/Localization/Localization.json +++ b/ActionTimelineEx/Localization/Localization.json @@ -78,7 +78,6 @@ "ActionTimelineEx.Configurations.UiString.Setting": "Setting", "ActionTimelineEx.Configurations.UiString.ShowedStatuses": "Showed Statuses", "ActionTimelineEx.Configurations.UiString.NotStatues": "Don't record these statuses", - "ActionTimelineEx.Configurations.UiString.Help": "Help", "ActionTimelineEx.Configurations.UiString.Wait": "Please wait for a second.", "ActionTimelineEx.Configurations.UiString.Confirm": "Are you sure to remove this timeline?", "ActionTimelineEx.Configurations.UiString.Remove": "Click to remove this timeline.", @@ -100,5 +99,7 @@ "ActionTimeline.Windows.SettingsWindow+TimelineItem": "ActionTimeline.Windows.SettingsWindow+TimelineItem", "ActionTimelineEx.Description": "Configurable timeline display of all the actions you use.", "ActionTimelineEx.Configurations.UiString.AddOne": "Add One Timeline", - "ActionTimelineEx.Configurations.UiString.RemoveDesc": "Remove this Item:" + "ActionTimelineEx.Configurations.UiString.RemoveDesc": "Remove this Item:", + "ActionTimeline.Windows.SettingsWindow+AddOne": "AddOne", + "ActionTimeline.Windows.SettingsWindow+ChangeLog": "ChangeLog" } \ No newline at end of file diff --git a/ActionTimelineEx/Plugin.cs b/ActionTimelineEx/Plugin.cs index d22d6c8..15923c7 100644 --- a/ActionTimelineEx/Plugin.cs +++ b/ActionTimelineEx/Plugin.cs @@ -66,7 +66,7 @@ public class Plugin : IDalamudPlugin public Plugin(DalamudPluginInterface pluginInterface) { ECommonsMain.Init(pluginInterface, this); - XIVConfigUIMain.Init(pluginInterface, "/atlConfig", "Opens the ActionTimeline configuration window.", PluginCommand, typeof(Settings), typeof(DrawingSettings), typeof(GroupItem), typeof(UiString)); + XIVConfigUIMain.Init(pluginInterface, "/atl", "Opens the ActionTimeline configuration window.", PluginCommand, typeof(Settings), typeof(DrawingSettings), typeof(GroupItem), typeof(UiString)); Svc.PluginInterface.UiBuilder.Draw += Draw; Svc.PluginInterface.UiBuilder.OpenConfigUi += OpenConfigUi; diff --git a/ActionTimelineEx/Windows/SettingsWindow.cs b/ActionTimelineEx/Windows/SettingsWindow.cs index 1dff5d8..03d92e8 100644 --- a/ActionTimelineEx/Windows/SettingsWindow.cs +++ b/ActionTimelineEx/Windows/SettingsWindow.cs @@ -10,6 +10,7 @@ using ECommons.DalamudServices; using ImGuiNET; using Lumina.Excel.GeneratedSheets; +using System.ComponentModel; using System.Numerics; using XIVConfigUI; using XIVConfigUI.SearchableConfigs; @@ -106,6 +107,36 @@ private bool RemoveValue(string name) return result; } } + + [Description("AddOne")] + public class AddOne(System.Action action) : ConfigWindowItem + { + public override string Description => UiString.AddOne.Local(); + + public override bool GetIcon(out IDalamudTextureWrap texture) + { + return ImageLoader.GetTexture(51, out texture); + } + public override bool OnClick() + { + Settings.TimelineSettings.Add(new DrawingSettings() + { + Name = (Settings.TimelineSettings.Count + 1).ToString(), + }); + action(); + return true; + } + } + + [Description("ChangeLog")] + public class ChangeLog : ConfigWindowItem + { + public override bool GetIcon(out IDalamudTextureWrap texture) + { + return ImageLoader.GetTexture(80, out texture); + } + public override string Link => $"https://github.com/{XIVConfigUIMain.UserName}/{XIVConfigUIMain.RepoName}/blob/main/CHANGELOG.md"; + } private static float _scale => ImGuiHelpers.GlobalScale; public override SearchableCollection Collection { get; } = new(Settings); protected override string Kofi => "B0B0IN5DX"; @@ -141,10 +172,8 @@ protected override void DrawAbout() { () => UiString.Setting.Local(),DrawSetting}, { () => UiString.ShowedStatuses.Local(), DrawShowedStatues}, { () => UiString.NotStatues.Local(), DrawGeneralSetting}, - { () => UiString.Help.Local(), () => CmdManager.DrawHelp() }, }); - base.DrawAbout(); _aboutHeaders.Draw(); @@ -152,21 +181,17 @@ protected override void DrawAbout() private void DrawSetting() { - if (ImGui.Button(UiString.AddOne.Local())) - { - Settings.TimelineSettings.Add(new DrawingSettings() - { - Name = (Settings.TimelineSettings.Count + 1).ToString(), - }); - ClearItems(); - } - Collection.DrawItems(0); } protected override ConfigWindowItem[] GetItems() { - return [..Settings.TimelineSettings.Select(i => new TimelineItem(i, ClearItems))]; + return + [ + ..Settings.TimelineSettings.Select(i => new TimelineItem(i, ClearItems)), + new AddOne(ClearItems), + new ChangeLog(), + ]; } private void DrawShowedStatues() diff --git a/XIVConfigUI b/XIVConfigUI index 14304d1..981f504 160000 --- a/XIVConfigUI +++ b/XIVConfigUI @@ -1 +1 @@ -Subproject commit 14304d1c46fd4629037459f39763f411ec16c0a4 +Subproject commit 981f50401d33afd3d5c18fd58327082029cd5f94