From 1dd4a642ef167ad5809858a63f962120427fdeea Mon Sep 17 00:00:00 2001 From: trawzified <55751269+tr4wzified@users.noreply.github.com> Date: Sat, 27 Apr 2024 11:15:42 +0200 Subject: [PATCH] Compiler screen order changes --- Wabbajack.App.Wpf/Themes/Styles.xaml | 20 +++----- .../Views/Compilers/CompilerView.xaml | 47 +++++++------------ .../Views/Compilers/CompilerView.xaml.cs | 2 + Wabbajack.App.Wpf/Views/HomeView.xaml | 16 +++---- 4 files changed, 33 insertions(+), 52 deletions(-) diff --git a/Wabbajack.App.Wpf/Themes/Styles.xaml b/Wabbajack.App.Wpf/Themes/Styles.xaml index d2afb138..55d386b2 100644 --- a/Wabbajack.App.Wpf/Themes/Styles.xaml +++ b/Wabbajack.App.Wpf/Themes/Styles.xaml @@ -105,6 +105,10 @@ x:Key="MahApps.Brushes.Accent4" options:Freeze="True" Color="{StaticResource MahApps.Colors.Accent4}" /> + @@ -245,6 +249,7 @@ - --> - - - - - - - - + - + - - - - + + + + + ToolTip="Link to the Readme." + mahapps:TextBoxHelper.Watermark="https://www.wabbajack.org"/> - - - diff --git a/Wabbajack.App.Wpf/Views/Compilers/CompilerView.xaml.cs b/Wabbajack.App.Wpf/Views/Compilers/CompilerView.xaml.cs index ea0b812a..78631f0b 100644 --- a/Wabbajack.App.Wpf/Views/Compilers/CompilerView.xaml.cs +++ b/Wabbajack.App.Wpf/Views/Compilers/CompilerView.xaml.cs @@ -80,9 +80,11 @@ namespace Wabbajack .DisposeWith(disposables); */ + /* ViewModel.WhenAnyValue(vm => vm.ReInferSettingsCommand) .BindToStrict(this, view => view.ReInferSettings.Command) .DisposeWith(disposables); + */ ViewModel.WhenAnyValue(vm => vm.State) .Select(v => v == CompilerState.Configuration ? Visibility.Visible : Visibility.Collapsed) diff --git a/Wabbajack.App.Wpf/Views/HomeView.xaml b/Wabbajack.App.Wpf/Views/HomeView.xaml index 879b633d..5987bedf 100644 --- a/Wabbajack.App.Wpf/Views/HomeView.xaml +++ b/Wabbajack.App.Wpf/Views/HomeView.xaml @@ -22,19 +22,19 @@ -