Merge pull request #434 from Leo-Corporation/vNext

Version 6.5.0.2408
Leo-Corporation · Aug 18, 2024 · a673880 · a673880
2 parents 062105a + 261bb75
commit a673880
Show file tree

Hide file tree

Showing 26 changed files with 1,702 additions and 1,383 deletions.
diff --git a/ColorPicker.Setup/Setup.iss b/ColorPicker.Setup/Setup.iss
@@ -2,8 +2,8 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "ColorPicker Max"
-#define MyAppVersion "6.4.0.2407"
-#define MyAppFullVersion "6.4.0.2407"
+#define MyAppVersion "6.5.0.2408"
+#define MyAppFullVersion "6.5.0.2408"
 #define MyAppPublisher "Léo Corporation"
 #define MyAppURL "https://leocorporation.dev/"
 #define MyAppExeName "ColorPicker.exe"

diff --git a/ColorPicker/App.xaml b/ColorPicker/App.xaml
@@ -1965,6 +1965,9 @@
             <Style x:Key="{x:Type ToolTip}" TargetType="ToolTip">
                 <Setter Property="OverridesDefaultStyle" Value="true" />
                 <Setter Property="HasDropShadow" Value="True" />
+                <Setter Property="Foreground" Value="{DynamicResource Foreground1}" />
+                <Setter Property="FontSize" Value="12" />
+                <Setter Property="FontWeight" Value="Normal" />
                 <Setter Property="Template">
                     <Setter.Value>
                         <ControlTemplate TargetType="ToolTip">
@@ -1973,7 +1976,7 @@
                                 Width="{TemplateBinding Width}"
                                 Height="{TemplateBinding Height}"
                                 Margin="5"
-                                Background="{TemplateBinding Background}"
+                                Background="{DynamicResource Background1}"
                                 BorderBrush="{DynamicResource LightAccentColor}"
                                 BorderThickness="1">
                                 <Border.Effect>
@@ -1985,7 +1988,7 @@
                                         Color="{DynamicResource Accent}" />
                                 </Border.Effect>
                                 <ContentPresenter
-                                    Margin="4"
+                                    Margin="4 2 4 4"
                                     HorizontalAlignment="Left"
                                     VerticalAlignment="Top" />
                             </Border>

diff --git a/ColorPicker/Classes/Global.cs b/ColorPicker/Classes/Global.cs
@@ -93,7 +93,7 @@ public static class Global
 	internal static string SettingsPath => $@"{FileSys.AppDataPath}\Léo Corporation\ColorPicker Max\Settings.xml";
 	public static string LastVersionLink => "https://raw.githubusercontent.com/Leo-Corporation/LeoCorp-Docs/master/Liens/Update%20System/ColorPicker/5.0/Version.txt";
 
