From 04ad4e8f82bc9747c8f4c68245299cdfe71e6e1a Mon Sep 17 00:00:00 2001 From: Timothy Baldridge Date: Mon, 11 Oct 2021 06:12:24 -0600 Subject: [PATCH] Fixed back navigation from play, added compiler configuration screen --- .../Screens/CompilerConfigurationView.axaml | 11 +++++++++++ .../Screens/CompilerConfigurationView.axaml.cs | 14 ++++++++++++++ .../Screens/CompilerConfigurationViewModel.cs | 14 ++++++++++++++ Wabbajack.App/ServiceExtensions.cs | 2 ++ Wabbajack.App/ViewModels/MainWindowViewModel.cs | 1 + Wabbajack.App/Views/MainWindow.axaml | 1 + Wabbajack.App/Views/ModeSelectionView.axaml | 2 +- Wabbajack.App/Views/ModeSelectionView.axaml.cs | 5 +++++ 8 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 Wabbajack.App/Screens/CompilerConfigurationView.axaml create mode 100644 Wabbajack.App/Screens/CompilerConfigurationView.axaml.cs create mode 100644 Wabbajack.App/Screens/CompilerConfigurationViewModel.cs diff --git a/Wabbajack.App/Screens/CompilerConfigurationView.axaml b/Wabbajack.App/Screens/CompilerConfigurationView.axaml new file mode 100644 index 00000000..8a51450f --- /dev/null +++ b/Wabbajack.App/Screens/CompilerConfigurationView.axaml @@ -0,0 +1,11 @@ + + + Compiler Configuration + + \ No newline at end of file diff --git a/Wabbajack.App/Screens/CompilerConfigurationView.axaml.cs b/Wabbajack.App/Screens/CompilerConfigurationView.axaml.cs new file mode 100644 index 00000000..25399ddd --- /dev/null +++ b/Wabbajack.App/Screens/CompilerConfigurationView.axaml.cs @@ -0,0 +1,14 @@ + + +using Wabbajack.App.Views; + +namespace Wabbajack.App.Screens +{ + public partial class CompilerConfigurationView : ScreenBase + { + public CompilerConfigurationView() + { + InitializeComponent(); + } + } +} \ No newline at end of file diff --git a/Wabbajack.App/Screens/CompilerConfigurationViewModel.cs b/Wabbajack.App/Screens/CompilerConfigurationViewModel.cs new file mode 100644 index 00000000..30dab667 --- /dev/null +++ b/Wabbajack.App/Screens/CompilerConfigurationViewModel.cs @@ -0,0 +1,14 @@ +using ReactiveUI; +using Wabbajack.App.Messages; +using Wabbajack.App.ViewModels; + +namespace Wabbajack.App.Screens; + +public class CompilerConfigurationViewModel : ViewModelBase, IReceiverMarker +{ + public CompilerConfigurationViewModel() + { + Activator = new ViewModelActivator(); + } + +} \ No newline at end of file diff --git a/Wabbajack.App/ServiceExtensions.cs b/Wabbajack.App/ServiceExtensions.cs index 16a69d59..a91559cc 100644 --- a/Wabbajack.App/ServiceExtensions.cs +++ b/Wabbajack.App/ServiceExtensions.cs @@ -43,6 +43,7 @@ namespace Wabbajack.App services.AddTransient(); services.AddSingleton(); services.AddSingleton(); + services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); @@ -53,6 +54,7 @@ namespace Wabbajack.App services.AddAllSingleton(); services.AddAllSingleton(); + services.AddAllSingleton(); services.AddAllSingleton(); services.AddAllSingleton(); services.AddAllSingleton(); diff --git a/Wabbajack.App/ViewModels/MainWindowViewModel.cs b/Wabbajack.App/ViewModels/MainWindowViewModel.cs index 10ae2598..50243983 100644 --- a/Wabbajack.App/ViewModels/MainWindowViewModel.cs +++ b/Wabbajack.App/ViewModels/MainWindowViewModel.cs @@ -78,6 +78,7 @@ namespace Wabbajack.App.ViewModels .DisposeWith(disposables); }); + CurrentScreen = (Control)_screens.First(s => s.ViewModelType == typeof(ModeSelectionViewModel)); LoadFirstScreen().FireAndForget(); diff --git a/Wabbajack.App/Views/MainWindow.axaml b/Wabbajack.App/Views/MainWindow.axaml index 2b7b30d3..b02b577b 100644 --- a/Wabbajack.App/Views/MainWindow.axaml +++ b/Wabbajack.App/Views/MainWindow.axaml @@ -38,6 +38,7 @@ +