From bfbdaa5fc6d8b71fffe8dc0f544d63b30670f4c2 Mon Sep 17 00:00:00 2001 From: goat Date: Wed, 12 Feb 2020 01:20:35 +0900 Subject: [PATCH] feat: plugin info command --- Dalamud/Dalamud.cs | 12 +++++++++--- Dalamud/Plugin/PluginManager.cs | 14 +++++++------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/Dalamud/Dalamud.cs b/Dalamud/Dalamud.cs index acc599411..96a665795 100644 --- a/Dalamud/Dalamud.cs +++ b/Dalamud/Dalamud.cs @@ -169,8 +169,6 @@ namespace Dalamud { private bool isImguiDrawLogWindow = false; private bool isImguiDrawDataWindow = false; - private bool neverDrawWelcome = false; - private DalamudLogWindow logWindow; private DalamudDataWindow dataWindow; @@ -204,12 +202,20 @@ namespace Dalamud { { Process.GetCurrentProcess().Kill(); } + ImGui.Separator(); + ImGui.MenuItem(this.assemblyVersion, false); ImGui.EndMenu(); } if (ImGui.BeginMenu("Plugins")) { + if (ImGui.MenuItem("Print plugin info")) { + foreach (var plugin in this.PluginManager.Plugins) { + // TODO: some more here, state maybe? + Log.Information($"{plugin.Name}"); + } + } if (ImGui.MenuItem("Reload plugins")) { OnPluginReloadCommand(string.Empty, string.Empty); @@ -217,7 +223,7 @@ namespace Dalamud { ImGui.EndMenu(); } - //ImGui.EndMainMenuBar(); + ImGui.EndMainMenuBar(); } } diff --git a/Dalamud/Plugin/PluginManager.cs b/Dalamud/Plugin/PluginManager.cs index a9de4b645..4a8a1082d 100644 --- a/Dalamud/Plugin/PluginManager.cs +++ b/Dalamud/Plugin/PluginManager.cs @@ -14,7 +14,7 @@ namespace Dalamud.Plugin private readonly string pluginDirectory; private readonly string defaultPluginDirectory; - private List plugins; + public List Plugins; public PluginManager(Dalamud dalamud, string pluginDirectory, string defaultPluginDirectory) { this.dalamud = dalamud; @@ -23,12 +23,12 @@ namespace Dalamud.Plugin } public void UnloadPlugins() { - if (this.plugins == null) + if (this.Plugins == null) return; - for (var i = 0; i < this.plugins.Count; i++) { - this.plugins[i].Dispose(); - this.plugins[i] = null; + for (var i = 0; i < this.Plugins.Count; i++) { + this.Plugins[i].Dispose(); + this.Plugins[i] = null; } } @@ -71,7 +71,7 @@ namespace Dalamud.Plugin } } - this.plugins = new List(foundImplementations.Count); + this.Plugins = new List(foundImplementations.Count); foreach (var pluginType in foundImplementations) { var plugin = (IDalamudPlugin)Activator.CreateInstance(pluginType); @@ -80,7 +80,7 @@ namespace Dalamud.Plugin plugin.Initialize(dalamudInterface); Log.Information("Loaded plugin: {0}", plugin.Name); - this.plugins.Add(plugin); + this.Plugins.Add(plugin); } } }