From f026a666dd4939c898c5a2f394afd6a077e2e25b Mon Sep 17 00:00:00 2001
From: Justin Swanson <justin.c.swanson@gmail.com>
Date: Sun, 19 Jan 2020 20:05:05 -0600
Subject: [PATCH 1/9] Bugfix for MO2 compiler not respecting targeted download
 folder

---
 Wabbajack/View Models/Compilers/MO2CompilerVM.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Wabbajack/View Models/Compilers/MO2CompilerVM.cs b/Wabbajack/View Models/Compilers/MO2CompilerVM.cs
index 945606a3..32fc866a 100644
--- a/Wabbajack/View Models/Compilers/MO2CompilerVM.cs	
+++ b/Wabbajack/View Models/Compilers/MO2CompilerVM.cs	
@@ -189,6 +189,7 @@ namespace Wabbajack
                     ModListWebsite = ModlistSettings.Website,
                     ModListReadme = ModlistSettings.ReadmeIsWebsite ? ModlistSettings.ReadmeWebsite : ModlistSettings.ReadmeFilePath.TargetPath,
                     ReadmeIsWebsite = ModlistSettings.ReadmeIsWebsite,
+                    MO2DownloadsFolder = DownloadLocation.TargetPath,
                 })
                 {
                     Parent.MWVM.Settings.Performance.AttachToBatchProcessor(ActiveCompilation);

From d788a3ae955575fb45fa5a52123052bafafdf21d Mon Sep 17 00:00:00 2001
From: Justin Swanson <justin.c.swanson@gmail.com>
Date: Mon, 20 Jan 2020 15:59:26 -0600
Subject: [PATCH 2/9] CompilerView swapped to RxUserControl

---
 Wabbajack/Extensions/IViewForExt.cs           |  24 +++-
 Wabbajack/View Models/Compilers/CompilerVM.cs |   6 +-
 Wabbajack/Views/Common/CpuView.xaml.cs        |   2 +-
 Wabbajack/Views/Compilers/CompilerView.xaml   |  88 +++++-------
 .../Views/Compilers/CompilerView.xaml.cs      | 135 +++++++++++++++++-
 Wabbajack/Views/MainWindow.xaml               |   2 +-
 6 files changed, 200 insertions(+), 57 deletions(-)

diff --git a/Wabbajack/Extensions/IViewForExt.cs b/Wabbajack/Extensions/IViewForExt.cs
index 083a7449..549cd367 100644
--- a/Wabbajack/Extensions/IViewForExt.cs
+++ b/Wabbajack/Extensions/IViewForExt.cs
@@ -54,6 +54,26 @@ namespace Wabbajack
                 viewProperty: viewProperty);
         }
 
+        public static IReactiveBinding<TView, TViewModel, (object view, bool isViewModel)> BindStrict<TViewModel, TView, TVMProp, TVProp, TDontCare>(
+            this TView view,
+            TViewModel viewModel,
+            Expression<Func<TViewModel, TVMProp>> vmProperty,
+            Expression<Func<TView, TVProp>> viewProperty,
+            IObservable<TDontCare> signalViewUpdate,
+            Func<TVMProp, TVProp> vmToViewConverter,
+            Func<TVProp, TVMProp> viewToVmConverter)
+            where TViewModel : class
+            where TView : class, IViewFor
+        {
+            return view.Bind(
+                viewModel: viewModel,
+                vmProperty: vmProperty,
+                viewProperty: viewProperty,
+                signalViewUpdate: signalViewUpdate,
+                vmToViewConverter: vmToViewConverter,
+                viewToVmConverter: viewToVmConverter);
+        }
+
         public static IReactiveBinding<TView, TViewModel, (object view, bool isViewModel)> BindStrict<TViewModel, TView, TVMProp, TVProp>(
             this TView view,
             TViewModel viewModel,
@@ -78,7 +98,9 @@ namespace Wabbajack
             Expression<Func<TTarget, TValue>> property)
             where TTarget : class
         {
-            return @this.BindTo<TValue, TTarget, TValue>(target, property);
+            return @this
+                .ObserveOnGuiThread()
+                .BindTo<TValue, TTarget, TValue>(target, property);
         }
 
         /// <summary>
diff --git a/Wabbajack/View Models/Compilers/CompilerVM.cs b/Wabbajack/View Models/Compilers/CompilerVM.cs
index 00531ec9..daee630b 100644
--- a/Wabbajack/View Models/Compilers/CompilerVM.cs	
+++ b/Wabbajack/View Models/Compilers/CompilerVM.cs	
@@ -48,9 +48,9 @@ namespace Wabbajack
         public ObservableCollectionExtended<IStatusMessage> Log => MWVM.Log;
 
         public ReactiveCommand<Unit, Unit> BackCommand { get; }
-        public IReactiveCommand GoToModlistCommand { get; }
-        public IReactiveCommand CloseWhenCompleteCommand { get; }
-        public IReactiveCommand BeginCommand { get; }
+        public ReactiveCommand<Unit, Unit> GoToModlistCommand { get; }
+        public ReactiveCommand<Unit, Unit> CloseWhenCompleteCommand { get; }
+        public ReactiveCommand<Unit, Unit> BeginCommand { get; }
 
         public FilePickerVM OutputLocation { get; }
 
diff --git a/Wabbajack/Views/Common/CpuView.xaml.cs b/Wabbajack/Views/Common/CpuView.xaml.cs
index 2899bfe5..72cf54c7 100644
--- a/Wabbajack/Views/Common/CpuView.xaml.cs
+++ b/Wabbajack/Views/Common/CpuView.xaml.cs
@@ -40,7 +40,7 @@ namespace Wabbajack
             set => SetValue(SettingsHookProperty, value);
         }
         public static readonly DependencyProperty SettingsHookProperty = DependencyProperty.Register(nameof(SettingsHook), typeof(MainSettings), typeof(CpuView),
-             new FrameworkPropertyMetadata(default(SettingsVM)));
+             new FrameworkPropertyMetadata(default(SettingsVM), WireNotifyPropertyChanged));
 
         private bool _ShowingSettings;
         public bool ShowingSettings { get => _ShowingSettings; set => this.RaiseAndSetIfChanged(ref _ShowingSettings, value); }
diff --git a/Wabbajack/Views/Compilers/CompilerView.xaml b/Wabbajack/Views/Compilers/CompilerView.xaml
index 99c843f2..131801f0 100644
--- a/Wabbajack/Views/Compilers/CompilerView.xaml
+++ b/Wabbajack/Views/Compilers/CompilerView.xaml
@@ -1,4 +1,4 @@
-<UserControl
+<rxui:ReactiveUserControl
     x:Class="Wabbajack.CompilerView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -8,10 +8,12 @@
     xmlns:local="clr-namespace:Wabbajack"
     xmlns:mahapps="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:rxui="http://reactiveui.net"
     xmlns:wabbacommon="clr-namespace:Wabbajack.Common;assembly=Wabbajack.Common"
     d:DataContext="{d:DesignInstance local:CompilerVM}"
     d:DesignHeight="450"
     d:DesignWidth="800"
+    x:TypeArguments="local:CompilerVM"
     mc:Ignorable="d">
     <Grid>
         <Grid.RowDefinitions>
@@ -27,11 +29,11 @@
             <ColumnDefinition Width="5" />
         </Grid.ColumnDefinitions>
         <local:HeatedBackgroundView
+            x:Name="HeatedBackground"
             Grid.Row="0"
             Grid.RowSpan="3"
             Grid.Column="0"
-            Grid.ColumnSpan="5"
-            PercentCompleted="{Binding PercentCompleted}" />
+            Grid.ColumnSpan="5" />
         <Border
             x:Name="ModlistDetailsBackground"
             Grid.Row="1"
@@ -54,30 +56,22 @@
             Grid.ColumnSpan="2"
             Margin="1,1,5,0"
             BorderBrush="{StaticResource HeatedBorderBrush}"
-            BorderThickness="1"
-            Opacity="{Binding PercentCompleted}" />
+            BorderThickness="1" />
         <Border
             Grid.Row="1"
             Grid.Column="3"
             BorderBrush="{StaticResource BorderInterestBrush}"
             BorderThickness="1,0,1,1">
-            <local:DetailImageView
-                Title="{Binding CurrentModlistSettings.ModListName}"
-                Author="{Binding CurrentModlistSettings.AuthorText}"
-                BorderThickness="0"
-                Description="{Binding CurrentModlistSettings.Description}"
-                Image="{Binding Image}" />
+            <local:DetailImageView x:Name="DetailImage" BorderThickness="0" />
         </Border>
         <!--  Comes after image area so shadow can overlay  -->
         <local:TopProgressView
-            Title="{Binding CurrentModlistSettings.ModListName, Mode=OneWay}"
+            x:Name="TopProgressBar"
             Grid.Row="0"
             Grid.RowSpan="2"
             Grid.Column="0"
             Grid.ColumnSpan="5"
-            OverhangShadow="True"
-            ProgressPercent="{Binding PercentCompleted}"
-            StatePrefixTitle="{Binding ProgressTitle}" />
+            OverhangShadow="True" />
         <Button
             x:Name="BackButton"
             Grid.Row="0"
@@ -88,23 +82,21 @@
             Margin="12,5,0,0"
             HorizontalAlignment="Left"
             VerticalAlignment="Top"
-            Command="{Binding BackCommand}"
             Style="{StaticResource IconCircleButtonStyle}"
             ToolTip="Back to main menu">
             <icon:PackIconMaterial Foreground="{Binding Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}" Kind="ArrowLeft" />
         </Button>
         <ScrollViewer
+            x:Name="SettingsScrollViewer"
             Grid.Row="1"
             Grid.Column="1"
             Margin="5"
             Background="Transparent"
             HorizontalScrollBarVisibility="Disabled"
-            IsEnabled="{Binding Compiling, Converter={StaticResource InverseBooleanConverter}}"
             VerticalScrollBarVisibility="Auto">
             <StackPanel
                 Margin="0,5,0,0"
                 Background="Transparent"
-                DataContext="{Binding CurrentModlistSettings}"
                 Orientation="Vertical">
                 <StackPanel.Resources>
                     <Thickness
@@ -128,26 +120,26 @@
                     </Style>
                 </StackPanel.Resources>
                 <TextBlock Margin="{StaticResource TitleMargin}" Text="ModList Name" />
-                <TextBox Style="{StaticResource ValueStyle}" Text="{Binding ModListName, UpdateSourceTrigger=PropertyChanged}" />
+                <TextBox x:Name="ModListNameSetting" Style="{StaticResource ValueStyle}" />
                 <TextBlock Margin="{StaticResource TitleMargin}" Text="Author" />
-                <TextBox Style="{StaticResource ValueStyle}" Text="{Binding AuthorText, UpdateSourceTrigger=PropertyChanged}" />
+                <TextBox x:Name="AuthorNameSetting" Style="{StaticResource ValueStyle}" />
                 <TextBlock Margin="{StaticResource TitleMargin}" Text="Description" />
                 <TextBox
+                    x:Name="DescriptionSetting"
                     Height="150"
                     mahapps:TextBoxHelper.Watermark="(700 characters max)"
                     AcceptsReturn="True"
                     AcceptsTab="False"
                     MaxLength="700"
                     Style="{StaticResource ValueStyle}"
-                    Text="{Binding Description, UpdateSourceTrigger=PropertyChanged}"
                     TextWrapping="Wrap" />
                 <TextBlock Margin="{StaticResource TitleMargin}" Text="Image" />
                 <local:FilePicker
-                    PickerVM="{Binding ImagePath}"
+                    x:Name="ImageFilePicker"
                     Style="{StaticResource PickerStyle}"
                     ToolTip="Path to an image to display for the modlist." />
                 <TextBlock Margin="{StaticResource TitleMargin}" Text="Website" />
-                <TextBox Style="{StaticResource ValueStyle}" Text="{Binding Website, UpdateSourceTrigger=PropertyChanged}" />
+                <TextBox x:Name="WebsiteSetting" Style="{StaticResource ValueStyle}" />
                 <TextBlock
                     Margin="{StaticResource TitleMargin}"
                     Text="Readme"
@@ -159,30 +151,28 @@
                         <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
                     <local:FilePicker
+                        x:Name="ReadmeFilePickerSetting"
                         Grid.Column="0"
                         Height="27"
                         Margin="0,0,3,0"
                         VerticalAlignment="Center"
-                        PickerVM="{Binding ReadmeFilePath}"
-                        ToolTip="Path to a readme file."
-                        Visibility="{Binding ReadmeIsWebsite, Converter={StaticResource bool2VisibilityConverter}, ConverterParameter=False}" />
+                        ToolTip="Path to a readme file." />
                     <TextBox
+                        x:Name="ReadmeWebsiteSetting"
                         Grid.Column="0"
                         Height="27"
                         Margin="0,0,3,0"
                         VerticalAlignment="Center"
-                        Text="{Binding ReadmeWebsite}"
-                        ToolTip="Readme website"
-                        Visibility="{Binding ReadmeIsWebsite, Converter={StaticResource bool2VisibilityConverter}}" />
+                        ToolTip="Readme website" />
                     <Button
+                        x:Name="SwapToReadmeWebsiteButton"
                         Grid.Column="1"
                         Width="27"
-                        Command="{Binding SwapToWebsiteReadmeCommand}"
                         ToolTip="Set readme to be a website">
                         <Button.Style>
                             <Style BasedOn="{StaticResource IconBareButtonStyle}" TargetType="Button">
                                 <Style.Triggers>
-                                    <DataTrigger Binding="{Binding ReadmeIsWebsite}" Value="True">
+                                    <DataTrigger Binding="{Binding CurrentModlistSettings.ReadmeIsWebsite}" Value="True">
                                         <Setter Property="Foreground" Value="{StaticResource SecondaryBrush}" />
                                     </DataTrigger>
                                 </Style.Triggers>
@@ -194,14 +184,14 @@
                             Kind="Web" />
                     </Button>
                     <Button
+                        x:Name="SwapToReadmeFileButton"
                         Grid.Column="2"
                         Width="27"
-                        Command="{Binding SwapToTextReadmeCommand}"
                         ToolTip="Source readme from a local file (txt | html)">
                         <Button.Style>
                             <Style BasedOn="{StaticResource IconBareButtonStyle}" TargetType="Button">
                                 <Style.Triggers>
-                                    <DataTrigger Binding="{Binding ReadmeIsWebsite}" Value="False">
+                                    <DataTrigger Binding="{Binding CurrentModlistSettings.ReadmeIsWebsite}" Value="False">
                                         <Setter Property="Foreground" Value="{StaticResource SecondaryBrush}" />
                                     </DataTrigger>
                                 </Style.Triggers>
@@ -228,10 +218,10 @@
             Grid.ColumnSpan="5"
             MaxWidth="1000">
             <Grid
+                x:Name="BottomCompilerSettingsGrid"
                 Margin="35,0,35,0"
                 VerticalAlignment="Center"
-                ClipToBounds="False"
-                Visibility="{Binding StartedCompilation, Converter={StaticResource bool2VisibilityConverter}, ConverterParameter=False}">
+                ClipToBounds="False">
                 <Grid.RowDefinitions>
                     <RowDefinition Height="*" />
                     <RowDefinition Height="Auto" />
@@ -254,6 +244,7 @@
                         <RowDefinition Height="Auto" />
                     </Grid.RowDefinitions>
                     <local:ImageRadioButtonView
+                        x:Name="MO2CompilerButton"
                         Grid.Row="0"
                         Height="35"
                         Margin="4"
@@ -263,6 +254,7 @@
                         </local:ImageRadioButtonView.Image>
                     </local:ImageRadioButtonView>
                     <local:ImageRadioButtonView
+                        x:Name="VortexCompilerButton"
                         Grid.Row="1"
                         Height="35"
                         Margin="4"
