diff --git a/src/Portal/Sucrose.Portal/ViewModels/Pages/Setting/DonateSettingViewModel.cs b/src/Portal/Sucrose.Portal/ViewModels/Pages/Setting/DonateSettingViewModel.cs index 07538cca6..f167ee342 100644 --- a/src/Portal/Sucrose.Portal/ViewModels/Pages/Setting/DonateSettingViewModel.cs +++ b/src/Portal/Sucrose.Portal/ViewModels/Pages/Setting/DonateSettingViewModel.cs @@ -111,6 +111,8 @@ private void InitializeViewModel() NumberBox AdvertisingDelay = new() { + Icon = new SymbolIcon(SymbolRegular.Timer20), + IconPlacement = ElementPlacement.Left, Value = SMMM.AdvertisingDelay, ClearButtonEnabled = false, MaxDecimalPlaces = 0, diff --git a/src/Portal/Sucrose.Portal/ViewModels/Pages/Setting/GeneralSettingViewModel.cs b/src/Portal/Sucrose.Portal/ViewModels/Pages/Setting/GeneralSettingViewModel.cs index ca67bd0da..bc69f3a7a 100644 --- a/src/Portal/Sucrose.Portal/ViewModels/Pages/Setting/GeneralSettingViewModel.cs +++ b/src/Portal/Sucrose.Portal/ViewModels/Pages/Setting/GeneralSettingViewModel.cs @@ -261,6 +261,8 @@ private void InitializeViewModel() NumberBox BackdropOpacity = new() { + Icon = new SymbolIcon(SymbolRegular.PositionBackward24), + IconPlacement = ElementPlacement.Left, Value = SMMM.BackgroundOpacity, ClearButtonEnabled = false, MaxDecimalPlaces = 0, diff --git a/src/Portal/Sucrose.Portal/ViewModels/Pages/Setting/OtherSettingViewModel.cs b/src/Portal/Sucrose.Portal/ViewModels/Pages/Setting/OtherSettingViewModel.cs index c214ee360..783fa6e5d 100644 --- a/src/Portal/Sucrose.Portal/ViewModels/Pages/Setting/OtherSettingViewModel.cs +++ b/src/Portal/Sucrose.Portal/ViewModels/Pages/Setting/OtherSettingViewModel.cs @@ -104,6 +104,8 @@ private void InitializeViewModel() NumberBox DiscordDelay = new() { + Icon = new SymbolIcon(SymbolRegular.TimePicker24), + IconPlacement = ElementPlacement.Left, ClearButtonEnabled = false, Value = SMMM.DiscordDelay, MaxDecimalPlaces = 0, @@ -149,6 +151,8 @@ private void InitializeViewModel() TextBox UserAgent = new() { + Icon = new SymbolIcon(SymbolRegular.PersonHeart24), + IconPlacement = ElementPlacement.Left, ClearButtonEnabled = false, Text = SMMM.UserAgent, IsReadOnly = true, @@ -187,7 +191,9 @@ private void InitializeViewModel() TextBox PersonalKey = new() { PlaceholderText = SSRER.GetValue("Portal", "OtherSettingPage", "Key", "PersonalKey"), + Icon = new SymbolIcon(SymbolRegular.PersonKey20), HorizontalAlignment = HorizontalAlignment.Left, + IconPlacement = ElementPlacement.Left, Margin = new Thickness(0, 10, 0, 0), Text = SMMM.Key, MaxLength = 93 diff --git a/src/Portal/Sucrose.Portal/ViewModels/Pages/Setting/PerformanceSettingViewModel.cs b/src/Portal/Sucrose.Portal/ViewModels/Pages/Setting/PerformanceSettingViewModel.cs index f48851df0..118380d26 100644 --- a/src/Portal/Sucrose.Portal/ViewModels/Pages/Setting/PerformanceSettingViewModel.cs +++ b/src/Portal/Sucrose.Portal/ViewModels/Pages/Setting/PerformanceSettingViewModel.cs @@ -99,7 +99,7 @@ private void InitializeViewModel() Margin = new Thickness(0, 10, 0, 0) }; - Cpu.LeftIcon.Symbol = SymbolRegular.HeartPulse24; + Cpu.LeftIcon.Symbol = SymbolRegular.DeveloperBoardLightning20; Cpu.Title.Text = SSRER.GetValue("Portal", "PerformanceSettingPage", "Cpu"); Cpu.Description.Text = SSRER.GetValue("Portal", "PerformanceSettingPage", "Cpu", "Description"); @@ -132,6 +132,8 @@ private void InitializeViewModel() NumberBox CpuUsage = new() { + Icon = new SymbolIcon(SymbolRegular.DeveloperBoard24), + IconPlacement = ElementPlacement.Left, Margin = new Thickness(0, 0, 10, 0), ClearButtonEnabled = false, Value = SMMM.CpuUsage, @@ -188,6 +190,8 @@ private void InitializeViewModel() NumberBox MemoryUsage = new() { + Icon = new SymbolIcon(SymbolRegular.DataUsage24), + IconPlacement = ElementPlacement.Left, Margin = new Thickness(0, 0, 10, 0), ClearButtonEnabled = false, Value = SMMM.MemoryUsage, @@ -295,6 +299,8 @@ private void InitializeViewModel() NumberBox NetworkUpload = new() { + Icon = new SymbolIcon(SymbolRegular.ArrowUpload24), + IconPlacement = ElementPlacement.Left, Margin = new Thickness(0, 0, 10, 0), ClearButtonEnabled = false, Value = SMMM.UploadValue, @@ -339,6 +345,8 @@ private void InitializeViewModel() NumberBox NetworkDownload = new() { + Icon = new SymbolIcon(SymbolRegular.ArrowDownload24), + IconPlacement = ElementPlacement.Left, Margin = new Thickness(0, 0, 10, 0), ClearButtonEnabled = false, Value = SMMM.DownloadValue, @@ -383,6 +391,8 @@ private void InitializeViewModel() NumberBox NetworkPing = new() { + Icon = new SymbolIcon(SymbolRegular.HeartPulse24), + IconPlacement = ElementPlacement.Left, Margin = new Thickness(0, 0, 10, 0), ClearButtonEnabled = false, Value = SMMM.PingValue, @@ -482,6 +492,8 @@ private void InitializeViewModel() NumberBox BatteryUsage = new() { + Icon = new SymbolIcon(SymbolRegular.BatteryWarning24), + IconPlacement = ElementPlacement.Left, Margin = new Thickness(0, 0, 10, 0), ClearButtonEnabled = false, Value = SMMM.BatteryUsage, diff --git a/src/Portal/Sucrose.Portal/ViewModels/Pages/Setting/PersonalSettingViewModel.cs b/src/Portal/Sucrose.Portal/ViewModels/Pages/Setting/PersonalSettingViewModel.cs index 356ed8caa..7b2857875 100644 --- a/src/Portal/Sucrose.Portal/ViewModels/Pages/Setting/PersonalSettingViewModel.cs +++ b/src/Portal/Sucrose.Portal/ViewModels/Pages/Setting/PersonalSettingViewModel.cs @@ -51,6 +51,8 @@ private void InitializeViewModel() NumberBox StoreDuration = new() { + Icon = new SymbolIcon(SymbolRegular.Clock24), + IconPlacement = ElementPlacement.Left, ClearButtonEnabled = false, Value = SMMM.StoreDuration, MaxDecimalPlaces = 0, @@ -213,6 +215,8 @@ private void InitializeViewModel() NumberBox TitleLength = new() { + Icon = new SymbolIcon(SymbolRegular.TextCaseTitle24), + IconPlacement = ElementPlacement.Left, ClearButtonEnabled = false, Value = SMMM.TitleLength, MaxDecimalPlaces = 0, @@ -240,6 +244,8 @@ private void InitializeViewModel() NumberBox DescriptionLength = new() { + Icon = new SymbolIcon(SymbolRegular.TextDescription24), + IconPlacement = ElementPlacement.Left, Value = SMMM.DescriptionLength, ClearButtonEnabled = false, MaxDecimalPlaces = 0, @@ -290,6 +296,8 @@ private void InitializeViewModel() NumberBox AdaptiveMargin = new() { + Icon = new SymbolIcon(SymbolRegular.DocumentMargins24), + IconPlacement = ElementPlacement.Left, Value = SMMM.AdaptiveMargin, ClearButtonEnabled = false, MaxDecimalPlaces = 0, @@ -317,6 +325,8 @@ private void InitializeViewModel() NumberBox AdaptiveLayout = new() { + Icon = new SymbolIcon(SymbolRegular.NumberRow24), + IconPlacement = ElementPlacement.Left, Value = SMMM.AdaptiveLayout, ClearButtonEnabled = false, MaxDecimalPlaces = 0, @@ -352,6 +362,8 @@ private void InitializeViewModel() NumberBox StorePagination = new() { + Icon = new SymbolIcon(SymbolRegular.TextWordCount24), + IconPlacement = ElementPlacement.Left, Value = SMMM.StorePagination, ClearButtonEnabled = false, MaxDecimalPlaces = 0, @@ -378,6 +390,8 @@ private void InitializeViewModel() NumberBox LibraryPagination = new() { + Icon = new SymbolIcon(SymbolRegular.TextWordCount24), + IconPlacement = ElementPlacement.Left, Value = SMMM.LibraryPagination, ClearButtonEnabled = false, MaxDecimalPlaces = 0, diff --git a/src/Portal/Sucrose.Portal/Views/Controls/Pagination.xaml.cs b/src/Portal/Sucrose.Portal/Views/Controls/Pagination.xaml.cs index 7a7a9dc32..0b60793c2 100644 --- a/src/Portal/Sucrose.Portal/Views/Controls/Pagination.xaml.cs +++ b/src/Portal/Sucrose.Portal/Views/Controls/Pagination.xaml.cs @@ -1,6 +1,7 @@ using System.Windows; using System.Windows.Controls; using System.Windows.Controls.Primitives; +using Wpf.Ui.Controls; namespace Sucrose.Portal.Views.Controls { @@ -13,6 +14,9 @@ public Pagination() { InitializeComponent(); UpdatePagination(); + + PageNumber.IconPlacement = ElementPlacement.Left; + PageNumber.Icon = new SymbolIcon(SymbolRegular.DocumentPageBottomCenter24); } public event EventHandler SelectPageChanged;