Skip to content

Portable Tool for an Ideal Windows Setup

upd language selection and remove old dictionaries

Greedeks216cc19d042c
diff --git a/.Source/GTweak/App.xaml.cs b/.Source/GTweak/App.xaml.cs
index 80693624..065ec7dd 100644
--- a/.Source/GTweak/App.xaml.cs
+++ b/.Source/GTweak/App.xaml.cs
@@ -2,7 +2,6 @@ using System;
using System.Linq;
using System.Windows;
using System.Windows.Threading;
-
using GTweak.Utilities.Configuration;
using GTweak.Utilities.Controls;
using GTweak.Utilities.Helpers;
@@ -81,35 +80,25 @@ namespace GTweak
{
var (code, region) = SystemDiagnostics.GetCurrentSystemLang();
- value ??= code;
-
- if (value.Contains('-'))
- {
- code = value.Split('-')[0];
- region = value.Split('-').Length > 1 ? value.Split('-')[1] : string.Empty;
- }
+ value ??= $"{code}-{region}";
ResourceDictionary dictionary = new ResourceDictionary
{
Source = value switch
{
"be" => GetResourceUri("ru"),
- _ when code == "pt" && region == "br" => GetResourceUri("pt-br"),
- _ when SettingsEngine.AvailableLangs?.Contains(value, StringComparer.OrdinalIgnoreCase) == true => GetResourceUri(value),
+ _ when SettingsEngine.AvailableLangs.Any(locale => string.Equals(locale, value, StringComparison.OrdinalIgnoreCase)) => GetResourceUri(value),
+ _ when value.Contains('-') && SettingsEngine.AvailableLangs.Any(locale => string.Equals(locale, value.Split('-')[0], StringComparison.OrdinalIgnoreCase)) => GetResourceUri(value.Split('-')[0]),
_ => GetResourceUri("en")
}
};
- ResourceDictionary oldDictionary = (from dict in Current.Resources.MergedDictionaries
- where dict.Source != null && dict.Source.OriginalString.StartsWith($"Languages/")
- select dict).First();
- if (oldDictionary != null)
+ foreach (ResourceDictionary oldDictionary in Current.Resources.MergedDictionaries.Where(d => d.Source != null && d.Source.OriginalString.StartsWith("Languages/")).ToList())
{
- int ind = Current.Resources.MergedDictionaries.IndexOf(oldDictionary);
Current.Resources.MergedDictionaries.Remove(oldDictionary);
- Current.Resources.MergedDictionaries.Insert(ind, dictionary);
}
- else { Current.Resources.MergedDictionaries.Add(dictionary); }
+
+ Current.Resources.MergedDictionaries.Add(dictionary);
LanguageChanged?.Invoke(default, EventArgs.Empty);
}
@@ -126,16 +115,12 @@ namespace GTweak
Source = GetResourceUri(char.ToUpper(value[0]) + value.Substring(1).ToLower(), true)
};
- ResourceDictionary oldDictionary = (from dict in Current.Resources.MergedDictionaries
- where dict.Source != null && dict.Source.OriginalString.StartsWith("Styles/Themes/")
- select dict).First();
- if (oldDictionary != null)
+ foreach (ResourceDictionary oldDictionary in Current.Resources.MergedDictionaries.Where(d => d.Source != null && d.Source.OriginalString.StartsWith("Styles/Themes/")).ToList())
{
- int ind = Current.Resources.MergedDictionaries.IndexOf(oldDictionary);
Current.Resources.MergedDictionaries.Remove(oldDictionary);
- Current.Resources.MergedDictionaries.Insert(ind, dictionary);
}
- else { Current.Resources.MergedDictionaries.Add(dictionary); }
+
+ Current.Resources.MergedDictionaries.Add(dictionary);
ThemeChanged?.Invoke(default, EventArgs.Empty);
}
diff --git a/.Source/GTweak/Utilities/Controls/SettingsEngine.cs b/.Source/GTweak/Utilities/Controls/SettingsEngine.cs
index 8c207945..0e940820 100644
--- a/.Source/GTweak/Utilities/Controls/SettingsEngine.cs
+++ b/.Source/GTweak/Utilities/Controls/SettingsEngine.cs
@@ -19,7 +19,7 @@ namespace GTweak.Utilities.Controls
[DllImport("winmm.dll")]
internal static extern int waveOutSetVolume(IntPtr hwo, uint dwVolume);
- internal static readonly string[] AvailableLangs = new ResourceDictionary { Source = new Uri("Languages/LanguageCatalog.xaml", UriKind.Relative) }.Keys.Cast<string>().Select(key => key.Replace("_", "-")).OrderBy(lang => lang, StringComparer.OrdinalIgnoreCase).ToArray();
+ internal static readonly string[] AvailableLangs = new ResourceDictionary { Source = new Uri("Languages/LanguageCatalog.xaml", UriKind.Relative) }.Keys.Cast<string>().Select(key => key.Replace("_", "-")).OrderBy(locale => locale, StringComparer.OrdinalIgnoreCase).ToArray();
internal static readonly string[] AvailableThemes = { "Dark", "Light" };
internal static string currentRelease = (Assembly.GetEntryAssembly() ?? throw new InvalidOperationException()).GetCustomAttribute<AssemblyInformationalVersionAttribute>().InformationalVersion.Split(' ').Last().Trim();