Added the possibility to use upper cases or lower cases for HEX (#385)

Leo-Corporation · Feb 24, 2024 · 36627eb · 36627eb
1 parent c72afc8
commit 36627eb
Show file tree

Hide file tree

Showing 11 changed files with 54 additions and 8 deletions.
diff --git a/ColorPicker/Classes/ColorInfo.cs b/ColorPicker/Classes/ColorInfo.cs
@@ -28,7 +28,7 @@ namespace ColorPicker.Classes
 	public class ColorInfo(RGB rgb)
 	{
 		public RGB RGB { get; set; } = rgb;
-		public HEX HEX { get; set; } = ColorConverter.RgbToHex(rgb);
+		public HEX HEX { get; set; } = GetHex(rgb);
 		public HSV HSV { get; set; } = ColorConverter.RgbToHsv(rgb);
 		public HSL HSL { get; set; } = ColorConverter.RgbToHsl(rgb);
 		public CMYK CMYK { get; set; } = ColorConverter.RgbToCmyk(rgb);
@@ -37,17 +37,21 @@ public class ColorInfo(RGB rgb)
 		public YUV YUV { get; set; } = ColorConverter.RgbToYuv(rgb);
 		public DEC DEC { get; set; } = DEC.FromRgb(rgb);
 
-		public override string ToString()
-		{
-			return $"{Properties.Resources.RGB}: {RGB.R}{Global.Settings.RgbSeparator}{RGB.G}{Global.Settings.RgbSeparator}{RGB.B}\n" +
-				$"{Properties.Resources.HEX}: {(HEX.Value.StartsWith("#") ? "" : "#")}{HEX.Value}\n" +
+		public override string ToString() => $"{Properties.Resources.RGB}: {RGB.R}{Global.Settings.RgbSeparator}{RGB.G}{Global.Settings.RgbSeparator}{RGB.B}\n" +
+				$"{Properties.Resources.HEX}: {(HEX.Value.StartsWith('#') ? "" : "#")}{((Global.Settings.UseUpperCasesHex ?? false) ? HEX.Value.ToUpper() : HEX.Value.ToLower())}\n" +
 				$"{Properties.Resources.HSV}: {HSV.H},{HSV.S},{HSV.V}\n" +
 				$"{Properties.Resources.HSL}: {HSL.H},{HSL.S},{HSL.L}\n" +
 				$"{Properties.Resources.CMYK}: {CMYK.C},{CMYK.M},{CMYK.Y},{CMYK.K}\n" +
 				$"{Properties.Resources.DEC}: {DEC.Value}\n" +
 				$"{Properties.Resources.XYZ}: {XYZ.X:0.00}..; {XYZ.Y:0.00}..; {XYZ.Z:0.00}..\n" +
 				$"{Properties.Resources.YIQ}: {YIQ.Y:0.00}..; {YIQ.I:0.00}..; {YIQ.Q:0.00}..\n" +
 				$"{Properties.Resources.YUV}: {YUV.Y:0.00}..; {YUV.U:0.00}..; {YUV.V:0.00}..";
+
+		private static HEX GetHex(RGB rgb)
+		{
+			var hex = ColorConverter.RgbToHex(rgb);
+			hex.Value =  (Global.Settings.UseUpperCasesHex ?? false) ? hex.Value.ToUpper() : hex.Value.ToLower();
+			return hex;
 		}
 	}
 }
diff --git a/ColorPicker/Classes/Settings.cs b/ColorPicker/Classes/Settings.cs
@@ -48,6 +48,7 @@ public Settings()
 			Model = "gpt-3.5-turbo";
 			SupportedModels = ["gpt-3.5-turbo", "gpt-4"];
 			RgbSeparator = ";";
+			UseUpperCasesHex = false;
 		}
 
 		public Themes Theme { get; set; }
@@ -69,5 +70,6 @@ public Settings()
 		public string? Model { get; set; }
 		public string[]? SupportedModels { get; set; }
 		public string? RgbSeparator { get; set; }
+		public bool? UseUpperCasesHex { get; set; }
 	}
 }
diff --git a/ColorPicker/Pages/SettingsPage.xaml b/ColorPicker/Pages/SettingsPage.xaml
@@ -391,6 +391,16 @@
                                 TextChanged="RgbSeparatorTxt_TextChanged" />
                         </Border>
                     </StackPanel>
+                    <CheckBox
+                        x:Name="UpperCaseHexChk"
+                        Margin="10 0 0 5"
+                        VerticalContentAlignment="Center"
+                        BorderThickness="2"
+                        Checked="UpperCaseHexChk_Checked"
+                        Content="{x:Static lang:Resources.UseUpperCasesHex}"
+                        Foreground="{DynamicResource Foreground1}"
+                        Style="{DynamicResource CheckBoxStyle1}"
+                        Unchecked="UpperCaseHexChk_Checked" />
                 </StackPanel>
             </Expander>
             <Expander

