From cb3160940d10976269fb887961fa551c22124e73 Mon Sep 17 00:00:00 2001
From: WeeXnes <somtrigi@gmail.com>
Date: Fri, 11 Nov 2022 16:38:09 +0100
Subject: [PATCH] gui improvements

---
 WeeXnes/Core/Globals.cs               |   2 +-
 WeeXnes/MVVM/View/DiscordRpcView.xaml | 231 +++++++++++++++++++++-----
 WeeXnes/MVVM/View/KeyManagerView.xaml |   1 +
 WeeXnes/MVVM/View/SettingView.xaml    |   8 +
 WeeXnes/Misc/CriticalMessage.xaml     |   1 +
 WeeXnes/Misc/Message.xaml             |   1 +
 WeeXnes/Misc/UpdateMessage.xaml       |   2 +
 WeeXnes/Theme/ControlButtonTheme.xaml |   2 +-
 WeeXnes/WeeXnes.csproj                |   2 +-
 9 files changed, 201 insertions(+), 49 deletions(-)

diff --git a/WeeXnes/Core/Globals.cs b/WeeXnes/Core/Globals.cs
index 787acb1..bedbdcc 100644
--- a/WeeXnes/Core/Globals.cs
+++ b/WeeXnes/Core/Globals.cs
@@ -16,7 +16,7 @@ namespace WeeXnes.Core
         public static string encryptionKey = "8zf5#RdyQ]$4x4_";
         public static string AppDataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "WeeXnes");
         public static string SettingsFileName = "settings.ini";
-        public static string version = "3.6.7";
+        public static string version = "3.6.8";
         public static bool   info_isRpcRunning = false;
         public static bool   info_RpcAutoStart;
         public static string apiUrl = "https://api.github.com/repos/weexnes/weexnessuite/releases/latest";
diff --git a/WeeXnes/MVVM/View/DiscordRpcView.xaml b/WeeXnes/MVVM/View/DiscordRpcView.xaml
index 1457e05..60b4822 100644
--- a/WeeXnes/MVVM/View/DiscordRpcView.xaml
+++ b/WeeXnes/MVVM/View/DiscordRpcView.xaml
@@ -15,7 +15,7 @@
             </Grid.RowDefinitions>
 
 
-            <Grid>
+            <Grid HorizontalAlignment="Center">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="220"/>
                     <ColumnDefinition/>
@@ -23,7 +23,7 @@
                 <Border 
                     CornerRadius="4"
                         Height="300"
-                        VerticalAlignment="Top">
+                    VerticalAlignment="Top">
                     
                     <Border.Background>
                         <LinearGradientBrush StartPoint="0 0" EndPoint="1 1">
@@ -37,6 +37,7 @@
                              VerticalAlignment="Top"
                              Background="Transparent"
                              BorderThickness="0"
+                             
                              Name="RpcItemList"
                              Foreground="White"
                              SelectionChanged="RpcItemList_SelectionChanged"
@@ -47,7 +48,7 @@
                 <TextBox Grid.Column="1"
                          Style="{StaticResource MaterialTextBox}"
                          Height="33"
-                         Width="220"
+                         Width="450"
                          HorizontalAlignment="Left"
                          VerticalAlignment="Top"
                          Margin="20,20,0,0"
@@ -58,22 +59,18 @@
                 <TextBox Grid.Column="1"
                          Style="{StaticResource MaterialTextBox}"
                          Height="33"
-                         Width="220"
+                         Width="450"
                          HorizontalAlignment="Left"
                          VerticalAlignment="Top"
                          Margin="20,60,0,0"
                          Name="tb_FormPName"
                          Background="#212329"
-                         Tag="Process Name"/>
-                <Label Content=".exe"
-                       Foreground="White"
-                       FontSize="20" Grid.Column="1"
-                         Margin="240,56,0,0"/>
+                         Tag="Process Name (without .exe)"/>
 
                 <TextBox Grid.Column="1"
                          Style="{StaticResource MaterialTextBox}"
                          Height="33"
-                         Width="220"
+                         Width="450"
                          HorizontalAlignment="Left"
                          VerticalAlignment="Top"
                          Margin="20,100,0,0"
@@ -83,7 +80,7 @@
                 <TextBox Grid.Column="1"
                          Style="{StaticResource MaterialTextBox}"
                          Height="33"
