Fix #1

Author: KaiHuaDou

StartPro/Setting.xaml

@@ -4,7 +4,6 @@
         xmlns:System="clr-namespace:System;assembly=mscorlib"
         xmlns:text="clr-namespace:StartPro.Resources"
         Title="{x:Static text:Main.TitleSetting}"
-        Loaded="WindowLoaded"
         SizeToContent="WidthAndHeight">
     <Grid Margin="10">
         <Grid.ColumnDefinitions>
@@ -36,18 +35,9 @@
             <TextBox x:Name="BackgroundBox" />
         </DockPanel>
         <TextBlock Grid.Row="1" Text="{x:Static text:Main.UIThemeText}" />
-        <StackPanel Grid.Row="1" Grid.Column="1" Margin="0,5,0,5">
-            <ComboBox x:Name="UIThemeBox" SelectionChanged="UIThemeBoxSelectionChanged">
-                <System:String>Aero.NormalColor</System:String>
-                <System:String>Aero2.NormalColor</System:String>
-                <System:String>Luna.NormalColor</System:String>
-                <System:String>Luna.Homestead</System:String>
-                <System:String>Luna.Metallic</System:String>
-                <System:String>Royale.NormalColor</System:String>
-                <System:String>Classic</System:String>
-            </ComboBox>
-            <Label x:Name="UIThemeText" />
-        </StackPanel>
+        <ComboBox x:Name="UIThemeBox"
+                  Grid.Row="1" Grid.Column="1"
+                  Margin="0,5,0,5" />
         <CheckBox x:Name="UIFlatBox" Grid.Row="2" Content="{x:Static text:Main.UIThemeFlat}" />
         <StackPanel Grid.Row="3" Grid.ColumnSpan="2"
                     HorizontalAlignment="Right"

StartPro/Setting.xaml.cs

@@ -1,5 +1,5 @@
-using System.Windows;
-using System.Windows.Controls;
+using System.Collections.Generic;
+using System.Windows;
 using System.Windows.Media;
 using StartPro.Api;
 using StartPro.Resources;
@@ -10,8 +10,19 @@ public partial class Setting : Window
     public Setting( )
     {
         InitializeComponent( );
+        List<string> UIThemeSource =
+        [
+            Main.ResourceManager.GetString("UITheme.Aero.NormalColor") + " (Aero.NormalColor)",
+            Main.ResourceManager.GetString("UITheme.Aero2.NormalColor") + " (Aero2.NormalColor)",
+            Main.ResourceManager.GetString("UITheme.Luna.NormalColor") + " (Luna.NormalColor)",
+            Main.ResourceManager.GetString("UITheme.Luna.Homestead") + " (Luna.Homestead)",
+            Main.ResourceManager.GetString("UITheme.Luna.Metallic") + " (Luna.Metallic)",
+            Main.ResourceManager.GetString("UITheme.Royale.NormalColor") + " (Royale.NormalColor)",
+            Main.ResourceManager.GetString("UITheme.Classic") + " (Classic)",
+        ];
         MaxWidth = Defaults.WidthPercent * SystemParameters.PrimaryScreenWidth;
         BackgroundBox.Text = App.Settings.Content.Background;
+        UIThemeBox.ItemsSource = UIThemeSource;
         UIThemeBox.SelectedIndex = App.Settings.Content.UITheme;
         UIFlatBox.IsChecked = App.Settings.Content.UIFlat;
     }
@@ -42,13 +53,4 @@ private void SelectImageClick(object o, RoutedEventArgs e)
         if (Utils.TrySelectFile(out string fileName, ".jpg"))
             BackgroundBox.Text = fileName;
     }
-
-    private void UIThemeBoxSelectionChanged(object o, SelectionChangedEventArgs e)
-    {
-        if (UIThemeText is null || UIThemeBox is null) return;
-        UIThemeText.Content = Main.ResourceManager.GetString($"UITheme.{UIThemeBox.SelectedValue}");
-    }
-
-    private void WindowLoaded(object o, RoutedEventArgs e)
-        => UIThemeBoxSelectionChanged(null, null);
 }