upstream

hellzerg · Aug 19, 2023 · 2e89125 · 2e89125
1 parent 2e48f90
commit 2e89125
Show file tree

Hide file tree

Showing 10 changed files with 931 additions and 630 deletions.
diff --git a/Optimizer/FontHelper.cs b/Optimizer/FontHelper.cs
@@ -63,6 +63,22 @@ internal static void ChangeGlobalFont(string fontName)
             }
         }
 
+        internal static string GetCurrentGlobalFont()
+        {
+            try
+            {
+                using (RegistryKey fontSubstitutesKey = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes", false))
+                {
+                   return fontSubstitutesKey.GetValue("Segoe UI", string.Empty) as string;
+                }
+            }
+            catch (Exception ex)
+            {
+                ErrorLogger.LogError("FontHelper.GetCurrentGlobalFont", ex.Message, ex.StackTrace);
+                return string.Empty;
+            }
+        }
+
         internal static void RestoreDefaultGlobalFont()
         {
             try

diff --git a/Optimizer/Forms/FirstRunForm.Designer.cs b/Optimizer/Forms/FirstRunForm.Designer.cs
diff --git a/Optimizer/Forms/MainForm.Designer.cs b/Optimizer/Forms/MainForm.Designer.cs
diff --git a/Optimizer/Forms/MainForm.cs b/Optimizer/Forms/MainForm.cs
@@ -85,6 +85,7 @@ public sealed partial class MainForm : Form
         bool _skipSystemRestore = false;
 
         string[] _currentDNS;
+        string[] _availableFonts;
 
         ColorOverrider _colorOverrider;
 
@@ -950,6 +951,7 @@ public MainForm(SplashForm _splashForm, bool disableIndicium = false, bool disab
                 LoadReadyMenusState();
                 GetDesktopItems();
                 GetCustomCommands();
+                LoadAvailableFonts();
             }
             else
             {
@@ -1061,6 +1063,16 @@ public MainForm(SplashForm _splashForm, bool disableIndicium = false, bool disab
             EnableToggleEvents();
         }
 
+        private void LoadAvailableFonts()
+        {
+            listFonts.Items.Clear();
+            _availableFonts = FontHelper.GetAvailableFonts().ToArray();
+            listFonts.Items.AddRange(_availableFonts);
+            string currentFont = FontHelper.GetCurrentGlobalFont();
+            lblCurrentFont.Text = !string.IsNullOrEmpty(currentFont) ? currentFont : "-";
+            lblFontsNumber.Text = _availableFonts.Length.ToString();
+        }
+
         private void FixFormSize()
         {
             int desiredWidth = (tabCollection.ItemSize.Width * tabCollection.TabPages.Count) + (Program.DPI_PREFERENCE / 3);
@@ -4346,7 +4358,7 @@ private void boxLang_SelectedIndexChanged(object sender, EventArgs e)
             }
             else if (boxLang.Text == Constants.TAIWANESE)
             {
-                picFlag.Image = Properties.Resources.taiwan;
+                picFlag.Image = Properties.Resources.china;
                 Options.CurrentOptions.LanguageCode = LanguageCode.TW;
             }
             else if (boxLang.Text == Constants.KOREAN)
@@ -4405,6 +4417,7 @@ private void boxLang_SelectedIndexChanged(object sender, EventArgs e)
             Translate();
 
             FixFormSize();
+            btnUpdate.Focus();
         }
 
         private void cleanDriveB_Click(object sender, EventArgs e)
@@ -4793,5 +4806,46 @@ private void linkLabel6_LinkClicked(object sender, LinkLabelLinkClickedEventArgs
         {
             Process.Start(_featureRequestLink);
         }
+
+        private void btnRefreshFonts_Click(object sender, EventArgs e)
+        {
+            LoadAvailableFonts();
+        }
+
+        private void btnRestoreFont_Click(object sender, EventArgs e)
+        {
+            if (MessageBox.Show(_uwpRestoreMessage, "Optimizer", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
+            {
+                FontHelper.RestoreDefaultGlobalFont();
+                ShowRestartNeeded();
+            }
+        }
+
+        private void btnSetGlobalFont_Click(object sender, EventArgs e)
+        {
+            if (listFonts.SelectedIndex < 0)
+            {
+                return;
+            }
+            if (MessageBox.Show(_uwpRestoreMessage, "Optimizer", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
+            {
+                string fontName = listFonts.SelectedItem.ToString();
+                FontHelper.ChangeGlobalFont(fontName);
+                ShowRestartNeeded();
+            }
+        }
+
+        private void txtSearchFonts_TextChanged(object sender, EventArgs e)
+        {
+            if (!string.IsNullOrEmpty(txtSearchFonts.Text))
+            {
+                listFonts.Items.Clear();
+                listFonts.Items.AddRange(_availableFonts.Where(x => x.ToLowerInvariant().Contains(txtSearchFonts.Text.ToLowerInvariant().Trim())).ToArray());
+            }
+            else
+            {
+                LoadAvailableFonts();
+            }
+        }
     }
-}
+}