-                         Width="220"
+                         Width="450"
                          HorizontalAlignment="Left"
                          VerticalAlignment="Top"
                          Margin="20,180,0,0"
@@ -93,7 +90,7 @@
                 <TextBox Grid.Column="1"
                          Style="{StaticResource MaterialTextBox}"
                          Height="33"
-                         Width="220"
+                         Width="450"
                          HorizontalAlignment="Left"
                          VerticalAlignment="Top"
                          Margin="20,140,0,0"
@@ -120,7 +117,7 @@
                          VerticalAlignment="Top"
                          Margin="250,220,0,0"
                          Name="tb_FormLargeImgTxt"
-                         Background="#202127"
+                         Background="#212329"
                          Tag="Large Image Text"/>
 
                 <TextBox Grid.Column="1"
@@ -141,10 +138,10 @@
                          VerticalAlignment="Top"
                          Margin="250,260,0,0"
                          Name="tb_FormSmallImgTxt"
-                         Background="#202127"
+                         Background="#212329"
                          Tag="Small Image Text"/>
                 <Button Height="30"
-                        Width="65"
+                        Width="450"
                         Style="{StaticResource UniversalMaterialButton}"
                         Name="DiscordRpcSave"
                         Click="DiscordRpcSave_Click"
@@ -152,43 +149,185 @@
                         HorizontalAlignment="Left"
                         Grid.Column="1"
                         Margin="20,0,0,5"
+                        Foreground="DarkGray"
                         Background="#212329"
-                        Content="Save"/>
+                        Content="Save">
+                    <Button.Triggers>
+      
+                        <!-- Animate the button's Width property. -->
+                        <EventTrigger RoutedEvent="Button.MouseEnter">
+                            <BeginStoryboard>
+                                <Storyboard>
+                                    <ColorAnimation
+                                        Storyboard.TargetProperty="(Button.Background).(SolidColorBrush.Color)"
+                                        To="DarkGray" Duration="0:0:00.1" AutoReverse="False" 
+                                    />
+                                    <ColorAnimation
+                                        Storyboard.TargetProperty="(Button.Foreground).(SolidColorBrush.Color)"
+                                        To="#212329" Duration="0:0:00.1" AutoReverse="False" 
+                                    />
+                                </Storyboard>
+                            </BeginStoryboard> 
+                        </EventTrigger>
+                        <EventTrigger RoutedEvent="Button.MouseLeave">
+                            <BeginStoryboard>
+                                <Storyboard>
+                                    <ColorAnimation
+                                        Storyboard.TargetProperty="(Button.Background).(SolidColorBrush.Color)"
+                                        To="#212329" Duration="0:0:00.1" AutoReverse="False" 
+                                    />
+                                    <ColorAnimation
+                                        Storyboard.TargetProperty="(Button.Foreground).(SolidColorBrush.Color)"
+                                        To="DarkGray" Duration="0:0:00.1" AutoReverse="False" 
+                                    />
+                                </Storyboard>
+                            </BeginStoryboard> 
+                        </EventTrigger>
+                                                        
+                    </Button.Triggers>
+                </Button>
 
 
 
 
 