@@ -273,9 +265,9 @@
                     </local:ImageRadioButtonView>
                 </Grid>
                 <ContentPresenter
+                    x:Name="CustomCompilerSettingsPresenter"
                     Grid.Row="1"
-                    Grid.Column="1"
-                    Content="{Binding Compiler}">
+                    Grid.Column="1">
                     <ContentPresenter.Resources>
                         <DataTemplate DataType="{x:Type local:MO2CompilerVM}">
                             <local:MO2CompilerConfigView />
@@ -286,38 +278,36 @@
                     </ContentPresenter.Resources>
                 </ContentPresenter>
                 <local:BeginButton
+                    x:Name="BeginButton"
                     Grid.Row="0"
                     Grid.RowSpan="3"
-                    Grid.Column="5"
-                    Command="{Binding BeginCommand}" />
+                    Grid.Column="5" />
             </Grid>
         </Grid>
         <Grid
+            x:Name="MidCompilationGrid"
             Grid.Row="2"
             Grid.Column="0"
             Grid.ColumnSpan="5"
-            Margin="5"
-            Visibility="{Binding StartedCompilation, Converter={StaticResource bool2VisibilityConverter}, FallbackValue=Hidden}">
+            Margin="5">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="4*" />
                 <ColumnDefinition Width="5" />
                 <ColumnDefinition Width="3*" />
             </Grid.ColumnDefinitions>
-            <local:LogView Grid.Column="0" ProgressPercent="{Binding PercentCompleted, Mode=OneWay}" />
+            <local:LogView x:Name="LogView" Grid.Column="0" />
             <local:CpuView
+                x:Name="CpuView"
                 Grid.Column="2"
-                ProgressPercent="{Binding PercentCompleted, Mode=OneWay}"
-                SettingsHook="{Binding MWVM.Settings}"
-                ViewModel="{Binding}"
-                Visibility="{Binding ActiveGlobalUserIntervention, Converter={StaticResource IsNotNullVisibilityConverter}, ConverterParameter=False}" />
-            <local:AttentionBorder Grid.Column="2" Visibility="{Binding ActiveGlobalUserIntervention, Converter={StaticResource IsNotNullVisibilityConverter}}">
+                ViewModel="{Binding}"/>
+            <local:AttentionBorder x:Name="UserInterventionsControl" Grid.Column="2">
                 <local:AttentionBorder.DisplayContent>
                     <Grid>
                         <local:ConfirmationInterventionView DataContext="{Binding ActiveGlobalUserIntervention}" Visibility="{Binding ActiveGlobalUserIntervention, Converter={StaticResource IsTypeVisibilityConverter}, ConverterParameter={x:Type common:ConfirmationIntervention}}" />
                     </Grid>
                 </local:AttentionBorder.DisplayContent>
             </local:AttentionBorder>
-            <local:CompilationCompleteView Grid.Column="2" Visibility="{Binding Completed, Converter={StaticResource IsNotNullVisibilityConverter}, FallbackValue=Collapsed}" />
+            <local:CompilationCompleteView x:Name="CompilationComplete" Grid.Column="2" />
         </Grid>
     </Grid>
-</UserControl>
+</rxui:ReactiveUserControl>
diff --git a/Wabbajack/Views/Compilers/CompilerView.xaml.cs b/Wabbajack/Views/Compilers/CompilerView.xaml.cs
index 745e665e..cddb0db0 100644
--- a/Wabbajack/Views/Compilers/CompilerView.xaml.cs
+++ b/Wabbajack/Views/Compilers/CompilerView.xaml.cs
@@ -1,15 +1,146 @@
-using System.Windows.Controls;
+using System.Reactive.Disposables;
+using System.Reactive.Linq;
+using System.Windows.Controls;
+using ReactiveUI;
+using System.Windows;
+using Wabbajack.Common;
 
 namespace Wabbajack
 {
     /// <summary>
     /// Interaction logic for CompilerView.xaml
     /// </summary>
-    public partial class CompilerView : UserControl
+    public partial class CompilerView : ReactiveUserControl<CompilerVM>
     {
         public CompilerView()
         {
             InitializeComponent();
+            this.WhenActivated(dispose =>
+            {
+                // Bind percent completed chanes
+                this.WhenAny(x => x.ViewModel.PercentCompleted)
+                    .Select(f => (double)f)
+                    .BindToStrict(this, x => x.HeatedBackground.PercentCompleted)
+                    .DisposeWith(dispose);
+                this.WhenAny(x => x.ViewModel.PercentCompleted)
+                    .Select(f => (double)f)
+                    .BindToStrict(this, x => x.ModlistDetailsHeatBorder.Opacity)
+                    .DisposeWith(dispose);
+                this.WhenAny(x => x.ViewModel.PercentCompleted)
+                    .Select(f => (double)f)
+                    .BindToStrict(this, x => x.TopProgressBar.ProgressPercent)
+                    .DisposeWith(dispose);
+
+                // Bind detail image display
+                this.WhenAny(x => x.ViewModel.CurrentModlistSettings.ModListName)
+                    .BindToStrict(this, x => x.DetailImage.Title)
+                    .DisposeWith(dispose);
+                this.WhenAny(x => x.ViewModel.CurrentModlistSettings.AuthorText)
+                    .BindToStrict(this, x => x.DetailImage.Author)
+                    .DisposeWith(dispose);
+                this.WhenAny(x => x.ViewModel.CurrentModlistSettings.Description)
+                    .BindToStrict(this, x => x.DetailImage.Description)
+                    .DisposeWith(dispose);
+                this.WhenAny(x => x.ViewModel.Image)
+                    .BindToStrict(this, x => x.DetailImage.Image)
+                    .DisposeWith(dispose);
+
+                // Top Progress Bar
+                this.WhenAny(x => x.ViewModel.CurrentModlistSettings.ModListName)
+                    .BindToStrict(this, x => x.TopProgressBar.Title)
+                    .DisposeWith(dispose);
+                this.WhenAny(x => x.ViewModel.ProgressTitle)
+                    .BindToStrict(this, x => x.TopProgressBar.StatePrefixTitle)
+                    .DisposeWith(dispose);
+                this.WhenAny(x => x.ViewModel.BackCommand)
+                    .BindToStrict(this, x => x.BackButton.Command)
+                    .DisposeWith(dispose);
+
+                // Settings Panel
+                this.WhenAny(x => x.ViewModel.Compiling)
+                    .Select(x => !x)
+                    .BindToStrict(this, x => x.SettingsScrollViewer.IsEnabled)
+                    .DisposeWith(dispose);
+                this.BindStrict(this.ViewModel, x => x.CurrentModlistSettings.ModListName, x => x.ModListNameSetting.Text)
+                    .DisposeWith(dispose);
+                this.BindStrict(this.ViewModel, x => x.CurrentModlistSettings.AuthorText, x => x.AuthorNameSetting.Text)
+                    .DisposeWith(dispose);
+                this.BindStrict(this.ViewModel, x => x.CurrentModlistSettings.Description, x => x.DescriptionSetting.Text)
+                    .DisposeWith(dispose);
+                this.WhenAny(x => x.ViewModel.CurrentModlistSettings.ImagePath)
+                    .BindToStrict(this, x => x.ImageFilePicker.PickerVM)
+                    .DisposeWith(dispose);
+                this.BindStrict(this.ViewModel, x => x.CurrentModlistSettings.Website, x => x.WebsiteSetting.Text)
+                    .DisposeWith(dispose);
+                this.WhenAny(x => x.ViewModel.CurrentModlistSettings.ReadmeFilePath)
+                    .BindToStrict(this, x => x.ReadmeFilePickerSetting.PickerVM)
+                    .DisposeWith(dispose);
+                this.WhenAny(x => x.ViewModel.CurrentModlistSettings.ReadmeIsWebsite)
+                    .Select(isWebsite => isWebsite ? Visibility.Collapsed : Visibility.Visible)
+                    .BindToStrict(this, x => x.ReadmeFilePickerSetting.Visibility)
+                    .DisposeWith(dispose);
+                this.BindStrict(this.ViewModel, x => x.CurrentModlistSettings.ReadmeWebsite, x => x.ReadmeWebsiteSetting.Text)
+                    .DisposeWith(dispose);
+                this.WhenAny(x => x.ViewModel.CurrentModlistSettings.ReadmeIsWebsite)
+                    .Select(isWebsite => isWebsite ? Visibility.Visible : Visibility.Collapsed)
+                    .BindToStrict(this, x => x.ReadmeWebsiteSetting.Visibility)
+                    .DisposeWith(dispose);
+                this.MarkAsNeeded<CompilerView, CompilerVM, bool>(this.ViewModel, x => x.CurrentModlistSettings.ReadmeIsWebsite);
+                this.WhenAny(x => x.ViewModel.CurrentModlistSettings.SwapToWebsiteReadmeCommand)
+                    .BindToStrict(this, x => x.SwapToReadmeWebsiteButton.Command)
+                    .DisposeWith(dispose);
+                this.WhenAny(x => x.ViewModel.CurrentModlistSettings.SwapToTextReadmeCommand)
+                    .BindToStrict(this, x => x.SwapToReadmeFileButton.Command)
+                    .DisposeWith(dispose);
+
+                // Bottom Compiler Settings
+                this.WhenAny(x => x.ViewModel.StartedCompilation)
+                    .Select(started => started ? Visibility.Hidden : Visibility.Visible)
+                    .BindToStrict(this, x => x.BottomCompilerSettingsGrid.Visibility)
+                    .DisposeWith(dispose);
+                // Seems to go into an infinite loop between each other.  Need to research a better radio button style pattern
+                //this.BindStrict(this.ViewModel, x => x.SelectedCompilerType, x => x.MO2CompilerButton.IsChecked,
+                //    vmToViewConverter: type => type == ModManager.MO2,
+                //    viewToVmConverter: isChecked => isChecked ? ModManager.MO2 : ModManager.Vortex);
+                //this.BindStrict(this.ViewModel, x => x.SelectedCompilerType, x => x.MO2CompilerButton.IsChecked,
+                //    vmToViewConverter: type => type == ModManager.Vortex,
+                //    viewToVmConverter: isChecked => isChecked ? ModManager.Vortex : ModManager.MO2);
+                this.WhenAny(x => x.ViewModel.Compiler)
+                    .BindToStrict(this, x => x.CustomCompilerSettingsPresenter.Content)
+                    .DisposeWith(dispose);
+                this.WhenAny(x => x.ViewModel.BeginCommand)
+                    .BindToStrict(this, x => x.BeginButton.Command)
+                    .DisposeWith(dispose);
+
+                // Mid-compilation panel
+                this.WhenAny(x => x.ViewModel.StartedCompilation)
+                    .Select(started => started ? Visibility.Visible : Visibility.Hidden)
+                    .BindToStrict(this, x => x.MidCompilationGrid.Visibility)
+                    .DisposeWith(dispose);
+                this.WhenAny(x => x.ViewModel.PercentCompleted)
+                    .Select(f => (double)f)
+                    .BindToStrict(this, x => x.LogView.ProgressPercent)
+                    .DisposeWith(dispose);
+                this.WhenAny(x => x.ViewModel.PercentCompleted)
+                    .Select(f => (double)f)
+                    .BindToStrict(this, x => x.CpuView.ProgressPercent)
+                    .DisposeWith(dispose);
+                this.WhenAny(x => x.ViewModel.MWVM.Settings)
+                    .BindToStrict(this, x => x.CpuView.SettingsHook)
+                    .DisposeWith(dispose);
+                this.WhenAny(x => x.ViewModel.ActiveGlobalUserIntervention)
+                    .Select(x => x == null ? Visibility.Visible : Visibility.Collapsed)
+                    .BindToStrict(this, x => x.CpuView.Visibility)
+                    .DisposeWith(dispose);
+                this.WhenAny(x => x.ViewModel.ActiveGlobalUserIntervention)
+                    .Select(x => x != null ? Visibility.Visible : Visibility.Collapsed)
+                    .BindToStrict(this, x => x.UserInterventionsControl.Visibility)
+                    .DisposeWith(dispose);
+                this.WhenAny(x => x.ViewModel.Completed)
+                    .Select(x => x != null ? Visibility.Visible : Visibility.Collapsed)
+                    .BindToStrict(this, x => x.CompilationComplete.Visibility)
+                    .DisposeWith(dispose);
+            });
         }
     }
 }
diff --git a/Wabbajack/Views/MainWindow.xaml b/Wabbajack/Views/MainWindow.xaml
index 711764b1..87a74052 100644
--- a/Wabbajack/Views/MainWindow.xaml
+++ b/Wabbajack/Views/MainWindow.xaml
@@ -23,7 +23,7 @@
     <ContentPresenter Content="{Binding ActivePane}">
         <ContentPresenter.Resources>
             <DataTemplate DataType="{x:Type local:CompilerVM}">
-                <local:CompilerView />
+                <local:CompilerView ViewModel="{Binding}" />
             </DataTemplate>
             <DataTemplate DataType="{x:Type local:InstallerVM}">
                 <local:InstallationView />

From 7ad46c65ccf0528f0503953b68523df2d15599f5 Mon Sep 17 00:00:00 2001
From: Justin Swanson <justin.c.swanson@gmail.com>
Date: Mon, 20 Jan 2020 16:17:17 -0600
Subject: [PATCH 3/9] Refactored AttentionBorder to a ContentControl

Looks like it's the proper way to do it anyway.
https://stackoverflow.com/questions/751325/how-to-create-a-wpf-usercontrol-with-named-content

UserControls are really just for super end-use
---
 Wabbajack/App.xaml                            |   1 +
 Wabbajack/Themes/CustomControls.xaml          | 118 ++++++++
 ...ntionBorder.xaml.cs => AttentionBorder.cs} |  13 -
 Wabbajack/Views/Common/AttentionBorder.xaml   | 116 --------
 .../Compilers/CompilationCompleteView.xaml    | 216 +++++++-------
 Wabbajack/Views/Compilers/CompilerView.xaml   |  10 +-
 .../Installers/InstallationCompleteView.xaml  | 270 +++++++++---------
 .../Views/Installers/InstallationView.xaml    |  10 +-
 Wabbajack/Wabbajack.csproj                    |  12 +-
 9 files changed, 373 insertions(+), 393 deletions(-)
 create mode 100644 Wabbajack/Themes/CustomControls.xaml
 rename Wabbajack/Views/Common/{AttentionBorder.xaml.cs => AttentionBorder.cs} (65%)
 delete mode 100644 Wabbajack/Views/Common/AttentionBorder.xaml

diff --git a/Wabbajack/App.xaml b/Wabbajack/App.xaml
index 17c85ac3..0c70ed88 100644
--- a/Wabbajack/App.xaml
+++ b/Wabbajack/App.xaml
@@ -12,6 +12,7 @@
                 <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Colors.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/BaseDark.xaml" />
                 <ResourceDictionary Source="Themes\Styles.xaml" />
