From bbb7f5e26c158fa4383ebeb91ebbe3a376f5d40c Mon Sep 17 00:00:00 2001
From: Elizabeth Cray <liz@cray.lgbt>
Date: Mon, 10 Jul 2023 00:50:19 -0400
Subject: [PATCH] UI Design Completed

---
 Installer/Dexif_Installer/App.xaml        | 173 +++++++++++++++++++---
 Installer/Dexif_Installer/MainWindow.xaml |  10 +-
 2 files changed, 160 insertions(+), 23 deletions(-)

diff --git a/Installer/Dexif_Installer/App.xaml b/Installer/Dexif_Installer/App.xaml
index 0dd86c3..a82ad8a 100644
--- a/Installer/Dexif_Installer/App.xaml
+++ b/Installer/Dexif_Installer/App.xaml
@@ -6,15 +6,7 @@
   xmlns:fa="http://schemas.fontawesome.io/icons/">
   <Application.Resources>
 
-    <!--
-      TODO:
-        - Progressbar Style
-        - Checkbox Style
-        - Button Hover Style
-        - Button Pressed Style
-        - Checkbox Hover Style
-    -->
-    
+    <!-- Nord Theme https://nordtheme.com/ -->
     <Color x:Key="Yellow">#EBCB8B</Color>
     <Color x:Key="Red">#BF616A</Color>
     <Color x:Key="Orange">#D08770</Color>
@@ -31,7 +23,6 @@
     <Color x:Key="Frost_1">#88C0D0</Color>
     <Color x:Key="Frost_2">#81A1C1</Color>
     <Color x:Key="Frost_3">#5E81AC</Color>
-
     <SolidColorBrush x:Key="Yellow_Brush" Color="{DynamicResource Yellow}"/>
     <SolidColorBrush x:Key="Red_Brush" Color="{DynamicResource Red}"/>
     <SolidColorBrush x:Key="Orange_Brush" Color="{DynamicResource Orange}"/>
@@ -50,6 +41,87 @@
     <SolidColorBrush x:Key="Frost_3_Brush" Color="{DynamicResource Frost_3}"/>
 
 
