From 92d0aa2ae698438987b957027ee9ad434004bfa9 Mon Sep 17 00:00:00 2001
From: "waffle.lord" <waffle.lord@hotmail.com>
Date: Fri, 6 Aug 2021 20:36:11 -0400
Subject: [PATCH] updated patching client style, add checkbox for autozip

---
 Patcher/PatchClient/App.xaml                  | 149 +++++++++++++++++-
 .../Extensions/ControlExtensions.cs           |   1 +
 Patcher/PatchClient/MainWindow.xaml           |  35 +++-
 Patcher/PatchClient/MainWindow.xaml.cs        |  16 ++
 Patcher/PatchGenerator/MainWindow.xaml        |  10 ++
 Patcher/PatchGenerator/MainWindow.xaml.cs     |   9 +-
 Patcher/PatcherUtils/FilePatcher.cs           |   2 -
 .../PatcherUtils/Resources/PatchClient.exe    | Bin 2936567 -> 4901623 bytes
 8 files changed, 214 insertions(+), 8 deletions(-)

diff --git a/Patcher/PatchClient/App.xaml b/Patcher/PatchClient/App.xaml
index 58657c0..180f09e 100644
--- a/Patcher/PatchClient/App.xaml
+++ b/Patcher/PatchClient/App.xaml
@@ -4,6 +4,153 @@
              xmlns:local="clr-namespace:PatchClient"
              StartupUri="MainWindow.xaml">
     <Application.Resources>
