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

It compiles! Ship it! (oh wait, it crashes on startup)

Browse Source
This commit is contained in:
Timothy Baldridge 2021-12-28 13:13:00 -07:00
parent c4f4f8889a
commit 2e3265f428
6 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Wabbajack.App.Wpf/Settings.cs
View File

@ -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);
}
}

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

@ -162,6 +162,7 @@ namespace Wabbajack
modlistPath = (AbsolutePath)CLIArguments.InstallPath;
return true;
*/
modlistPath = default;
return false;
}

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

@ -31,7 +31,7 @@ namespace Wabbajack
: base(logger, mainWindowVM)
{
MWVM = mainWindowVM;
Login = new LoginManagerVM(this);
Login = new LoginManagerVM(provider.GetService<ILogger<LoginManagerVM>>(), this);
Performance = mainWindowVM.Settings.Performance;
AuthorFile = new AuthorFilesVM(provider.GetService<ILogger<AuthorFilesVM>>()!,
provider.GetService<WabbajackApiTokenProvider>()!, provider.GetService<Client>()!, this);

8
Wabbajack.App.Wpf/View Models/UserIntervention/ConfirmUpdateOfExistingInstallVM.cs
View File

@ -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)
{

2
Wabbajack.App.Wpf/Views/Settings/CredentialsLoginView.xaml.cs
View File

@ -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);
*/
});
}

4
Wabbajack.Lib/Consts.cs
View File

@ -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();
}