-                <Button Height="30"
-                        Width="65"
-                        Style="{StaticResource UniversalMaterialButton}"
-                        Name="DiscordRpcStop"
-                        Click="DiscordRpcStop_Click"
-                        VerticalAlignment="Bottom"
-                        HorizontalAlignment="Left"
-                        Margin="70,0,0,5"
-                        Background="#212329"
-                        Content="Stop"/>
-                <Button Height="30"
-                        Width="65"
-                        Style="{StaticResource UniversalMaterialButton}"
-                        Name="DiscordRpcStart"
-                        Click="DiscordRpcStart_Click"
-                        VerticalAlignment="Bottom"
-                        HorizontalAlignment="Left"
-                        Margin="0,0,0,5"
-                        Background="#212329"
-                        Content="Start"/>
-                <Button Height="30"
-                        Width="65"
-                        Style="{StaticResource UniversalMaterialButton}"
-                        Name="DiscordRpcNew"
-                        Click="DiscordRpcNew_Click"
-                        VerticalAlignment="Bottom"
-                        HorizontalAlignment="Left"
-                        Margin="140,0,0,5"
-                        Background="#212329"
-                        Content="New"/>
+                <StackPanel Grid.Column="0" Orientation="Horizontal" HorizontalAlignment="Center">
+                    <Button Height="30" Cursor="Hand"
+                            Width="65"
+                            Style="{StaticResource UniversalMaterialButton}"
+                            Name="DiscordRpcStart"
+                            Click="DiscordRpcStart_Click"
+                            VerticalAlignment="Bottom"
+                            HorizontalAlignment="Left"
+                            Margin="0,0,5,5"
+                            Foreground="DarkGray"
+                            Background="#212329"
+                            Content="Start">
+                        <Button.Triggers>
+      
+                            <!-- Animate the button's Width property. -->
+                            <EventTrigger RoutedEvent="Button.MouseEnter">
+                                <BeginStoryboard>
+                                    <Storyboard>
+                                        <ColorAnimation
+                                            Storyboard.TargetProperty="(Button.Background).(SolidColorBrush.Color)"
+                                            To="DarkGray" Duration="0:0:00.1" AutoReverse="False" 
+                                        />
+                                        <ColorAnimation
+                                            Storyboard.TargetProperty="(Button.Foreground).(SolidColorBrush.Color)"
+                                            To="#212329" Duration="0:0:00.1" AutoReverse="False" 
+                                        />
+                                    </Storyboard>
+                                </BeginStoryboard> 
+                            </EventTrigger>
+                            <EventTrigger RoutedEvent="Button.MouseLeave">
+                                <BeginStoryboard>
+                                    <Storyboard>
+                                        <ColorAnimation
+                                            Storyboard.TargetProperty="(Button.Background).(SolidColorBrush.Color)"
+                                            To="#212329" Duration="0:0:00.1" AutoReverse="False" 
+                                        />
+                                        <ColorAnimation
+                                            Storyboard.TargetProperty="(Button.Foreground).(SolidColorBrush.Color)"
+                                            To="DarkGray" Duration="0:0:00.1" AutoReverse="False" 
+                                        />
+                                    </Storyboard>
+                                </BeginStoryboard> 
+                            </EventTrigger>
+                                                        
+                        </Button.Triggers>
+                    </Button>
+                    <Button Height="30"
+                            Width="65"
+                            Style="{StaticResource UniversalMaterialButton}"
+                            Name="DiscordRpcStop"
+                            Click="DiscordRpcStop_Click"
+                            VerticalAlignment="Bottom"
+                            HorizontalAlignment="Left"
+                            Margin="5,0,5,5"
+                            Foreground="DarkGray"
+                            Background="#212329"
+                            Content="Stop">
+                        <Button.Triggers>
+      
+                            <!-- Animate the button's Width property. -->
+                            <EventTrigger RoutedEvent="Button.MouseEnter">
+                                <BeginStoryboard>
+                                    <Storyboard>
+                                        <ColorAnimation
+                                            Storyboard.TargetProperty="(Button.Background).(SolidColorBrush.Color)"
+                                            To="DarkGray" Duration="0:0:00.1" AutoReverse="False" 
+                                        />
+                                        <ColorAnimation
+                                            Storyboard.TargetProperty="(Button.Foreground).(SolidColorBrush.Color)"
+                                            To="#212329" Duration="0:0:00.1" AutoReverse="False" 
+                                        />
+                                    </Storyboard>
+                                </BeginStoryboard> 
+                            </EventTrigger>
+                            <EventTrigger RoutedEvent="Button.MouseLeave">
+                                <BeginStoryboard>
+                                    <Storyboard>
+                                        <ColorAnimation
+                                            Storyboard.TargetProperty="(Button.Background).(SolidColorBrush.Color)"
+                                            To="#212329" Duration="0:0:00.1" AutoReverse="False" 
+                                        />
+                                        <ColorAnimation
+                                            Storyboard.TargetProperty="(Button.Foreground).(SolidColorBrush.Color)"
+                                            To="DarkGray" Duration="0:0:00.1" AutoReverse="False" 
+                                        />
+                                    </Storyboard>
+                                </BeginStoryboard> 
+                            </EventTrigger>
+                                                        
+                        </Button.Triggers>
+                    </Button>
+                    <Button Height="30"
+                            Width="65"
+                            Style="{StaticResource UniversalMaterialButton}"
+                            Name="DiscordRpcNew"
+                            Click="DiscordRpcNew_Click"
+                            VerticalAlignment="Bottom"
+                            HorizontalAlignment="Left"
+                            Margin="5,0,0,5"
+                            Foreground="DarkGray"
+                            Background="#212329"
+                            Content="New">
+                        <Button.Triggers>
+      
+                            <!-- Animate the button's Width property. -->
+                            <EventTrigger RoutedEvent="Button.MouseEnter">
+                                <BeginStoryboard>
+                                    <Storyboard>
+                                        <ColorAnimation
+                                            Storyboard.TargetProperty="(Button.Background).(SolidColorBrush.Color)"
+                                            To="DarkGray" Duration="0:0:00.1" AutoReverse="False" 
+                                        />
+                                        <ColorAnimation
+                                            Storyboard.TargetProperty="(Button.Foreground).(SolidColorBrush.Color)"
+                                            To="#212329" Duration="0:0:00.1" AutoReverse="False" 
+                                        />
+                                    </Storyboard>
+                                </BeginStoryboard> 
+                            </EventTrigger>
+                            <EventTrigger RoutedEvent="Button.MouseLeave">
+                                <BeginStoryboard>
+                                    <Storyboard>
+                                        <ColorAnimation
+                                            Storyboard.TargetProperty="(Button.Background).(SolidColorBrush.Color)"
+                                            To="#212329" Duration="0:0:00.1" AutoReverse="False" 
+                                        />
+                                        <ColorAnimation
+                                            Storyboard.TargetProperty="(Button.Foreground).(SolidColorBrush.Color)"
+                                            To="DarkGray" Duration="0:0:00.1" AutoReverse="False" 
+                                        />
+                                    </Storyboard>
+                                </BeginStoryboard> 
+                            </EventTrigger>
+                                                        
+                        </Button.Triggers>
+                    </Button>
+                </StackPanel>
 
 
 