-         
+        <!-- Colors -->
+        <Color x:Key="AKI_DarkGray">#121212</Color>
+        <Color x:Key="AKI_Yellow">#FFC107</Color>
+        <Color x:Key="AKI_White">#FFFFFF</Color>
+        <Color x:Key="AKI_Gray">#282828</Color>
+        <Color x:Key="AKI_DarkGrayBlue">#323947</Color>
+
+        <!-- Brushes -->
+        <SolidColorBrush x:Key="AKI_Foreground_Light" Color="{StaticResource AKI_White}"/>
+        <SolidColorBrush x:Key="AKI_Background_Light" Color="{StaticResource AKI_Gray}"/>
+        <SolidColorBrush x:Key="AKI_Background_Dark" Color="{StaticResource AKI_DarkGray}"/>
+        <SolidColorBrush x:Key="AKI_Background_Yellow" Color="{StaticResource AKI_Yellow}"/>
+        <SolidColorBrush x:Key="AKI_Background_DarkGrayBlue" Color="{StaticResource AKI_DarkGrayBlue}"/>
+
+        <!-- Remove Hightlight effect from buttons -->
+        <Style x:Key="NoChromeButton" TargetType="{x:Type Button}">
+            <Setter Property="Background" Value="Transparent"/>
+            <Setter Property="BorderThickness" Value="1"/>
+            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
+            <Setter Property="HorizontalContentAlignment" Value="Center"/>
+            <Setter Property="VerticalContentAlignment" Value="Center"/>
+            <Setter Property="Padding" Value="1"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type Button}">
+                        <Grid x:Name="NoChromeGrid" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
+                            <Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+                                <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                            </Border>
+                        </Grid>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsEnabled" Value="false">
+                                <Trigger.EnterActions>
+                                    <BeginStoryboard x:Name="disable_enter">
+                                        <Storyboard>
+                                            <DoubleAnimation Storyboard.TargetProperty="Opacity" To="0.5" Duration="0:0:0.100" BeginTime="0:0:0.100"/>
+                                        </Storyboard>
+                                    </BeginStoryboard>
+                                </Trigger.EnterActions>
+                                <Trigger.ExitActions>
+                                    <RemoveStoryboard BeginStoryboardName="disable_enter"/>
+                                    <BeginStoryboard>
+                                        <Storyboard>
+                                            <DoubleAnimation Storyboard.TargetProperty="Opacity" To="1" Duration="0:0:0.100"/>
+                                        </Storyboard>
+                                    </BeginStoryboard>
+                                </Trigger.ExitActions>
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+
+        <!-- App Button Base Style -->
+        <Style x:Key="AppButtonStyleBase" TargetType="{x:Type Button}" BasedOn="{StaticResource NoChromeButton}">
+            <Setter Property="Foreground" Value="Gray"/>
+            <Setter Property="Background" Value="{StaticResource AKI_Background_Dark}"/>
+            <Setter Property="BorderBrush" Value="Transparent"/>
+            <Setter Property="BorderThickness" Value="0"/>
+            <Setter Property="MinWidth" Value="40"/>
+            <Setter Property="MinHeight" Value="25"/>
+            <Setter Property="FontSize" Value="12"/>
+            <Setter Property="FontWeight" Value="Bold"/>
+        </Style>
+
+        <!-- Close App Button Style -->
+        <Style x:Key="AppCloseButtonStyle" TargetType="{x:Type Button}" BasedOn="{StaticResource AppButtonStyleBase}">
+            <Style.Triggers>
+                <EventTrigger RoutedEvent="PreviewMouseDown">
+                    <BeginStoryboard>
+                        <Storyboard>
+                            <ColorAnimation Storyboard.TargetProperty="(Button.Background).(SolidColorBrush.Color)" To="{StaticResource AKI_DarkGrayBlue}" Duration="0:0:0.200"/>
+                            <ColorAnimation Storyboard.TargetProperty="(Button.Foreground).(SolidColorBrush.Color)" To="White" Duration="0:0:0.200"/>
+                        </Storyboard>
+                    </BeginStoryboard>
+                </EventTrigger>
+                <EventTrigger RoutedEvent="MouseEnter">
+                    <BeginStoryboard>
+                        <Storyboard>
+                            <ColorAnimation Storyboard.TargetProperty="(Button.Background).(SolidColorBrush.Color)" To="IndianRed" Duration="0:0:0.200"/>
+                            <ColorAnimation Storyboard.TargetProperty="(Button.Foreground).(SolidColorBrush.Color)" To="White" Duration="0:0:0.200"/>
+                        </Storyboard>
+                    </BeginStoryboard>
+                </EventTrigger>
+                <EventTrigger RoutedEvent="MouseLeave">
+                    <BeginStoryboard>
+                        <Storyboard>
+                            <ColorAnimation Storyboard.TargetProperty="(Button.Background).(SolidColorBrush.Color)" To="{StaticResource AKI_DarkGray}" Duration="0:0:0.200"/>
+                            <ColorAnimation Storyboard.TargetProperty="(Button.Foreground).(SolidColorBrush.Color)" To="Gray" Duration="0:0:0.200"/>
+                        </Storyboard>
+                    </BeginStoryboard>
+                </EventTrigger>
+            </Style.Triggers>
+        </Style>
+
+        <!-- TextBlock Style -->
+        <Style TargetType="{x:Type TextBlock}">
+            <Setter Property="Foreground" Value="{StaticResource AKI_Foreground_Light}"/>
+            <Setter Property="Opacity" Value="0"/>
+            <Style.Triggers>
+                <EventTrigger RoutedEvent="Loaded">
+                    <BeginStoryboard>
+                        <Storyboard>
+                            <DoubleAnimation Storyboard.TargetProperty="Opacity" To="1" Duration="0:0:0.250" BeginTime="0:0:0.150"/>
+                        </Storyboard>
+                    </BeginStoryboard>
+                </EventTrigger>
+            </Style.Triggers>
+        </Style>
+
+        <!-- Label Style-->
+        <Style TargetType="{x:Type Label}">
+            <Setter Property="Foreground" Value="{StaticResource AKI_Foreground_Light}"/>
+            <Setter Property="Opacity" Value="0"/>
+            <Style.Triggers>
+                <EventTrigger RoutedEvent="Loaded">
+                    <BeginStoryboard>
+                        <Storyboard>
+                            <DoubleAnimation Storyboard.TargetProperty="Opacity" To="1" Duration="0:0:0.250" BeginTime="0:0:0.150"/>
+                        </Storyboard>
+                    </BeginStoryboard>
+                </EventTrigger>
+            </Style.Triggers>
+        </Style>
+        
+        <!-- Progressbar Style -->
+        <Style TargetType="{x:Type ProgressBar}">
+            <Setter Property="Foreground" Value="{StaticResource AKI_Background_Yellow}"/>
+            <Setter Property="Background" Value="{StaticResource AKI_Background_DarkGrayBlue}"/>
+            <Setter Property="BorderBrush" Value="{StaticResource AKI_Background_DarkGrayBlue}"/>
+            <Setter Property="BorderThickness" Value="0"/>
+            <Setter Property="Opacity" Value="0"/>
+            <Style.Triggers>
+                <EventTrigger RoutedEvent="Loaded">
+                    <BeginStoryboard>
+                        <Storyboard>
+                            <DoubleAnimation Storyboard.TargetProperty="Opacity" To="1" Duration="0:0:0.250" BeginTime="0:0:0.150"/>
+                        </Storyboard>
+                    </BeginStoryboard>
+                </EventTrigger>
+            </Style.Triggers>
+        </Style>
     </Application.Resources>
 </Application>
