diff --git a/Wabbajack.App.Wpf/App.xaml.cs b/Wabbajack.App.Wpf/App.xaml.cs index e12daec6..34dc1e43 100644 --- a/Wabbajack.App.Wpf/App.xaml.cs +++ b/Wabbajack.App.Wpf/App.xaml.cs @@ -168,8 +168,8 @@ namespace Wabbajack services.AddTransient(); services.AddTransient(); - services.AddTransient(); - services.AddTransient(); + services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); diff --git a/Wabbajack.App.Wpf/Messages/NavigateToGlobal.cs b/Wabbajack.App.Wpf/Messages/NavigateToGlobal.cs index 7ec4ff69..83c224d2 100644 --- a/Wabbajack.App.Wpf/Messages/NavigateToGlobal.cs +++ b/Wabbajack.App.Wpf/Messages/NavigateToGlobal.cs @@ -8,8 +8,8 @@ public enum ScreenType ModListGallery, Installer, Settings, - Compiler, - CreateModList, + CompilerDetails, + CompilerHome, ModListContents, WebBrowser } diff --git a/Wabbajack.App.Wpf/ViewModels/Compilers/CreatedModlistVM.cs b/Wabbajack.App.Wpf/ViewModels/Compilers/CompiledModListTileVM.cs similarity index 82% rename from Wabbajack.App.Wpf/ViewModels/Compilers/CreatedModlistVM.cs rename to Wabbajack.App.Wpf/ViewModels/Compilers/CompiledModListTileVM.cs index c229060d..502d43fb 100644 --- a/Wabbajack.App.Wpf/ViewModels/Compilers/CreatedModlistVM.cs +++ b/Wabbajack.App.Wpf/ViewModels/Compilers/CompiledModListTileVM.cs @@ -8,7 +8,7 @@ using Wabbajack.Models; namespace Wabbajack { - public class CreatedModlistVM + public class CompiledModListTileVM { private ILogger _logger; public LoadingLock LoadingImageLock { get; } = new(); @@ -16,7 +16,7 @@ namespace Wabbajack [Reactive] public CompilerSettings CompilerSettings { get; set; } - public CreatedModlistVM(ILogger logger, CompilerSettings compilerSettings) + public CompiledModListTileVM(ILogger logger, CompilerSettings compilerSettings) { _logger = logger; CompilerSettings = compilerSettings; @@ -26,7 +26,7 @@ namespace Wabbajack private void CompileModList() { _logger.LogInformation($"Selected modlist {CompilerSettings.ModListName} for compilation, located in '{CompilerSettings.Source}'"); - NavigateToGlobal.Send(ScreenType.Compiler); + NavigateToGlobal.Send(ScreenType.CompilerDetails); LoadModlistForCompiling.Send(CompilerSettings); } } diff --git a/Wabbajack.App.Wpf/ViewModels/Compilers/CompilerVM.cs b/Wabbajack.App.Wpf/ViewModels/Compilers/CompilerDetailsVM.cs similarity index 98% rename from Wabbajack.App.Wpf/ViewModels/Compilers/CompilerVM.cs rename to Wabbajack.App.Wpf/ViewModels/Compilers/CompilerDetailsVM.cs index d23c3bc8..a9c7d41e 100644 --- a/Wabbajack.App.Wpf/ViewModels/Compilers/CompilerVM.cs +++ b/Wabbajack.App.Wpf/ViewModels/Compilers/CompilerDetailsVM.cs @@ -38,12 +38,12 @@ namespace Wabbajack Completed, Errored } - public class CompilerVM : BackNavigatingVM, ICpuStatusVM + public class CompilerDetailsVM : BackNavigatingVM, ICpuStatusVM { private readonly DTOSerializer _dtos; private readonly SettingsManager _settingsManager; private readonly IServiceProvider _serviceProvider; - private readonly ILogger _logger; + private readonly ILogger _logger; private readonly ResourceMonitor _resourceMonitor; private readonly CompilerSettingsInferencer _inferencer; private readonly Client _wjClient; @@ -75,7 +75,7 @@ namespace Wabbajack [Reactive] public ErrorResponse ErrorState { get; private set; } - public CompilerVM(ILogger logger, DTOSerializer dtos, SettingsManager settingsManager, + public CompilerDetailsVM(ILogger logger, DTOSerializer dtos, SettingsManager settingsManager, IServiceProvider serviceProvider, LogStream loggerProvider, ResourceMonitor resourceMonitor, CompilerSettingsInferencer inferencer, Client wjClient) : base(logger) { diff --git a/Wabbajack.App.Wpf/ViewModels/CreateModListVM.cs b/Wabbajack.App.Wpf/ViewModels/Compilers/CompilerHomeVM.cs similarity index 85% rename from Wabbajack.App.Wpf/ViewModels/CreateModListVM.cs rename to Wabbajack.App.Wpf/ViewModels/Compilers/CompilerHomeVM.cs index e19d523c..c08d5b1a 100644 --- a/Wabbajack.App.Wpf/ViewModels/CreateModListVM.cs +++ b/Wabbajack.App.Wpf/ViewModels/Compilers/CompilerHomeVM.cs @@ -29,11 +29,11 @@ using Wabbajack.Services.OSIntegrated.Services; namespace Wabbajack { - public class CreateModListVM : ViewModel + public class CompilerHomeVM : ViewModel { private readonly SettingsManager _settingsManager; private readonly IServiceProvider _serviceProvider; - private readonly ILogger _logger; + private readonly ILogger _logger; private readonly CancellationToken _cancellationToken; private readonly DTOSerializer _dtos; @@ -41,11 +41,11 @@ namespace Wabbajack public ICommand LoadSettingsCommand { get; set; } [Reactive] - public ObservableCollection CreatedModlists { get; set; } + public ObservableCollection CompiledModLists { get; set; } public FilePickerVM CompilerSettingsPicker { get; private set; } - public CreateModListVM(ILogger logger, SettingsManager settingsManager, + public CompilerHomeVM(ILogger logger, SettingsManager settingsManager, IServiceProvider serviceProvider, DTOSerializer dtos) { _logger = logger; @@ -64,7 +64,7 @@ namespace Wabbajack ]); NewModListCommand = ReactiveCommand.Create(() => { - NavigateToGlobal.Send(ScreenType.Compiler); + NavigateToGlobal.Send(ScreenType.CompilerDetails); LoadModlistForCompiling.Send(new()); }); @@ -73,7 +73,7 @@ namespace Wabbajack CompilerSettingsPicker.SetTargetPathCommand.Execute(null); if(CompilerSettingsPicker.TargetPath != default) { - NavigateToGlobal.Send(ScreenType.Compiler); + NavigateToGlobal.Send(ScreenType.CompilerDetails); var compilerSettings = _dtos.Deserialize(File.ReadAllText(CompilerSettingsPicker.TargetPath.ToString())); LoadModlistForCompiling.Send(compilerSettings); } @@ -87,13 +87,13 @@ namespace Wabbajack private async Task LoadAllCompilerSettings() { - CreatedModlists = new(); + CompiledModLists = new(); var savedCompilerSettingsPaths = await _settingsManager.Load>(Consts.AllSavedCompilerSettingsPaths); foreach(var settingsPath in savedCompilerSettingsPaths) { await using var fs = settingsPath.Open(FileMode.Open, FileAccess.Read, FileShare.Read); var settings = (await _dtos.DeserializeAsync(fs))!; - CreatedModlists.Add(new CreatedModlistVM(_logger, settings)); + CompiledModLists.Add(new CompiledModListTileVM(_logger, settings)); } } } diff --git a/Wabbajack.App.Wpf/ViewModels/Compilers/MO2CompilerVM.cs b/Wabbajack.App.Wpf/ViewModels/Compilers/MO2CompilerVM.cs index b9f708ae..06a197de 100644 --- a/Wabbajack.App.Wpf/ViewModels/Compilers/MO2CompilerVM.cs +++ b/Wabbajack.App.Wpf/ViewModels/Compilers/MO2CompilerVM.cs @@ -18,7 +18,7 @@ namespace Wabbajack { public class MO2CompilerVM : ViewModel { - public CompilerVM Parent { get; } + public CompilerDetailsVM Parent { get; } public FilePickerVM DownloadLocation { get; } @@ -41,7 +41,7 @@ namespace Wabbajack throw new NotImplementedException(); } - public MO2CompilerVM(CompilerVM parent) + public MO2CompilerVM(CompilerDetailsVM parent) { } } diff --git a/Wabbajack.App.Wpf/ViewModels/MainWindowVM.cs b/Wabbajack.App.Wpf/ViewModels/MainWindowVM.cs index 767c1b50..7bf810b1 100644 --- a/Wabbajack.App.Wpf/ViewModels/MainWindowVM.cs +++ b/Wabbajack.App.Wpf/ViewModels/MainWindowVM.cs @@ -44,8 +44,8 @@ namespace Wabbajack public ObservableCollectionExtended Log { get; } = new ObservableCollectionExtended(); - public readonly CompilerVM CompilerVM; - public readonly CreateModListVM CreateModListVM; + public readonly CompilerDetailsVM CompilerDetailsVM; + public readonly CompilerHomeVM CompilerHomeVM; public readonly InstallerVM InstallerVM; public readonly SettingsVM SettingsPaneVM; public readonly ModListGalleryVM GalleryVM; @@ -79,7 +79,7 @@ namespace Wabbajack public MainWindowVM(ILogger logger, Client wjClient, IServiceProvider serviceProvider, HomeVM homeVM, ModListGalleryVM modListGalleryVM, ResourceMonitor resourceMonitor, - InstallerVM installerVM, CompilerVM compilerVM, CreateModListVM createModListVM, SettingsVM settingsVM, WebBrowserVM webBrowserVM, NavigationVM navigationVM) + InstallerVM installerVM, CompilerDetailsVM compilerVM, CompilerHomeVM compilerHomeVM, SettingsVM settingsVM, WebBrowserVM webBrowserVM, NavigationVM navigationVM) { _logger = logger; _wjClient = wjClient; @@ -87,8 +87,8 @@ namespace Wabbajack _serviceProvider = serviceProvider; ConverterRegistration.Register(); InstallerVM = installerVM; - CompilerVM = compilerVM; - CreateModListVM = createModListVM; + CompilerDetailsVM = compilerVM; + CompilerHomeVM = compilerHomeVM; SettingsPaneVM = settingsVM; GalleryVM = modListGalleryVM; HomeVM = homeVM; @@ -235,8 +235,8 @@ namespace Wabbajack ScreenType.Home => HomeVM, ScreenType.ModListGallery => GalleryVM, ScreenType.Installer => InstallerVM, - ScreenType.Compiler => CompilerVM, - ScreenType.CreateModList => CreateModListVM, + ScreenType.CompilerDetails => CompilerDetailsVM, + ScreenType.CompilerHome => CompilerHomeVM, ScreenType.Settings => SettingsPaneVM, _ => ActivePane }; diff --git a/Wabbajack.App.Wpf/ViewModels/NavigationVM.cs b/Wabbajack.App.Wpf/ViewModels/NavigationVM.cs index 5212f733..75335e5c 100644 --- a/Wabbajack.App.Wpf/ViewModels/NavigationVM.cs +++ b/Wabbajack.App.Wpf/ViewModels/NavigationVM.cs @@ -37,7 +37,7 @@ namespace Wabbajack LoadLastLoadedModlist.Send(); NavigateToGlobal.Send(ScreenType.Installer); }); - CreateModListCommand = ReactiveCommand.Create(() => NavigateToGlobal.Send(ScreenType.CreateModList)); + CompileModListCommand = ReactiveCommand.Create(() => NavigateToGlobal.Send(ScreenType.CompilerHome)); SettingsCommand = ReactiveCommand.Create( /* canExecute: this.WhenAny(x => x.ActivePane) @@ -58,7 +58,7 @@ namespace Wabbajack public ICommand HomeCommand { get; } public ICommand BrowseCommand { get; } public ICommand InstallCommand { get; } - public ICommand CreateModListCommand { get; } + public ICommand CompileModListCommand { get; } public ICommand SettingsCommand { get; } public string Version { get; } } diff --git a/Wabbajack.App.Wpf/Views/Compilers/CompilationCompleteView.xaml b/Wabbajack.App.Wpf/Views/Compilers/CompilationCompleteView.xaml index 158f2e5f..170d370e 100644 --- a/Wabbajack.App.Wpf/Views/Compilers/CompilationCompleteView.xaml +++ b/Wabbajack.App.Wpf/Views/Compilers/CompilationCompleteView.xaml @@ -9,7 +9,7 @@ xmlns:rxui="http://reactiveui.net" d:DesignHeight="450" d:DesignWidth="800" - x:TypeArguments="local:CompilerVM" + x:TypeArguments="local:CompilerDetailsVM" mc:Ignorable="d"> diff --git a/Wabbajack.App.Wpf/Views/CreateModListTileView.xaml b/Wabbajack.App.Wpf/Views/Compilers/CompiledModListTileView.xaml similarity index 99% rename from Wabbajack.App.Wpf/Views/CreateModListTileView.xaml rename to Wabbajack.App.Wpf/Views/Compilers/CompiledModListTileView.xaml index e138d719..feaa3baf 100644 --- a/Wabbajack.App.Wpf/Views/CreateModListTileView.xaml +++ b/Wabbajack.App.Wpf/Views/Compilers/CompiledModListTileView.xaml @@ -1,5 +1,5 @@ diff --git a/Wabbajack.App.Wpf/Views/CreateModListTileView.xaml.cs b/Wabbajack.App.Wpf/Views/Compilers/CompiledModListTileView.xaml.cs similarity index 90% rename from Wabbajack.App.Wpf/Views/CreateModListTileView.xaml.cs rename to Wabbajack.App.Wpf/Views/Compilers/CompiledModListTileView.xaml.cs index 66565f45..1174c199 100644 --- a/Wabbajack.App.Wpf/Views/CreateModListTileView.xaml.cs +++ b/Wabbajack.App.Wpf/Views/Compilers/CompiledModListTileView.xaml.cs @@ -10,9 +10,9 @@ namespace Wabbajack /// /// Interaction logic for CreateModListTileView.xaml /// - public partial class CreatedModListTileView : ReactiveUserControl + public partial class CompiledModListTileView : ReactiveUserControl { - public CreatedModListTileView() + public CompiledModListTileView() { InitializeComponent(); this.WhenActivated(dispose => diff --git a/Wabbajack.App.Wpf/Views/Compilers/CompilerView.xaml b/Wabbajack.App.Wpf/Views/Compilers/CompilerDetailsView.xaml similarity index 98% rename from Wabbajack.App.Wpf/Views/Compilers/CompilerView.xaml rename to Wabbajack.App.Wpf/Views/Compilers/CompilerDetailsView.xaml index 4ce3f79d..0382426a 100644 --- a/Wabbajack.App.Wpf/Views/Compilers/CompilerView.xaml +++ b/Wabbajack.App.Wpf/Views/Compilers/CompilerDetailsView.xaml @@ -1,5 +1,5 @@  diff --git a/Wabbajack.App.Wpf/Views/Compilers/CompilerView.xaml.cs b/Wabbajack.App.Wpf/Views/Compilers/CompilerDetailsView.xaml.cs similarity index 99% rename from Wabbajack.App.Wpf/Views/Compilers/CompilerView.xaml.cs rename to Wabbajack.App.Wpf/Views/Compilers/CompilerDetailsView.xaml.cs index 2caf31aa..3865789b 100644 --- a/Wabbajack.App.Wpf/Views/Compilers/CompilerView.xaml.cs +++ b/Wabbajack.App.Wpf/Views/Compilers/CompilerDetailsView.xaml.cs @@ -19,11 +19,11 @@ using Wabbajack.Services.OSIntegrated; namespace Wabbajack { /// - /// Interaction logic for CompilerView.xaml + /// Interaction logic for CompilerDetailsView.xaml /// - public partial class CompilerView : ReactiveUserControl + public partial class CompilerDetailsView : ReactiveUserControl { - public CompilerView() + public CompilerDetailsView() { InitializeComponent(); diff --git a/Wabbajack.App.Wpf/Views/Compilers/CreateModListView.xaml b/Wabbajack.App.Wpf/Views/Compilers/CompilerHomeView.xaml similarity index 95% rename from Wabbajack.App.Wpf/Views/Compilers/CreateModListView.xaml rename to Wabbajack.App.Wpf/Views/Compilers/CompilerHomeView.xaml index abc9e7a2..48cc4e50 100644 --- a/Wabbajack.App.Wpf/Views/Compilers/CreateModListView.xaml +++ b/Wabbajack.App.Wpf/Views/Compilers/CompilerHomeView.xaml @@ -1,5 +1,5 @@  @@ -111,7 +111,7 @@ @@ -121,7 +121,7 @@ - + diff --git a/Wabbajack.App.Wpf/Views/Compilers/CreateModListView.xaml.cs b/Wabbajack.App.Wpf/Views/Compilers/CompilerHomeView.xaml.cs similarity index 82% rename from Wabbajack.App.Wpf/Views/Compilers/CreateModListView.xaml.cs rename to Wabbajack.App.Wpf/Views/Compilers/CompilerHomeView.xaml.cs index ff59c9d6..42c9bc37 100644 --- a/Wabbajack.App.Wpf/Views/Compilers/CreateModListView.xaml.cs +++ b/Wabbajack.App.Wpf/Views/Compilers/CompilerHomeView.xaml.cs @@ -22,16 +22,16 @@ namespace Wabbajack /// /// Interaction logic for CreateModList.xaml /// - public partial class CreateModListView : ReactiveUserControl + public partial class CompilerHomeView : ReactiveUserControl { - public CreateModListView() + public CompilerHomeView() { InitializeComponent(); this.WhenActivated(dispose => { - this.WhenAny(x => x.ViewModel.CreatedModlists) - .BindToStrict(this, x => x.CreatedModListsControl.ItemsSource) + this.WhenAny(x => x.ViewModel.CompiledModLists) + .BindToStrict(this, x => x.CompiledModListsControl.ItemsSource) .DisposeWith(dispose); NewModListBorder diff --git a/Wabbajack.App.Wpf/Views/MainWindow.xaml b/Wabbajack.App.Wpf/Views/MainWindow.xaml index 35ed5670..3745a834 100644 --- a/Wabbajack.App.Wpf/Views/MainWindow.xaml +++ b/Wabbajack.App.Wpf/Views/MainWindow.xaml @@ -67,21 +67,21 @@ - - - - - - - - - + + + + + + + + + diff --git a/Wabbajack.App.Wpf/Views/NavigationView.xaml.cs b/Wabbajack.App.Wpf/Views/NavigationView.xaml.cs index ce25be7f..7fd1b674 100644 --- a/Wabbajack.App.Wpf/Views/NavigationView.xaml.cs +++ b/Wabbajack.App.Wpf/Views/NavigationView.xaml.cs @@ -23,7 +23,7 @@ namespace Wabbajack ScreenButtonDictionary = new() { { ScreenType.Home, HomeButton }, { ScreenType.ModListGallery, BrowseButton }, - { ScreenType.CreateModList, CompileButton }, + { ScreenType.CompilerHome, CompileButton }, { ScreenType.Settings, SettingsButton }, }; this.WhenActivated(dispose => @@ -32,7 +32,7 @@ namespace Wabbajack .DisposeWith(dispose); this.BindCommand(ViewModel, vm => vm.HomeCommand, v => v.HomeButton) .DisposeWith(dispose); - this.BindCommand(ViewModel, vm => vm.CreateModListCommand, v => v.CompileButton) + this.BindCommand(ViewModel, vm => vm.CompileModListCommand, v => v.CompileButton) .DisposeWith(dispose); this.BindCommand(ViewModel, vm => vm.SettingsCommand, v => v.SettingsButton) .DisposeWith(dispose);