diff --git a/WeeXnes/MVVM/View/KeyManagerView.xaml b/WeeXnes/MVVM/View/KeyManagerView.xaml
index 261fdaa..0a9bde3 100644
--- a/WeeXnes/MVVM/View/KeyManagerView.xaml
+++ b/WeeXnes/MVVM/View/KeyManagerView.xaml
@@ -82,6 +82,7 @@
                     Margin="15,0,0,0"
                     Click="AddButton_Click"
                     Content="Add"
+                    Foreground="DarkGray"
                     Background="#1c1e23"
                     Style="{StaticResource UniversalMaterialButton}"
             />
diff --git a/WeeXnes/MVVM/View/SettingView.xaml b/WeeXnes/MVVM/View/SettingView.xaml
index ad84bea..fbecb0a 100644
--- a/WeeXnes/MVVM/View/SettingView.xaml
+++ b/WeeXnes/MVVM/View/SettingView.xaml
@@ -66,6 +66,7 @@
                             Style="{StaticResource UniversalMaterialButton}"
                             Content="Check for Updates"
                             Background="#2f313b"
+                            Foreground="DarkGray"
                             Height="25"
                             Click="CheckForUpdateBtn_OnClick"
                             Margin="4,10,4,0"/>
@@ -74,6 +75,7 @@
                             Style="{StaticResource UniversalMaterialButton}"
                             Content="Create Startmenu Entry"
                             Background="#2f313b"
+                            Foreground="DarkGray"
                             Height="25"
                             Click="CreateShortcut_OnClick"
                             Margin="4,10,4,0"/>
@@ -82,6 +84,7 @@
                             Style="{StaticResource UniversalMaterialButton}"
                             Content="Open AppData Folder"
                             Background="#2f313b"
+                            Foreground="DarkGray"
                             Height="25"
                             Margin="4,10,4,0"
                             Click="OpenAppdataFolder_Click"/>
@@ -139,6 +142,7 @@
                         Style="{StaticResource UniversalMaterialButton}"
                         Content="Set Default ClientID"
                         Background="#2f313b"
+                        Foreground="DarkGray"
                             Height="25"
                         Click="SaveDefaultID_Click"
                             Margin="4,10,4,0"/>
@@ -166,6 +170,7 @@
                             Style="{StaticResource UniversalMaterialButton}"
                             Content="Set Rpc Files Path"
                             Background="#2f313b"