+                <ResourceDictionary Source="Themes\CustomControls.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>
diff --git a/Wabbajack/Themes/CustomControls.xaml b/Wabbajack/Themes/CustomControls.xaml
new file mode 100644
index 00000000..1ba0c9d0
--- /dev/null
+++ b/Wabbajack/Themes/CustomControls.xaml
@@ -0,0 +1,118 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="clr-namespace:Wabbajack">
+    <Style TargetType="local:AttentionBorder">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="local:AttentionBorder">
+                    <Border BorderThickness="1">
+                        <Border.Style>
+                            <Style TargetType="Border">
+                                <Setter Property="Background" Value="{StaticResource WindowBackgroundBrush}" />
+                                <Setter Property="BorderBrush" Value="{StaticResource DarkerSecondaryBrush}" />
+                                <Style.Triggers>
+                                    <MultiDataTrigger>
+                                        <MultiDataTrigger.Conditions>
+                                            <Condition Binding="{Binding IsVisible, RelativeSource={RelativeSource Self}}" Value="True" />
+                                            <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}" Value="False" />
+                                            <Condition Binding="{Binding Failure, RelativeSource={RelativeSource AncestorType={x:Type local:AttentionBorder}}}" Value="False" />
+                                        </MultiDataTrigger.Conditions>
+                                        <MultiDataTrigger.EnterActions>
+                                            <BeginStoryboard>
+                                                <Storyboard>
+                                                    <ColorAnimation
+                                                        AutoReverse="True"
+                                                        RepeatBehavior="Forever"
+                                                        Storyboard.TargetProperty="(Border.BorderBrush).(SolidColorBrush.Color)"
+                                                        To="{StaticResource Secondary}"
+                                                        Duration="0:0:1.5" />
+                                                </Storyboard>
+                                            </BeginStoryboard>
+                                            <BeginStoryboard>
+                                                <Storyboard>
+                                                    <ColorAnimation
+                                                        AutoReverse="True"
+                                                        RepeatBehavior="Forever"
+                                                        Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Color)"
+                                                        To="{StaticResource SecondaryBackground}"
+                                                        Duration="0:0:1.5" />
+                                                </Storyboard>
+                                            </BeginStoryboard>
+                                        </MultiDataTrigger.EnterActions>
+                                        <MultiDataTrigger.ExitActions>
+                                            <BeginStoryboard>
+                                                <Storyboard>
+                                                    <ColorAnimation
+                                                        Storyboard.TargetProperty="(Border.BorderBrush).(SolidColorBrush.Color)"
+                                                        To="{StaticResource DarkerSecondary}"
+                                                        Duration="0:0:0.1" />
+                                                </Storyboard>
+                                            </BeginStoryboard>
+                                            <BeginStoryboard>
+                                                <Storyboard>
+                                                    <ColorAnimation
+                                                        Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Color)"
+                                                        To="{StaticResource WindowBackgroundColor}"
+                                                        Duration="0:0:0.1" />
+                                                </Storyboard>
+                                            </BeginStoryboard>
+                                        </MultiDataTrigger.ExitActions>
+                                    </MultiDataTrigger>
+                                    <MultiDataTrigger>
+                                        <MultiDataTrigger.Conditions>
+                                            <Condition Binding="{Binding IsVisible, RelativeSource={RelativeSource Self}}" Value="True" />
+                                            <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}" Value="False" />
+                                            <Condition Binding="{Binding Failure, RelativeSource={RelativeSource AncestorType={x:Type local:AttentionBorder}}}" Value="True" />
+                                        </MultiDataTrigger.Conditions>
+                                        <MultiDataTrigger.EnterActions>
+                                            <BeginStoryboard>
+                                                <Storyboard>
+                                                    <ColorAnimation
+                                                        AutoReverse="True"
+                                                        RepeatBehavior="Forever"
+                                                        Storyboard.TargetProperty="(Border.BorderBrush).(SolidColorBrush.Color)"
+                                                        To="#ff0026"
+                                                        Duration="0:0:1.5" />
+                                                </Storyboard>
+                                            </BeginStoryboard>
+                                            <BeginStoryboard>
+                                                <Storyboard>
+                                                    <ColorAnimation
+                                                        AutoReverse="True"
+                                                        RepeatBehavior="Forever"
+                                                        Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Color)"
+                                                        To="#540914"
+                                                        Duration="0:0:1.5" />
+                                                </Storyboard>
+                                            </BeginStoryboard>
+                                        </MultiDataTrigger.EnterActions>
+                                        <MultiDataTrigger.ExitActions>
+                                            <BeginStoryboard>
+                                                <Storyboard>
+                                                    <ColorAnimation
+                                                        Storyboard.TargetProperty="(Border.BorderBrush).(SolidColorBrush.Color)"
+                                                        To="#700d1c"
+                                                        Duration="0:0:0.1" />
+                                                </Storyboard>
+                                            </BeginStoryboard>
+                                            <BeginStoryboard>
+                                                <Storyboard>
+                                                    <ColorAnimation
+                                                        Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Color)"
+                                                        To="#1c0307"
+                                                        Duration="0:0:0.1" />
+                                                </Storyboard>
+                                            </BeginStoryboard>
+                                        </MultiDataTrigger.ExitActions>
+                                    </MultiDataTrigger>
+                                </Style.Triggers>
+                            </Style>
+                        </Border.Style>
+                        <ContentPresenter Content="{TemplateBinding Content}" />
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/Wabbajack/Views/Common/AttentionBorder.xaml.cs b/Wabbajack/Views/Common/AttentionBorder.cs
similarity index 65%
rename from Wabbajack/Views/Common/AttentionBorder.xaml.cs
rename to Wabbajack/Views/Common/AttentionBorder.cs
index c43909ab..5cfdb343 100644
--- a/Wabbajack/Views/Common/AttentionBorder.xaml.cs
+++ b/Wabbajack/Views/Common/AttentionBorder.cs
@@ -20,14 +20,6 @@ namespace Wabbajack
     /// </summary>
     public partial class AttentionBorder : UserControl
     {
-        public object DisplayContent
-        {
-            get => (object)GetValue(DisplayContentProperty);
-            set => SetValue(DisplayContentProperty, value);
-        }
-        public static readonly DependencyProperty DisplayContentProperty = DependencyProperty.Register(nameof(DisplayContent), typeof(object), typeof(AttentionBorder),
-             new FrameworkPropertyMetadata(default(object)));
-
         public bool Failure
         {
             get => (bool)GetValue(FailureProperty);
@@ -35,10 +27,5 @@ namespace Wabbajack
         }
         public static readonly DependencyProperty FailureProperty = DependencyProperty.Register(nameof(Failure), typeof(bool), typeof(AttentionBorder),
              new FrameworkPropertyMetadata(default(bool)));
-
-        public AttentionBorder()
-        {
-            InitializeComponent();
-        }
     }
 }
diff --git a/Wabbajack/Views/Common/AttentionBorder.xaml b/Wabbajack/Views/Common/AttentionBorder.xaml
deleted file mode 100644
index b1ba1137..00000000
--- a/Wabbajack/Views/Common/AttentionBorder.xaml
+++ /dev/null
@@ -1,116 +0,0 @@
-<UserControl
-    x:Class="Wabbajack.AttentionBorder"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="clr-namespace:Wabbajack"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    d:DesignHeight="450"
-    d:DesignWidth="800"
-    mc:Ignorable="d">
-    <Border BorderThickness="1">
-        <Border.Style>
-            <Style TargetType="Border">
-                <Setter Property="Background" Value="{StaticResource WindowBackgroundBrush}" />
-                <Setter Property="BorderBrush" Value="{StaticResource DarkerSecondaryBrush}" />
-                <Style.Triggers>
-                    <MultiDataTrigger>
-                        <MultiDataTrigger.Conditions>
-                            <Condition Binding="{Binding IsVisible, RelativeSource={RelativeSource Self}}" Value="True" />
-                            <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}" Value="False" />
-                            <Condition Binding="{Binding Failure, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}" Value="False" />
-                        </MultiDataTrigger.Conditions>
-                        <MultiDataTrigger.EnterActions>
-                            <BeginStoryboard>
-                                <Storyboard>
-                                    <ColorAnimation
-                                        AutoReverse="True"
-                                        RepeatBehavior="Forever"
-                                        Storyboard.TargetProperty="(Border.BorderBrush).(SolidColorBrush.Color)"
-                                        To="{StaticResource Secondary}"
-                                        Duration="0:0:1.5" />
-                                </Storyboard>
-                            </BeginStoryboard>
-                            <BeginStoryboard>
-                                <Storyboard>
-                                    <ColorAnimation
-                                        AutoReverse="True"
-                                        RepeatBehavior="Forever"
-                                        Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Color)"
-                                        To="{StaticResource SecondaryBackground}"
-                                        Duration="0:0:1.5" />
-                                </Storyboard>
-                            </BeginStoryboard>
-                        </MultiDataTrigger.EnterActions>
-                        <MultiDataTrigger.ExitActions>
-                            <BeginStoryboard>
-                                <Storyboard>
-                                    <ColorAnimation
-                                        Storyboard.TargetProperty="(Border.BorderBrush).(SolidColorBrush.Color)"
-                                        To="{StaticResource DarkerSecondary}"
-                                        Duration="0:0:0.1" />
-                                </Storyboard>
-                            </BeginStoryboard>
-                            <BeginStoryboard>
-                                <Storyboard>
-                                    <ColorAnimation
-                                        Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Color)"
-                                        To="{StaticResource WindowBackgroundColor}"
-                                        Duration="0:0:0.1" />
-                                </Storyboard>
-                            </BeginStoryboard>
-                        </MultiDataTrigger.ExitActions>
-                    </MultiDataTrigger>
-                    <MultiDataTrigger>
-                        <MultiDataTrigger.Conditions>
-                            <Condition Binding="{Binding IsVisible, RelativeSource={RelativeSource Self}}" Value="True" />
-                            <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}" Value="False" />
-                            <Condition Binding="{Binding Failure, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}" Value="True" />
-                        </MultiDataTrigger.Conditions>
-                        <MultiDataTrigger.EnterActions>
-                            <BeginStoryboard>
-                                <Storyboard>
-                                    <ColorAnimation
-                                        AutoReverse="True"
-                                        RepeatBehavior="Forever"
-                                        Storyboard.TargetProperty="(Border.BorderBrush).(SolidColorBrush.Color)"
-                                        To="#ff0026"
-                                        Duration="0:0:1.5" />
-                                </Storyboard>
-                            </BeginStoryboard>
-                            <BeginStoryboard>
-                                <Storyboard>
-                                    <ColorAnimation
-                                        AutoReverse="True"
-                                        RepeatBehavior="Forever"
-                                        Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Color)"
-                                        To="#540914"
-                                        Duration="0:0:1.5" />
-                                </Storyboard>
-                            </BeginStoryboard>
-                        </MultiDataTrigger.EnterActions>
-                        <MultiDataTrigger.ExitActions>
-                            <BeginStoryboard>
-                                <Storyboard>
-                                    <ColorAnimation
-                                        Storyboard.TargetProperty="(Border.BorderBrush).(SolidColorBrush.Color)"
-                                        To="#700d1c"
-                                        Duration="0:0:0.1" />
-                                </Storyboard>
-                            </BeginStoryboard>
-                            <BeginStoryboard>
-                                <Storyboard>
-                                    <ColorAnimation
-                                        Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Color)"
-                                        To="#1c0307"
-                                        Duration="0:0:0.1" />
-                                </Storyboard>
-                            </BeginStoryboard>
-                        </MultiDataTrigger.ExitActions>
-                    </MultiDataTrigger>
-                </Style.Triggers>
-            </Style>
-        </Border.Style>
-        <ContentPresenter Content="{Binding DisplayContent, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}" />
-    </Border>
-</UserControl>
diff --git a/Wabbajack/Views/Compilers/CompilationCompleteView.xaml b/Wabbajack/Views/Compilers/CompilationCompleteView.xaml
index 3c69841f..947c5bd9 100644
--- a/Wabbajack/Views/Compilers/CompilationCompleteView.xaml
+++ b/Wabbajack/Views/Compilers/CompilationCompleteView.xaml
@@ -10,102 +10,101 @@
     d:DesignWidth="800"
     mc:Ignorable="d">
     <local:AttentionBorder ClipToBounds="True" Failure="{Binding Completed.Failed}">
-        <local:AttentionBorder.DisplayContent>
-            <Grid Margin="5">
+        <Grid Margin="5">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="*" />
+                <RowDefinition Height="3*" />
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+            <TextBlock
+                Grid.Row="0"
+                Grid.Column="0"
+                Grid.ColumnSpan="3"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Bottom"
+                FontFamily="Lucida Sans"
+                FontSize="22"
+                FontWeight="Black">
+                <TextBlock.Effect>
+                    <DropShadowEffect BlurRadius="25" Opacity="0.5" />
+                </TextBlock.Effect>
+                <TextBlock.Style>
+                    <Style TargetType="TextBlock">
+                        <Setter Property="Text" Value="Compilation Complete" />
+                        <Style.Triggers>
+                            <DataTrigger Binding="{Binding Completed.Failed}" Value="True">
+                                <Setter Property="Text" Value="Compilation Failed" />
+                            </DataTrigger>
+                        </Style.Triggers>
+                    </Style>
+                </TextBlock.Style>
+            </TextBlock>
+            <Grid
+                Grid.Row="1"
+                Grid.Column="0"
+                VerticalAlignment="Center">
                 <Grid.RowDefinitions>
-                    <RowDefinition Height="*" />
-                    <RowDefinition Height="3*" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
-                <TextBlock
+                <Button
                     Grid.Row="0"
-                    Grid.Column="0"
-                    Grid.ColumnSpan="3"
+                    Width="55"
+                    Height="55"
+                    Command="{Binding BackCommand}"
+                    Style="{StaticResource CircleButtonStyle}">
+                    <icon:PackIconMaterial
+                        Width="28"
+                        Height="28"
+                        Foreground="{Binding Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}"
+                        Kind="ArrowLeft" />
+                </Button>
+                <TextBlock
+                    Grid.Row="1"
+                    Margin="0,10,0,0"
                     HorizontalAlignment="Center"
-                    VerticalAlignment="Bottom"
-                    FontFamily="Lucida Sans"
-                    FontSize="22"
-                    FontWeight="Black">
-                    <TextBlock.Effect>
-                        <DropShadowEffect BlurRadius="25" Opacity="0.5" />
-                    </TextBlock.Effect>
-                    <TextBlock.Style>
-                        <Style TargetType="TextBlock">
-                            <Setter Property="Text" Value="Compilation Complete" />
-                            <Style.Triggers>
-                                <DataTrigger Binding="{Binding Completed.Failed}" Value="True">
-                                    <Setter Property="Text" Value="Compilation Failed" />
-                                </DataTrigger>
-                            </Style.Triggers>
-                        </Style>
-                    </TextBlock.Style>
-                </TextBlock>
-                <Grid
+                    Text="Main Menu" />
+            </Grid>
+            <Grid
+                Grid.Row="1"
+                Grid.Column="1"
+                VerticalAlignment="Center"
+                Visibility="{Binding CompilerSupportsAfterCompileNavigation, Converter={StaticResource bool2VisibilityConverter}}">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+                <Button
+                    Width="55"
+                    Height="55"
+                    Command="{Binding GoToModlistCommand}"
+                    Style="{StaticResource CircleButtonStyle}">
+                    <icon:PackIconMaterial
+                        Width="25"
+                        Height="25"
+                        Foreground="{Binding Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}"
+                        Kind="FolderMove" />
+                </Button>
+                <TextBlock
                     Grid.Row="1"
-                    Grid.Column="0"
-                    VerticalAlignment="Center">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <Button
-                        Grid.Row="0"
-                        Width="55"
-                        Height="55"
-                        Command="{Binding BackCommand}"
-                        Style="{StaticResource CircleButtonStyle}">
-                        <icon:PackIconMaterial
-                            Width="28"
-                            Height="28"
-                            Foreground="{Binding Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}"
-                            Kind="ArrowLeft" />
-                    </Button>
-                    <TextBlock
-                        Grid.Row="1"
-                        Margin="0,10,0,0"
-                        HorizontalAlignment="Center"
-                        Text="Main Menu" />
-                </Grid>
-                <Grid
-                    Grid.Row="1"
-                    Grid.Column="1"
-                    VerticalAlignment="Center"
-                    Visibility="{Binding CompilerSupportsAfterCompileNavigation, Converter={StaticResource bool2VisibilityConverter}}">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <Button
-                        Width="55"
-                        Height="55"
-                        Command="{Binding GoToModlistCommand}"
-                        Style="{StaticResource CircleButtonStyle}">
-                        <icon:PackIconMaterial
-                            Width="25"
-                            Height="25"
-                            Foreground="{Binding Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}"
-                            Kind="FolderMove" />
-                    </Button>
-                    <TextBlock
-                        Grid.Row="1"
-                        Margin="0,10,0,0"
-                        HorizontalAlignment="Center"
-                        Text="Go To Modlist" />
-                </Grid>
-                <Grid
-                    Grid.Row="1"
-                    Grid.Column="2"
-                    VerticalAlignment="Center"
-                    Background="Transparent">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <!--<Button
+                    Margin="0,10,0,0"
+                    HorizontalAlignment="Center"
+                    Text="Go To Modlist" />
+            </Grid>
+            <Grid
+                Grid.Row="1"
+                Grid.Column="2"
+                VerticalAlignment="Center"
+                Background="Transparent">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+                <!--<Button
                                 Width="55"
                                 Height="55"
                                 Background="{StaticResource PrimaryVariantBrush}"
