ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-12 18:27:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #1140 from Infiziert90/master

Browse source
This commit is contained in:
goat 2023-03-01 22:06:12 +01:00 • committed by GitHub
commit 15ea80d21a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 67 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Dalamud/Interface/Internal/DalamudInterface.cs
View file

@ -266,6 +266,15 @@ internal class DalamudInterface : IDisposable, IServiceType
this.pluginWindow.BringToFront();
}
/// <summary>
/// Opens the <see cref="PluginInstallerWindow"/> on the plugin installed.
/// </summary>
public void OpenPluginInstallerPluginInstalled()
{
this.pluginWindow.OpenInstalledPlugins();
this.pluginWindow.BringToFront();
}
/// <summary>
/// Opens the <see cref="PluginInstallerWindow"/> on the plugin changelogs.
/// </summary>
@ -432,6 +441,15 @@ internal class DalamudInterface : IDisposable, IServiceType
#endregion
/// <summary>
/// Sets the current search text for the plugin installer.
/// </summary>
/// <param name="text">The search term.</param>
public void SetPluginInstallerSearchText(string text)
{
this.pluginWindow.SetSearchText(text);
}
/// <summary>
/// Toggle the screen darkening effect used for the credits.
/// </summary>

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

@ -97,6 +97,7 @@ internal class PluginInstallerWindow : Window, IDisposable
private bool hasDevPlugins = false;
private string searchText = string.Empty;
private bool isSearchTextPrefilled = false;
private PluginSortKind sortKind = PluginSortKind.Alphabetical;
private string filterText = Locs.SortBy_Alphabetical;
@ -202,7 +203,7 @@ internal class PluginInstallerWindow : Window, IDisposable
_ = pluginManager.ReloadPluginMastersAsync();
this.searchText = string.Empty;
if (!this.isSearchTextPrefilled) this.searchText = string.Empty;
this.sortKind = PluginSortKind.Alphabetical;
this.filterText = Locs.SortBy_Alphabetical;
@ -218,6 +219,12 @@ internal class PluginInstallerWindow : Window, IDisposable
public override void OnClose()
{
Service<DalamudConfiguration>.Get().QueueSave();
if (this.isSearchTextPrefilled)
{
this.isSearchTextPrefilled = false;
this.searchText = string.Empty;
}
}
/// <inheritdoc/>
@ -244,6 +251,18 @@ internal class PluginInstallerWindow : Window, IDisposable
this.imageCache.ClearIconCache();
}
/// <summary>
/// Open the window on the plugin changelogs.
/// </summary>
public void OpenInstalledPlugins()
{
// Installed group
this.categoryManager.CurrentGroupIdx = 1;
// All category
this.categoryManager.CurrentCategoryIdx = 0;
this.IsOpen = true;
}
/// <summary>
/// Open the window on the plugin changelogs.
/// </summary>
@ -256,6 +275,16 @@ internal class PluginInstallerWindow : Window, IDisposable
this.IsOpen = true;
}
/// <summary>
/// Sets the current search text and marks it as prefilled.
/// </summary>
/// <param name="text">The search term.</param>
public void SetSearchText(string text)
{
this.isSearchTextPrefilled = true;
this.searchText = text;
}
private void DrawProgressOverlay()
{
var pluginManager = Service<PluginManager>.Get();

19
Dalamud/Plugin/DalamudPluginInterface.cs
View file

@ -17,6 +17,7 @@ using Dalamud.Game.Text.SeStringHandling;
using Dalamud.Game.Text.SeStringHandling.Payloads;
using Dalamud.Interface;
using Dalamud.Interface.Internal;
using Dalamud.Interface.Internal.Windows.PluginInstaller;
using Dalamud.Plugin.Internal;
using Dalamud.Plugin.Internal.Types;
using Dalamud.Plugin.Ipc;
@ -194,6 +195,24 @@ public sealed class DalamudPluginInterface : IDisposable
/// </summary>
public List<string> PluginInternalNames => Service<PluginManager>.Get().InstalledPlugins.Select(p => p.Manifest.InternalName).ToList();
/// <summary>
/// Opens the <see cref="PluginInstallerWindow"/> with the plugin name set as search target.
/// </summary>
/// <returns>Returns false if the DalamudInterface was null.</returns>
public bool OpenPluginInstaller()
{
var dalamudInterface = Service<DalamudInterface>.GetNullable(); // Can be null during boot
if (dalamudInterface == null)
{
return false;
}
dalamudInterface.OpenPluginInstallerPluginInstalled();
dalamudInterface.SetPluginInstallerSearchText(this.pluginName);
return true;
}
#region IPC
/// <inheritdoc cref="DataShare.GetOrCreateData{T}"/>