+                            Foreground="DarkGray"
                             Height="25"
                             Click="SetRpcLocation_OnClick"
                             Margin="4,10,4,0"/>
@@ -173,6 +178,7 @@
                             Style="{StaticResource UniversalMaterialButton}"
                             Content="Set Default Path"
                             Background="#2f313b"
+                            Foreground="DarkGray"
                             Height="25"
                             Click="SetRpcLocationDefault_OnClick"
                             Margin="4,10,4,0"/>
@@ -233,6 +239,7 @@
                             Style="{StaticResource UniversalMaterialButton}"
                             Content="Set Key Files Path"
                             Background="#2f313b"
+                            Foreground="DarkGray"
                             Height="25"
                             Click="SetKeyLocation_OnClick"
                             Margin="4,10,4,0"/>
@@ -240,6 +247,7 @@
                             Style="{StaticResource UniversalMaterialButton}"
                             Content="Set Default Path"
                             Background="#2f313b"
+                            Foreground="DarkGray"
                             Height="25"
                             Click="SetKeyLocationDefault_OnClick"
                             Margin="4,10,4,0"/>
diff --git a/WeeXnes/Misc/CriticalMessage.xaml b/WeeXnes/Misc/CriticalMessage.xaml
index 3aaee94..9ae1eac 100644
--- a/WeeXnes/Misc/CriticalMessage.xaml
+++ b/WeeXnes/Misc/CriticalMessage.xaml
@@ -44,6 +44,7 @@
                     Content="OK"
                     Width="140"
                     Height="40"
+                    Foreground="DarkGray"
                     Background="#520b16"
                     Name="okButton"
                     Click="okButton_Click"
diff --git a/WeeXnes/Misc/Message.xaml b/WeeXnes/Misc/Message.xaml
index f612030..51c96f0 100644
--- a/WeeXnes/Misc/Message.xaml
+++ b/WeeXnes/Misc/Message.xaml
@@ -45,6 +45,7 @@
                     Width="140"
                     Height="40"
                     Background="#2f313b"
+                    Foreground="DarkGray"
                     Name="okButton"
                     Click="okButton_Click"
                     Margin="0,0,0,20"/>
diff --git a/WeeXnes/Misc/UpdateMessage.xaml b/WeeXnes/Misc/UpdateMessage.xaml
index f6fcb77..750bccc 100644
--- a/WeeXnes/Misc/UpdateMessage.xaml
+++ b/WeeXnes/Misc/UpdateMessage.xaml
@@ -58,6 +58,7 @@
                             Content="OK"
                             Width="140"
                             Height="40"
+                            Foreground="DarkGray"
                             Background="#2f313b"
                             Name="okButton"
                             Click="OkButton_OnClick"
@@ -67,6 +68,7 @@
                             Content="CANCEL"
                             Width="140"
                             Height="40"
+                            Foreground="DarkGray"
                             Background="#2f313b"
                             Name="cancelButton"
                             Click="CancelButton_OnClick"
diff --git a/WeeXnes/Theme/ControlButtonTheme.xaml b/WeeXnes/Theme/ControlButtonTheme.xaml
index ec41277..16608aa 100644
--- a/WeeXnes/Theme/ControlButtonTheme.xaml
+++ b/WeeXnes/Theme/ControlButtonTheme.xaml
@@ -64,7 +64,7 @@
                             <TextBlock Text="{TemplateBinding Property=Content}"
                                        HorizontalAlignment="Center"
                                        VerticalAlignment="Center"
-                                       Foreground="DarkGray"/>
+                                       Foreground="{TemplateBinding Foreground}"/>
                         </Grid>
                     </Border>
                     <ControlTemplate.Triggers>
diff --git a/WeeXnes/WeeXnes.csproj b/WeeXnes/WeeXnes.csproj
index bc71dd0..9102a7c 100644
--- a/WeeXnes/WeeXnes.csproj
+++ b/WeeXnes/WeeXnes.csproj
@@ -4,7 +4,7 @@
     <PropertyGroup>
         <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
         <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-        <Version>3.6.7</Version>
+        <Version>3.6.8</Version>
         <ProjectGuid>{4B33CEE7-C74D-43B9-B99A-8B273D5195BC}</ProjectGuid>
         <OutputType>WinExe</OutputType>
         <RootNamespace>WeeXnes</RootNamespace>