@@ -127,24 +126,23 @@
                                     <BlurEffect Radius="15" />
                                 </Button.Effect>
                             </Button>-->
-                    <Button
-                        Width="55"
-                        Height="55"
-                        Command="{Binding CloseWhenCompleteCommand}"
-                        Style="{StaticResource CircleButtonStyle}">
-                        <icon:PackIconMaterial
-                            Width="30"
-                            Height="30"
-                            Foreground="{Binding Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}"
-                            Kind="Check" />
-                    </Button>
-                    <TextBlock
-                        Grid.Row="1"
-                        Margin="0,10,0,0"
-                        HorizontalAlignment="Center"
-                        Text="Close" />
-                </Grid>
+                <Button
+                    Width="55"
+                    Height="55"
+                    Command="{Binding CloseWhenCompleteCommand}"
+                    Style="{StaticResource CircleButtonStyle}">
+                    <icon:PackIconMaterial
+                        Width="30"
+                        Height="30"
+                        Foreground="{Binding Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}"
+                        Kind="Check" />
+                </Button>
+                <TextBlock
+                    Grid.Row="1"
+                    Margin="0,10,0,0"
+                    HorizontalAlignment="Center"
+                    Text="Close" />
             </Grid>
-        </local:AttentionBorder.DisplayContent>
+        </Grid>
     </local:AttentionBorder>
 </UserControl>
diff --git a/Wabbajack/Views/Compilers/CompilerView.xaml b/Wabbajack/Views/Compilers/CompilerView.xaml
index 131801f0..821b1ccf 100644
--- a/Wabbajack/Views/Compilers/CompilerView.xaml
+++ b/Wabbajack/Views/Compilers/CompilerView.xaml
@@ -299,13 +299,11 @@
             <local:CpuView
                 x:Name="CpuView"
                 Grid.Column="2"
-                ViewModel="{Binding}"/>
+                ViewModel="{Binding}" />
             <local:AttentionBorder x:Name="UserInterventionsControl" Grid.Column="2">
-                <local:AttentionBorder.DisplayContent>
-                    <Grid>
-                        <local:ConfirmationInterventionView DataContext="{Binding ActiveGlobalUserIntervention}" Visibility="{Binding ActiveGlobalUserIntervention, Converter={StaticResource IsTypeVisibilityConverter}, ConverterParameter={x:Type common:ConfirmationIntervention}}" />
-                    </Grid>
-                </local:AttentionBorder.DisplayContent>
+                <Grid>
+                    <local:ConfirmationInterventionView DataContext="{Binding ActiveGlobalUserIntervention}" Visibility="{Binding ActiveGlobalUserIntervention, Converter={StaticResource IsTypeVisibilityConverter}, ConverterParameter={x:Type common:ConfirmationIntervention}}" />
+                </Grid>
             </local:AttentionBorder>
             <local:CompilationCompleteView x:Name="CompilationComplete" Grid.Column="2" />
         </Grid>
diff --git a/Wabbajack/Views/Installers/InstallationCompleteView.xaml b/Wabbajack/Views/Installers/InstallationCompleteView.xaml
index 26edba90..32d1e61c 100644
--- a/Wabbajack/Views/Installers/InstallationCompleteView.xaml
+++ b/Wabbajack/Views/Installers/InstallationCompleteView.xaml
@@ -10,146 +10,144 @@
     d:DesignWidth="800"
     mc:Ignorable="d">
     <local:AttentionBorder ClipToBounds="True" Failure="{Binding Completed.Failed}">
-        <local:AttentionBorder.DisplayContent>
-            <Grid Margin="5">
+        <Grid Margin="5">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="*" />
+                <RowDefinition Height="3*" />
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+            <TextBlock
+                Grid.Row="0"
+                Grid.Column="0"
+                Grid.ColumnSpan="4"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Bottom"
+                FontFamily="Lucida Sans"
+                FontSize="22"
+                FontWeight="Black">
+                <TextBlock.Effect>
+                    <DropShadowEffect BlurRadius="25" Opacity="0.5" />
+                </TextBlock.Effect>
+                <TextBlock.Style>
+                    <Style TargetType="TextBlock">
+                        <Setter Property="Text" Value="Installation Complete" />
+                        <Style.Triggers>
+                            <DataTrigger Binding="{Binding Completed.Failed}" Value="True">
+                                <Setter Property="Text" Value="Installation Failed" />
+                            </DataTrigger>
+                        </Style.Triggers>
+                    </Style>
+                </TextBlock.Style>
+            </TextBlock>
+            <Grid
+                Grid.Row="1"
+                Grid.Column="0"
+                VerticalAlignment="Center">
                 <Grid.RowDefinitions>
-                    <RowDefinition Height="*" />
-                    <RowDefinition Height="3*" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
-                <TextBlock
+                <Button
                     Grid.Row="0"
-                    Grid.Column="0"
-                    Grid.ColumnSpan="4"
+                    Width="50"
+                    Height="50"
+                    Command="{Binding BackCommand}"
+                    Style="{StaticResource CircleButtonStyle}">
+                    <icon:PackIconMaterial
+                        Width="25"
+                        Height="25"
+                        Foreground="{Binding Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}"
+                        Kind="ArrowLeft" />
+                </Button>
+                <TextBlock
+                    Grid.Row="1"
+                    Margin="0,10,0,0"
                     HorizontalAlignment="Center"
-                    VerticalAlignment="Bottom"
-                    FontFamily="Lucida Sans"
-                    FontSize="22"
-                    FontWeight="Black">
-                    <TextBlock.Effect>
-                        <DropShadowEffect BlurRadius="25" Opacity="0.5" />
-                    </TextBlock.Effect>
-                    <TextBlock.Style>
-                        <Style TargetType="TextBlock">
-                            <Setter Property="Text" Value="Installation Complete" />
-                            <Style.Triggers>
-                                <DataTrigger Binding="{Binding Completed.Failed}" Value="True">
-                                    <Setter Property="Text" Value="Installation Failed" />
-                                </DataTrigger>
-                            </Style.Triggers>
-                        </Style>
-                    </TextBlock.Style>
-                </TextBlock>
-                <Grid
-                    Grid.Row="1"
-                    Grid.Column="0"
-                    VerticalAlignment="Center">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <Button
-                        Grid.Row="0"
-                        Width="50"
-                        Height="50"
-                        Command="{Binding BackCommand}"
-                        Style="{StaticResource CircleButtonStyle}">
-                        <icon:PackIconMaterial
-                            Width="25"
-                            Height="25"
-                            Foreground="{Binding Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}"
-                            Kind="ArrowLeft" />
-                    </Button>
-                    <TextBlock
-                        Grid.Row="1"
-                        Margin="0,10,0,0"
-                        HorizontalAlignment="Center"
-                        Text="Main Menu" />
-                </Grid>
-                <Grid
-                    Grid.Row="1"
-                    Grid.Column="1"
-                    VerticalAlignment="Center"
-                    Visibility="{Binding InstallerSupportsAfterInstallNavigation, Converter={StaticResource bool2VisibilityConverter}}">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <Button
-                        Width="50"
-                        Height="50"
-                        Command="{Binding GoToInstallCommand}"
-                        Style="{StaticResource CircleButtonStyle}">
-                        <icon:PackIconMaterial
-                            Width="23"
-                            Height="23"
-                            Foreground="{Binding Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}"
-                            Kind="FolderMove" />
-                    </Button>
-                    <TextBlock
-                        Grid.Row="1"
-                        Margin="0,10,0,0"
-                        HorizontalAlignment="Center"
-                        Text="Install Folder" />
-                </Grid>
-                <Grid
-                    Grid.Row="1"
-                    Grid.Column="2"
-                    VerticalAlignment="Center"
-                    Background="Transparent">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <Button
-                        Width="50"
-                        Height="50"
-                        Command="{Binding OpenReadmeCommand}"
-                        Style="{StaticResource CircleButtonStyle}">
-                        <icon:PackIconFontAwesome
-                            Width="25"
-                            Height="25"
-                            Foreground="{Binding Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}"
-                            Kind="ReadmeBrands" />
-                    </Button>
-                    <TextBlock
-                        Grid.Row="1"
-                        Margin="0,10,0,0"
-                        HorizontalAlignment="Center"
-                        Text="Readme" />
-                </Grid>
-                <Grid
-                    Grid.Row="1"
-                    Grid.Column="3"
-                    VerticalAlignment="Center"
-                    Background="Transparent">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <Button
-                        Width="50"
-                        Height="50"
-                        Command="{Binding CloseWhenCompleteCommand}"
-                        Style="{StaticResource CircleButtonStyle}">
-                        <icon:PackIconMaterial
-                            Width="25"
-                            Height="25"
-                            Foreground="{Binding Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}"
-                            Kind="Check" />
-                    </Button>
-                    <TextBlock
-                        Grid.Row="1"
-                        Margin="0,10,0,0"
-                        HorizontalAlignment="Center"
-                        Text="Close" />
-                </Grid>
+                    Text="Main Menu" />
             </Grid>
-        </local:AttentionBorder.DisplayContent>
+            <Grid
+                Grid.Row="1"
+                Grid.Column="1"
+                VerticalAlignment="Center"
+                Visibility="{Binding InstallerSupportsAfterInstallNavigation, Converter={StaticResource bool2VisibilityConverter}}">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+                <Button
+                    Width="50"
+                    Height="50"
+                    Command="{Binding GoToInstallCommand}"
+                    Style="{StaticResource CircleButtonStyle}">
+                    <icon:PackIconMaterial
+                        Width="23"
+                        Height="23"
+                        Foreground="{Binding Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}"
+                        Kind="FolderMove" />
+                </Button>
+                <TextBlock
+                    Grid.Row="1"
+                    Margin="0,10,0,0"
+                    HorizontalAlignment="Center"
+                    Text="Install Folder" />
+            </Grid>
+            <Grid
+                Grid.Row="1"
+                Grid.Column="2"
+                VerticalAlignment="Center"
+                Background="Transparent">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+                <Button
+                    Width="50"
+                    Height="50"
+                    Command="{Binding OpenReadmeCommand}"
+                    Style="{StaticResource CircleButtonStyle}">
+                    <icon:PackIconFontAwesome
+                        Width="25"
+                        Height="25"
+                        Foreground="{Binding Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}"
+                        Kind="ReadmeBrands" />
+                </Button>
+                <TextBlock
+                    Grid.Row="1"
+                    Margin="0,10,0,0"
+                    HorizontalAlignment="Center"
+                    Text="Readme" />
+            </Grid>
+            <Grid
+                Grid.Row="1"
+                Grid.Column="3"
+                VerticalAlignment="Center"
+                Background="Transparent">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+                <Button
+                    Width="50"
+                    Height="50"
+                    Command="{Binding CloseWhenCompleteCommand}"
+                    Style="{StaticResource CircleButtonStyle}">
+                    <icon:PackIconMaterial
+                        Width="25"
+                        Height="25"
+                        Foreground="{Binding Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}"
+                        Kind="Check" />
+                </Button>
+                <TextBlock
+                    Grid.Row="1"
+                    Margin="0,10,0,0"
+                    HorizontalAlignment="Center"
+                    Text="Close" />
+            </Grid>
+        </Grid>
     </local:AttentionBorder>
 </UserControl>
diff --git a/Wabbajack/Views/Installers/InstallationView.xaml b/Wabbajack/Views/Installers/InstallationView.xaml
index f3f11ee4..7616daa3 100644
--- a/Wabbajack/Views/Installers/InstallationView.xaml
+++ b/Wabbajack/Views/Installers/InstallationView.xaml
@@ -430,12 +430,10 @@
                 ViewModel="{Binding}"
                 Visibility="{Binding ActiveGlobalUserIntervention, Converter={StaticResource IsNotNullVisibilityConverter}, ConverterParameter=False}" />
             <local:AttentionBorder Grid.Column="2" Visibility="{Binding ActiveGlobalUserIntervention, Converter={StaticResource IsNotNullVisibilityConverter}}">
-                <local:AttentionBorder.DisplayContent>
-                    <Grid>
-                        <local:ConfirmationInterventionView DataContext="{Binding ActiveGlobalUserIntervention}" Visibility="{Binding ActiveGlobalUserIntervention, Converter={StaticResource IsTypeVisibilityConverter}, ConverterParameter={x:Type common:ConfirmationIntervention}}" />
-                        <local:ConfirmUpdateOfExistingInstallView Visibility="{Binding ActiveGlobalUserIntervention, Converter={StaticResource IsTypeVisibilityConverter}, ConverterParameter={x:Type lib:ConfirmUpdateOfExistingInstall}}" />
-                    </Grid>
-                </local:AttentionBorder.DisplayContent>
+                <Grid>
+                    <local:ConfirmationInterventionView DataContext="{Binding ActiveGlobalUserIntervention}" Visibility="{Binding ActiveGlobalUserIntervention, Converter={StaticResource IsTypeVisibilityConverter}, ConverterParameter={x:Type common:ConfirmationIntervention}}" />
+                    <local:ConfirmUpdateOfExistingInstallView Visibility="{Binding ActiveGlobalUserIntervention, Converter={StaticResource IsTypeVisibilityConverter}, ConverterParameter={x:Type lib:ConfirmUpdateOfExistingInstall}}" />
+                </Grid>
             </local:AttentionBorder>
             <local:InstallationCompleteView Grid.Column="2" Visibility="{Binding Completed, Converter={StaticResource IsNotNullVisibilityConverter}, FallbackValue=Collapsed}" />
         </Grid>
diff --git a/Wabbajack/Wabbajack.csproj b/Wabbajack/Wabbajack.csproj
index bec54fb2..d20916db 100644
--- a/Wabbajack/Wabbajack.csproj
+++ b/Wabbajack/Wabbajack.csproj
@@ -174,6 +174,7 @@
     </ApplicationDefinition>
     <Compile Include="Extensions\DynamicDataExt.cs" />
     <Compile Include="View Models\Settings\AuthorFilesVM.cs" />
+    <Compile Include="Views\Common\AttentionBorder.cs" />
     <Compile Include="Views\ModListTileView.xaml.cs">
       <DependentUpon>ModListTileView.xaml</DependentUpon>
     </Compile>
@@ -202,9 +203,6 @@
     <Compile Include="Views\Settings\SettingsView.xaml.cs">
       <DependentUpon>SettingsView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\Common\AttentionBorder.xaml.cs">
-      <DependentUpon>AttentionBorder.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Converters\IsTypeVisibilityConverter.cs" />
     <Compile Include="Views\Common\UnderMaintenanceOverlay.xaml.cs">
       <DependentUpon>UnderMaintenanceOverlay.xaml</DependentUpon>
@@ -308,6 +306,10 @@
     <Compile Include="Views\WebBrowserView.xaml.cs">
       <DependentUpon>WebBrowserView.xaml</DependentUpon>
     </Compile>