+    <!-- CHECKBOXES -->
+    <Style x:Key="OptionMarkFocusVisual">
+      <Setter Property="Control.Template">
+        <Setter.Value>
+          <ControlTemplate>
+            <Rectangle Margin="14,0,0,0" StrokeDashArray="1 2" Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" SnapsToDevicePixels="true" StrokeThickness="1"/>
+          </ControlTemplate>
+        </Setter.Value>
+      </Setter>
+    </Style>
+    <SolidColorBrush x:Key="OptionMark.Static.Background" Color="{DynamicResource PolarNight_0}"/>
+    <SolidColorBrush x:Key="OptionMark.Static.Border" Color="{DynamicResource PolarNight_3}"/>
+    <SolidColorBrush x:Key="OptionMark.Static.Glyph" Color="{DynamicResource Frost_1}"/>
+    <SolidColorBrush x:Key="OptionMark.MouseOver.Background" Color="{DynamicResource PolarNight_1}"/>
+    <SolidColorBrush x:Key="OptionMark.MouseOver.Border" Color="{DynamicResource PolarNight_3}"/>
+    <SolidColorBrush x:Key="OptionMark.MouseOver.Glyph" Color="{DynamicResource Frost_0}"/>
+    <SolidColorBrush x:Key="OptionMark.Pressed.Background" Color="{DynamicResource PolarNight_3}"/>
+    <SolidColorBrush x:Key="OptionMark.Pressed.Border" Color="{DynamicResource PolarNight_3}"/>
+    <SolidColorBrush x:Key="OptionMark.Pressed.Glyph" Color="{DynamicResource Frost_0}"/>
+    <SolidColorBrush x:Key="OptionMark.Disabled.Background" Color="{DynamicResource PolarNight_1}"/>
+    <SolidColorBrush x:Key="OptionMark.Disabled.Border" Color="{DynamicResource PolarNight_2}"/>
+    <SolidColorBrush x:Key="OptionMark.Disabled.Glyph" Color="{DynamicResource PolarNight_3}"/>
+    <Style TargetType="{x:Type CheckBox}">
+      <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
+      <Setter Property="Background" Value="{StaticResource OptionMark.Static.Background}"/>
+      <Setter Property="BorderBrush" Value="{StaticResource OptionMark.Static.Border}"/>
+      <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
+      <Setter Property="BorderThickness" Value="1"/>
+      <Setter Property="Template">
+        <Setter.Value>
+          <ControlTemplate TargetType="{x:Type CheckBox}">
+            <Grid x:Name="templateRoot" Background="Transparent" SnapsToDevicePixels="True">
+              <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="*"/>
+              </Grid.ColumnDefinitions>
+              <Border x:Name="checkBoxBorder" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="1" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+                <Grid x:Name="markGrid">
+                  <Path x:Name="optionMark" Data="F1 M 9.97498,1.22334L 4.6983,9.09834L 4.52164,9.09834L 0,5.19331L 1.27664,3.52165L 4.255,6.08833L 8.33331,1.52588e-005L 9.97498,1.22334 Z " Fill="{StaticResource OptionMark.Static.Glyph}" Margin="1" Opacity="0" Stretch="None"/>
+                  <Rectangle x:Name="indeterminateMark" Fill="{StaticResource OptionMark.Static.Glyph}" Margin="2" Opacity="0"/>
+                </Grid>
+              </Border>
+              <ContentPresenter x:Name="contentPresenter" Grid.Column="1" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+            </Grid>
+            <ControlTemplate.Triggers>
+              <Trigger Property="HasContent" Value="true">
+                <Setter Property="FocusVisualStyle" Value="{StaticResource OptionMarkFocusVisual}"/>
+                <Setter Property="Padding" Value="4,-1,0,0"/>
+              </Trigger>
+              <Trigger Property="IsMouseOver" Value="true">
+                <Setter Property="Background" TargetName="checkBoxBorder" Value="{StaticResource OptionMark.MouseOver.Background}"/>
+                <Setter Property="BorderBrush" TargetName="checkBoxBorder" Value="{StaticResource OptionMark.MouseOver.Border}"/>
+                <Setter Property="Fill" TargetName="optionMark" Value="{StaticResource OptionMark.MouseOver.Glyph}"/>
+                <Setter Property="Fill" TargetName="indeterminateMark" Value="{StaticResource OptionMark.MouseOver.Glyph}"/>
+              </Trigger>
+              <Trigger Property="IsEnabled" Value="false">
+                <Setter Property="Background" TargetName="checkBoxBorder" Value="{StaticResource OptionMark.Disabled.Background}"/>
+                <Setter Property="BorderBrush" TargetName="checkBoxBorder" Value="{StaticResource OptionMark.Disabled.Border}"/>
+                <Setter Property="Fill" TargetName="optionMark" Value="{StaticResource OptionMark.Disabled.Glyph}"/>
+                <Setter Property="Fill" TargetName="indeterminateMark" Value="{StaticResource OptionMark.Disabled.Glyph}"/>
+              </Trigger>
+              <Trigger Property="IsPressed" Value="true">
+                <Setter Property="Background" TargetName="checkBoxBorder" Value="{StaticResource OptionMark.Pressed.Background}"/>
+                <Setter Property="BorderBrush" TargetName="checkBoxBorder" Value="{StaticResource OptionMark.Pressed.Border}"/>
+                <Setter Property="Fill" TargetName="optionMark" Value="{StaticResource OptionMark.Pressed.Glyph}"/>
+                <Setter Property="Fill" TargetName="indeterminateMark" Value="{StaticResource OptionMark.Pressed.Glyph}"/>
+              </Trigger>
+              <Trigger Property="IsChecked" Value="true">
+                <Setter Property="Opacity" TargetName="optionMark" Value="1"/>
+                <Setter Property="Opacity" TargetName="indeterminateMark" Value="0"/>
+              </Trigger>
+              <Trigger Property="IsChecked" Value="{x:Null}">
+                <Setter Property="Opacity" TargetName="optionMark" Value="0"/>
+                <Setter Property="Opacity" TargetName="indeterminateMark" Value="1"/>
+              </Trigger>
+            </ControlTemplate.Triggers>
+          </ControlTemplate>
+        </Setter.Value>
+      </Setter>
+    </Style>
+
     <!-- STATUSES -->
     <Style TargetType="{x:Type fa:FontAwesome}">
       <Setter Property="TextWrapping" Value="NoWrap"/>
