From ef49d9bcf57a1779919b93ca78df286415b833bb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Jul 2024 16:32:52 +0000 Subject: [PATCH 01/21] Bump Betalgo.OpenAI from 7.4.6 to 8.6.1 Bumps [Betalgo.OpenAI](https://github.com/betalgo/openai) from 7.4.6 to 8.6.1. - [Release notes](https://github.com/betalgo/openai/releases) - [Commits](https://github.com/betalgo/openai/compare/v7.4.6...v8.6.1) --- updated-dependencies: - dependency-name: Betalgo.OpenAI dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- ColorPicker/ColorPicker.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ColorPicker/ColorPicker.csproj b/ColorPicker/ColorPicker.csproj index 8ae4e61..d417e67 100644 --- a/ColorPicker/ColorPicker.csproj +++ b/ColorPicker/ColorPicker.csproj @@ -48,7 +48,7 @@ - + From 7bd84fe2924f5035c2ed1ebd26900dc58ddd2bce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Peyronnet?= Date: Sat, 17 Aug 2024 12:36:58 +0200 Subject: [PATCH 02/21] Added translations (#428) --- ColorPicker/Properties/Resources.Designer.cs | 54 ++++++++++++++++++++ ColorPicker/Properties/Resources.en-US.resx | 18 +++++++ ColorPicker/Properties/Resources.fr-FR.resx | 18 +++++++ ColorPicker/Properties/Resources.resx | 18 +++++++ ColorPicker/Properties/Resources.zh-CN.resx | 18 +++++++ 5 files changed, 126 insertions(+) diff --git a/ColorPicker/Properties/Resources.Designer.cs b/ColorPicker/Properties/Resources.Designer.cs index 5a8db9d..b88a3e6 100644 --- a/ColorPicker/Properties/Resources.Designer.cs +++ b/ColorPicker/Properties/Resources.Designer.cs @@ -321,6 +321,15 @@ public static string Clear { } } + /// + /// Looks up a localized string similar to Close. + /// + public static string Close { + get { + return ResourceManager.GetString("Close", resourceCulture); + } + } + /// /// Looks up a localized string similar to CMYK. /// @@ -1293,6 +1302,15 @@ public static string Max { } } + /// + /// Looks up a localized string similar to Maximize. + /// + public static string Maximize { + get { + return ResourceManager.GetString("Maximize", resourceCulture); + } + } + /// /// Looks up a localized string similar to Maximum. /// @@ -1302,6 +1320,15 @@ public static string Maximum { } } + /// + /// Looks up a localized string similar to Minimize. + /// + public static string Minimize { + get { + return ResourceManager.GetString("Minimize", resourceCulture); + } + } + /// /// Looks up a localized string similar to Minimum. /// @@ -1473,6 +1500,15 @@ public static string Picker { } } + /// + /// Looks up a localized string similar to Pin. + /// + public static string Pin { + get { + return ResourceManager.GetString("Pin", resourceCulture); + } + } + /// /// Looks up a localized string similar to Pinned. /// @@ -1608,6 +1644,15 @@ public static string ResetSynethia { } } + /// + /// Looks up a localized string similar to Restore. + /// + public static string Restore { + get { + return ResourceManager.GetString("Restore", resourceCulture); + } + } + /// /// Looks up a localized string similar to RGB. /// @@ -2004,6 +2049,15 @@ public static string Triadic { } } + /// + /// Looks up a localized string similar to Unpin. + /// + public static string Unpin { + get { + return ResourceManager.GetString("Unpin", resourceCulture); + } + } + /// /// Looks up a localized string similar to Updates. /// diff --git a/ColorPicker/Properties/Resources.en-US.resx b/ColorPicker/Properties/Resources.en-US.resx index 5c94268..7dd01a0 100644 --- a/ColorPicker/Properties/Resources.en-US.resx +++ b/ColorPicker/Properties/Resources.en-US.resx @@ -798,4 +798,22 @@ Bookmarks were sucessfully imported. + + Close + + + Maximize + + + Restore + + + Minimize + + + Pin + + + Unpin + \ No newline at end of file diff --git a/ColorPicker/Properties/Resources.fr-FR.resx b/ColorPicker/Properties/Resources.fr-FR.resx index 925b696..c09cf49 100644 --- a/ColorPicker/Properties/Resources.fr-FR.resx +++ b/ColorPicker/Properties/Resources.fr-FR.resx @@ -802,4 +802,22 @@ Les signets ont été importés avec succès. + + Fermer + + + Maximiser + + + Restorer + + + Minimiser + + + Épingler + + + Desépingler + \ No newline at end of file diff --git a/ColorPicker/Properties/Resources.resx b/ColorPicker/Properties/Resources.resx index c4de613..84a4f5f 100644 --- a/ColorPicker/Properties/Resources.resx +++ b/ColorPicker/Properties/Resources.resx @@ -778,4 +778,22 @@ Bookmarks were sucessfully imported. + + Close + + + Maximize + + + Restore + + + Minimize + + + Pin + + + Unpin + \ No newline at end of file diff --git a/ColorPicker/Properties/Resources.zh-CN.resx b/ColorPicker/Properties/Resources.zh-CN.resx index ad70d7f..917002c 100644 --- a/ColorPicker/Properties/Resources.zh-CN.resx +++ b/ColorPicker/Properties/Resources.zh-CN.resx @@ -798,4 +798,22 @@ 已成功导入书签。 + + 关闭 + + + 最大化 + + + 恢复 + + + 最小化 + + + 针脚 + + + 解夹 + \ No newline at end of file From f5e4b8745467fdf23a3d1d4c6c0e314b37595e64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Peyronnet?= Date: Sat, 17 Aug 2024 12:37:28 +0200 Subject: [PATCH 03/21] Added tooltips in MainWindow (#428) --- ColorPicker/MainWindow.xaml | 24 ++++++++++++++++++++---- ColorPicker/MainWindow.xaml.cs | 6 +++++- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/ColorPicker/MainWindow.xaml b/ColorPicker/MainWindow.xaml index 0218a77..4249775 100644 --- 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}"> + + + + diff --git a/ColorPicker/MainWindow.xaml.cs b/ColorPicker/MainWindow.xaml.cs index aeb1838..fe58975 100644 --- 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 From 891d0df4cae8c38a93ac2688c98ea699f8d2fa56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Peyronnet?= Date: Sat, 17 Aug 2024 12:37:55 +0200 Subject: [PATCH 04/21] Added tooltips in Color Window (#428) --- ColorPicker/Windows/ColorDetailsWindow.xaml | 18 +++++++++++++++--- ColorPicker/Windows/ColorDetailsWindow.xaml.cs | 5 ++++- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/ColorPicker/Windows/ColorDetailsWindow.xaml b/ColorPicker/Windows/ColorDetailsWindow.xaml index ac24f6f..d4860de 100644 --- a/ColorPicker/Windows/ColorDetailsWindow.xaml +++ b/ColorPicker/Windows/ColorDetailsWindow.xaml @@ -139,7 +139,11 @@ MouseEnter="PinBtn_MouseEnter" MouseLeave="PinBtn_MouseLeave" RenderOptions.EdgeMode="Aliased" - Style="{StaticResource TitleBarButtonStyle}" /> + Style="{StaticResource TitleBarButtonStyle}"> + + + + Date: Sat, 17 Aug 2024 12:38:08 +0200 Subject: [PATCH 05/21] Fixed tooltip style issues (#428) --- ColorPicker/App.xaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ColorPicker/App.xaml b/ColorPicker/App.xaml index 51e2f91..168b6fa 100644 --- a/ColorPicker/App.xaml +++ b/ColorPicker/App.xaml @@ -1965,6 +1965,9 @@