+    <Page Include="Themes\CustomControls.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Views\ModListTileView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -329,10 +331,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Views\Common\AttentionBorder.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="Views\Common\UnderMaintenanceOverlay.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

From 86391512bc0933073cbc563e69255fe0916bb3e6 Mon Sep 17 00:00:00 2001
From: Justin Swanson <justin.c.swanson@gmail.com>
Date: Mon, 20 Jan 2020 16:26:45 -0600
Subject: [PATCH 4/9] CompilationCompleteView swapped to RxUserControl

---
 .../Compilers/CompilationCompleteView.xaml    | 28 +++++++-----------
 .../Compilers/CompilationCompleteView.xaml.cs | 29 ++++++++++++++++++-
 Wabbajack/Views/Compilers/CompilerView.xaml   |  5 +++-
 3 files changed, 42 insertions(+), 20 deletions(-)

diff --git a/Wabbajack/Views/Compilers/CompilationCompleteView.xaml b/Wabbajack/Views/Compilers/CompilationCompleteView.xaml
index 947c5bd9..b0302a94 100644
--- a/Wabbajack/Views/Compilers/CompilationCompleteView.xaml
+++ b/Wabbajack/Views/Compilers/CompilationCompleteView.xaml
@@ -1,4 +1,4 @@
-<UserControl
+<rxui:ReactiveUserControl
     x:Class="Wabbajack.CompilationCompleteView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -6,10 +6,12 @@
     xmlns:icon="http://metro.mahapps.com/winfx/xaml/iconpacks"
     xmlns:local="clr-namespace:Wabbajack"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:rxui="http://reactiveui.net"
     d:DesignHeight="450"
     d:DesignWidth="800"
+    x:TypeArguments="local:CompilerVM"
     mc:Ignorable="d">
-    <local:AttentionBorder ClipToBounds="True" Failure="{Binding Completed.Failed}">
+    <local:AttentionBorder x:Name="AttentionBorder" ClipToBounds="True">
         <Grid Margin="5">
             <Grid.RowDefinitions>
                 <RowDefinition Height="*" />
@@ -21,6 +23,7 @@
                 <ColumnDefinition Width="*" />
             </Grid.ColumnDefinitions>
             <TextBlock
+                x:Name="TitleText"
                 Grid.Row="0"
                 Grid.Column="0"
                 Grid.ColumnSpan="3"
@@ -32,16 +35,6 @@
                 <TextBlock.Effect>
                     <DropShadowEffect BlurRadius="25" Opacity="0.5" />
                 </TextBlock.Effect>
-                <TextBlock.Style>
-                    <Style TargetType="TextBlock">
-                        <Setter Property="Text" Value="Compilation Complete" />
-                        <Style.Triggers>
-                            <DataTrigger Binding="{Binding Completed.Failed}" Value="True">
-                                <Setter Property="Text" Value="Compilation Failed" />
-                            </DataTrigger>
-                        </Style.Triggers>
-                    </Style>
-                </TextBlock.Style>
             </TextBlock>
             <Grid
                 Grid.Row="1"
@@ -52,10 +45,10 @@
                     <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
                 <Button
+                    x:Name="BackButton"
                     Grid.Row="0"
                     Width="55"
                     Height="55"
-                    Command="{Binding BackCommand}"
                     Style="{StaticResource CircleButtonStyle}">
                     <icon:PackIconMaterial
                         Width="28"
@@ -72,16 +65,15 @@
             <Grid
                 Grid.Row="1"
                 Grid.Column="1"
-                VerticalAlignment="Center"
-                Visibility="{Binding CompilerSupportsAfterCompileNavigation, Converter={StaticResource bool2VisibilityConverter}}">
+                VerticalAlignment="Center">
                 <Grid.RowDefinitions>
                     <RowDefinition Height="Auto" />
                     <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
                 <Button
+                    x:Name="GoToModlistButton"
                     Width="55"
                     Height="55"
-                    Command="{Binding GoToModlistCommand}"
                     Style="{StaticResource CircleButtonStyle}">
                     <icon:PackIconMaterial
                         Width="25"
@@ -127,9 +119,9 @@
                                 </Button.Effect>
                             </Button>-->
                 <Button
+                    x:Name="CloseWhenCompletedButton"
                     Width="55"
                     Height="55"
-                    Command="{Binding CloseWhenCompleteCommand}"
                     Style="{StaticResource CircleButtonStyle}">
                     <icon:PackIconMaterial
                         Width="30"
@@ -145,4 +137,4 @@
             </Grid>
         </Grid>
     </local:AttentionBorder>
-</UserControl>
+</rxui:ReactiveUserControl>
diff --git a/Wabbajack/Views/Compilers/CompilationCompleteView.xaml.cs b/Wabbajack/Views/Compilers/CompilationCompleteView.xaml.cs
index 42167ce4..74be065c 100644
--- a/Wabbajack/Views/Compilers/CompilationCompleteView.xaml.cs
+++ b/Wabbajack/Views/Compilers/CompilationCompleteView.xaml.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reactive.Disposables;
+using System.Reactive.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
@@ -12,17 +14,42 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
+using ReactiveUI;
 
 namespace Wabbajack
 {
     /// <summary>
     /// Interaction logic for CompilationCompleteView.xaml
     /// </summary>
-    public partial class CompilationCompleteView : UserControl
+    public partial class CompilationCompleteView : ReactiveUserControl<CompilerVM>
     {
         public CompilationCompleteView()
         {
             InitializeComponent();
+            this.WhenActivated(dispose =>
+            {
+                this.WhenAny(x => x.ViewModel.Completed)
+                    .Select(x => x?.Failed ?? false)
+                    .BindToStrict(this, x => x.AttentionBorder.Failure)
+                    .DisposeWith(dispose);
+                this.WhenAny(x => x.ViewModel.Completed)
+                    .Select(x => x?.Failed ?? false)
+                    .Select(failed =>
+                    {
+                        return $"Compilation {(failed ? "Failed" : "Complete")}";
+                    })
+                    .BindToStrict(this, x => x.TitleText.Text)
+                    .DisposeWith(dispose);
+                this.WhenAny(x => x.ViewModel.BackCommand)
+                    .BindToStrict(this, x => x.BackButton.Command)
+                    .DisposeWith(dispose);
+                this.WhenAny(x => x.ViewModel.GoToModlistCommand)
+                    .BindToStrict(this, x => x.GoToModlistButton.Command)
+                    .DisposeWith(dispose);
+                this.WhenAny(x => x.ViewModel.CloseWhenCompleteCommand)
+                    .BindToStrict(this, x => x.CloseWhenCompletedButton.Command)
+                    .DisposeWith(dispose);
+            });
         }
     }
 }
diff --git a/Wabbajack/Views/Compilers/CompilerView.xaml b/Wabbajack/Views/Compilers/CompilerView.xaml
index 821b1ccf..dd5783cc 100644
--- a/Wabbajack/Views/Compilers/CompilerView.xaml
+++ b/Wabbajack/Views/Compilers/CompilerView.xaml
@@ -305,7 +305,10 @@
                     <local:ConfirmationInterventionView DataContext="{Binding ActiveGlobalUserIntervention}" Visibility="{Binding ActiveGlobalUserIntervention, Converter={StaticResource IsTypeVisibilityConverter}, ConverterParameter={x:Type common:ConfirmationIntervention}}" />
                 </Grid>
             </local:AttentionBorder>
-            <local:CompilationCompleteView x:Name="CompilationComplete" Grid.Column="2" />
+            <local:CompilationCompleteView
+                x:Name="CompilationComplete"
+                Grid.Column="2"
+                ViewModel="{Binding}" />
         </Grid>
     </Grid>
 </rxui:ReactiveUserControl>

From 95260b13429fe25fbc8c73a060b595ff2890c4a0 Mon Sep 17 00:00:00 2001
From: Justin Swanson <justin.c.swanson@gmail.com>
Date: Mon, 20 Jan 2020 16:43:58 -0600
Subject: [PATCH 5/9] InstallationCompleteView swapped to RxUserControl

---
 .../View Models/Installers/InstallerVM.cs     | 18 +++++++----
 .../Installers/InstallationCompleteView.xaml  | 27 ++++++----------
 .../InstallationCompleteView.xaml.cs          | 32 ++++++++++++++++++-
 .../Views/Installers/InstallationView.xaml    |  5 ++-
 4 files changed, 56 insertions(+), 26 deletions(-)

diff --git a/Wabbajack/View Models/Installers/InstallerVM.cs b/Wabbajack/View Models/Installers/InstallerVM.cs
index 5195cf09..4ef2f253 100644
--- a/Wabbajack/View Models/Installers/InstallerVM.cs	
+++ b/Wabbajack/View Models/Installers/InstallerVM.cs	
@@ -96,13 +96,13 @@ namespace Wabbajack
         public bool IsActive => _IsActive.Value;
 
         // Command properties
-        public IReactiveCommand ShowReportCommand { get; }
-        public IReactiveCommand OpenReadmeCommand { get; }
-        public IReactiveCommand VisitWebsiteCommand { get; }
+        public ReactiveCommand<Unit, Unit> ShowReportCommand { get; }
+        public ReactiveCommand<Unit, Unit> OpenReadmeCommand { get; }
+        public ReactiveCommand<Unit, Unit> VisitWebsiteCommand { get; }
         public ReactiveCommand<Unit, Unit> BackCommand { get; }
-        public IReactiveCommand CloseWhenCompleteCommand { get; }
-        public IReactiveCommand GoToInstallCommand { get; }
-        public IReactiveCommand BeginCommand { get; }
+        public ReactiveCommand<Unit, Unit> CloseWhenCompleteCommand { get; }
+        public ReactiveCommand<Unit, Unit> GoToInstallCommand { get; }
+        public ReactiveCommand<Unit, Unit> BeginCommand { get; }
 
         public InstallerVM(MainWindowVM mainWindowVM)
         {
@@ -324,7 +324,11 @@ namespace Wabbajack
                     .Select(modList => !string.IsNullOrEmpty(modList?.Readme))
                     .ObserveOnGuiThread());
             VisitWebsiteCommand = ReactiveCommand.Create(
-                execute: () => Process.Start(ModList.Website),
+                execute: () =>
+                {
+                    Process.Start(ModList.Website);
+                    return Unit.Default;
+                },
                 canExecute: this.WhenAny(x => x.ModList.Website)
                     .Select(x => x?.StartsWith("https://") ?? false)
                     .ObserveOnGuiThread());
diff --git a/Wabbajack/Views/Installers/InstallationCompleteView.xaml b/Wabbajack/Views/Installers/InstallationCompleteView.xaml
index 32d1e61c..a1e83306 100644
--- a/Wabbajack/Views/Installers/InstallationCompleteView.xaml
+++ b/Wabbajack/Views/Installers/InstallationCompleteView.xaml
@@ -1,4 +1,4 @@
-<UserControl
+<rxui:ReactiveUserControl
     x:Class="Wabbajack.InstallationCompleteView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -6,10 +6,12 @@
     xmlns:icon="http://metro.mahapps.com/winfx/xaml/iconpacks"
     xmlns:local="clr-namespace:Wabbajack"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:rxui="http://reactiveui.net"
     d:DesignHeight="450"
     d:DesignWidth="800"
+    x:TypeArguments="local:InstallerVM"
     mc:Ignorable="d">
-    <local:AttentionBorder ClipToBounds="True" Failure="{Binding Completed.Failed}">
+    <local:AttentionBorder x:Name="AttentionBorder" ClipToBounds="True">
         <Grid Margin="5">
             <Grid.RowDefinitions>
                 <RowDefinition Height="*" />
@@ -22,6 +24,7 @@
                 <ColumnDefinition Width="*" />
             </Grid.ColumnDefinitions>
             <TextBlock
+                x:Name="TitleText"
                 Grid.Row="0"
                 Grid.Column="0"
                 Grid.ColumnSpan="4"
@@ -33,16 +36,6 @@
                 <TextBlock.Effect>
                     <DropShadowEffect BlurRadius="25" Opacity="0.5" />
                 </TextBlock.Effect>
-                <TextBlock.Style>
-                    <Style TargetType="TextBlock">
-                        <Setter Property="Text" Value="Installation Complete" />
-                        <Style.Triggers>
-                            <DataTrigger Binding="{Binding Completed.Failed}" Value="True">
-                                <Setter Property="Text" Value="Installation Failed" />
-                            </DataTrigger>
-                        </Style.Triggers>
-                    </Style>
-                </TextBlock.Style>
             </TextBlock>
             <Grid
                 Grid.Row="1"
@@ -53,10 +46,10 @@
                     <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
                 <Button
+                    x:Name="BackButton"
                     Grid.Row="0"
                     Width="50"
                     Height="50"
-                    Command="{Binding BackCommand}"
                     Style="{StaticResource CircleButtonStyle}">
                     <icon:PackIconMaterial
                         Width="25"
@@ -80,9 +73,9 @@
                     <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
                 <Button
+                    x:Name="GoToInstallButton"
                     Width="50"
                     Height="50"
-                    Command="{Binding GoToInstallCommand}"
                     Style="{StaticResource CircleButtonStyle}">
                     <icon:PackIconMaterial
                         Width="23"
@@ -106,9 +99,9 @@
                     <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
                 <Button
+                    x:Name="OpenReadmeButton"
                     Width="50"
                     Height="50"
-                    Command="{Binding OpenReadmeCommand}"
                     Style="{StaticResource CircleButtonStyle}">
                     <icon:PackIconFontAwesome
                         Width="25"
@@ -132,9 +125,9 @@
                     <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
                 <Button
+                    x:Name="CloseButton"
                     Width="50"
                     Height="50"
-                    Command="{Binding CloseWhenCompleteCommand}"
                     Style="{StaticResource CircleButtonStyle}">
                     <icon:PackIconMaterial
                         Width="25"
@@ -150,4 +143,4 @@
             </Grid>
         </Grid>
     </local:AttentionBorder>
-</UserControl>
+</rxui:ReactiveUserControl>
diff --git a/Wabbajack/Views/Installers/InstallationCompleteView.xaml.cs b/Wabbajack/Views/Installers/InstallationCompleteView.xaml.cs
index af71f9ac..4e657cb1 100644
--- a/Wabbajack/Views/Installers/InstallationCompleteView.xaml.cs
+++ b/Wabbajack/Views/Installers/InstallationCompleteView.xaml.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reactive.Disposables;
+using System.Reactive.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
@@ -12,17 +14,45 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
+using ReactiveUI;
 
 namespace Wabbajack
 {
     /// <summary>
     /// Interaction logic for InstallationCompleteView.xaml
     /// </summary>
-    public partial class InstallationCompleteView : UserControl
+    public partial class InstallationCompleteView : ReactiveUserControl<InstallerVM>
     {
         public InstallationCompleteView()
         {
             InitializeComponent();
+            this.WhenActivated(dispose =>
+            {
+                this.WhenAny(x => x.ViewModel.Completed)
+                    .Select(x => x?.Failed ?? false)
+                    .BindToStrict(this, x => x.AttentionBorder.Failure)
+                    .DisposeWith(dispose);
+                this.WhenAny(x => x.ViewModel.Completed)
+                    .Select(x => x?.Failed ?? false)
+                    .Select(failed =>
+                    {
+                        return $"Installation {(failed ? "Failed" : "Complete")}";
+                    })
+                    .BindToStrict(this, x => x.TitleText.Text)
+                    .DisposeWith(dispose);
+                this.WhenAny(x => x.ViewModel.BackCommand)
+                    .BindToStrict(this, x => x.BackButton.Command)
+                    .DisposeWith(dispose);
+                this.WhenAny(x => x.ViewModel.GoToInstallCommand)
+                    .BindToStrict(this, x => x.GoToInstallButton.Command)
+                    .DisposeWith(dispose);
+                this.WhenAny(x => x.ViewModel.OpenReadmeCommand)
+                    .BindToStrict(this, x => x.OpenReadmeButton.Command)
+                    .DisposeWith(dispose);
+                this.WhenAny(x => x.ViewModel.CloseWhenCompleteCommand)
+                    .BindToStrict(this, x => x.CloseButton.Command)
+                    .DisposeWith(dispose);
+            });
         }
     }
 }