-	public static string Version => "6.4.0.2407";
+	public static string Version => "6.5.0.2408";
 
 	public static string HiSentence
 	{

diff --git a/ColorPicker/ColorPicker.csproj b/ColorPicker/ColorPicker.csproj
@@ -11,7 +11,7 @@
 	<Title>ColorPicker</Title>
 	<Description>Maximize your creativity.</Description>
 	<RepositoryUrl>https://github.com/Leo-Corporation/ColorPicker</RepositoryUrl>
-	<Version>6.4.0.2407</Version>
+	<Version>6.5.0.2408</Version>
 	<PackageLicenseExpression>MIT</PackageLicenseExpression>
 	<PackageIcon>logo.png</PackageIcon>
 	<ApplicationIcon>CPM.ico</ApplicationIcon>
@@ -48,7 +48,7 @@
   </ItemGroup>
 
   <ItemGroup>
-	<PackageReference Include="Betalgo.OpenAI" Version="7.4.6" />
+	<PackageReference Include="Betalgo.OpenAI" Version="8.6.1" />
 	<PackageReference Include="ColorHelper" Version="1.8.1" />
 	<PackageReference Include="MouseKeyHook" Version="5.7.1" />
 	<PackageReference Include="PeyrSharp.Core" Version="2.1.0.2312" />

diff --git a/ColorPicker/MainWindow.xaml b/ColorPicker/MainWindow.xaml
@@ -160,7 +160,11 @@
                         FontSize="14"
                         Foreground="{DynamicResource Foreground1}"
                         RenderOptions.EdgeMode="Aliased"
-                        Style="{StaticResource TitleBarButtonStyle}" />
+                        Style="{StaticResource TitleBarButtonStyle}">
+                        <Button.ToolTip>
+                            <ToolTip x:Name="PinTooltip" Content="{x:Static lang:Resources.Pin}" />
+                        </Button.ToolTip>
+                    </Button>
                     <Button
                         x:Name="MinimizeBtn"
                         Grid.Column="3"
@@ -173,7 +177,11 @@
                         FontSize="14"
                         Foreground="{DynamicResource Foreground1}"
                         RenderOptions.EdgeMode="Aliased"
-                        Style="{StaticResource TitleBarButtonStyle}" />
+                        Style="{StaticResource TitleBarButtonStyle}">
+                        <Button.ToolTip>
+                            <ToolTip Content="{x:Static lang:Resources.Minimize}" />
+                        </Button.ToolTip>
+                    </Button>
                     <Button
                         x:Name="MaximizeRestoreBtn"
                         Grid.Column="4"
@@ -186,7 +194,11 @@
                         FontSize="14"
                         Foreground="{DynamicResource Foreground1}"
                         RenderOptions.EdgeMode="Aliased"
-                        Style="{StaticResource TitleBarButtonStyle}" />
+                        Style="{StaticResource TitleBarButtonStyle}">
+                        <Button.ToolTip>
+                            <ToolTip x:Name="MaximizeTooltip" Content="{x:Static lang:Resources.Maximize}" />
+                        </Button.ToolTip>
+                    </Button>
                     <Button
                         x:Name="CloseBtn"
                         Grid.Column="5"
@@ -199,7 +211,11 @@
                         FontSize="14"
                         Foreground="{DynamicResource Foreground1}"
                         RenderOptions.EdgeMode="Aliased"
-                        Style="{StaticResource TitleBarCloseButtonStyle}" />
+                        Style="{StaticResource TitleBarCloseButtonStyle}">
+                        <Button.ToolTip>
+                            <ToolTip Content="{x:Static lang:Resources.Close}" />
+                        </Button.ToolTip>
+                    </Button>
                 </Grid>
             </Border>
             <Border Grid.Row="1" Style="{StaticResource WindowMainPanelStyle}">

diff --git a/ColorPicker/MainWindow.xaml.cs b/ColorPicker/MainWindow.xaml.cs
@@ -164,6 +164,7 @@ private void InitUI()
 			AppPages.ContrastGrid => Global.ContrastPage,
 			_ => Global.HomePage
 		});
+		PinTooltip.Content = Topmost ? Properties.Resources.Unpin : Properties.Resources.Pin;
 	}
 
 	private void PageCard_OnCardClick(object? sender, PageEventArgs e)
@@ -257,6 +258,7 @@ private void PinBtn_Click(object sender, RoutedEventArgs e)
 	{
 		Topmost = !Topmost; // Toggle
 		PinBtn.Content = Topmost ? "\uF604" : "\uF602"; // Set text
+		PinTooltip.Content = Topmost ? Properties.Resources.Unpin : Properties.Resources.Pin;
 	}
 
 	private void HandleWindowStateChanged()
@@ -267,7 +269,9 @@ private void HandleWindowStateChanged()
 		MaximizeRestoreBtn.FontSize = WindowState == WindowState.Maximized
 			? 18
 			: 14;
-
+		MaximizeTooltip.Content = WindowState == WindowState.Maximized
+			? Properties.Resources.Restore // Restore icon
+			: Properties.Resources.Maximize; // Maximize icon
 		DefineMaximumSize();
 
 		WindowBorder.Margin = WindowState == WindowState.Maximized ? new(10, 10, 0, 0) : new(10); // Set