+
+<!--Foreground="{StaticResource AKI_Background_Yellow}"
+                                 Background="{StaticResource AKI_Background_DarkGrayBlue}"
+                                 BorderBrush="{StaticResource AKI_Background_DarkGrayBlue}"
+                                 BorderThickness="0"-->
\ No newline at end of file
diff --git a/Patcher/PatchClient/Extensions/ControlExtensions.cs b/Patcher/PatchClient/Extensions/ControlExtensions.cs
index bf6b129..a635dde 100644
--- a/Patcher/PatchClient/Extensions/ControlExtensions.cs
+++ b/Patcher/PatchClient/Extensions/ControlExtensions.cs
@@ -1,5 +1,6 @@
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Shell;
 
 namespace PatchClient.Extensions
 {
diff --git a/Patcher/PatchClient/MainWindow.xaml b/Patcher/PatchClient/MainWindow.xaml
index f7d83e5..5cb92b5 100644
--- a/Patcher/PatchClient/MainWindow.xaml
+++ b/Patcher/PatchClient/MainWindow.xaml
@@ -7,18 +7,45 @@
         mc:Ignorable="d"
         Title="Patching Client" Height="200" Width="600"
         WindowStartupLocation="CenterScreen"
-        Loaded="Window_Loaded">
+        Background="{StaticResource AKI_Background_Light}"
+        Loaded="Window_Loaded"
+        WindowStyle="SingleBorderWindow">
+    <WindowChrome.WindowChrome>
+        <WindowChrome CaptionHeight="0" CornerRadius="0" GlassFrameThickness="0 0 0 5" UseAeroCaptionButtons="False"
+                      ResizeBorderThickness="5"
+                      />
+    </WindowChrome.WindowChrome>
     <Grid>
-        <StackPanel VerticalAlignment="Center">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*"/>
+            <ColumnDefinition Width="AUTO"/>
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="AUTO"/>
+            <RowDefinition Height="*"/>
+        </Grid.RowDefinitions>
+
+        
+        
+        <Label Content="Patching Client"
+               FontSize="15" Background="{StaticResource AKI_Background_Dark}"
+               MouseDown="label_topbar_MouseDown"
+               />
+        
+        <Button x:Name="Close_Button" Grid.Column="1" Content="X" HorizontalAlignment="Right" VerticalAlignment="Stretch"
+                Style="{StaticResource AppCloseButtonStyle}"
+                Click="Close_Button_Click"
+                />
+
+        <StackPanel Grid.ColumnSpan="2" Grid.Row="1">
             <Label x:Name="PatchMessageLabel"
                    Margin="10"
                    />
 
-            <ContentControl Margin="10">
+            <ContentControl Margin="10 0 10 10">
                 <Grid>
                     <ProgressBar x:Name="PatchProgressBar"
                                  Height="20"
-                                 Foreground="MediumPurple"
                                  />
                     <Label x:Name="PatchProgressInfoLabel"
                            HorizontalAlignment="Center" VerticalAlignment="Center"
diff --git a/Patcher/PatchClient/MainWindow.xaml.cs b/Patcher/PatchClient/MainWindow.xaml.cs
index 3610ca5..65f0d0c 100644
--- a/Patcher/PatchClient/MainWindow.xaml.cs
+++ b/Patcher/PatchClient/MainWindow.xaml.cs
@@ -3,6 +3,7 @@ using PatcherUtils;
 using System;
 using System.Threading.Tasks;
 using System.Windows;
+using System.Windows.Input;
 
 namespace PatchClient
 {
@@ -14,6 +15,8 @@ namespace PatchClient
         public MainWindow()
         {
             InitializeComponent();
+
+            this.TaskbarItemInfo = new System.Windows.Shell.TaskbarItemInfo() { ProgressState = System.Windows.Shell.TaskbarItemProgressState.Normal };
         }
 
         private void RunPatcher()
@@ -78,5 +81,18 @@ namespace PatchClient
         {
             RunPatcher();
         }
+
+        private void Close_Button_Click(object sender, RoutedEventArgs e)
+        {
+            Application.Current.Shutdown(0);
+        }
+
+        private void label_topbar_MouseDown(object sender, System.Windows.Input.MouseButtonEventArgs e)
+        {
+            if (e.ChangedButton == MouseButton.Left)
+            {
+                this.DragMove();
+            }
+        }
     }
 }
