From 886fbd13ad6cc8ade9f19079b18546a04b1331b8 Mon Sep 17 00:00:00 2001
From: Justin Swanson <justin.c.swanson@gmail.com>
Date: Sun, 8 Dec 2019 16:30:49 -0600
Subject: [PATCH] Split LogCpuView

---
 .../Common/{LogCpuView.xaml => CpuView.xaml}  | 33 ++---------------
 .../{LogCpuView.xaml.cs => CpuView.xaml.cs}   | 22 +++++++++---
 Wabbajack/Views/Common/LogView.xaml           | 26 ++++++++++++++
 Wabbajack/Views/Common/LogView.xaml.cs        | 36 +++++++++++++++++++
 Wabbajack/Views/Compilers/CompilerView.xaml   |  8 ++++-
 .../Views/Installers/InstallationView.xaml    |  8 ++++-
 Wabbajack/Wabbajack.csproj                    | 21 +++++++----
 7 files changed, 110 insertions(+), 44 deletions(-)
 rename Wabbajack/Views/Common/{LogCpuView.xaml => CpuView.xaml} (60%)
 rename Wabbajack/Views/Common/{LogCpuView.xaml.cs => CpuView.xaml.cs} (51%)
 create mode 100644 Wabbajack/Views/Common/LogView.xaml
 create mode 100644 Wabbajack/Views/Common/LogView.xaml.cs

diff --git a/Wabbajack/Views/Common/LogCpuView.xaml b/Wabbajack/Views/Common/CpuView.xaml
similarity index 60%
rename from Wabbajack/Views/Common/LogCpuView.xaml
rename to Wabbajack/Views/Common/CpuView.xaml
index cb5b23b5..ec61a2d4 100644
--- a/Wabbajack/Views/Common/LogCpuView.xaml
+++ b/Wabbajack/Views/Common/CpuView.xaml
@@ -1,44 +1,17 @@
 <UserControl
-    x:Class="Wabbajack.LogCpuView"
+    x:Class="Wabbajack.CpuView"
     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:mahapps="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    d:DesignHeight="250"
+    d:DesignHeight="450"
     d:DesignWidth="800"
-    BorderThickness="0"
     mc:Ignorable="d">
     <Grid>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*" />
-            <ColumnDefinition Width="5" />
-            <ColumnDefinition Width="500" />
-        </Grid.ColumnDefinitions>
-        <Rectangle
-            Grid.Column="0"
-            Fill="{StaticResource HeatedBorderBrush}"
-            Opacity="{Binding ProgressPercent, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}" />
+        <Rectangle Fill="{StaticResource HeatedBorderBrush}" Opacity="{Binding ProgressPercent, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}" />
         <ListBox
-            Grid.Column="0"
-            local:AutoScrollBehavior.ScrollOnNewItem="True"
-            BorderBrush="Transparent"
-            BorderThickness="1"
-            ItemsSource="{Binding Log}"
-            ScrollViewer.HorizontalScrollBarVisibility="Disabled">
-            <ListBox.ItemTemplate>
-                <DataTemplate>
-                    <TextBlock Text="{Binding ShortDescription}" TextWrapping="WrapWithOverflow" />
-                </DataTemplate>
-            </ListBox.ItemTemplate>
-        </ListBox>
-        <Rectangle
-            Grid.Column="2"
-            Fill="{StaticResource HeatedBorderBrush}"
-            Opacity="{Binding ProgressPercent, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}" />
-        <ListBox
-            Grid.Column="2"
             HorizontalAlignment="Stretch"
             BorderBrush="Transparent"
             BorderThickness="1"
