Minor

rampaa · Dec 15, 2024 · dd23c16 · dd23c16
1 parent bca4690
commit dd23c16
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 16 deletions.
diff --git a/JL.Windows/ConfigManager.cs b/JL.Windows/ConfigManager.cs
@@ -194,7 +194,7 @@ internal sealed class ConfigManager
     #endregion
 
     private static readonly ComboBoxItem[] s_japaneseFonts = WindowsUtils.FindJapaneseFonts();
-    private static readonly ComboBoxItem[] s_popupJapaneseFonts = WindowsUtils.CloneJapaneseFontComboBoxItems(s_japaneseFonts);
+    private static readonly ComboBoxItem[] s_popupJapaneseFonts = WindowsUtils.CloneComboBoxItems(s_japaneseFonts);
     private SkinType Theme { get; set; } = SkinType.Dark;
 
     private ConfigManager()

diff --git a/JL.Windows/GUI/AddAudioSourceWindow.xaml.cs b/JL.Windows/GUI/AddAudioSourceWindow.xaml.cs
@@ -5,6 +5,7 @@
 using JL.Core.Audio;
 using JL.Core.Utilities;
 using JL.Windows.SpeechSynthesis;
+using JL.Windows.Utilities;
 
 namespace JL.Windows.GUI;
 
@@ -129,7 +130,10 @@ private void SaveButton_Click(object sender, RoutedEventArgs e)
     private void Window_Loaded(object sender, RoutedEventArgs e)
     {
         AudioSourceTypeComboBox.ItemsSource = s_audioSourceTypes;
-        TextToSpeechVoicesComboBox.ItemsSource = SpeechSynthesisUtils.InstalledVoices;
+        if (SpeechSynthesisUtils.InstalledVoices is not null)
+        {
+            TextToSpeechVoicesComboBox.ItemsSource = WindowsUtils.CloneComboBoxItems(SpeechSynthesisUtils.InstalledVoices);
+        }
     }
 
     private void InfoButton_Click(object sender, RoutedEventArgs e)

diff --git a/JL.Windows/GUI/EditAudioSourceWindow.xaml.cs b/JL.Windows/GUI/EditAudioSourceWindow.xaml.cs
@@ -5,6 +5,7 @@
 using JL.Core.Audio;
 using JL.Core.Utilities;
 using JL.Windows.SpeechSynthesis;
+using JL.Windows.Utilities;
 
 namespace JL.Windows.GUI;
 
@@ -45,15 +46,16 @@ public EditAudioSourceWindow(string uri, AudioSource audioSource)
 
             case AudioSourceType.TextToSpeech:
                 PathType.Text = "Text to Speech Voice";
-                TextToSpeechVoicesComboBox.ItemsSource = SpeechSynthesisUtils.InstalledVoices;
 
-                TextToSpeechVoicesComboBox.SelectedIndex = SpeechSynthesisUtils.InstalledVoices is not null
-                    ? Array.FindIndex(SpeechSynthesisUtils.InstalledVoices, iv => iv.Content.ToString() == _uri)
-                    : 0;
-
-                if (TextToSpeechVoicesComboBox.SelectedIndex < 0)
+                if (SpeechSynthesisUtils.InstalledVoices is not null)
                 {
-                    TextToSpeechVoicesComboBox.SelectedIndex = 0;
+                    TextToSpeechVoicesComboBox.ItemsSource = WindowsUtils.CloneComboBoxItems(SpeechSynthesisUtils.InstalledVoices);
+                    TextToSpeechVoicesComboBox.SelectedIndex = Array.FindIndex(SpeechSynthesisUtils.InstalledVoices, iv => iv.Content.ToString() == _uri);
+
+                    if (TextToSpeechVoicesComboBox.SelectedIndex < 0)
+                    {
+                        TextToSpeechVoicesComboBox.SelectedIndex = 0;
+                    }
                 }
 
                 TextBlockUri.Visibility = Visibility.Collapsed;

diff --git a/JL.Windows/SpeechSynthesis/SpeechSynthesisUtils.cs b/JL.Windows/SpeechSynthesis/SpeechSynthesisUtils.cs
@@ -15,9 +15,9 @@ internal static class SpeechSynthesisUtils
     public static string? InstalledVoiceWithHighestPriority { get; private set; }
     private static SpeechSynthesizer Synthesizer { get; } = new();
 
-    public static ComboBoxItem[]? InstalledVoices { get; } = GetInstalledJapaneseVoiceNames();
+    public static ComboBoxItem[]? InstalledVoices { get; } = GetInstalledVoiceNames();
 
-    private static ComboBoxItem[]? GetInstalledJapaneseVoiceNames()
+    private static ComboBoxItem[]? GetInstalledVoiceNames()
     {
         Synthesizer.InjectOneCoreVoices();
 

diff --git a/JL.Windows/Utilities/WindowsUtils.cs b/JL.Windows/Utilities/WindowsUtils.cs
@@ -110,16 +110,16 @@ public static ComboBoxItem[] FindJapaneseFonts()
             .ToArray();
     }
 
-    public static ComboBoxItem[] CloneJapaneseFontComboBoxItems(ComboBoxItem[] japaneseFontsComboBoxItems)
+    public static ComboBoxItem[] CloneComboBoxItems(ComboBoxItem[] comboBoxItems)
     {
-        ComboBoxItem[] clone = new ComboBoxItem[japaneseFontsComboBoxItems.Length];
-        for (int i = 0; i < japaneseFontsComboBoxItems.Length; i++)
+        ComboBoxItem[] clone = new ComboBoxItem[comboBoxItems.Length];
+        for (int i = 0; i < comboBoxItems.Length; i++)
         {
-            ComboBoxItem comboBoxItem = japaneseFontsComboBoxItems[i];
+            ComboBoxItem comboBoxItem = comboBoxItems[i];
 
             clone[i] = new ComboBoxItem
             {
-                Content = comboBoxItem.FontFamily.Source,
+                Content = comboBoxItem.Content,
                 FontFamily = comboBoxItem.FontFamily
             };