feat(plugin): switch SettingsWindow type to new Ui.Windows namespace
This commit is contained in:
@@ -96,7 +96,7 @@ public sealed class Plugin : IAsyncDalamudPlugin
|
|||||||
// Phase-2 services are constructed in LoadAsync; null! shape is kept
|
// Phase-2 services are constructed in LoadAsync; null! shape is kept
|
||||||
// consistent across all properties for clarity.
|
// consistent across all properties for clarity.
|
||||||
internal Ui.Windows.MainWindow MainWindow { get; private set; } = null!;
|
internal Ui.Windows.MainWindow MainWindow { get; private set; } = null!;
|
||||||
public SettingsWindow SettingsWindow { get; private set; } = null!;
|
internal Ui.Windows.SettingsWindow SettingsWindow { get; private set; } = null!;
|
||||||
public DbViewer DbViewer { get; private set; } = null!;
|
public DbViewer DbViewer { get; private set; } = null!;
|
||||||
public InputPreview InputPreview { get; private set; } = null!;
|
public InputPreview InputPreview { get; private set; } = null!;
|
||||||
public CommandHelpWindow CommandHelpWindow { get; private set; } = null!;
|
public CommandHelpWindow CommandHelpWindow { get; private set; } = null!;
|
||||||
@@ -295,7 +295,7 @@ public sealed class Plugin : IAsyncDalamudPlugin
|
|||||||
|
|
||||||
InputBar = _host.Services.GetRequiredService<Ui.Components.InputBar>();
|
InputBar = _host.Services.GetRequiredService<Ui.Components.InputBar>();
|
||||||
MainWindow = _host.Services.GetRequiredService<Ui.Windows.MainWindow>();
|
MainWindow = _host.Services.GetRequiredService<Ui.Windows.MainWindow>();
|
||||||
SettingsWindow = _host.Services.GetRequiredService<SettingsWindow>();
|
SettingsWindow = _host.Services.GetRequiredService<Ui.Windows.SettingsWindow>();
|
||||||
DbViewer = _host.Services.GetRequiredService<DbViewer>();
|
DbViewer = _host.Services.GetRequiredService<DbViewer>();
|
||||||
InputPreview = _host.Services.GetRequiredService<InputPreview>();
|
InputPreview = _host.Services.GetRequiredService<InputPreview>();
|
||||||
CommandHelpWindow = _host.Services.GetRequiredService<CommandHelpWindow>();
|
CommandHelpWindow = _host.Services.GetRequiredService<CommandHelpWindow>();
|
||||||
|
|||||||
@@ -227,8 +227,20 @@ internal static class PluginHostFactory
|
|||||||
|
|
||||||
// Block C — Windows. WindowSystem.AddWindow is called from
|
// Block C — Windows. WindowSystem.AddWindow is called from
|
||||||
// PluginLifecycle.LoadAsync on the framework thread.
|
// PluginLifecycle.LoadAsync on the framework thread.
|
||||||
services.AddSingleton(sp => new SettingsWindow(
|
services.AddSingleton(sp => new Ui.Windows.SettingsWindow(
|
||||||
sp.GetRequiredService<Plugin>(),
|
sp.GetRequiredService<Plugin>(),
|
||||||
|
sp.GetRequiredService<Ui.Components.Settings.TabSidebar>(),
|
||||||
|
sp.GetRequiredService<Ui.Components.Settings.ContentArea>(),
|
||||||
|
sp.GetRequiredService<Ui.Components.Settings.ThemePicker>(),
|
||||||
|
sp.GetRequiredService<Ui.Components.Settings.ColorPicker>(),
|
||||||
|
sp.GetRequiredService<Ui.Components.Settings.LivePreviewPanel>(),
|
||||||
|
sp.GetRequiredService<Ui.Components.Settings.Tabs.AppearanceTab>(),
|
||||||
|
sp.GetRequiredService<Ui.Components.Settings.Tabs.GeneralTab>(),
|
||||||
|
sp.GetRequiredService<Ui.Components.Settings.Tabs.ChatTab>(),
|
||||||
|
sp.GetRequiredService<Ui.Components.Settings.Tabs.WindowTab>(),
|
||||||
|
sp.GetRequiredService<Ui.Components.Settings.Tabs.ChannelsTab>(),
|
||||||
|
sp.GetRequiredService<Ui.Components.Settings.Tabs.DataPrivacyTab>(),
|
||||||
|
sp.GetRequiredService<Ui.Components.Settings.Tabs.AboutTab>(),
|
||||||
sp.GetRequiredService<ILoggerFactory>()
|
sp.GetRequiredService<ILoggerFactory>()
|
||||||
));
|
));
|
||||||
services.AddSingleton(sp => new DbViewer(
|
services.AddSingleton(sp => new DbViewer(
|
||||||
|
|||||||
Reference in New Issue
Block a user