diff --git a/Wabbajack/Views/Common/LogCpuView.xaml.cs b/Wabbajack/Views/Common/CpuView.xaml.cs
similarity index 51%
rename from Wabbajack/Views/Common/LogCpuView.xaml.cs
rename to Wabbajack/Views/Common/CpuView.xaml.cs
index 14c4358d..987fa512 100644
--- a/Wabbajack/Views/Common/LogCpuView.xaml.cs
+++ b/Wabbajack/Views/Common/CpuView.xaml.cs
@@ -1,22 +1,34 @@
-using System.Windows;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
 
 namespace Wabbajack
 {
     /// <summary>
-    /// Interaction logic for LogCpuView.xaml
+    /// Interaction logic for CpuView.xaml
     /// </summary>
-    public partial class LogCpuView : UserControl
+    public partial class CpuView : UserControl
     {
         public double ProgressPercent
         {
             get => (double)GetValue(ProgressPercentProperty);
             set => SetValue(ProgressPercentProperty, value);
         }
-        public static readonly DependencyProperty ProgressPercentProperty = DependencyProperty.Register(nameof(ProgressPercent), typeof(double), typeof(LogCpuView),
+        public static readonly DependencyProperty ProgressPercentProperty = DependencyProperty.Register(nameof(ProgressPercent), typeof(double), typeof(CpuView),
              new FrameworkPropertyMetadata(default(double)));
 
-        public LogCpuView()
+        public CpuView()
         {
             InitializeComponent();
         }
diff --git a/Wabbajack/Views/Common/LogView.xaml b/Wabbajack/Views/Common/LogView.xaml
new file mode 100644
index 00000000..4e340afc
--- /dev/null
+++ b/Wabbajack/Views/Common/LogView.xaml
@@ -0,0 +1,26 @@
+<UserControl
+    x:Class="Wabbajack.LogView"
+    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">
+    <Grid>
+        <Rectangle Fill="{StaticResource HeatedBorderBrush}" Opacity="{Binding ProgressPercent, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}" />
+        <ListBox
+            local:AutoScrollBehavior.ScrollOnNewItem="True"
+            BorderBrush="Transparent"
+            BorderThickness="1"
+            ItemsSource="{Binding Log}"
+            ScrollViewer.HorizontalScrollBarVisibility="Disabled">
+            <ListBox.ItemTemplate>
+                <DataTemplate>
+                    <TextBlock Text="{Binding ShortDescription}" TextWrapping="WrapWithOverflow" />
+                </DataTemplate>
+            </ListBox.ItemTemplate>
+        </ListBox>
+    </Grid>
+</UserControl>
diff --git a/Wabbajack/Views/Common/LogView.xaml.cs b/Wabbajack/Views/Common/LogView.xaml.cs
new file mode 100644
index 00000000..fcb2f5c2
--- /dev/null
+++ b/Wabbajack/Views/Common/LogView.xaml.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Wabbajack
+{
+    /// <summary>
+    /// Interaction logic for LogView.xaml
+    /// </summary>
+    public partial class LogView : UserControl
+    {
+        public double ProgressPercent
+        {
+            get => (double)GetValue(ProgressPercentProperty);
+            set => SetValue(ProgressPercentProperty, value);
+        }
+        public static readonly DependencyProperty ProgressPercentProperty = DependencyProperty.Register(nameof(ProgressPercent), typeof(double), typeof(LogView),
+             new FrameworkPropertyMetadata(default(double)));
+
+        public LogView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/Wabbajack/Views/Compilers/CompilerView.xaml b/Wabbajack/Views/Compilers/CompilerView.xaml
index fef694b4..51dbf30d 100644
--- a/Wabbajack/Views/Compilers/CompilerView.xaml
+++ b/Wabbajack/Views/Compilers/CompilerView.xaml
@@ -240,7 +240,13 @@
             Grid.ColumnSpan="5"
             Margin="5"
             Visibility="{Binding Compiling, Converter={StaticResource bool2VisibilityConverter}, FallbackValue=Hidden}">
-            <local:LogCpuView ProgressPercent="{Binding PercentCompleted}" />
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="5" />
+                <ColumnDefinition Width="500" />
+            </Grid.ColumnDefinitions>
+            <local:LogView Grid.Column="0" ProgressPercent="{Binding PercentCompleted, Mode=OneWay}" />
+            <local:CpuView Grid.Column="2" ProgressPercent="{Binding PercentCompleted, Mode=OneWay}" />
         </Grid>
     </Grid>
 </UserControl>
diff --git a/Wabbajack/Views/Installers/InstallationView.xaml b/Wabbajack/Views/Installers/InstallationView.xaml
index a7aa4066..0872b3c5 100644
--- a/Wabbajack/Views/Installers/InstallationView.xaml
+++ b/Wabbajack/Views/Installers/InstallationView.xaml
@@ -343,7 +343,13 @@
             Grid.Row="2"
             Margin="5,0,5,5"
             Visibility="{Binding InstallingMode, Converter={StaticResource bool2VisibilityConverter}, FallbackValue=Hidden}">
-            <local:LogCpuView ProgressPercent="{Binding PercentCompleted, Mode=OneWay}" />
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="5" />
+                <ColumnDefinition Width="500" />
+            </Grid.ColumnDefinitions>
+            <local:LogView Grid.Column="0" ProgressPercent="{Binding PercentCompleted, Mode=OneWay}" />
+            <local:CpuView Grid.Column="2" ProgressPercent="{Binding PercentCompleted, Mode=OneWay}" />
         </Grid>
     </Grid>
 </UserControl>
diff --git a/Wabbajack/Wabbajack.csproj b/Wabbajack/Wabbajack.csproj
index e24a46de..2a35ef84 100644
--- a/Wabbajack/Wabbajack.csproj
+++ b/Wabbajack/Wabbajack.csproj
@@ -173,6 +173,12 @@
       <SubType>Designer</SubType>
     </ApplicationDefinition>
     <Compile Include="Converters\EqualsToBoolConverter.cs" />
+    <Compile Include="Views\Common\CpuView.xaml.cs">
+      <DependentUpon>CpuView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\Common\LogView.xaml.cs">
+      <DependentUpon>LogView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="View Models\UserInterventionHandlers.cs" />
     <Compile Include="View Models\WebBrowserVM.cs" />
     <Compile Include="Views\Installers\MO2InstallerConfigView.xaml.cs">
@@ -234,9 +240,6 @@
     </Compile>
     <Compile Include="View Models\Compilers\CompilerVM.cs" />
     <Compile Include="View Models\MainWindowVM.cs" />
-    <Compile Include="Views\Common\LogCpuView.xaml.cs">
-      <DependentUpon>LogCpuView.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Converters\LeftMarginMultiplierConverter.cs" />
     <Compile Include="Util\TreeViewItemExtensions.cs" />
     <Compile Include="View Models\SlideShow.cs" />
@@ -256,6 +259,14 @@
     <Compile Include="Views\WebBrowserView.xaml.cs">
       <DependentUpon>WebBrowserView.xaml</DependentUpon>
     </Compile>
+    <Page Include="Views\Common\CpuView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\Common\LogView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Views\Installers\MO2InstallerConfigView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -304,10 +315,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Views\Common\LogCpuView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="Views\MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>