diff --git a/Wabbajack/Views/Installers/InstallationView.xaml b/Wabbajack/Views/Installers/InstallationView.xaml
index 7616daa3..149ac64c 100644
--- a/Wabbajack/Views/Installers/InstallationView.xaml
+++ b/Wabbajack/Views/Installers/InstallationView.xaml
@@ -435,7 +435,10 @@
                     <local:ConfirmUpdateOfExistingInstallView Visibility="{Binding ActiveGlobalUserIntervention, Converter={StaticResource IsTypeVisibilityConverter}, ConverterParameter={x:Type lib:ConfirmUpdateOfExistingInstall}}" />
                 </Grid>
             </local:AttentionBorder>
-            <local:InstallationCompleteView Grid.Column="2" Visibility="{Binding Completed, Converter={StaticResource IsNotNullVisibilityConverter}, FallbackValue=Collapsed}" />
+            <local:InstallationCompleteView
+                Grid.Column="2"
+                ViewModel="{Binding}"
+                Visibility="{Binding Completed, Converter={StaticResource IsNotNullVisibilityConverter}, FallbackValue=Collapsed}" />
         </Grid>
     </Grid>
 </UserControl>

From 29295a774e5c28aeaa9d82c06a122c798d73613b Mon Sep 17 00:00:00 2001
From: Justin Swanson <justin.c.swanson@gmail.com>
Date: Mon, 20 Jan 2020 19:07:41 -0600
Subject: [PATCH 6/9] InstallationView swapped to RxUserControl

---
 .../View Models/Installers/InstallerVM.cs     |   8 +-
 Wabbajack/View Models/SlideShow.cs            |  10 +-
 .../Views/Installers/InstallationView.xaml    | 106 +++++--------
 .../Views/Installers/InstallationView.xaml.cs | 147 +++++++++++++++++-
 Wabbajack/Views/MainWindow.xaml               |   2 +-
 5 files changed, 196 insertions(+), 77 deletions(-)

diff --git a/Wabbajack/View Models/Installers/InstallerVM.cs b/Wabbajack/View Models/Installers/InstallerVM.cs
index 4ef2f253..de0d400e 100644
--- a/Wabbajack/View Models/Installers/InstallerVM.cs	
+++ b/Wabbajack/View Models/Installers/InstallerVM.cs	
@@ -96,9 +96,9 @@ namespace Wabbajack
         public bool IsActive => _IsActive.Value;
 
         // Command properties
-        public ReactiveCommand<Unit, Unit> ShowReportCommand { get; }
+        public ReactiveCommand<Unit, Unit> ShowManifestCommand { get; }
         public ReactiveCommand<Unit, Unit> OpenReadmeCommand { get; }
-        public ReactiveCommand<Unit, Unit> VisitWebsiteCommand { get; }
+        public ReactiveCommand<Unit, Unit> VisitModListWebsiteCommand { get; }
         public ReactiveCommand<Unit, Unit> BackCommand { get; }
         public ReactiveCommand<Unit, Unit> CloseWhenCompleteCommand { get; }
         public ReactiveCommand<Unit, Unit> GoToInstallCommand { get; }
@@ -317,13 +317,13 @@ namespace Wabbajack
                 .ToGuiProperty(this, nameof(ModListName));
 
             // Define commands
-            ShowReportCommand = ReactiveCommand.Create(ShowReport);
+            ShowManifestCommand = ReactiveCommand.Create(ShowReport);
             OpenReadmeCommand = ReactiveCommand.Create(
                 execute: () => this.ModList?.OpenReadmeWindow(),
                 canExecute: this.WhenAny(x => x.ModList)
                     .Select(modList => !string.IsNullOrEmpty(modList?.Readme))
                     .ObserveOnGuiThread());
