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

Modlist -> ModList

Browse Source
This commit is contained in:
Justin Swanson
2019-12-14 16:13:31 -06:00
parent dee09f17d4
commit 7aa579cf5a
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Wabbajack/View Models/Compilers/MO2CompilerVM.cs
View File

@ -25,7 +25,7 @@ namespace Wabbajack
public FilePickerVM DownloadLocation { get; } public FilePickerVM DownloadLocation { get; }
public FilePickerVM ModlistLocation { get; } public FilePickerVM ModListLocation { get; }
public IReactiveCommand BeginCommand { get; } public IReactiveCommand BeginCommand { get; }
@ -41,7 +41,7 @@ namespace Wabbajack
public MO2CompilerVM(CompilerVM parent) public MO2CompilerVM(CompilerVM parent)
{ {
Parent = parent; Parent = parent;
ModlistLocation = new FilePickerVM() ModListLocation = new FilePickerVM()
{ {
ExistCheckOption = FilePickerVM.CheckOptions.On, ExistCheckOption = FilePickerVM.CheckOptions.On,
PathType = FilePickerVM.PathTypeOptions.File, PathType = FilePickerVM.PathTypeOptions.File,
@ -54,7 +54,7 @@ namespace Wabbajack
PromptTitle = "Select download location", PromptTitle = "Select download location",
}; };
_mo2Folder = this.WhenAny(x => x.ModlistLocation.TargetPath) _mo2Folder = this.WhenAny(x => x.ModListLocation.TargetPath)
.Select(loc => .Select(loc =>
{ {
try try
@ -68,7 +68,7 @@ namespace Wabbajack
} }
}) })
.ToProperty(this, nameof(Mo2Folder)); .ToProperty(this, nameof(Mo2Folder));
_moProfile = this.WhenAny(x => x.ModlistLocation.TargetPath) _moProfile = this.WhenAny(x => x.ModListLocation.TargetPath)
.Select(loc => .Select(loc =>
{ {
try try
@ -84,7 +84,7 @@ namespace Wabbajack
.ToProperty(this, nameof(MOProfile)); .ToProperty(this, nameof(MOProfile));
// Wire missing Mo2Folder to signal error state for Modlist Location // Wire missing Mo2Folder to signal error state for Modlist Location
ModlistLocation.AdditionalError = this.WhenAny(x => x.Mo2Folder) ModListLocation.AdditionalError = this.WhenAny(x => x.Mo2Folder)
.Select<string, IErrorResponse>(moFolder => .Select<string, IErrorResponse>(moFolder =>
{ {
if (Directory.Exists(moFolder)) return ErrorResponse.Success; if (Directory.Exists(moFolder)) return ErrorResponse.Success;
@ -93,8 +93,8 @@ namespace Wabbajack
// Load custom modlist settings per MO2 profile // Load custom modlist settings per MO2 profile
_modlistSettings = Observable.CombineLatest( _modlistSettings = Observable.CombineLatest(
this.WhenAny(x => x.ModlistLocation.ErrorState), this.WhenAny(x => x.ModListLocation.ErrorState),
this.WhenAny(x => x.ModlistLocation.TargetPath), this.WhenAny(x => x.ModListLocation.TargetPath),
resultSelector: (state, path) => (State: state, Path: path)) resultSelector: (state, path) => (State: state, Path: path))
// A short throttle is a quick hack to make the above changes "atomic" // A short throttle is a quick hack to make the above changes "atomic"
.Throttle(TimeSpan.FromMilliseconds(25)) .Throttle(TimeSpan.FromMilliseconds(25))
@ -122,7 +122,7 @@ namespace Wabbajack
// Wire start command // Wire start command
BeginCommand = ReactiveCommand.CreateFromTask( BeginCommand = ReactiveCommand.CreateFromTask(
canExecute: Observable.CombineLatest( canExecute: Observable.CombineLatest(
this.WhenAny(x => x.ModlistLocation.InError), this.WhenAny(x => x.ModListLocation.InError),
this.WhenAny(x => x.DownloadLocation.InError), this.WhenAny(x => x.DownloadLocation.InError),
parent.WhenAny(x => x.OutputLocation.InError), parent.WhenAny(x => x.OutputLocation.InError),
this.WhenAny(x => x.ModlistSettings) this.WhenAny(x => x.ModlistSettings)
@ -183,7 +183,7 @@ namespace Wabbajack
// Load settings // Load settings
_settings = parent.MWVM.Settings.Compiler.MO2Compilation; _settings = parent.MWVM.Settings.Compiler.MO2Compilation;
ModlistLocation.TargetPath = _settings.LastCompiledProfileLocation; ModListLocation.TargetPath = _settings.LastCompiledProfileLocation;
if (!string.IsNullOrWhiteSpace(_settings.DownloadLocation)) if (!string.IsNullOrWhiteSpace(_settings.DownloadLocation))
{ {
DownloadLocation.TargetPath = _settings.DownloadLocation; DownloadLocation.TargetPath = _settings.DownloadLocation;
@ -211,7 +211,7 @@ namespace Wabbajack
public void Unload() public void Unload()
{ {
_settings.DownloadLocation = DownloadLocation.TargetPath; _settings.DownloadLocation = DownloadLocation.TargetPath;
_settings.LastCompiledProfileLocation = ModlistLocation.TargetPath; _settings.LastCompiledProfileLocation = ModListLocation.TargetPath;
ModlistSettings?.Save(); ModlistSettings?.Save();
} }
} }

2
Wabbajack/Views/Compilers/MO2CompilerConfigView.xaml
View File

@ -34,7 +34,7 @@
Grid.Column="2" Grid.Column="2"
Height="30" Height="30"
VerticalAlignment="Center" VerticalAlignment="Center"
DataContext="{Binding ModlistLocation}" DataContext="{Binding ModListLocation}"
FontSize="14" FontSize="14"
ToolTip="The MO2 modlist.txt file you want to use as your source" /> ToolTip="The MO2 modlist.txt file you want to use as your source" />
<TextBlock <TextBlock