@@ -66,7 +138,72 @@
         </Trigger>
       </Style.Triggers>
     </Style>
-    
+
+    <!-- PROGRESBARS -->
+    <SolidColorBrush x:Key="ProgressBar.Progress" Color="{DynamicResource Frost_1}"/>
+    <SolidColorBrush x:Key="ProgressBar.Background" Color="{DynamicResource PolarNight_1}"/>
+    <SolidColorBrush x:Key="ProgressBar.Border" Color="{DynamicResource PolarNight_3}"/>
+    <Style TargetType="{x:Type ProgressBar}">
+      <Setter Property="Foreground" Value="{StaticResource ProgressBar.Progress}"/>
+      <Setter Property="Background" Value="{StaticResource ProgressBar.Background}"/>
+      <Setter Property="BorderBrush" Value="{StaticResource ProgressBar.Border}"/>
+      <Setter Property="BorderThickness" Value="1"/>
+      <Setter Property="Template">
+        <Setter.Value>
+          <ControlTemplate TargetType="{x:Type ProgressBar}">
+            <Grid x:Name="TemplateRoot">
+              <VisualStateManager.VisualStateGroups>
+                <VisualStateGroup x:Name="CommonStates">
+                  <VisualState x:Name="Determinate"/>
+                  <VisualState x:Name="Indeterminate">
+                    <Storyboard RepeatBehavior="Forever">
+                      <DoubleAnimationUsingKeyFrames Storyboard.TargetName="Animation" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)">
+                        <EasingDoubleKeyFrame KeyTime="0" Value="0.25"/>
+                        <EasingDoubleKeyFrame KeyTime="0:0:1" Value="0.25"/>
+                        <EasingDoubleKeyFrame KeyTime="0:0:2" Value="0.25"/>
+                      </DoubleAnimationUsingKeyFrames>
+                      <PointAnimationUsingKeyFrames Storyboard.TargetName="Animation" Storyboard.TargetProperty="(UIElement.RenderTransformOrigin)">
+                        <EasingPointKeyFrame KeyTime="0" Value="-0.5,0.5"/>
+                        <EasingPointKeyFrame KeyTime="0:0:1" Value="0.5,0.5"/>
+                        <EasingPointKeyFrame KeyTime="0:0:2" Value="1.5,0.5"/>
+                      </PointAnimationUsingKeyFrames>
+                    </Storyboard>
+                  </VisualState>
+                </VisualStateGroup>
+              </VisualStateManager.VisualStateGroups>
+              <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}"/>
+              <Rectangle x:Name="PART_Track"/>
+              <Grid x:Name="PART_Indicator" ClipToBounds="true" HorizontalAlignment="Left">
+                <Rectangle x:Name="Indicator" Fill="{TemplateBinding Foreground}"/>
+                <Rectangle x:Name="Animation" Fill="{TemplateBinding Foreground}" RenderTransformOrigin="0.5,0.5">
+                  <Rectangle.RenderTransform>
+                    <TransformGroup>
+                      <ScaleTransform/>
+                      <SkewTransform/>
+                      <RotateTransform/>
+                      <TranslateTransform/>
+                    </TransformGroup>
+                  </Rectangle.RenderTransform>
+                </Rectangle>
+              </Grid>
+            </Grid>
+            <ControlTemplate.Triggers>
+              <Trigger Property="Orientation" Value="Vertical">
+                <Setter Property="LayoutTransform" TargetName="TemplateRoot">
+                  <Setter.Value>
+                    <RotateTransform Angle="-90"/>
+                  </Setter.Value>
+                </Setter>
+              </Trigger>
+              <Trigger Property="IsIndeterminate" Value="true">
+                <Setter Property="Visibility" TargetName="Indicator" Value="Collapsed"/>
+              </Trigger>
+            </ControlTemplate.Triggers>
+          </ControlTemplate>
+        </Setter.Value>
+      </Setter>
+    </Style>
+
     <!-- LABELS -->
     <Style TargetType="{x:Type Label}">
       <Setter Property="Foreground" Value="{DynamicResource Button.Static.Foreground}"/>
