ToxicMushroom/Penumbra
1
0
Fork 0
mirror of https://github.com/xivdev/Penumbra.git synced 2026-02-23 16:27:47 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'master' into luna

Browse source 
# Conflicts:
#	Penumbra/Api/Api/RedrawApi.cs
#	Penumbra/Api/Api/ResolveApi.cs
#	Penumbra/Api/Api/UiApi.cs
#	Penumbra/Interop/Services/TextureArraySlicer.cs
#	Penumbra/UI/CollectionTab/CollectionPanel.cs
#	Penumbra/UI/Tabs/CollectionsTab.cs
#	Penumbra/UI/Tabs/Debug/DebugTab.cs
#	Penumbra/UI/Tabs/Debug/GlobalVariablesDrawer.cs
#	Penumbra/UI/Tabs/ModsTab.cs
#	Penumbra/UI/Tabs/ResourceTab.cs
#	Penumbra/packages.lock.json
This commit is contained in:
Ottermandias 2025-12-19 14:52:06 +01:00
commit f035073966
26 changed files with 378 additions and 140 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Penumbra/UI/Tabs/SettingsTab.cs
View file

@ -12,6 +12,7 @@ using Penumbra.Interop.Services;
using Penumbra.Mods.Manager;
using Penumbra.Services;
using Penumbra.UI.Classes;
using Penumbra.UI.Integration;
using Penumbra.UI.ModsTab;
using Penumbra.UI.ModsTab.Selector;
@ -51,6 +52,7 @@ public sealed class SettingsTab : ITab<TabType>
private readonly CleanupService _cleanupService;
private readonly AttributeHook _attributeHook;
private readonly PcpService _pcpService;
private readonly IntegrationSettingsRegistry _integrationSettings;
private string _lastCloudSyncTestedPath = string.Empty;
private bool _lastCloudSyncTestResult;
@ -62,7 +64,7 @@ public sealed class SettingsTab : ITab<TabType>
DalamudSubstitutionProvider dalamudSubstitutionProvider, FileCompactor compactor, DalamudConfigService dalamudConfig,
IDataManager gameData, PredefinedTagManager predefinedTagConfig, CrashHandlerService crashService,
MigrationSectionDrawer migrationDrawer, CollectionAutoSelector autoSelector, CleanupService cleanupService,
AttributeHook attributeHook, PcpService pcpService)
AttributeHook attributeHook, PcpService pcpService, IntegrationSettingsRegistry integrationSettings)
{
_pluginInterface = pluginInterface;
_config = config;
@ -90,6 +92,7 @@ public sealed class SettingsTab : ITab<TabType>
_cleanupService = cleanupService;
_attributeHook = attributeHook;
_pcpService = pcpService;
_integrationSettings = integrationSettings;
}
public void PostTabButton()
@ -120,6 +123,7 @@ public sealed class SettingsTab : ITab<TabType>
DrawColorSettings();
DrawPredefinedTagsSection();
DrawAdvancedSettings();
_integrationSettings.Draw();
DrawSupportButtons();
}
@ -1085,7 +1089,7 @@ public sealed class SettingsTab : ITab<TabType>
}
#endregion
/// <summary> Draw the support button group on the right-hand side of the window. </summary>
private void DrawSupportButtons()
{