diff --git a/Wabbajack.App.Wpf/Settings.cs b/Wabbajack.App.Wpf/Settings.cs index 5395ff48..7d028136 100644 --- a/Wabbajack.App.Wpf/Settings.cs +++ b/Wabbajack.App.Wpf/Settings.cs @@ -17,7 +17,6 @@ namespace Wabbajack public class MainSettings { public byte Version { get; set; } = Consts.SettingsVersion; - public double PosX { get; set; } public double PosY { get; set; } public double Height { get; set; } @@ -33,6 +32,7 @@ namespace Wabbajack public static async ValueTask<(MainSettings settings, bool loaded)> TryLoadTypicalSettings() { + /* if (!Consts.SettingsFile.Exists) { return default; @@ -55,7 +55,7 @@ namespace Wabbajack await Consts.SettingsFile.CopyToAsync(backup); await Consts.SettingsFile.DeleteAsync(); - +*/ return default; } @@ -68,7 +68,7 @@ namespace Wabbajack //settings._saveSignal.OnCompleted(); //await settings._saveSignal; - await settings.ToJsonAsync(Consts.SettingsFile); + //await settings.ToJsonAsync(Consts.SettingsFile); } } diff --git a/Wabbajack.App.Wpf/View Models/MainWindowVM.cs b/Wabbajack.App.Wpf/View Models/MainWindowVM.cs index 4373d87e..53f3e270 100644 --- a/Wabbajack.App.Wpf/View Models/MainWindowVM.cs +++ b/Wabbajack.App.Wpf/View Models/MainWindowVM.cs @@ -162,6 +162,7 @@ namespace Wabbajack modlistPath = (AbsolutePath)CLIArguments.InstallPath; return true; */ + modlistPath = default; return false; } diff --git a/Wabbajack.App.Wpf/View Models/Settings/SettingsVM.cs b/Wabbajack.App.Wpf/View Models/Settings/SettingsVM.cs index bb3f6ec5..a35bd4a7 100644 --- a/Wabbajack.App.Wpf/View Models/Settings/SettingsVM.cs +++ b/Wabbajack.App.Wpf/View Models/Settings/SettingsVM.cs @@ -31,7 +31,7 @@ namespace Wabbajack : base(logger, mainWindowVM) { MWVM = mainWindowVM; - Login = new LoginManagerVM(this); + Login = new LoginManagerVM(provider.GetService>(), this); Performance = mainWindowVM.Settings.Performance; AuthorFile = new AuthorFilesVM(provider.GetService>()!, provider.GetService()!, provider.GetService()!, this); diff --git a/Wabbajack.App.Wpf/View Models/UserIntervention/ConfirmUpdateOfExistingInstallVM.cs b/Wabbajack.App.Wpf/View Models/UserIntervention/ConfirmUpdateOfExistingInstallVM.cs index 9bc2738b..86188872 100644 --- a/Wabbajack.App.Wpf/View Models/UserIntervention/ConfirmUpdateOfExistingInstallVM.cs +++ b/Wabbajack.App.Wpf/View Models/UserIntervention/ConfirmUpdateOfExistingInstallVM.cs @@ -17,13 +17,13 @@ namespace Wabbajack public bool Handled => ((IUserIntervention)Source).Handled; - public int CpuID => ((IUserIntervention)Source).CpuID; + public int CpuID => 0; - public DateTime Timestamp => ((IUserIntervention)Source).Timestamp; + public DateTime Timestamp => DateTime.Now; - public string ShortDescription => ((IUserIntervention)Source).ShortDescription; + public string ShortDescription => "Short Desc"; - public string ExtendedDescription => ((IUserIntervention)Source).ExtendedDescription; + public string ExtendedDescription => "Extended Desc"; public ConfirmUpdateOfExistingInstallVM(MO2InstallerVM installer, ConfirmUpdateOfExistingInstall confirm) { diff --git a/Wabbajack.App.Wpf/Views/Settings/CredentialsLoginView.xaml.cs b/Wabbajack.App.Wpf/Views/Settings/CredentialsLoginView.xaml.cs index 524d86f8..16fcd701 100644 --- a/Wabbajack.App.Wpf/Views/Settings/CredentialsLoginView.xaml.cs +++ b/Wabbajack.App.Wpf/Views/Settings/CredentialsLoginView.xaml.cs @@ -29,8 +29,10 @@ namespace Wabbajack .DisposeWith(disposable); this.OneWayBind(ViewModel, x => x.MFAVisible, x => x.MFAText.Visibility) .DisposeWith(disposable); + /* TODO this.OneWayBind(ViewModel, x => x.ReturnMessage.Message, x => x.Message.Text) .DisposeWith(disposable); + */ }); } diff --git a/Wabbajack.Lib/Consts.cs b/Wabbajack.Lib/Consts.cs index 479c46bd..bd07c0e4 100644 --- a/Wabbajack.Lib/Consts.cs +++ b/Wabbajack.Lib/Consts.cs @@ -8,5 +8,9 @@ public static class Consts public static string AppName = "Wabbajack"; public static Uri WabbajackBuildServerUri => new("https://build.wabbajack.org"); public static Version CurrentMinimumWabbajackVersion { get; set; } = Version.Parse("2.3.0.0"); + public static bool UseNetworkWorkaroundMode { get; set; } = false; + + public static byte SettingsVersion = 0; + public static RelativePath NativeSettingsJson = "native_settings.json".ToRelativePath(); } \ No newline at end of file