Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-08 04:07:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

[Settings][QuickAccent]Sort Languages ComboBox (#35462)

Browse Source 
sort languages
This commit is contained in:
Davide Giacometti
2024-10-18 15:09:29 +02:00
committed by GitHub
parent 2335501421
commit 14139affc5
1 changed files with 32 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/settings-ui/Settings.UI/ViewModels/GeneralViewModel.cs
View File

@@ -9,7 +9,6 @@ using System.Diagnostics;
using System.Globalization; using System.Globalization;
using System.IO; using System.IO;
using System.IO.Abstractions; using System.IO.Abstractions;
using System.Linq;
using System.Reflection; using System.Reflection;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
using System.Text.Json; using System.Text.Json;
@@ -1083,25 +1082,50 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
private void InitializeLanguages() private void InitializeLanguages()
{ {
var lang = LanguageModel.LoadSetting(); var lang = LanguageModel.LoadSetting();
int i = 0; var selectedLanguageIndex = 0;
foreach (var item in langTagsAndIds) foreach (var item in langTagsAndIds)
{ {
Languages.Add(new LanguageModel { Tag = item.Key, ResourceID = item.Value, Language = GetResourceString(item.Value) }); var language = new LanguageModel { Tag = item.Key, ResourceID = item.Value, Language = GetResourceString(item.Value) };
var index = GetLanguageIndex(language.Language, item.Key == string.Empty);
Languages.Insert(index, language);
if (item.Key.Equals(lang, StringComparison.Ordinal)) if (item.Key.Equals(lang, StringComparison.Ordinal))
{ {
_initLanguagesIndex = i; selectedLanguageIndex = index;
LanguagesIndex = i; }
else if (index <= selectedLanguageIndex)
{
selectedLanguageIndex++;
} }
i++;
} }
_initLanguagesIndex = selectedLanguageIndex;
LanguagesIndex = selectedLanguageIndex;
}
[System.Diagnostics.CodeAnalysis.SuppressMessage("Globalization", "CA1309:Use ordinal string comparison", Justification = "Building a user facing list")]
private int GetLanguageIndex(string language, bool isDefault)
{
if (Languages.Count == 0 || isDefault)
{
return 0;
}
for (var i = 1; i < Languages.Count; i++)
{
if (string.Compare(Languages[i].Language, language, StringComparison.CurrentCultureIgnoreCase) > 0)
{
return i;
}
}
return Languages.Count;
} }
private void NotifyLanguageChanged() private void NotifyLanguageChanged()
{ {
OutGoingLanguageSettings outsettings = new OutGoingLanguageSettings(langTagsAndIds.ElementAt(LanguagesIndex).Key); OutGoingLanguageSettings outsettings = new OutGoingLanguageSettings(Languages[_languagesIndex].Tag);
SendConfigMSG(outsettings.ToString()); SendConfigMSG(outsettings.ToString());
} }