diff --git a/ColorPicker/Pages/SettingsPage.xaml.cs b/ColorPicker/Pages/SettingsPage.xaml.cs
@@ -83,8 +83,10 @@ private async void InitUI()
 
 			// Load the color option section
 			Global.Settings.RgbSeparator ??= ";";
+			Global.Settings.UseUpperCasesHex ??= false;
 			ColorTypeComboBox.SelectedIndex = (int)Global.Settings.DefaultColorType;
 			RgbSeparatorTxt.Text = Global.Settings.RgbSeparator;
+			UpperCaseHexChk.IsChecked = Global.Settings.UseUpperCasesHex;
 
 			// Load the default page ComboBox
 			PageComboBox.SelectedIndex = (int)Global.Settings.DefaultPage;
@@ -536,6 +538,12 @@ private void RgbSeparatorTxt_TextChanged(object sender, TextChangedEventArgs e)
 			XmlSerializerManager.SaveToXml(Global.Settings, Global.SettingsPath);
 		}
 
+		private void UpperCaseHexChk_Checked(object sender, RoutedEventArgs e)
+		{
+			Global.Settings.UseUpperCasesHex = UpperCaseHexChk.IsChecked;
+			XmlSerializerManager.SaveToXml(Global.Settings, Global.SettingsPath);
+		}
+
 		private void ResetSynethiaLink_Click(object sender, RoutedEventArgs e)
 		{
 			// Ask the user a confirmation

diff --git a/ColorPicker/Properties/Resources.Designer.cs b/ColorPicker/Properties/Resources.Designer.cs
diff --git a/ColorPicker/Properties/Resources.en-US.resx b/ColorPicker/Properties/Resources.en-US.resx
@@ -735,4 +735,7 @@
   <data name="BackgroundDetails" xml:space="preserve">
     <value>Background color details</value>
   </data>
+  <data name="UseUpperCasesHex" xml:space="preserve">
+    <value>Use upper cases for HEX color</value>
+  </data>
 </root>
diff --git a/ColorPicker/Properties/Resources.fr-FR.resx b/ColorPicker/Properties/Resources.fr-FR.resx
@@ -739,4 +739,7 @@
   <data name="BackgroundDetails" xml:space="preserve">
     <value>Détails de la couleur d'arrière-plan</value>
   </data>
+  <data name="UseUpperCasesHex" xml:space="preserve">
+    <value>Utiliser des majuscules pour les couleurs HEX</value>
+  </data>
 </root>
diff --git a/ColorPicker/Properties/Resources.resx b/ColorPicker/Properties/Resources.resx
@@ -715,4 +715,7 @@
   <data name="BackgroundDetails" xml:space="preserve">
     <value>Background color details</value>
   </data>
+  <data name="UseUpperCasesHex" xml:space="preserve">
+    <value>Use upper cases for HEX color</value>
+  </data>
 </root>
diff --git a/ColorPicker/Properties/Resources.zh-CN.resx b/ColorPicker/Properties/Resources.zh-CN.resx
@@ -743,4 +743,7 @@
   <data name="BackgroundDetails" xml:space="preserve">
     <value>背景颜色细节</value>
   </data>
+  <data name="UseUpperCasesHex" xml:space="preserve">
+    <value>使用大写字母表示 HEX 颜色</value>
+  </data>
 </root>
diff --git a/ColorPicker/UserControls/ColorFrequenceItem.xaml.cs b/ColorPicker/UserControls/ColorFrequenceItem.xaml.cs
@@ -23,6 +23,7 @@ MIT License
 */
 
 using ColorHelper;
+using ColorPicker.Classes;
 using ColorPicker.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
@@ -49,7 +50,7 @@ public ColorFrequenceItem(RGB color, int freq)
 		private void InitUI()
 		{
 			ColorBorder.Background = new SolidColorBrush { Color = System.Windows.Media.Color.FromRgb(Color.R, Color.G, Color.B) };
-			ColorTxt.Text = $"#{ColorHelper.ColorConverter.RgbToHex(Color).Value}";
+			ColorTxt.Text = $"#{((Global.Settings.UseUpperCasesHex ?? false) ? ColorHelper.ColorConverter.RgbToHex(Color).Value.ToUpper() : ColorHelper.ColorConverter.RgbToHex(Color).Value.ToLower())}";
 			FreqTxt.Text = Freq.ToString();
 		}
 

diff --git a/ColorPicker/UserControls/ColorItem.xaml.cs b/ColorPicker/UserControls/ColorItem.xaml.cs
@@ -41,7 +41,7 @@ public partial class ColorItem : UserControl
 		public ColorItem(string hexColor)
 		{
 			InitializeComponent();
-			HexColor = hexColor;
+			HexColor = (Global.Settings.UseUpperCasesHex ?? false) ? hexColor.ToUpper() : hexColor.ToLower();
 			ColorInfo = new(ColorHelper.ColorConverter.HexToRgb(new(HexColor)));
 
 			InitUI();