Mirrored_Repos/wabbajack
1
0
Fork 0
mirror of https://github.com/wabbajack-tools/wabbajack.git synced 2024-08-30 18:42:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Window pops up, but it's blank :|

Browse Source
This commit is contained in:
Timothy Baldridge 2021-12-28 14:39:20 -07:00
parent 2e3265f428
commit 1dcf740bf4
7 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Wabbajack.App.Wpf/App.xaml.cs
View File

@ -1,9 +1,12 @@
using System;
using System.Windows;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using Wabbajack.Common;
using Wabbajack.Lib;
using Wabbajack.Services.OSIntegrated;
using Wabbajack.Util;
namespace Wabbajack
{
@ -12,21 +15,35 @@ namespace Wabbajack
/// </summary>
public partial class App
{
private readonly ServiceProvider _serviceProvider;
private readonly IServiceProvider _serviceProvider;
public App()
{
var services = new ServiceCollection();
ConfigureServices(services);
_serviceProvider = services.BuildServiceProvider();
var host = Host.CreateDefaultBuilder(Array.Empty<string>())
//.ConfigureLogging(c => { c.ClearProviders(); })
.ConfigureServices((host, services) => { ConfigureServices(services); }).Build();
_serviceProvider = host.Services;
}
private void ConfigureServices(ServiceCollection services)
private IServiceCollection ConfigureServices(IServiceCollection services)
{
services.AddOSIntegrated();
services.AddSingleton<MainWindow>();
services.AddTransient<MainWindow>();
services.AddTransient<MainWindowVM>();
services.AddSingleton<SystemParametersConstructor>();
services.AddSingleton<LauncherUpdater>();
services.AddSingleton<MainSettings>();
services.AddTransient<CompilerVM>();
services.AddTransient<InstallerVM>();
return services;
}
private void OnStartup(object sender, StartupEventArgs e)
{
var mainWindow = _serviceProvider.GetService<MainWindow>();
var mainWindow = _serviceProvider.GetRequiredService<MainWindow>();
mainWindow!.Show();
}
}

2
Wabbajack.App.Wpf/View Models/Gallery/ModListGalleryVM.cs
View File

@ -61,7 +61,7 @@ namespace Wabbajack
public ICommand ClearFiltersCommand { get; }
public ModListGalleryVM(ILogger<ModListGalleryVM> logger, MainWindowVM mainWindowVM, Client wjClient,
GameLocator locator, ServiceProvider provider)
GameLocator locator, IServiceProvider provider)
: base(logger, mainWindowVM)
{
MWVM = mainWindowVM;

2
Wabbajack.App.Wpf/View Models/Installers/InstallerVM.cs
View File

@ -98,7 +98,7 @@ public class InstallerVM : BackNavigatingVM, IBackNavigatingVM, ICpuStatusVM
public ReactiveCommand<Unit, Unit> GoToInstallCommand { get; }
public ReactiveCommand<Unit, Unit> BeginCommand { get; }
public InstallerVM(ILogger<InstallerVM> logger, MainWindowVM mainWindowVM, ServiceProvider serviceProvider) : base(logger, mainWindowVM)
public InstallerVM(ILogger<InstallerVM> logger, MainWindowVM mainWindowVM, IServiceProvider serviceProvider) : base(logger, mainWindowVM)
{
_logger = logger;

2
Wabbajack.App.Wpf/View Models/MainWindowVM.cs
View File

@ -55,7 +55,7 @@ namespace Wabbajack
public bool UpdateAvailable { get; private set; }
public MainWindowVM(ILogger<MainWindowVM> logger, MainSettings settings, Client wjClient,
ServiceProvider serviceProvider)
IServiceProvider serviceProvider)
{
_logger = logger;
_wjClient = wjClient;

2
Wabbajack.App.Wpf/View Models/Settings/SettingsVM.cs
View File

@ -27,7 +27,7 @@ namespace Wabbajack
public ICommand OpenTerminalCommand { get; }
public SettingsVM(ILogger<SettingsVM> logger, MainWindowVM mainWindowVM, ServiceProvider provider)
public SettingsVM(ILogger<SettingsVM> logger, MainWindowVM mainWindowVM, IServiceProvider provider)
: base(logger, mainWindowVM)
{
MWVM = mainWindowVM;

2
Wabbajack.App.Wpf/View Models/SlideShow.cs
View File

@ -38,7 +38,7 @@ namespace Wabbajack.View_Models
public const int PreloadAmount = 4;
public SlideShow(InstallerVM appState, ServiceProvider provider)
public SlideShow(InstallerVM appState, IServiceProvider provider)
{
Installer = appState;

1
Wabbajack.App.Wpf/Wabbajack.csproj
View File

@ -76,6 +76,7 @@
<PackageReference Include="MahApps.Metro" Version="2.4.7" />
<PackageReference Include="MahApps.Metro.IconPacks" Version="4.8.0" />
<PackageReference Include="Microsoft-WindowsAPICodePack-Shell" Version="1.1.4" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.0" />
<PackageReference Include="PInvoke.User32" Version="0.7.104" />
<PackageReference Include="ReactiveUI" Version="14.1.1" />
<PackageReference Include="ReactiveUI.Fody" Version="14.1.1" />