diff --git a/Bloxstrap/Extensions/CursorTypeEx.cs b/Bloxstrap/Extensions/CursorTypeEx.cs index 34b8de9..35efd7b 100644 --- a/Bloxstrap/Extensions/CursorTypeEx.cs +++ b/Bloxstrap/Extensions/CursorTypeEx.cs @@ -2,11 +2,11 @@ { static class CursorTypeEx { - public static IReadOnlyDictionary Selections => new Dictionary + public static IReadOnlyCollection Selections => new CursorType[] { - { "Default", CursorType.Default }, - { "2013 (Angular)", CursorType.From2013 }, - { "2006 (Cartoony)", CursorType.From2006 }, + CursorType.Default, + CursorType.From2013, + CursorType.From2006 }; } } diff --git a/Bloxstrap/Resources/Strings.Designer.cs b/Bloxstrap/Resources/Strings.Designer.cs index 93fec38..14531c6 100644 --- a/Bloxstrap/Resources/Strings.Designer.cs +++ b/Bloxstrap/Resources/Strings.Designer.cs @@ -864,6 +864,33 @@ namespace Bloxstrap.Resources { } } + /// + /// Looks up a localized string similar to Default. + /// + public static string Enums_CursorType_Default { + get { + return ResourceManager.GetString("Enums.CursorType.Default", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to 2006 (Cartoony). + /// + public static string Enums_CursorType_From2006 { + get { + return ResourceManager.GetString("Enums.CursorType.From2006", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to 2013 (Angular). + /// + public static string Enums_CursorType_From2013 { + get { + return ResourceManager.GetString("Enums.CursorType.From2013", resourceCulture); + } + } + /// /// Looks up a localized string similar to Catmoji. /// diff --git a/Bloxstrap/Resources/Strings.resx b/Bloxstrap/Resources/Strings.resx index edd4dc0..c36b3ce 100644 --- a/Bloxstrap/Resources/Strings.resx +++ b/Bloxstrap/Resources/Strings.resx @@ -387,6 +387,15 @@ Your ReShade configuration files will still be saved, and you can locate them by Always prompt + + Default + + + 2006 (Cartoony) + + + 2013 (Angular) + Catmoji diff --git a/Bloxstrap/UI/Elements/Menu/Pages/ModsPage.xaml b/Bloxstrap/UI/Elements/Menu/Pages/ModsPage.xaml index 3728dd6..56a881f 100644 --- a/Bloxstrap/UI/Elements/Menu/Pages/ModsPage.xaml +++ b/Bloxstrap/UI/Elements/Menu/Pages/ModsPage.xaml @@ -80,7 +80,13 @@ - + + + + + + + diff --git a/Bloxstrap/UI/ViewModels/Menu/ModsViewModel.cs b/Bloxstrap/UI/ViewModels/Menu/ModsViewModel.cs index 268522d..eb143a3 100644 --- a/Bloxstrap/UI/ViewModels/Menu/ModsViewModel.cs +++ b/Bloxstrap/UI/ViewModels/Menu/ModsViewModel.cs @@ -62,12 +62,12 @@ namespace Bloxstrap.UI.ViewModels.Menu set => App.Settings.Prop.UseOldCharacterSounds = value; } - public IReadOnlyDictionary CursorTypes => CursorTypeEx.Selections; + public IReadOnlyCollection CursorTypes => CursorTypeEx.Selections; - public string SelectedCursorType + public Enums.CursorType SelectedCursorType { - get => CursorTypes.FirstOrDefault(x => x.Value == App.Settings.Prop.CursorType).Key; - set => App.Settings.Prop.CursorType = CursorTypes[value]; + get => App.Settings.Prop.CursorType; + set => App.Settings.Prop.CursorType = value; } public bool OldAvatarBackground