diff --git a/Patcher/PatchGenerator/MainWindow.xaml b/Patcher/PatchGenerator/MainWindow.xaml
index 0bd37ad..1da4dcf 100644
--- a/Patcher/PatchGenerator/MainWindow.xaml
+++ b/Patcher/PatchGenerator/MainWindow.xaml
@@ -80,5 +80,15 @@
                 Content="Generate Patches"
                 Click="GenButton_Click"
                 />
+
+        <CheckBox x:Name="AutoZip_checkBox" Grid.Row="3" Grid.Column="1" VerticalAlignment="Bottom"
+                  Margin="10"
+                  ToolTip="This will compress the patch files after they are generated using 7z format."
+                  Content="Auto Zip After Patches are Generated"
+                  IsChecked="{Binding Path=AutoZip, 
+                              RelativeSource={
+                              RelativeSource AncestorType=Window,
+                              Mode=FindAncestor}}"
+                  />
     </Grid>
 </Window>
diff --git a/Patcher/PatchGenerator/MainWindow.xaml.cs b/Patcher/PatchGenerator/MainWindow.xaml.cs
index 7cde06f..0431190 100644
--- a/Patcher/PatchGenerator/MainWindow.xaml.cs
+++ b/Patcher/PatchGenerator/MainWindow.xaml.cs
@@ -18,6 +18,7 @@ namespace PatchGenerator
         private string compareFolder = "";
         private string targetFolder = "";
         private string outputFolderName = "";
+        public bool AutoZip { get; set; } = true;
 
         private Stopwatch stopwatch = new Stopwatch();
 
@@ -103,7 +104,10 @@ namespace PatchGenerator
             File.Copy(LazyOperations.PatcherClientPath, $"{outputFolderName}\\patcher.exe", true);
 
             //compress patch output folder to 7z file
-            LazyOperations.StartZipProcess(outputFolderName, $"{outputFolderName}.7z".FromCwd());
+            if (AutoZip)
+            {
+                LazyOperations.StartZipProcess(outputFolderName, $"{outputFolderName}.7z".FromCwd());
+            }
 
             GenProgressBar.DispatcherSetValue(100);
             GenProgressMessageLabel.DispaatcherSetContent("Done");
@@ -136,6 +140,7 @@ namespace PatchGenerator
             CompareLabel.IsEnabled = false;
             TargetLabel.IsEnabled = false;
             FileNameBox.IsEnabled = false;
+            AutoZip_checkBox.IsEnabled = false;
 
             string InfoNeededMessage = "You must set the following: ";
             bool infoNeeded = false;
@@ -168,6 +173,7 @@ namespace PatchGenerator
                 CompareLabel.IsEnabled = true;
                 TargetLabel.IsEnabled = true;
                 FileNameBox.IsEnabled = true;
+                AutoZip_checkBox.IsEnabled = true;
                 return;
             }
 
@@ -177,6 +183,7 @@ namespace PatchGenerator
                 CompareLabel.DispatcherSetEnabled(true);
                 TargetLabel.DispatcherSetEnabled(true);
                 FileNameBox.DispatcherSetEnabled(true);
+                AutoZip_checkBox.DispatcherSetEnabled(true);
 
                 GenProgressMessageLabel.DispaatcherSetContent("");
                 GenProgressInfoLabel.DispaatcherSetContent(info);
diff --git a/Patcher/PatcherUtils/FilePatcher.cs b/Patcher/PatcherUtils/FilePatcher.cs
index e93969d..f3ec4db 100644
--- a/Patcher/PatcherUtils/FilePatcher.cs
+++ b/Patcher/PatcherUtils/FilePatcher.cs
@@ -58,8 +58,6 @@ namespace PatcherUtils
         {
             DirectoryInfo di = new DirectoryInfo(patchpath);
 
-            //RaiseProgressChanged(0, fileCount, "Patching client...");
-
             foreach (FileInfo file in di.GetFiles())
             {
                 FileInfo target = null;
diff --git a/Patcher/PatcherUtils/Resources/PatchClient.exe b/Patcher/PatcherUtils/Resources/PatchClient.exe
index 1ee5d62926b9bb7e5d9c2c99e2bdb05ec78357c0..736d0fdc6d76a5d7684e7fe65f6195826c7939d0 100644
GIT binary patch
delta 12415
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

delta 191
zcmWN=w+R9P002M~C-~l+bIv)tid)#pH+GgzV5#5^E@bN+-0%L3{vNN$<sCVHuVD~3
zVbYXoGiJ@1w_wqdWh+*#S+`-+mTfzB?b&zW(2-*&PMtY-;nJ0BH*Vdz_u%mp2B%x>
E4`^dTG5`Po