ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-13 20:24:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

feat: don't remove plugins from installer when disabling, always draw delete button

Browse source
This commit is contained in:
goat 2022-07-15 19:04:23 +02:00
parent a0022f6358
commit 465ae1857d
No known key found for this signature in database
GPG key ID: 7773BB5B43BA52E5
1 changed files with 21 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

33
Dalamud/Interface/Internal/Windows/PluginInstaller/PluginInstallerWindow.cs
View file

@ -1616,11 +1616,7 @@ namespace Dalamud.Interface.Internal.Windows.PluginInstaller
this.DrawUpdateSinglePluginButton(availablePluginUpdate); this.DrawUpdateSinglePluginButton(availablePluginUpdate);
ImGui.SameLine(); ImGui.SameLine();
var version = plugin.AssemblyName?.Version; ImGui.TextColored(ImGuiColors.DalamudGrey3, $" v{plugin.Manifest.EffectiveVersion}");
version ??= plugin.Manifest.Testing
? plugin.Manifest.TestingAssemblyVersion
: plugin.Manifest.AssemblyVersion;
ImGui.TextColored(ImGuiColors.DalamudGrey3, $" v{version}");
if (plugin.IsDev) if (plugin.IsDev)
{ {
@ -1637,7 +1633,7 @@ namespace Dalamud.Interface.Internal.Windows.PluginInstaller
if (hasChangelog) if (hasChangelog)
{ {
if (ImGui.TreeNode($"Changelog (v{plugin.Manifest.AssemblyVersion})")) if (ImGui.TreeNode($"Changelog (v{plugin.Manifest.EffectiveVersion})"))
{ {
this.DrawInstalledPluginChangelog(plugin.Manifest); this.DrawInstalledPluginChangelog(plugin.Manifest);
} }
@ -1752,10 +1748,10 @@ namespace Dalamud.Interface.Internal.Windows.PluginInstaller
if (!disableTask.Result) if (!disableTask.Result)
return; return;
if (!plugin.IsDev) /*if (!plugin.IsDev)
{ {
pluginManager.RemovePlugin(plugin); pluginManager.RemovePlugin(plugin);
} }*/
notifications.AddNotification(Locs.Notifications_PluginDisabled(plugin.Manifest.Name), Locs.Notifications_PluginDisabledTitle, NotificationType.Success); notifications.AddNotification(Locs.Notifications_PluginDisabled(plugin.Manifest.Name), Locs.Notifications_PluginDisabledTitle, NotificationType.Success);
}); });
@ -1931,18 +1927,29 @@ namespace Dalamud.Interface.Internal.Windows.PluginInstaller
private void DrawDeletePluginButton(LocalPlugin plugin) private void DrawDeletePluginButton(LocalPlugin plugin)
{ {
var unloaded = plugin.State == PluginState.Unloaded || plugin.State == PluginState.LoadError; /*var unloaded = plugin.State == PluginState.Unloaded || plugin.State == PluginState.LoadError;
// When policy check fails, the plugin is never loaded // When policy check fails, the plugin is never loaded
var showButton = unloaded && (plugin.IsDev || plugin.IsOutdated || plugin.IsBanned || plugin.IsOrphaned || !plugin.CheckPolicy()); var showButton = unloaded && (plugin.IsDev || plugin.IsOutdated || plugin.IsBanned || plugin.IsOrphaned || !plugin.CheckPolicy());
if (!showButton) if (!showButton)
return; return;*/
var pluginManager = Service<PluginManager>.Get(); var pluginManager = Service<PluginManager>.Get();
ImGui.SameLine(); ImGui.SameLine();
if (plugin.HasEverStartedLoad) if (plugin.State != PluginState.Unloaded && plugin.State != PluginState.LoadError)
{
ImGui.PushFont(InterfaceManager.IconFont);
ImGuiComponents.DisabledButton(FontAwesomeIcon.TrashAlt.ToIconString());
ImGui.PopFont();
if (ImGui.IsItemHovered())
{
ImGui.SetTooltip(Locs.PluginButtonToolTip_DeletePluginLoaded);
}
}
else if (plugin.HasEverStartedLoad)
{ {
ImGui.PushFont(InterfaceManager.IconFont); ImGui.PushFont(InterfaceManager.IconFont);
ImGuiComponents.DisabledButton(FontAwesomeIcon.TrashAlt.ToIconString()); ImGuiComponents.DisabledButton(FontAwesomeIcon.TrashAlt.ToIconString());
@ -2384,7 +2391,9 @@ namespace Dalamud.Interface.Internal.Windows.PluginInstaller
public static string PluginButtonToolTip_DeletePlugin => Loc.Localize("InstallerDeletePlugin ", "Delete plugin"); public static string PluginButtonToolTip_DeletePlugin => Loc.Localize("InstallerDeletePlugin ", "Delete plugin");
public static string PluginButtonToolTip_DeletePluginRestricted => Loc.Localize("InstallerDeletePluginRestricted", "Cannot delete - please try restarting the game."); public static string PluginButtonToolTip_DeletePluginRestricted => Loc.Localize("InstallerDeletePluginRestricted", "Cannot delete right now - please restart the game.");
public static string PluginButtonToolTip_DeletePluginLoaded => Loc.Localize("InstallerDeletePluginLoaded", "Disable this plugin before deleting it.");
public static string PluginButtonToolTip_VisitPluginUrl => Loc.Localize("InstallerVisitPluginUrl", "Visit plugin URL"); public static string PluginButtonToolTip_VisitPluginUrl => Loc.Localize("InstallerVisitPluginUrl", "Visit plugin URL");