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

19 errors, woot

Browse Source
This commit is contained in:
Timothy Baldridge
2021-12-28 13:00:17 -07:00
parent f49083f0c2
commit c4f4f8889a
4 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Wabbajack.App.Wpf/View Models/Interfaces/INeedsLogin.cs
View File

@ -1,6 +1,11 @@
using System.Windows.Input;
namespace Wabbajack; namespace Wabbajack;
public interface INeedsLogin public interface INeedsLogin
{ {
string SiteName { get; }
ICommand TriggerLogin { get; set; }
ICommand ClearLogin { get; set; }
object? IconUri { get; set; }
} }

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

@ -54,13 +54,12 @@ namespace Wabbajack
[Reactive] [Reactive]
public bool UpdateAvailable { get; private set; } public bool UpdateAvailable { get; private set; }
public MainWindowVM(ILogger<MainWindowVM> logger, MainWindow mainWindow, MainSettings settings, Client wjClient, public MainWindowVM(ILogger<MainWindowVM> logger, MainSettings settings, Client wjClient,
ServiceProvider serviceProvider) ServiceProvider serviceProvider)
{ {
_logger = logger; _logger = logger;
_wjClient = wjClient; _wjClient = wjClient;
ConverterRegistration.Register(); ConverterRegistration.Register();
MainWindow = mainWindow;
Settings = settings; Settings = settings;
Installer = new Lazy<InstallerVM>(() => new InstallerVM(serviceProvider.GetService<ILogger<InstallerVM>>(), this, serviceProvider)); Installer = new Lazy<InstallerVM>(() => new InstallerVM(serviceProvider.GetService<ILogger<InstallerVM>>(), this, serviceProvider));
Compiler = new Lazy<CompilerVM>(() => new CompilerVM(serviceProvider.GetService<ILogger<CompilerVM>>(), this)); Compiler = new Lazy<CompilerVM>(() => new CompilerVM(serviceProvider.GetService<ILogger<CompilerVM>>(), this));
@ -189,6 +188,7 @@ namespace Wabbajack
public async Task ShutdownApplication() public async Task ShutdownApplication()
{ {
/*
Dispose(); Dispose();
Settings.PosX = MainWindow.Left; Settings.PosX = MainWindow.Left;
Settings.PosY = MainWindow.Top; Settings.PosY = MainWindow.Top;
@ -196,6 +196,7 @@ namespace Wabbajack
Settings.Height = MainWindow.Height; Settings.Height = MainWindow.Height;
await MainSettings.SaveSettings(Settings); await MainSettings.SaveSettings(Settings);
Application.Current.Shutdown(); Application.Current.Shutdown();
*/
} }
} }
} }

8
Wabbajack.App.Wpf/View Models/Settings/LoginManagerVM.cs
View File

@ -60,12 +60,13 @@ namespace Wabbajack
LoginWithCredentials = loginWithCredentials; LoginWithCredentials = loginWithCredentials;
} }
/*
_metaInfo = (login.MetaInfo ?? Observable.Return("")) _metaInfo = (login.MetaInfo ?? Observable.Return(""))
.ToGuiProperty(this, nameof(MetaInfo)); .ToGuiProperty(this, nameof(MetaInfo));*/
if (!UsesCredentials) if (!UsesCredentials)
return; return;
/*
TriggerCredentialsLogin = ReactiveCommand.Create(() => TriggerCredentialsLogin = ReactiveCommand.Create(() =>
{ {
if (!(login is INeedsLoginCredentials)) if (!(login is INeedsLoginCredentials))
@ -74,10 +75,12 @@ namespace Wabbajack
var loginWindow = new LoginWindowView(LoginWithCredentials); var loginWindow = new LoginWindowView(LoginWithCredentials);
loginWindow.Show(); loginWindow.Show();
}, LoginWithCredentials.IsLoggedIn.Select(b => !b).ObserveOnGuiThread()); }, LoginWithCredentials.IsLoggedIn.Select(b => !b).ObserveOnGuiThread());
*/
} }
private void LoadImage() private void LoadImage()
{ {
/*
Task.Run(async () => Task.Run(async () =>
{ {
if (Login.IconUri == null) return; if (Login.IconUri == null) return;
@ -139,6 +142,7 @@ namespace Wabbajack
Favicon = source; Favicon = source;
} }
}); });
*/
} }
} }

8
Wabbajack.App.Wpf/Views/MainWindow.xaml.cs
View File

@ -22,8 +22,11 @@ namespace Wabbajack
private readonly ILogger<MainWindow> _logger; private readonly ILogger<MainWindow> _logger;
private readonly SystemParametersConstructor _systemParams; private readonly SystemParametersConstructor _systemParams;
public MainWindow(ILogger<MainWindow> logger, SystemParametersConstructor systemParams, LauncherUpdater updater) public MainWindow(ILogger<MainWindow> logger, SystemParametersConstructor systemParams, LauncherUpdater updater, MainWindowVM vm)
{ {
_mwvm = vm;
DataContext = _mwvm;
_logger = logger; _logger = logger;
_systemParams = systemParams; _systemParams = systemParams;
try try
@ -70,9 +73,6 @@ namespace Wabbajack
RunWhenLoaded(LoadSettings); RunWhenLoaded(LoadSettings);
}*/ }*/
// Set datacontext
_mwvm = new MainWindowVM(this, _settings);
DataContext = _mwvm;
// Bring window to the front if it isn't already // Bring window to the front if it isn't already
this.Initialized += (s, e) => this.Initialized += (s, e) =>