From ebcb80f18fa110ea9759590aec4491fc68b7190f Mon Sep 17 00:00:00 2001 From: Justin Swanson Date: Fri, 29 Nov 2019 16:09:22 -0600 Subject: [PATCH] Adjusted heat and progress bar looks slightly --- Wabbajack/Themes/Styles.xaml | 14 +++- .../Views/Common/BorderFadeDownView.xaml | 19 ----- .../Views/Common/BorderFadeDownView.xaml.cs | 15 ---- .../Views/Common/HeatedBackgroundView.xaml | 29 +++++++ .../Views/Common/HeatedBackgroundView.xaml.cs | 36 ++++++++ Wabbajack/Views/Common/LogCpuView.xaml | 18 +++- Wabbajack/Views/Common/LogCpuView.xaml.cs | 11 ++- Wabbajack/Views/Common/TopProgressView.xaml | 83 +++++++++++++------ Wabbajack/Views/Compilers/CompilerView.xaml | 20 ++--- Wabbajack/Views/InstallationView.xaml | 23 ++--- Wabbajack/Wabbajack.csproj | 16 ++-- 11 files changed, 175 insertions(+), 109 deletions(-) delete mode 100644 Wabbajack/Views/Common/BorderFadeDownView.xaml delete mode 100644 Wabbajack/Views/Common/BorderFadeDownView.xaml.cs create mode 100644 Wabbajack/Views/Common/HeatedBackgroundView.xaml create mode 100644 Wabbajack/Views/Common/HeatedBackgroundView.xaml.cs diff --git a/Wabbajack/Themes/Styles.xaml b/Wabbajack/Themes/Styles.xaml index f1471114..e3e1d79f 100644 --- a/Wabbajack/Themes/Styles.xaml +++ b/Wabbajack/Themes/Styles.xaml @@ -1,4 +1,4 @@ - #121212 - #292929 - #414141 - #3D3D3D + #222222 + #424242 + #323232 #424242 #394140 #666666 + #362675 #EFEFEF @@ -35,7 +36,9 @@ #52b545 #BB86FC + #00BB86FC #3700B3 + #1b0059 #03DAC6 #0e8f83 #095952 @@ -99,9 +102,12 @@ + + + diff --git a/Wabbajack/Views/Common/BorderFadeDownView.xaml b/Wabbajack/Views/Common/BorderFadeDownView.xaml deleted file mode 100644 index 72f612a4..00000000 --- a/Wabbajack/Views/Common/BorderFadeDownView.xaml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - diff --git a/Wabbajack/Views/Common/BorderFadeDownView.xaml.cs b/Wabbajack/Views/Common/BorderFadeDownView.xaml.cs deleted file mode 100644 index 65e3c8c0..00000000 --- a/Wabbajack/Views/Common/BorderFadeDownView.xaml.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System.Windows.Controls; - -namespace Wabbajack -{ - /// - /// Interaction logic for BorderFadeDownView.xaml - /// - public partial class BorderFadeDownView : UserControl - { - public BorderFadeDownView() - { - InitializeComponent(); - } - } -} diff --git a/Wabbajack/Views/Common/HeatedBackgroundView.xaml b/Wabbajack/Views/Common/HeatedBackgroundView.xaml new file mode 100644 index 00000000..1eb2f689 --- /dev/null +++ b/Wabbajack/Views/Common/HeatedBackgroundView.xaml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/Wabbajack/Views/Common/HeatedBackgroundView.xaml.cs b/Wabbajack/Views/Common/HeatedBackgroundView.xaml.cs new file mode 100644 index 00000000..5011cd86 --- /dev/null +++ b/Wabbajack/Views/Common/HeatedBackgroundView.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 +{ + /// + /// Interaction logic for HeatedBackgroundView.xaml + /// + public partial class HeatedBackgroundView : UserControl + { + public double PercentCompleted + { + get => (double)GetValue(PercentCompletedProperty); + set => SetValue(PercentCompletedProperty, value); + } + public static readonly DependencyProperty PercentCompletedProperty = DependencyProperty.Register(nameof(PercentCompleted), typeof(double), typeof(HeatedBackgroundView), + new FrameworkPropertyMetadata(default(double))); + + public HeatedBackgroundView() + { + InitializeComponent(); + } + } +} diff --git a/Wabbajack/Views/Common/LogCpuView.xaml b/Wabbajack/Views/Common/LogCpuView.xaml index d295edb9..79d56c44 100644 --- a/Wabbajack/Views/Common/LogCpuView.xaml +++ b/Wabbajack/Views/Common/LogCpuView.xaml @@ -4,21 +4,27 @@ 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" xmlns:mahapps="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro" + xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" d:DesignHeight="250" d:DesignWidth="800" + BorderThickness="0" mc:Ignorable="d"> - + + @@ -27,9 +33,15 @@ + diff --git a/Wabbajack/Views/Common/LogCpuView.xaml.cs b/Wabbajack/Views/Common/LogCpuView.xaml.cs index 9a388e14..14c4358d 100644 --- a/Wabbajack/Views/Common/LogCpuView.xaml.cs +++ b/Wabbajack/Views/Common/LogCpuView.xaml.cs @@ -1,4 +1,5 @@ -using System.Windows.Controls; +using System.Windows; +using System.Windows.Controls; namespace Wabbajack { @@ -7,6 +8,14 @@ namespace Wabbajack /// public partial class LogCpuView : 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), + new FrameworkPropertyMetadata(default(double))); + public LogCpuView() { InitializeComponent(); diff --git a/Wabbajack/Views/Common/TopProgressView.xaml b/Wabbajack/Views/Common/TopProgressView.xaml index 43743b1f..fa39e7e8 100644 --- a/Wabbajack/Views/Common/TopProgressView.xaml +++ b/Wabbajack/Views/Common/TopProgressView.xaml @@ -8,6 +8,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" d:DesignHeight="450" d:DesignWidth="800" + BorderThickness="0" mc:Ignorable="d"> @@ -46,22 +47,6 @@ - - - - - @@ -69,22 +54,36 @@ - + Value="{Binding ProgressPercent, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"> + + + + + + + + + + + + + + + + + + + + + + + + + - - - + PercentCompleted="{Binding PercentCompleted}" /> - + Background="{StaticResource WindowBackgroundBrush}" /> - + - + - - + diff --git a/Wabbajack/Wabbajack.csproj b/Wabbajack/Wabbajack.csproj index 5bf6d0b2..74cfd63f 100644 --- a/Wabbajack/Wabbajack.csproj +++ b/Wabbajack/Wabbajack.csproj @@ -1,4 +1,4 @@ - + @@ -169,6 +169,9 @@ Designer + + HeatedBackgroundView.xaml + LinksView.xaml @@ -183,9 +186,6 @@ - - BorderFadeDownView.xaml - @@ -239,6 +239,10 @@ VortexCompilerConfigView.xaml + + Designer + MSBuild:Compile + Designer MSBuild:Compile @@ -251,10 +255,6 @@ Designer MSBuild:Compile - - Designer - MSBuild:Compile - Designer MSBuild:Compile