diff --git a/src/ST.Client.Desktop.Avalonia.App/App.axaml b/src/ST.Client.Desktop.Avalonia.App/App.axaml index cdad64280..5a70120d6 100644 --- a/src/ST.Client.Desktop.Avalonia.App/App.axaml +++ b/src/ST.Client.Desktop.Avalonia.App/App.axaml @@ -8,7 +8,7 @@ - + diff --git a/src/ST.Client.Desktop.Avalonia.App/Program.cs b/src/ST.Client.Desktop.Avalonia.App/Program.cs index 220d9d14f..8a08dbe9e 100644 --- a/src/ST.Client.Desktop.Avalonia.App/Program.cs +++ b/src/ST.Client.Desktop.Avalonia.App/Program.cs @@ -15,7 +15,7 @@ namespace System.Application.UI // yet and stuff might break. [STAThread] static int Main(string[] args) - { + { // 目前桌面端默认使用 SystemTextJson 如果出现兼容性问题可取消下面这行代码 // Serializable.DefaultJsonImplType = Serializable.JsonImplType.NewtonsoftJson; Startup.IsMainProcess = args.Length == 0; diff --git a/src/ST.Client.Desktop.Avalonia/Application/Converters/CardTitleToPlaceholderConverter.cs b/src/ST.Client.Desktop.Avalonia/Application/Converters/CardTitleToPlaceholderConverter.cs deleted file mode 100644 index 604371c76..000000000 --- a/src/ST.Client.Desktop.Avalonia/Application/Converters/CardTitleToPlaceholderConverter.cs +++ /dev/null @@ -1,51 +0,0 @@ -using System.Globalization; -using System.Linq; -using Avalonia; -using Avalonia.Data.Converters; -using Avalonia.Media; - -namespace System.Application.Converters -{ - public class CardTitleToPlaceholderConverter : IValueConverter - { - private static readonly (Color StartColor, Color EndColor)[] placeholderColors = - { - (Color.Parse("#38ADAE"), Color.Parse("#CD295A")), - (Color.Parse("#F1EAB9"), Color.Parse("#FF8C8C")), - (Color.Parse("#C6EA8D"), Color.Parse("#FE90AF")), - (Color.Parse("#EA8D8D"), Color.Parse("#A890FE")), - (Color.Parse("#D8B5FF"), Color.Parse("#1EAE98")), - (Color.Parse("#FF61D2"), Color.Parse("#FE9090")), - (Color.Parse("#BFF098"), Color.Parse("#6FD6FF")), - (Color.Parse("#4E65FF"), Color.Parse("#92EFFD")), - (Color.Parse("#A9F1DF"), Color.Parse("#FFBBBB")) - }; - - public object? Convert(object value, Type targetType, object parameter, CultureInfo culture) - { - if (value is string s) - { - var selector = s.Select(x => (uint) x) - .Aggregate((x, y) => x ^ y) % (uint) placeholderColors.Length; - - return new LinearGradientBrush - { - StartPoint = new RelativePoint(0, 0, RelativeUnit.Relative), - EndPoint = new RelativePoint(1, 1, RelativeUnit.Relative), - GradientStops = new GradientStops - { - new GradientStop(placeholderColors[selector].StartColor, 0), - new GradientStop(placeholderColors[selector].EndColor, 1) - } - }; - } - - return null; - } - - public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) - { - throw new NotImplementedException(); - } - } -} \ No newline at end of file diff --git a/src/ST.Client.Desktop.Avalonia/Application/Converters/NameToFontFamilyConverter.cs b/src/ST.Client.Desktop.Avalonia/Application/Converters/NameToFontFamilyConverter.cs new file mode 100644 index 000000000..29a3140ea --- /dev/null +++ b/src/ST.Client.Desktop.Avalonia/Application/Converters/NameToFontFamilyConverter.cs @@ -0,0 +1,27 @@ +using System.Globalization; +using System.Linq; +using Avalonia; +using Avalonia.Data.Converters; +using Avalonia.Media; + +namespace System.Application.Converters +{ + public class NameToFontFamilyConverter : IValueConverter + { + public object? Convert(object value, Type targetType, object parameter, CultureInfo culture) + { + if (value is string s) + { + if (string.IsNullOrEmpty(s) || s.Equals("Default", StringComparison.OrdinalIgnoreCase)) + return new FontFamily(FontManager.Current.DefaultFontFamilyName); + return new FontFamily(s); + } + return null; + } + + public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) + { + throw new NotImplementedException(); + } + } +} \ No newline at end of file diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Controls/PaperView.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Controls/PaperView.axaml index ce0725dc1..dd8c5bfbe 100644 --- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Controls/PaperView.axaml +++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Controls/PaperView.axaml @@ -11,7 +11,6 @@ x:Class="System.Application.UI.Views.Controls.PaperView"> - diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/MainView.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/MainView.axaml index 0d770f82e..899cbdb14 100644 --- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/MainView.axaml +++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/MainView.axaml @@ -7,159 +7,161 @@ xmlns:vm="clr-namespace:System.Application.UI.ViewModels;assembly=System.Application.SteamTools.Client.Desktop" xmlns:service="clr-namespace:System.Application.Services;assembly=System.Application.SteamTools.Client.Desktop" xmlns:resx="clr-namespace:System.Application.UI.Resx;assembly=System.Application.SteamTools.Client.Desktop" + xmlns:ms="clr-namespace:System.Application.Models.Settings;assembly=System.Application.SteamTools.Client.Desktop" xmlns:controls="clr-namespace:System.Application.UI.Views.Controls" x:Class="System.Application.UI.Views.MainView" FontSize="14" + FontFamily="{Binding Source={x:Static ms:UISettings.FontName},Path=Value, Mode=OneWay,Converter={StaticResource NameToFontFamilyConverter}}" x:DataType="vm:MainWindowViewModel" x:CompileBindings="True"> - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + \ No newline at end of file diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/GameListPage.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/GameListPage.axaml index cc682526f..3da18265b 100644 --- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/GameListPage.axaml +++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/GameListPage.axaml @@ -95,13 +95,19 @@ + + + - + + + diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/Settings/Settings_Steam.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/Settings/Settings_Steam.axaml index 5f426db13..7f4b8d491 100644 --- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/Settings/Settings_Steam.axaml +++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/Settings/Settings_Steam.axaml @@ -32,7 +32,17 @@ - + + + + + + + + + + + diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/Settings/Settings_UI.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/Settings/Settings_UI.axaml index cf065b4e5..f665612a1 100644 --- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/Settings/Settings_UI.axaml +++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/Settings/Settings_UI.axaml @@ -7,55 +7,58 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="System.Application.UI.Views.Pages.Settings_UI"> - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/AddAuthWindow.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/AddAuthWindow.axaml index 7084c5271..7b04d24dd 100644 --- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/AddAuthWindow.axaml +++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/AddAuthWindow.axaml @@ -8,6 +8,8 @@ xmlns:vm="clr-namespace:System.Application.UI.ViewModels;assembly=System.Application.SteamTools.Client.Desktop" xmlns:service="clr-namespace:System.Application.Services;assembly=System.Application.SteamTools.Client.Desktop" xmlns:controls="clr-namespace:System.Application.UI.Views.Controls" + xmlns:ms="clr-namespace:System.Application.Models.Settings;assembly=System.Application.SteamTools.Client.Desktop" + FontFamily="{Binding Source={x:Static ms:UISettings.FontName},Path=Value, Mode=OneWay,Converter={StaticResource NameToFontFamilyConverter}}" Width="800" Height="600" WindowStartupLocation="CenterOwner" ExtendClientAreaToDecorationsHint="True" diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/AuthTradeWindow.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/AuthTradeWindow.axaml index 1fc2816dc..8c457a19c 100644 --- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/AuthTradeWindow.axaml +++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/AuthTradeWindow.axaml @@ -10,6 +10,8 @@ xmlns:controls="clr-namespace:System.Application.UI.Views.Controls" xmlns:i="using:Avalonia.Xaml.Interactivity" xmlns:ia="using:Avalonia.Xaml.Interactions.Core" + xmlns:ms="clr-namespace:System.Application.Models.Settings;assembly=System.Application.SteamTools.Client.Desktop" + FontFamily="{Binding Source={x:Static ms:UISettings.FontName},Path=Value, Mode=OneWay,Converter={StaticResource NameToFontFamilyConverter}}" Background="Transparent" ExtendClientAreaToDecorationsHint="True" ExtendClientAreaChromeHints="NoChrome" diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/ChangeBindPhoneNumberWindow.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/ChangeBindPhoneNumberWindow.axaml index 9b8e7a1da..381977126 100644 --- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/ChangeBindPhoneNumberWindow.axaml +++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/ChangeBindPhoneNumberWindow.axaml @@ -12,6 +12,8 @@ xmlns:resx="clr-namespace:System.Application.UI.Resx;assembly=System.Application.SteamTools.Client.Desktop" xmlns:ccl_services="clr-namespace:System.Application.Services;assembly=System.Application.SteamTools.Client" xmlns:vm="clr-namespace:System.Application.UI.ViewModels;assembly=System.Application.SteamTools.Client.Desktop" + xmlns:ms="clr-namespace:System.Application.Models.Settings;assembly=System.Application.SteamTools.Client.Desktop" + FontFamily="{Binding Source={x:Static ms:UISettings.FontName},Path=Value, Mode=OneWay,Converter={StaticResource NameToFontFamilyConverter}}" Background="Transparent" ExtendClientAreaToDecorationsHint="True" ExtendClientAreaChromeHints="NoChrome" diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/FluentWindow.cs b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/FluentWindow.cs index 5e0d9cc09..5684c8b89 100644 --- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/FluentWindow.cs +++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/FluentWindow.cs @@ -26,7 +26,7 @@ namespace Avalonia.Controls void Constructor() { - this.SetDefaultFontFamily(); + //this.SetDefaultFontFamily(); ExtendClientAreaToDecorationsHint = true; ExtendClientAreaTitleBarHeightHint = -1; diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/LoginOrRegisterWindow.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/LoginOrRegisterWindow.axaml index 0476b4949..6c467a2c9 100644 --- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/LoginOrRegisterWindow.axaml +++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/LoginOrRegisterWindow.axaml @@ -12,6 +12,8 @@ xmlns:resx="clr-namespace:System.Application.UI.Resx;assembly=System.Application.SteamTools.Client.Desktop" xmlns:ccl_services="clr-namespace:System.Application.Services;assembly=System.Application.SteamTools.Client" xmlns:vm="clr-namespace:System.Application.UI.ViewModels;assembly=System.Application.SteamTools.Client.Desktop" + xmlns:ms="clr-namespace:System.Application.Models.Settings;assembly=System.Application.SteamTools.Client.Desktop" + FontFamily="{Binding Source={x:Static ms:UISettings.FontName},Path=Value, Mode=OneWay,Converter={StaticResource NameToFontFamilyConverter}}" Background="Transparent" ExtendClientAreaToDecorationsHint="True" ExtendClientAreaChromeHints="NoChrome" diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/MessageBoxWindow.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/MessageBoxWindow.axaml index 8ace7a341..14b5ad1aa 100644 --- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/MessageBoxWindow.axaml +++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/MessageBoxWindow.axaml @@ -7,6 +7,8 @@ xmlns:resx="clr-namespace:System.Application.UI.Resx;assembly=System.Application.SteamTools.Client.Desktop" xmlns:vm="clr-namespace:System.Application.UI.ViewModels;assembly=System.Application.SteamTools.Client.Desktop" xmlns:controls="clr-namespace:System.Application.UI.Views.Controls" + xmlns:ms="clr-namespace:System.Application.Models.Settings;assembly=System.Application.SteamTools.Client.Desktop" + FontFamily="{Binding Source={x:Static ms:UISettings.FontName},Path=Value, Mode=OneWay,Converter={StaticResource NameToFontFamilyConverter}}" UseLayoutRounding="True" WindowStartupLocation="CenterOwner" SizeToContent="WidthAndHeight" diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/ProxyScriptManageWindow.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/ProxyScriptManageWindow.axaml index 50fb19bc8..c9641c3a1 100644 --- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/ProxyScriptManageWindow.axaml +++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/ProxyScriptManageWindow.axaml @@ -8,6 +8,8 @@ xmlns:resx="clr-namespace:System.Application.UI.Resx;assembly=System.Application.SteamTools.Client.Desktop" xmlns:vm="clr-namespace:System.Application.UI.ViewModels;assembly=System.Application.SteamTools.Client.Desktop" xmlns:controls="clr-namespace:System.Application.UI.Views.Controls" + xmlns:ms="clr-namespace:System.Application.Models.Settings;assembly=System.Application.SteamTools.Client.Desktop" + FontFamily="{Binding Source={x:Static ms:UISettings.FontName},Path=Value, Mode=OneWay,Converter={StaticResource NameToFontFamilyConverter}}" Background="Transparent" ExtendClientAreaToDecorationsHint="True" ExtendClientAreaChromeHints="NoChrome" diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/ShowAuthWindow.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/ShowAuthWindow.axaml index b46ec3cca..16037955c 100644 --- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/ShowAuthWindow.axaml +++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/ShowAuthWindow.axaml @@ -8,6 +8,8 @@ xmlns:resx="clr-namespace:System.Application.UI.Resx;assembly=System.Application.SteamTools.Client.Desktop" xmlns:vm="clr-namespace:System.Application.UI.ViewModels;assembly=System.Application.SteamTools.Client.Desktop" xmlns:controls="clr-namespace:System.Application.UI.Views.Controls" + xmlns:ms="clr-namespace:System.Application.Models.Settings;assembly=System.Application.SteamTools.Client.Desktop" + FontFamily="{Binding Source={x:Static ms:UISettings.FontName},Path=Value, Mode=OneWay,Converter={StaticResource NameToFontFamilyConverter}}" Background="Transparent" ExtendClientAreaToDecorationsHint="True" ExtendClientAreaChromeHints="NoChrome" diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/UserProfileWindow.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/UserProfileWindow.axaml index 45fbc111f..0618bd9c1 100644 --- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/UserProfileWindow.axaml +++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/UserProfileWindow.axaml @@ -13,6 +13,8 @@ xmlns:resx="clr-namespace:System.Application.UI.Resx;assembly=System.Application.SteamTools.Client.Desktop" xmlns:ccl_services="clr-namespace:System.Application.Services;assembly=System.Application.SteamTools.Client" xmlns:vm="clr-namespace:System.Application.UI.ViewModels;assembly=System.Application.SteamTools.Client.Desktop" + xmlns:ms="clr-namespace:System.Application.Models.Settings;assembly=System.Application.SteamTools.Client.Desktop" + FontFamily="{Binding Source={x:Static ms:UISettings.FontName},Path=Value, Mode=OneWay,Converter={StaticResource NameToFontFamilyConverter}}" Background="Transparent" ExtendClientAreaToDecorationsHint="True" ExtendClientAreaChromeHints="NoChrome" diff --git a/src/ST.Client.Desktop/Models/Enum/SteamAppType.cs b/src/ST.Client.Desktop/Models/Enum/SteamAppType.cs index 4f695e19c..c1deb3dfc 100644 --- a/src/ST.Client.Desktop/Models/Enum/SteamAppType.cs +++ b/src/ST.Client.Desktop/Models/Enum/SteamAppType.cs @@ -60,6 +60,9 @@ namespace System.Application.Models [Description("SteamAppType_Mod")] Mod = 18, + + [Description("SteamAppType_Beta")] + Beta = 19, } #if DEBUG diff --git a/src/ST.Client.Desktop/Models/Settings/UISettings.cs b/src/ST.Client.Desktop/Models/Settings/UISettings.cs index e3e360ba4..cbfabed0b 100644 --- a/src/ST.Client.Desktop/Models/Settings/UISettings.cs +++ b/src/ST.Client.Desktop/Models/Settings/UISettings.cs @@ -39,6 +39,12 @@ namespace System.Application.Models.Settings public static SerializableProperty Language { get; } = new SerializableProperty(GetKey(), Providers.Local, "") { AutoSave = true }; + /// + /// + /// + public static SerializableProperty FontName { get; } + = new SerializableProperty(GetKey(), Providers.Local, "Default") { AutoSave = true }; + private static string GetKey([CallerMemberName] string propertyName = "") { return nameof(UISettings) + "." + propertyName; diff --git a/src/ST.Client.Desktop/UI/Resx/AppResources.Designer.cs b/src/ST.Client.Desktop/UI/Resx/AppResources.Designer.cs index db0998f13..9c3f9089d 100644 --- a/src/ST.Client.Desktop/UI/Resx/AppResources.Designer.cs +++ b/src/ST.Client.Desktop/UI/Resx/AppResources.Designer.cs @@ -1511,6 +1511,15 @@ namespace System.Application.UI.Resx { } } + /// + /// 查找类似 测试 的本地化字符串。 + /// + public static string SteamAppType_Beta { + get { + return ResourceManager.GetString("SteamAppType_Beta", resourceCulture); + } + } + /// /// 查找类似 配置 的本地化字符串。 /// diff --git a/src/ST.Client.Desktop/UI/Resx/AppResources.en.resx b/src/ST.Client.Desktop/UI/Resx/AppResources.en.resx index 85a688650..0c188657d 100644 --- a/src/ST.Client.Desktop/UI/Resx/AppResources.en.resx +++ b/src/ST.Client.Desktop/UI/Resx/AppResources.en.resx @@ -121,52 +121,52 @@ About - Fix Steam 302 Error + Community acceleration - My Games + Stock game - Game Related + Game features The written hosts already exist - An error occurred while reading the hosts file + There was an error reading the hosts file Read hosts successfully - Write hosts successfully + The write hosts succeeded - Error writing to hosts + An error occurred while writing hosts Language - Settings + Set up - Auth Settings + Token settings - General Settings + Basic settings Steam Auth - Account Change + Account switching Warning - Start Page + The start page FAQ troubleshooting @@ -195,9 +195,6 @@ Cloud sync - - Community acceleration - Are you sure @@ -219,27 +216,6 @@ Export - - Stock game - - - Game features - - - The written hosts already exist - - - There was an error reading the hosts file - - - Read hosts successfully - - - The write hosts succeeded - - - An error occurred while writing hosts - Automatic set card @@ -375,15 +351,6 @@ Select {0} file import - - Set up - - - Token settings - - - Basic settings - Language @@ -423,13 +390,7 @@ Offline mode starts - - Account switching - - - Warning - - - The start page + + Default System \ No newline at end of file diff --git a/src/ST.Client.Desktop/UI/Resx/AppResources.resx b/src/ST.Client.Desktop/UI/Resx/AppResources.resx index 8cd15c186..f0635c57c 100644 --- a/src/ST.Client.Desktop/UI/Resx/AppResources.resx +++ b/src/ST.Client.Desktop/UI/Resx/AppResources.resx @@ -593,6 +593,9 @@ 软件 + + 测试 + 配置 diff --git a/src/ST.Client.Desktop/UI/Resx/R.cs b/src/ST.Client.Desktop/UI/Resx/R.cs index 1639d95a0..e9e84decf 100644 --- a/src/ST.Client.Desktop/UI/Resx/R.cs +++ b/src/ST.Client.Desktop/UI/Resx/R.cs @@ -13,9 +13,9 @@ namespace System.Application.UI.Resx { public static R Current { get; } - public static readonly IList> Languages; + public static readonly IReadOnlyCollection> Languages; public static readonly Dictionary SteamLanguages; - public static readonly IList> Fonts; + public static readonly IReadOnlyCollection Fonts; public AppResources Res { get; set; } = new AppResources(); @@ -49,13 +49,12 @@ namespace System.Application.UI.Resx AppResources.Culture = DefaultCurrentUICulture; } - static IList> GetFonts() + static IReadOnlyCollection GetFonts() { var culture = Culture; InstalledFontCollection ifc = new(); - var list = ifc.Families.Select(x => - KeyValuePair.Create(x.GetName(culture.LCID), (FontFamily?)x)).ToList(); - list.Insert(0, KeyValuePair.Create("Default", (FontFamily?)null)); + var list = ifc.Families.Select(x => x.GetName(culture.LCID)).ToList(); + list.Insert(0, "Default"); return list; } diff --git a/src/ST.Client.Desktop/UI/ViewModels/Pages/Settings/SettingsPageViewModel.cs b/src/ST.Client.Desktop/UI/ViewModels/Pages/Settings/SettingsPageViewModel.cs index 35c105509..ea6bb18f6 100644 --- a/src/ST.Client.Desktop/UI/ViewModels/Pages/Settings/SettingsPageViewModel.cs +++ b/src/ST.Client.Desktop/UI/ViewModels/Pages/Settings/SettingsPageViewModel.cs @@ -25,13 +25,6 @@ namespace System.Application.UI.ViewModels protected set => this.RaiseAndSetIfChanged(ref _SelectLanguage, value); } - KeyValuePair _SelectFont; - public KeyValuePair SelectFont - { - get => _SelectFont; - protected set => this.RaiseAndSetIfChanged(ref _SelectFont, value); - } - public SettingsPageViewModel() { IconKey = nameof(SettingsPageViewModel).Replace("ViewModel", "Svg");