-            VisitWebsiteCommand = ReactiveCommand.Create(
+            VisitModListWebsiteCommand = ReactiveCommand.Create(
                 execute: () =>
                 {
                     Process.Start(ModList.Website);
diff --git a/Wabbajack/View Models/SlideShow.cs b/Wabbajack/View Models/SlideShow.cs
index 7a64cacd..6ccba2ad 100644
--- a/Wabbajack/View Models/SlideShow.cs	
+++ b/Wabbajack/View Models/SlideShow.cs	
@@ -32,8 +32,8 @@ namespace Wabbajack
         private readonly ObservableAsPropertyHelper<ModVM> _targetMod;
         public ModVM TargetMod => _targetMod.Value;
 
-        public IReactiveCommand SlideShowNextItemCommand { get; } = ReactiveCommand.Create(() => { });
-        public IReactiveCommand VisitNexusSiteCommand { get; }
+        public ReactiveCommand<Unit, Unit> SlideShowNextItemCommand { get; } = ReactiveCommand.Create(() => { });
+        public ReactiveCommand<Unit, Unit> VisitNexusSiteCommand { get; }
 
         public const int PreloadAmount = 4;
 
@@ -119,7 +119,11 @@ namespace Wabbajack
                 .ToGuiProperty(this, nameof(Image));
 
             VisitNexusSiteCommand = ReactiveCommand.Create(
-                execute: () => Process.Start(TargetMod.ModURL),
+                execute: () =>
+                {
+                    Process.Start(TargetMod.ModURL);
+                    return Unit.Default;
+                },
                 canExecute: this.WhenAny(x => x.TargetMod.ModURL)
                     .Select(x => x?.StartsWith("https://") ?? false)
                     .ObserveOnGuiThread());
diff --git a/Wabbajack/Views/Installers/InstallationView.xaml b/Wabbajack/Views/Installers/InstallationView.xaml
index 149ac64c..773a75c6 100644
--- a/Wabbajack/Views/Installers/InstallationView.xaml
+++ b/Wabbajack/Views/Installers/InstallationView.xaml
@@ -1,4 +1,4 @@
-<UserControl
+<rxui:ReactiveUserControl
     x:Class="Wabbajack.InstallationView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -9,9 +9,11 @@
     xmlns:local="clr-namespace:Wabbajack"
     xmlns:mahapps="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:rxui="http://reactiveui.net"
     d:DataContext="{d:DesignInstance local:InstallerVM}"
     d:DesignHeight="500"
     d:DesignWidth="800"
+    x:TypeArguments="local:InstallerVM"
     mc:Ignorable="d">
     <UserControl.Resources>
         <Style
@@ -41,21 +43,17 @@
             </Rectangle.Fill>
         </Rectangle>
         <local:HeatedBackgroundView
+            x:Name="HeatedBackground"
             Grid.Row="0"
-            Grid.RowSpan="3"
-            PercentCompleted="{Binding PercentCompleted}" />
+            Grid.RowSpan="3" />
         <Grid
             x:Name="Slideshow"
             Grid.Row="1"
             Margin="5,0,5,5">
             <Border BorderBrush="{StaticResource BorderInterestBrush}" BorderThickness="1,0,1,1">
                 <Grid>
-                    <local:DetailImageView
-                        Title="{Binding TitleText, Mode=OneWay}"
-                        Author="{Binding AuthorText, Mode=OneWay}"
-                        Description="{Binding Description, Mode=OneWay}"
-                        Image="{Binding Image, Mode=OneWay}" />
-                    <mahapps:ProgressRing Visibility="{Binding LoadingModlist, Mode=OneWay, Converter={StaticResource bool2VisibilityHiddenConverter}}" />
+                    <local:DetailImageView x:Name="DetailImage" />
+                    <mahapps:ProgressRing x:Name="ModlistLoadingRing" />
                 </Grid>
             </Border>
             <Grid
@@ -108,12 +106,12 @@
                     </Style>
                 </Grid.Style>
                 <Button
+                    x:Name="SkipSlideButton"
                     Grid.Column="3"
                     Width="60"
                     Height="60"
                     Margin="6"
                     Background="{StaticResource BackgroundBrush}"
-                    Command="{Binding Slideshow.SlideShowNextItemCommand}"
                     Style="{StaticResource CircleButtonStyle}"
                     ToolTip="Skip to the next mod">
                     <icon:PackIconFontAwesome
@@ -126,17 +124,7 @@
                     Grid.Column="2"
                     Margin="6"
                     Background="{StaticResource BackgroundBrush}"
-                    IsChecked="{Binding Slideshow.Enable}">
-                    <ToggleButton.Style>
-                        <Style BasedOn="{StaticResource SlideshowButton}" TargetType="ToggleButton">
-                            <Setter Property="ToolTip" Value="Play slideshow" />
-                            <Style.Triggers>
-                                <DataTrigger Binding="{Binding Slideshow.Enable}" Value="True">
-                                    <Setter Property="ToolTip" Value="Pause slideshow" />
-                                </DataTrigger>
-                            </Style.Triggers>
-                        </Style>
-                    </ToggleButton.Style>
+                    Style="{StaticResource SlideshowButton}">
                     <icon:PackIconMaterial>
                         <icon:PackIconMaterial.Style>
                             <Style TargetType="icon:PackIconMaterial">
@@ -151,32 +139,22 @@
                     </icon:PackIconMaterial>
                 </ToggleButton>
                 <Button
+                    x:Name="OpenWebsite"
                     Grid.Column="1"
                     Margin="6"
                     Background="{StaticResource BackgroundBrush}"
-                    Command="{Binding Slideshow.VisitNexusSiteCommand}"
                     Style="{StaticResource SlideshowButton}"
-                    ToolTip="Open Nexus Website">
+                    ToolTip="Open mod's website">
                     <icon:PackIconMaterial
                         Width="28"
                         Height="28"
                         Kind="Web" />
                 </Button>
                 <ToggleButton
+                    x:Name="ShowNSFWButton"
                     Grid.Column="0"
                     Background="{StaticResource BackgroundBrush}"
-                    IsChecked="{Binding Slideshow.ShowNSFW}"
-                    ToolTip="Show NSFW mods">
-                    <ToggleButton.Style>
-                        <Style BasedOn="{StaticResource SlideshowButton}" TargetType="ToggleButton">
-                            <Setter Property="ToolTip" Value="Show NSFW mods" />
-                            <Style.Triggers>
-                                <DataTrigger Binding="{Binding Slideshow.ShowNSFW}" Value="True">
-                                    <Setter Property="ToolTip" Value="Hide NSFW mods" />
-                                </DataTrigger>
-                            </Style.Triggers>
-                        </Style>
-                    </ToggleButton.Style>
+                    Style="{StaticResource SlideshowButton}">
                     <Grid>
                         <TextBlock
                             Margin="4"
@@ -187,24 +165,22 @@
                             FontWeight="Bold"
                             Text="NSFW" />
                         <icon:PackIconOcticons
+                            x:Name="NSFWSlashIcon"
                             Width="40"
                             Height="40"
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"
                             Foreground="#88FFFFFF"
-                            Kind="CircleSlash"
-                            Visibility="{Binding Slideshow.ShowNSFW, Converter={StaticResource bool2VisibilityConverter}, ConverterParameter=False}" />
+                            Kind="CircleSlash" />
                     </Grid>
                 </ToggleButton>
             </Grid>
         </Grid>
         <!--  Comes after slideshow control, so that any effects/overlap goes on top  -->
         <local:TopProgressView
-            Title="{Binding ModListName}"
+            x:Name="TopProgressBar"
             Grid.Row="0"
-            Grid.RowSpan="2"
-            ProgressPercent="{Binding PercentCompleted}"
-            StatePrefixTitle="{Binding ProgressTitle}">
+            Grid.RowSpan="2">
             <!--  Readd when Pause/Stop implementations added  -->
             <!--<Button Grid.Column="2"
                     ToolTip="Pause Installation"
@@ -234,17 +210,16 @@
             Margin="7,5,0,0"
             HorizontalAlignment="Left"
             VerticalAlignment="Top"
-            Command="{Binding BackCommand}"
             Style="{StaticResource IconCircleButtonStyle}"
             ToolTip="Back to main menu">
             <icon:PackIconMaterial Foreground="{Binding Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}" Kind="ArrowLeft" />
         </Button>
         <!--  Bottom Area  -->
         <Grid
+            x:Name="BottomButtonInputGrid"
             Grid.Row="2"
             Margin="5,0,5,5"
-            ClipToBounds="True"
-            Visibility="{Binding StartedInstallation, Converter={StaticResource bool2VisibilityConverter}, ConverterParameter=False}">
+            ClipToBounds="True">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="*" />
                 <ColumnDefinition Width="4" />
@@ -257,9 +232,9 @@
                     <RowDefinition Height="*" />
                 </Grid.RowDefinitions>
                 <Button
+                    x:Name="OpenReadmePreInstallButton"
                     Grid.Row="0"
                     Margin="30,5"
-                    Command="{Binding OpenReadmeCommand}"
                     FontSize="20"
                     Style="{StaticResource LargeButtonStyle}"
                     ToolTip="Open the readme for the modlist">
@@ -282,9 +257,9 @@
                     </Grid>
                 </Button>
                 <Button
+                    x:Name="VisitWebsitePreInstallButton"
                     Grid.Row="1"
                     Margin="30,5"
-                    Command="{Binding VisitWebsiteCommand}"
                     FontSize="20"
                     Style="{StaticResource LargeButtonStyle}"
                     ToolTip="Open the webpage for the modlist">
@@ -307,9 +282,9 @@
                     </Grid>
                 </Button>
                 <Button
+                    x:Name="ShowManifestPreInstallButton"
                     Grid.Row="2"
                     Margin="30,5"
-                    Command="{Binding ShowReportCommand}"
                     FontSize="20"
                     Style="{StaticResource LargeButtonStyle}"
                     ToolTip="Open an explicit listing of all actions this modlist will take">
@@ -345,8 +320,7 @@
                     Grid.Column="0"
                     Margin="5"
                     VerticalAlignment="Center"
-                    Background="Transparent"
-                    Visibility="{Binding StartedInstallation, Converter={StaticResource bool2VisibilityConverter}, ConverterParameter=False}">
+                    Background="Transparent">
                     <Grid.RowDefinitions>
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="Auto" />
@@ -358,7 +332,7 @@
                         <ColumnDefinition Width="20" />
                         <ColumnDefinition Width="*" />
                     </Grid.ColumnDefinitions>
-                    <Rectangle Grid.Row="0" Height="{Binding Installer.ConfigVisualVerticalOffset, Mode=OneWay}" />
+                    <Rectangle x:Name="InstallConfigSpacer" Grid.Row="0" />
                     <TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
@@ -368,18 +342,18 @@
                         Text="Target Modlist"
                         TextAlignment="Center" />
                     <local:FilePicker
+                        x:Name="ModListLocationPicker"
                         Grid.Row="1"
                         Grid.Column="2"
                         Height="30"
                         VerticalAlignment="Center"
-                        FontSize="14"
-                        PickerVM="{Binding ModListLocation}" />
+                        FontSize="14" />
                     <ContentPresenter
+                        x:Name="InstallerCustomizationContent"
                         Grid.Row="3"
                         Grid.Column="0"
                         Grid.ColumnSpan="3"
-                        VerticalAlignment="Top"
-                        Content="{Binding Installer}">
+                        VerticalAlignment="Top">
                         <ContentPresenter.Resources>
                             <DataTemplate DataType="{x:Type local:MO2InstallerVM}">
                                 <local:MO2InstallerConfigView />
@@ -406,39 +380,37 @@
                     </ContentPresenter>
                 </Grid>
                 <local:BeginButton
+                    x:Name="BeginButton"
                     Grid.Column="2"
                     Margin="0,0,25,0"
                     HorizontalAlignment="Right"
-                    VerticalAlignment="Center"
-                    Command="{Binding BeginCommand, Mode=OneWay}" />
+                    VerticalAlignment="Center" />
             </Grid>
         </Grid>
         <Grid
+            x:Name="MidInstallDisplayGrid"
             Grid.Row="2"
-            Margin="5,0,5,5"
-            Visibility="{Binding StartedInstallation, Converter={StaticResource bool2VisibilityConverter}, FallbackValue=Hidden}">
+            Margin="5,0,5,5">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="4*" />
                 <ColumnDefinition Width="5" />
                 <ColumnDefinition Width="3*" />
             </Grid.ColumnDefinitions>
-            <local:LogView Grid.Column="0" ProgressPercent="{Binding PercentCompleted, Mode=OneWay}" />
+            <local:LogView x:Name="LogView" Grid.Column="0" />
             <local:CpuView
+                x:Name="CpuView"
                 Grid.Column="2"
-                ProgressPercent="{Binding PercentCompleted, Mode=OneWay}"
-                SettingsHook="{Binding MWVM.Settings}"
-                ViewModel="{Binding}"
-                Visibility="{Binding ActiveGlobalUserIntervention, Converter={StaticResource IsNotNullVisibilityConverter}, ConverterParameter=False}" />
-            <local:AttentionBorder Grid.Column="2" Visibility="{Binding ActiveGlobalUserIntervention, Converter={StaticResource IsNotNullVisibilityConverter}}">
+                ViewModel="{Binding}" />
+            <local:AttentionBorder x:Name="UserInterventionsControl" Grid.Column="2">
                 <Grid>
                     <local:ConfirmationInterventionView DataContext="{Binding ActiveGlobalUserIntervention}" Visibility="{Binding ActiveGlobalUserIntervention, Converter={StaticResource IsTypeVisibilityConverter}, ConverterParameter={x:Type common:ConfirmationIntervention}}" />
                     <local:ConfirmUpdateOfExistingInstallView Visibility="{Binding ActiveGlobalUserIntervention, Converter={StaticResource IsTypeVisibilityConverter}, ConverterParameter={x:Type lib:ConfirmUpdateOfExistingInstall}}" />
                 </Grid>
             </local:AttentionBorder>
             <local:InstallationCompleteView
+                x:Name="InstallComplete"
                 Grid.Column="2"
-                ViewModel="{Binding}"
-                Visibility="{Binding Completed, Converter={StaticResource IsNotNullVisibilityConverter}, FallbackValue=Collapsed}" />
+                ViewModel="{Binding}" />
         </Grid>
     </Grid>
-</UserControl>
+</rxui:ReactiveUserControl>
diff --git a/Wabbajack/Views/Installers/InstallationView.xaml.cs b/Wabbajack/Views/Installers/InstallationView.xaml.cs
index e018418d..971180b6 100644
--- a/Wabbajack/Views/Installers/InstallationView.xaml.cs
+++ b/Wabbajack/Views/Installers/InstallationView.xaml.cs
@@ -1,15 +1,158 @@
-using System.Windows.Controls;
+using System.Reactive.Disposables;
+using System.Reactive.Linq;
+using System.Windows.Controls;
+using ReactiveUI;
+using System.Windows;
 
 namespace Wabbajack
 {
     /// <summary>
     /// Interaction logic for InstallationView.xaml
     /// </summary>
-    public partial class InstallationView : UserControl
+    public partial class InstallationView : ReactiveUserControl<InstallerVM>
     {
         public InstallationView()
         {
             InitializeComponent();
+            this.WhenActivated(dispose =>
+            {
+                this.MarkAsNeeded<InstallationView, InstallerVM, bool>(this.ViewModel, x => x.Installing);
+                this.MarkAsNeeded<InstallationView, InstallerVM, bool>(this.ViewModel, x => x.Slideshow.Enable);
+
+                // General progress indicators
+                this.WhenAny(x => x.ViewModel.PercentCompleted)
+                    .Select(x => (double)x)
+                    .BindToStrict(this, x => x.HeatedBackground.PercentCompleted)
+                    .DisposeWith(dispose);
+
+                // Top Progress Bar
+                this.WhenAny(x => x.ViewModel.ModListName)
+                    .BindToStrict(this, x => x.TopProgressBar.Title)
+                    .DisposeWith(dispose);
+                this.WhenAny(x => x.ViewModel.ProgressTitle)
+                    .BindToStrict(this, x => x.TopProgressBar.StatePrefixTitle)
+                    .DisposeWith(dispose);
+                this.WhenAny(x => x.ViewModel.PercentCompleted)
+                    .Select(x => (double)x)
+                    .BindToStrict(this, x => x.TopProgressBar.ProgressPercent)
+                    .DisposeWith(dispose);
+                this.WhenAny(x => x.ViewModel.BackCommand)
+                    .BindToStrict(this, x => x.BackButton.Command)
+                    .DisposeWith(dispose);
+
+                // Detail Image
+                this.WhenAny(x => x.ViewModel.TitleText)
+                    .BindToStrict(this, x => x.DetailImage.Title)
+                    .DisposeWith(dispose);
+                this.WhenAny(x => x.ViewModel.AuthorText)
+                    .BindToStrict(this, x => x.DetailImage.Author)
+                    .DisposeWith(dispose);
+                this.WhenAny(x => x.ViewModel.Description)
+                    .BindToStrict(this, x => x.DetailImage.Description)
+                    .DisposeWith(dispose);
+                this.WhenAny(x => x.ViewModel.Image)
+                    .BindToStrict(this, x => x.DetailImage.Image)
+                    .DisposeWith(dispose);
+                this.WhenAny(x => x.ViewModel.LoadingModlist)
+                    .Select(x => x ? Visibility.Visible : Visibility.Collapsed)
+                    .BindToStrict(this, x => x.ModlistLoadingRing.Visibility)
+                    .DisposeWith(dispose);
+
+                // Slideshow controls
+                this.WhenAny(x => x.ViewModel.Slideshow.SlideShowNextItemCommand)
+                    .BindToStrict(this, x => x.SkipSlideButton.Command)
+                    .DisposeWith(dispose);
+                this.BindStrict(this.ViewModel, x => x.Slideshow.Enable, x => x.PlayPauseButton.IsChecked,
+                        vmToViewConverter: x => x,
+                        viewToVmConverter: x => x ?? true)
+                    .DisposeWith(dispose);
+                this.WhenAny(x => x.ViewModel.Slideshow.Enable)
+                    .Select(enabled =>
+                    {
+                        return $"{(enabled ? "Pause" : "Play")} slideshow";
+                    })
+                    .BindToStrict(this, x => x.PlayPauseButton.ToolTip)
+                    .DisposeWith(dispose);
+                this.WhenAny(x => x.ViewModel.Slideshow.VisitNexusSiteCommand)
+                    .BindToStrict(this, x => x.OpenWebsite.Command)
+                    .DisposeWith(dispose);
+                this.BindStrict(this.ViewModel, x => x.Slideshow.ShowNSFW, x => x.ShowNSFWButton.IsChecked,
+                        vmToViewConverter: x => x,
+                        viewToVmConverter: x => x ?? true)
+                    .DisposeWith(dispose);
+                this.WhenAny(x => x.ViewModel.Slideshow.ShowNSFW)
+                    .Select(show =>
+                    {
+                        return $"{(show ? "Hide" : "Show")} NSFW mods";
+                    })
+                    .BindToStrict(this, x => x.ShowNSFWButton.ToolTip)
+                    .DisposeWith(dispose);
+                this.WhenAny(x => x.ViewModel.Slideshow.ShowNSFW)
+                    .Select(show => show ? Visibility.Collapsed : Visibility.Visible)
+                    .BindToStrict(this, x => x.NSFWSlashIcon.Visibility)
+                    .DisposeWith(dispose);
+
+                // Bottom Input Customization
+                this.WhenAny(x => x.ViewModel.StartedInstallation)
+                    .Select(started => started ? Visibility.Hidden : Visibility.Visible)
+                    .BindToStrict(this, x => x.BottomButtonInputGrid.Visibility)
+                    .DisposeWith(dispose);
+                this.WhenAny(x => x.ViewModel.OpenReadmeCommand)
+                    .BindToStrict(this, x => x.OpenReadmePreInstallButton.Command)
+                    .DisposeWith(dispose);
+                this.WhenAny(x => x.ViewModel.VisitModListWebsiteCommand)
+                    .BindToStrict(this, x => x.VisitWebsitePreInstallButton.Command)
+                    .DisposeWith(dispose);
+                this.WhenAny(x => x.ViewModel.ShowManifestCommand)
+                    .BindToStrict(this, x => x.ShowManifestPreInstallButton.Command)
+                    .DisposeWith(dispose);
+                this.WhenAny(x => x.ViewModel.StartedInstallation)
+                    .Select(started => started ? Visibility.Collapsed : Visibility.Visible)
+                    .BindToStrict(this, x => x.InstallationConfigurationView.Visibility)
+                    .DisposeWith(dispose);
+                this.WhenAny(x => x.ViewModel.Installer.ConfigVisualVerticalOffset)
+                    .Select(i => (double)i)
+                    .BindToStrict(this, x => x.InstallConfigSpacer.Height)
+                    .DisposeWith(dispose);
+                this.WhenAny(x => x.ViewModel.ModListLocation)
+                    .BindToStrict(this, x => x.ModListLocationPicker.PickerVM)
+                    .DisposeWith(dispose);
+                this.WhenAny(x => x.ViewModel.Installer)
+                    .BindToStrict(this, x => x.InstallerCustomizationContent.Content)
+                    .DisposeWith(dispose);
+                this.WhenAny(x => x.ViewModel.BeginCommand)
+                    .BindToStrict(this, x => x.BeginButton.Command)
+                    .DisposeWith(dispose);
+
+                // Bottom mid-install display
+                this.WhenAny(x => x.ViewModel.StartedInstallation)
+                    .Select(started => started ? Visibility.Visible : Visibility.Hidden)
+                    .BindToStrict(this, x => x.MidInstallDisplayGrid.Visibility)
+                    .DisposeWith(dispose);
+                this.WhenAny(x => x.ViewModel.PercentCompleted)
+                    .Select(x => (double)x)
+                    .BindToStrict(this, x => x.LogView.ProgressPercent)
+                    .DisposeWith(dispose);
+                this.WhenAny(x => x.ViewModel.PercentCompleted)
+                    .Select(f => (double)f)
+                    .BindToStrict(this, x => x.CpuView.ProgressPercent)
+                    .DisposeWith(dispose);
+                this.WhenAny(x => x.ViewModel.MWVM.Settings)
+                    .BindToStrict(this, x => x.CpuView.SettingsHook)
+                    .DisposeWith(dispose);
+                this.WhenAny(x => x.ViewModel.ActiveGlobalUserIntervention)
+                    .Select(x => x == null ? Visibility.Visible : Visibility.Collapsed)
+                    .BindToStrict(this, x => x.CpuView.Visibility)
+                    .DisposeWith(dispose);
+                this.WhenAny(x => x.ViewModel.ActiveGlobalUserIntervention)
+                    .Select(x => x != null ? Visibility.Visible : Visibility.Collapsed)
+                    .BindToStrict(this, x => x.UserInterventionsControl.Visibility)
+                    .DisposeWith(dispose);
+                this.WhenAny(x => x.ViewModel.Completed)
+                    .Select(completed => completed != null ? Visibility.Visible : Visibility.Collapsed)
+                    .BindToStrict(this, x => x.InstallComplete.Visibility)
+                    .DisposeWith(dispose);
+            });
         }
     }
 }
diff --git a/Wabbajack/Views/MainWindow.xaml b/Wabbajack/Views/MainWindow.xaml
index 87a74052..b853feed 100644
--- a/Wabbajack/Views/MainWindow.xaml
+++ b/Wabbajack/Views/MainWindow.xaml
@@ -26,7 +26,7 @@
                 <local:CompilerView ViewModel="{Binding}" />
             </DataTemplate>
             <DataTemplate DataType="{x:Type local:InstallerVM}">
-                <local:InstallationView />
+                <local:InstallationView ViewModel="{Binding}" />
             </DataTemplate>
             <DataTemplate DataType="{x:Type local:ModeSelectionVM}">
                 <local:ModeSelectionView />

From 0e935ec26103aa646d37b363c2b3ee54eb7c2b7b Mon Sep 17 00:00:00 2001
From: Justin Swanson <justin.c.swanson@gmail.com>
Date: Mon, 20 Jan 2020 22:23:33 -0600
Subject: [PATCH 7/9] UserIntervention views made to RxUserControls

---
 .../View Models/Installers/ISubInstallerVM.cs |  1 +
 .../View Models/Installers/InstallerVM.cs     | 18 ++++++---
 .../View Models/Installers/MO2InstallerVM.cs  | 11 ++++++
 .../Installers/VortexInstallerVM.cs           |  2 +
 .../ConfirmUpdateOfExistingInstallVM.cs       | 38 +++++++++++++++++++
 .../Views/Installers/InstallationView.xaml    | 17 ++++++---
 .../ConfirmUpdateOfExistingInstallView.xaml   | 16 +++++---
 ...ConfirmUpdateOfExistingInstallView.xaml.cs | 25 +++++++++++-
 .../ConfirmationInterventionView.xaml         | 15 +++++---
 .../ConfirmationInterventionView.xaml.cs      | 20 +++++++++-
 Wabbajack/Wabbajack.csproj                    |  1 +
 11 files changed, 140 insertions(+), 24 deletions(-)
 create mode 100644 Wabbajack/View Models/UserIntervention/ConfirmUpdateOfExistingInstallVM.cs

diff --git a/Wabbajack/View Models/Installers/ISubInstallerVM.cs b/Wabbajack/View Models/Installers/ISubInstallerVM.cs
index ca773423..0c69d559 100644
--- a/Wabbajack/View Models/Installers/ISubInstallerVM.cs	
+++ b/Wabbajack/View Models/Installers/ISubInstallerVM.cs	
@@ -19,5 +19,6 @@ namespace Wabbajack
         int ConfigVisualVerticalOffset { get; }
         IObservable<bool> CanInstall { get; }
         Task<bool> Install();
+        IUserIntervention InterventionConverter(IUserIntervention intervention);
     }
 }
diff --git a/Wabbajack/View Models/Installers/InstallerVM.cs b/Wabbajack/View Models/Installers/InstallerVM.cs
index de0d400e..c74aaaf1 100644
--- a/Wabbajack/View Models/Installers/InstallerVM.cs	
+++ b/Wabbajack/View Models/Installers/InstallerVM.cs	
@@ -397,11 +397,19 @@ namespace Wabbajack
 
             // Listen for user interventions, and compile a dynamic list of all unhandled ones
             var activeInterventions = this.WhenAny(x => x.Installer.ActiveInstallation)
-                .SelectMany(c => c?.LogMessages ?? Observable.Empty<IStatusMessage>())
-                .WhereCastable<IStatusMessage, IUserIntervention>()
-                .ToObservableChangeSet()
-                .AutoRefresh(i => i.Handled)
-                .Filter(i => !i.Handled)
+                .WithLatestFrom(
+                    this.WhenAny(x => x.Installer),
+                    (activeInstall, installer) =>
+                    {
+                        if (activeInstall == null) return Observable.Empty<IChangeSet<IUserIntervention>>();
+                        return activeInstall.LogMessages
+                            .WhereCastable<IStatusMessage, IUserIntervention>()
+                            .ToObservableChangeSet()
+                            .AutoRefresh(i => i.Handled)
+                            .Filter(i => !i.Handled)
+                            .Transform(x => installer.InterventionConverter(x));
+                    })
+                .Switch()
                 .AsObservableList();
 
             // Find the top intervention /w no CPU ID to be marked as "global"
diff --git a/Wabbajack/View Models/Installers/MO2InstallerVM.cs b/Wabbajack/View Models/Installers/MO2InstallerVM.cs
index 9ddb428f..180147e6 100644
--- a/Wabbajack/View Models/Installers/MO2InstallerVM.cs	
+++ b/Wabbajack/View Models/Installers/MO2InstallerVM.cs	
@@ -169,5 +169,16 @@ namespace Wabbajack
                 });
             }
         }