@@ -103,12 +240,12 @@
     <SolidColorBrush x:Key="Button.Static.Background" Color="{DynamicResource PolarNight_0}"/>
     <SolidColorBrush x:Key="Button.Static.Border" Color="{DynamicResource PolarNight_3}"/>
     <SolidColorBrush x:Key="Button.Static.Foreground" Color="{DynamicResource SnowStorm_2}"/>
-    <SolidColorBrush x:Key="Button.MouseOver.Background" Color="{DynamicResource PolarNight_0}"/>
-    <SolidColorBrush x:Key="Button.MouseOver.Border" Color="{DynamicResource PolarNight_3}"/>
-    <SolidColorBrush x:Key="Button.Pressed.Background" Color="{DynamicResource PolarNight_0}"/>
-    <SolidColorBrush x:Key="Button.Pressed.Border" Color="{DynamicResource PolarNight_3}"/>
-    <SolidColorBrush x:Key="Button.Disabled.Background" Color="{DynamicResource PolarNight_0}"/>
-    <SolidColorBrush x:Key="Button.Disabled.Border" Color="{DynamicResource PolarNight_3}"/>
+    <SolidColorBrush x:Key="Button.MouseOver.Background" Color="{DynamicResource PolarNight_1}"/>
+    <SolidColorBrush x:Key="Button.MouseOver.Border" Color="{DynamicResource Frost_1}"/>
+    <SolidColorBrush x:Key="Button.Pressed.Background" Color="{DynamicResource PolarNight_2}"/>
+    <SolidColorBrush x:Key="Button.Pressed.Border" Color="{DynamicResource Frost_1}"/>
+    <SolidColorBrush x:Key="Button.Disabled.Background" Color="{DynamicResource PolarNight_1}"/>
+    <SolidColorBrush x:Key="Button.Disabled.Border" Color="{DynamicResource PolarNight_2}"/>
     <SolidColorBrush x:Key="Button.Disabled.Foreground" Color="{DynamicResource PolarNight_3}"/>
     <Style TargetType="{x:Type Button}">
       <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
@@ -147,7 +284,7 @@
         </Setter.Value>
       </Setter>
     </Style>
-    
+
       <!-- WINDOWS -->
     <Style TargetType="{x:Type Window}">
       <Setter Property="Background" Value="{DynamicResource PolarNight_0_Brush}"/>
diff --git a/Installer/Dexif_Installer/MainWindow.xaml b/Installer/Dexif_Installer/MainWindow.xaml
index 9fb323c..f29420b 100644
--- a/Installer/Dexif_Installer/MainWindow.xaml
+++ b/Installer/Dexif_Installer/MainWindow.xaml
@@ -7,7 +7,7 @@
         xmlns:local="clr-namespace:Dexif_Installer"
         mc:Ignorable="d"
         Title="DEXIF Installer" Height="300" Width="510" >
-  <Grid>
+  <Grid Background="{DynamicResource PolarNight_0_Brush}">
     <Grid.RowDefinitions>
       <RowDefinition Height="1*" x:Name="Header"/>
       <RowDefinition Height="1*" x:Name="Row_Chocolatey"/>
@@ -33,7 +33,7 @@
     <Button x:Name="Locate_Exec" Content="Locate" Margin="12,0,12,-0.2" VerticalAlignment="Center" Grid.Row="3" Grid.Column="3" FontSize="18"/>
       <Button x:Name="Install" Content="Install" Margin="12,0,12,-0.2" VerticalAlignment="Center" Grid.Row="5" Grid.Column="3" FontSize="18"/>
     <CheckBox x:Name="Enable_ConectMenu" Grid.Row="4" Grid.Column="3" FontSize="18" IsChecked="True" VerticalAlignment="Center" HorizontalAlignment="Center" VerticalContentAlignment="Center">
-      <TextBlock Text="Enable"/>
+      <Label Content="Enable" Margin="0,-2,0,0"/>
     </CheckBox>
 
     <fa:FontAwesome Icon="QuestionCircleOutline" x:Name="Status_Chocolatey" HorizontalAlignment="Center" Margin="0,0,0,0" VerticalAlignment="Center" Grid.Row="1" Grid.Column="2" FontSize="36"/>
@@ -42,14 +42,14 @@
     <fa:FontAwesome Icon="QuestionCircleOutline" x:Name="Status_Contextmenu" HorizontalAlignment="Center" Margin="0,0,0,0" VerticalAlignment="Center" Grid.Row="4" Grid.Column="2" FontSize="36"/>
     <fa:FontAwesome Icon="QuestionCircleOutline" x:Name="Status_Install" HorizontalAlignment="Center" Margin="0,0,0,0" VerticalAlignment="Center" Grid.Row="5" Grid.Column="2" FontSize="36"/>
 
-    <ProgressBar x:Name="Progress" Grid.Column="1" Grid.Row="5" VerticalAlignment="Center" Margin="12,0,12,0" Height="12"/>
+    <ProgressBar x:Name="Progress" Grid.Column="1" Grid.Row="5" VerticalAlignment="Center" Margin="12,0,12,0" Height="12" Value="40"/>
 
     <Image x:Name="Logo_Chocolatey" HorizontalAlignment="Center" Grid.Row="1" VerticalAlignment="Center"/>
     <Image x:Name="Logo_Exiftool" HorizontalAlignment="Center" Grid.Row="2" VerticalAlignment="Center"/>
     <Image x:Name="Logo_Executable" HorizontalAlignment="Center" Grid.Row="3" VerticalAlignment="Center"/>
     <Image x:Name="Logo_Contextmenu" HorizontalAlignment="Center" Grid.Row="4" VerticalAlignment="Center"/>
 
-    <Label x:Name="AppTitle" Content="DEXIF" HorizontalAlignment="Left" Margin="0,0,0,0" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2" FontSize="40" VerticalContentAlignment="Center" VerticalAlignment="Center" RenderTransformOrigin="0.5,0.114" FontFamily="Trajan Pro"/>
-    <Label x:Name="AppDescription" Content="Image metadata removal tool" HorizontalAlignment="Right" Margin="0,0,12,1" Grid.Column="1" Grid.Row="0" VerticalContentAlignment="Center" VerticalAlignment="Bottom" FontSize="9"/>
+    <Label x:Name="AppTitle" Content="DEXIF" HorizontalAlignment="Left" Margin="0,0,0,0" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2" FontSize="36" VerticalContentAlignment="Center" VerticalAlignment="Center" RenderTransformOrigin="0.5,0.114" FontFamily="Trajan Pro"/>
+    <Label x:Name="AppDescription" Content="Image metadata removal tool" HorizontalAlignment="Right" Margin="0,0,12,3" Grid.Column="1" Grid.Row="0" VerticalContentAlignment="Center" VerticalAlignment="Bottom" FontSize="9"/>
   </Grid>
 </Window>