+
+        public IUserIntervention InterventionConverter(IUserIntervention intervention)
+        {
+            switch (intervention)
+            {
+                case ConfirmUpdateOfExistingInstall confirm:
+                    return new ConfirmUpdateOfExistingInstallVM(this, confirm);
+                default:
+                    return intervention;
+            }
+        }
     }
 }
diff --git a/Wabbajack/View Models/Installers/VortexInstallerVM.cs b/Wabbajack/View Models/Installers/VortexInstallerVM.cs
index e16282b2..2652332a 100644
--- a/Wabbajack/View Models/Installers/VortexInstallerVM.cs	
+++ b/Wabbajack/View Models/Installers/VortexInstallerVM.cs	
@@ -87,5 +87,7 @@ namespace Wabbajack
                 });
             }
         }
+
+        public IUserIntervention InterventionConverter(IUserIntervention intervention) => intervention;
     }
 }
diff --git a/Wabbajack/View Models/UserIntervention/ConfirmUpdateOfExistingInstallVM.cs b/Wabbajack/View Models/UserIntervention/ConfirmUpdateOfExistingInstallVM.cs
new file mode 100644
index 00000000..af8b3881
--- /dev/null
+++ b/Wabbajack/View Models/UserIntervention/ConfirmUpdateOfExistingInstallVM.cs	
@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Wabbajack.Common;
+using Wabbajack.Lib;
+
+namespace Wabbajack
+{
+    public class ConfirmUpdateOfExistingInstallVM : ViewModel, IUserIntervention
+    {
+        public ConfirmUpdateOfExistingInstall Source { get; }
+
+        public MO2InstallerVM Installer { get; }
+
+        public bool Handled => ((IUserIntervention)Source).Handled;
+
+        public int CpuID => ((IUserIntervention)Source).CpuID;
+
+        public DateTime Timestamp => ((IUserIntervention)Source).Timestamp;
+
+        public string ShortDescription => ((IUserIntervention)Source).ShortDescription;
+
+        public string ExtendedDescription => ((IUserIntervention)Source).ExtendedDescription;
+
+        public ConfirmUpdateOfExistingInstallVM(MO2InstallerVM installer, ConfirmUpdateOfExistingInstall confirm)
+        {
+            Source = confirm;
+            Installer = installer;
+        }
+
+        public void Cancel()
+        {
+            ((IUserIntervention)Source).Cancel();
+        }
+    }
+}
diff --git a/Wabbajack/Views/Installers/InstallationView.xaml b/Wabbajack/Views/Installers/InstallationView.xaml
index 773a75c6..f0199be3 100644
--- a/Wabbajack/Views/Installers/InstallationView.xaml
+++ b/Wabbajack/Views/Installers/InstallationView.xaml
@@ -401,11 +401,18 @@
                 x:Name="CpuView"
                 Grid.Column="2"
                 ViewModel="{Binding}" />
-            <local:AttentionBorder x:Name="UserInterventionsControl" Grid.Column="2">
-                <Grid>
-                    <local:ConfirmationInterventionView DataContext="{Binding ActiveGlobalUserIntervention}" Visibility="{Binding ActiveGlobalUserIntervention, Converter={StaticResource IsTypeVisibilityConverter}, ConverterParameter={x:Type common:ConfirmationIntervention}}" />
-                    <local:ConfirmUpdateOfExistingInstallView Visibility="{Binding ActiveGlobalUserIntervention, Converter={StaticResource IsTypeVisibilityConverter}, ConverterParameter={x:Type lib:ConfirmUpdateOfExistingInstall}}" />
-                </Grid>
+            <local:AttentionBorder
+                x:Name="UserInterventionsControl"
+                Grid.Column="2"
+                Content="{Binding ActiveGlobalUserIntervention}">
+                <local:AttentionBorder.Resources>
+                    <DataTemplate DataType="{x:Type common:ConfirmationIntervention}">
+                        <local:ConfirmationInterventionView ViewModel="{Binding}" />
+                    </DataTemplate>
+                    <DataTemplate DataType="{x:Type local:ConfirmUpdateOfExistingInstallVM}">
+                        <local:ConfirmUpdateOfExistingInstallView ViewModel="{Binding}" />
+                    </DataTemplate>
+                </local:AttentionBorder.Resources>
             </local:AttentionBorder>
             <local:InstallationCompleteView
                 x:Name="InstallComplete"
diff --git a/Wabbajack/Views/Interventions/ConfirmUpdateOfExistingInstallView.xaml b/Wabbajack/Views/Interventions/ConfirmUpdateOfExistingInstallView.xaml
index 9a02a56d..82ebb5ba 100644
--- a/Wabbajack/Views/Interventions/ConfirmUpdateOfExistingInstallView.xaml
+++ b/Wabbajack/Views/Interventions/ConfirmUpdateOfExistingInstallView.xaml
@@ -1,12 +1,15 @@
-<UserControl
+<rxui:ReactiveUserControl
     x:Class="Wabbajack.ConfirmUpdateOfExistingInstallView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:lib="clr-namespace:Wabbajack.Lib;assembly=Wabbajack.Lib"
     xmlns:local="clr-namespace:Wabbajack"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:rxui="http://reactiveui.net"
     d:DesignHeight="450"
     d:DesignWidth="800"
+    x:TypeArguments="local:ConfirmUpdateOfExistingInstallVM"
     mc:Ignorable="d">
     <Grid Margin="10">
         <Grid.ColumnDefinitions>
@@ -21,6 +24,7 @@
             <RowDefinition Height="2*" />
         </Grid.RowDefinitions>
         <TextBlock
+            x:Name="ShortDescription"
             Grid.Row="0"
             Grid.Column="0"
             Grid.ColumnSpan="3"
@@ -28,15 +32,15 @@
             FontFamily="Lucida Sans"
             FontSize="14"
             FontWeight="Bold"
-            Text="{Binding ActiveGlobalUserIntervention.ShortDescription}"
             TextWrapping="WrapWithOverflow" />
         <TextBlock
+            x:Name="ExtendedDescription"
             Grid.Row="1"
             Grid.Column="0"
             Grid.ColumnSpan="3"
-            Text="{Binding ActiveGlobalUserIntervention.ExtendedDescription}"
             TextWrapping="WrapWithOverflow" />
         <CheckBox
+            x:Name="AutoOverwriteCheckbox"
             Grid.Row="2"
             Grid.Column="2"
             Margin="4"
@@ -45,14 +49,14 @@
             IsChecked="{Binding Installer.AutomaticallyOverwrite}"
             ToolTip="If installing over an existing installation next time, automatically replace it without asking permission." />
         <Button
+            x:Name="CancelButton"
             Grid.Row="3"
             Grid.Column="0"
-            Command="{Binding ActiveGlobalUserIntervention.CancelCommand}"
             Content="Cancel" />
         <Button
+            x:Name="ConfirmButton"
             Grid.Row="3"
             Grid.Column="2"
-            Command="{Binding ActiveGlobalUserIntervention.ConfirmCommand}"
             Content="Confirm" />
     </Grid>
-</UserControl>
+</rxui:ReactiveUserControl>
diff --git a/Wabbajack/Views/Interventions/ConfirmUpdateOfExistingInstallView.xaml.cs b/Wabbajack/Views/Interventions/ConfirmUpdateOfExistingInstallView.xaml.cs
index ca67f806..b26994d0 100644
--- a/Wabbajack/Views/Interventions/ConfirmUpdateOfExistingInstallView.xaml.cs
+++ b/Wabbajack/Views/Interventions/ConfirmUpdateOfExistingInstallView.xaml.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reactive.Disposables;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
@@ -12,17 +13,39 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
+using ReactiveUI;
+using Wabbajack.Lib;
 
 namespace Wabbajack
 {
     /// <summary>
     /// Interaction logic for ConfirmUpdateOfExistingInstallView.xaml
     /// </summary>
-    public partial class ConfirmUpdateOfExistingInstallView : UserControl
+    public partial class ConfirmUpdateOfExistingInstallView : ReactiveUserControl<ConfirmUpdateOfExistingInstallVM>
     {
         public ConfirmUpdateOfExistingInstallView()
         {
             InitializeComponent();
+            this.WhenActivated(dispose =>
+            {
+                this.WhenAny(x => x.ViewModel.ShortDescription)
+                    .BindToStrict(this, x => x.ShortDescription.Text)
+                    .DisposeWith(dispose);
+                this.WhenAny(x => x.ViewModel.ExtendedDescription)
+                    .BindToStrict(this, x => x.ExtendedDescription.Text)
+                    .DisposeWith(dispose);
+                this.WhenAny(x => x.ViewModel.Source.ConfirmCommand)
+                    .BindToStrict(this, x => x.ConfirmButton.Command)
+                    .DisposeWith(dispose);
+                this.WhenAny(x => x.ViewModel.Source.CancelCommand)
+                    .BindToStrict(this, x => x.CancelButton.Command)
+                    .DisposeWith(dispose);
+
+                this.BindStrict(this.ViewModel, x => x.Installer.AutomaticallyOverwrite, x => x.AutoOverwriteCheckbox.IsChecked,
+                        vmToViewConverter: x => x,
+                        viewToVmConverter: x => x ?? false)
+                    .DisposeWith(dispose);
+            });
         }
     }
 }
diff --git a/Wabbajack/Views/Interventions/ConfirmationInterventionView.xaml b/Wabbajack/Views/Interventions/ConfirmationInterventionView.xaml
index 328ec7e7..010ff907 100644
--- a/Wabbajack/Views/Interventions/ConfirmationInterventionView.xaml
+++ b/Wabbajack/Views/Interventions/ConfirmationInterventionView.xaml
@@ -1,12 +1,15 @@
-<UserControl
+<rxui:ReactiveUserControl
     x:Class="Wabbajack.ConfirmationInterventionView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:common="clr-namespace:Wabbajack.Common;assembly=Wabbajack.Common"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:Wabbajack"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:rxui="http://reactiveui.net"
     d:DesignHeight="450"
     d:DesignWidth="800"
+    x:TypeArguments="common:ConfirmationIntervention"
     mc:Ignorable="d">
     <Grid Margin="10">
         <Grid.ColumnDefinitions>
@@ -20,6 +23,7 @@
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
         <TextBlock
+            x:Name="ShortDescription"
             Grid.Row="0"
             Grid.Column="0"
             Grid.ColumnSpan="3"
@@ -27,23 +31,22 @@
             FontFamily="Lucida Sans"
             FontSize="14"
             FontWeight="Bold"
-            Text="{Binding ShortDescription}"
             TextWrapping="WrapWithOverflow" />
         <TextBlock
+            x:Name="ExtendedDescription"
             Grid.Row="1"
             Grid.Column="0"
             Grid.ColumnSpan="3"
-            Text="{Binding ExtendedDescription}"
             TextWrapping="WrapWithOverflow" />
         <Button
+            x:Name="CancelButton"
             Grid.Row="2"
             Grid.Column="0"
-            Command="{Binding CancelCommand}"
             Content="Cancel" />
         <Button
+            x:Name="ConfirmButton"
             Grid.Row="2"
             Grid.Column="2"
-            Command="{Binding ConfirmCommand}"
             Content="Confirm" />
     </Grid>
-</UserControl>
+</rxui:ReactiveUserControl>
diff --git a/Wabbajack/Views/Interventions/ConfirmationInterventionView.xaml.cs b/Wabbajack/Views/Interventions/ConfirmationInterventionView.xaml.cs
index 0b28abc6..05c6222f 100644
--- a/Wabbajack/Views/Interventions/ConfirmationInterventionView.xaml.cs
+++ b/Wabbajack/Views/Interventions/ConfirmationInterventionView.xaml.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reactive.Disposables;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
@@ -12,17 +13,34 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
+using ReactiveUI;
+using Wabbajack.Common;
 
 namespace Wabbajack
 {
     /// <summary>
     /// Interaction logic for ConfirmationInterventionView.xaml
     /// </summary>
-    public partial class ConfirmationInterventionView : UserControl
+    public partial class ConfirmationInterventionView : ReactiveUserControl<ConfirmationIntervention>
     {
         public ConfirmationInterventionView()
         {
             InitializeComponent();
+            this.WhenActivated(dispose =>
+            {
+                this.WhenAny(x => x.ViewModel.ShortDescription)
+                    .BindToStrict(this, x => x.ShortDescription.Text)
+                    .DisposeWith(dispose);
+                this.WhenAny(x => x.ViewModel.ExtendedDescription)
+                    .BindToStrict(this, x => x.ExtendedDescription.Text)
+                    .DisposeWith(dispose);
+                this.WhenAny(x => x.ViewModel.ConfirmCommand)
+                    .BindToStrict(this, x => x.ConfirmButton.Command)
+                    .DisposeWith(dispose);
+                this.WhenAny(x => x.ViewModel.CancelCommand)
+                    .BindToStrict(this, x => x.CancelButton.Command)
+                    .DisposeWith(dispose);
+            });
         }
     }
 }
diff --git a/Wabbajack/Wabbajack.csproj b/Wabbajack/Wabbajack.csproj
index d20916db..1d184d75 100644
--- a/Wabbajack/Wabbajack.csproj
+++ b/Wabbajack/Wabbajack.csproj
@@ -174,6 +174,7 @@
     </ApplicationDefinition>
     <Compile Include="Extensions\DynamicDataExt.cs" />
     <Compile Include="View Models\Settings\AuthorFilesVM.cs" />
+    <Compile Include="View Models\UserIntervention\ConfirmUpdateOfExistingInstallVM.cs" />
     <Compile Include="Views\Common\AttentionBorder.cs" />
     <Compile Include="Views\ModListTileView.xaml.cs">
       <DependentUpon>ModListTileView.xaml</DependentUpon>

From 5838fc9d8004a3601754560c42cfa719b67f13e4 Mon Sep 17 00:00:00 2001
From: Justin Swanson <justin.c.swanson@gmail.com>
Date: Mon, 20 Jan 2020 22:28:45 -0600
Subject: [PATCH 8/9] Fix for website readmes not opening

---
 Wabbajack/View Models/ModListVM.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Wabbajack/View Models/ModListVM.cs b/Wabbajack/View Models/ModListVM.cs
index 4bdb4009..21e257e1 100644
--- a/Wabbajack/View Models/ModListVM.cs	
+++ b/Wabbajack/View Models/ModListVM.cs	
@@ -94,7 +94,7 @@ namespace Wabbajack
         public void OpenReadmeWindow()
         {
             if (string.IsNullOrEmpty(Readme)) return;
-            if (false) //SourceModList.ReadmeIsWebsite)
+            if (SourceModList.ReadmeIsWebsite)
             {
                 Process.Start(Readme);
             }

From 06afa322f9786f58afdcebdb32e778bc473d075a Mon Sep 17 00:00:00 2001
From: Justin Swanson <justin.c.swanson@gmail.com>
Date: Mon, 20 Jan 2020 22:33:06 -0600
Subject: [PATCH 9/9] Changelog update

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 75c6acd5..e27c21a9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 ### Changelog
 
+* Fix for website readme compilation
+* Fix for compiler downloads folder specification (was always standard path)
+
+#### Version - 1.0 beta 16 - 1/19/2020
 * Progress ring displays when downloading modlist images
 * GUI releases memory of download modlists better when navigating around
 * Fixed phrasing after failed installations to say "failed".