Portable Tool for an Ideal Windows Setup
C# activatorbloatware-removalcsharpdebloatdebloaterdisable-servicesmonitoring-systemportableprivacy-toolsregistry-tweakssystem-tuningsystem-utilitytelemetrytweakerwindows-10windows-11windows-debloatwindows-defenderwindows-optimizationwindows-tweaks
re. simplification of some parts
Greedeksb115709625a4
diff --git a/.Source/GTweak/Core/ViewModel/MainViewModel.cs b/.Source/GTweak/Core/ViewModel/MainViewModel.csindex b1b2f18a..df4005a7 100644--- a/.Source/GTweak/Core/ViewModel/MainViewModel.cs+++ b/.Source/GTweak/Core/ViewModel/MainViewModel.cs@@ -113,7 +113,7 @@ namespace GTweak.Core.ViewModelResourceDictionary dictionary = new ResourceDictionary { Source = new Uri($"Languages/LanguageCatalog.xaml", UriKind.Relative) };foreach (string code in SettingsEngine.AvailableLangs)- Languages.Add(new MainModel.LanguageItem { Code = code, Display = dictionary[$"{code.Replace("-", "_")}_main"] as string ?? code });+ Languages.Add(new MainModel.LanguageItem { Code = code, Display = dictionary[$"{code.Replace("-", "_")}"] as string ?? code });SelectedLanguage = SettingsEngine.AvailableLangs.Contains(SettingsEngine.Language) ? SettingsEngine.Language : SettingsEngine.AvailableLangs.FirstOrDefault();}diff --git a/.Source/GTweak/Languages/LanguageCatalog.xaml b/.Source/GTweak/Languages/LanguageCatalog.xamlindex 19309d67..07b79324 100644--- a/.Source/GTweak/Languages/LanguageCatalog.xaml+++ b/.Source/GTweak/Languages/LanguageCatalog.xaml@@ -8,12 +8,12 @@- If there are regional variants, use the country code (e.g., Portuguese (BR) for Brazilian, Portuguese (PT) for European).-->- <v:String x:Key="en_main">English (EN)</v:String>- <v:String x:Key="fr_main">Français (FR)</v:String>- <v:String x:Key="it_main">Italiano (IT)</v:String>- <v:String x:Key="ko_main">한국어 (KO)</v:String>- <v:String x:Key="pt_br_main">Português (BR)</v:String>- <v:String x:Key="ru_main">Русский (RU)</v:String>- <v:String x:Key="uk_main">Українська (UA)</v:String>+ <v:String x:Key="en">English (EN)</v:String>+ <v:String x:Key="fr">Français (FR)</v:String>+ <v:String x:Key="it">Italiano (IT)</v:String>+ <v:String x:Key="ko">한국어 (KO)</v:String>+ <v:String x:Key="pt_br">Português (BR)</v:String>+ <v:String x:Key="ru">Русский (RU)</v:String>+ <v:String x:Key="uk">Українська (UA)</v:String></ResourceDictionary>\ No newline at end of filediff --git a/.Source/GTweak/Utilities/Configuration/SystemDiagnostics.cs b/.Source/GTweak/Utilities/Configuration/SystemDiagnostics.csindex 56b7df48..b1440529 100644--- a/.Source/GTweak/Utilities/Configuration/SystemDiagnostics.cs+++ b/.Source/GTweak/Utilities/Configuration/SystemDiagnostics.cs@@ -338,8 +338,7 @@ namespace GTweak.Utilities.Configuration22 => "FBD2",23 => "DDR3",24 => "DDR3",- 25 => "DDR4",- 26 => "DDR4",+ uint type when type == 25 || type == 26 => "DDR4",27 => "LPDDR",28 => "LPDDR2",29 => "LPDDR3",@@ -365,19 +364,24 @@ namespace GTweak.Utilities.Configuration{StringBuilder result = new StringBuilder();+ static string GetStorageType(object mediaType)+ {+ (object[] Keys, string Type)[] map = new (object[] Keys, string Type)[]+ {+ (new object[] { (ushort)3, "Removable Media" }, "(HDD)"),+ (new object[] { (ushort)4, "Fixed hard disk media" }, "(SSD)"),+ (new object[] { (ushort)5, "Unknown" }, "(SCM)")+ };+ return map.FirstOrDefault(x => x.Keys.Contains(mediaType)).Type ?? "(Unspecified)";+ }+if (isMsftAvailable){foreach (var managementObj in new ManagementObjectSearcher(@"root\microsoft\windows\storage", "select FriendlyName, Model, Description, MediaType, Size, BusType from MSFT_PhysicalDisk", new EnumerationOptions { ReturnImmediately = true }).Get()){string data = new[] { "FriendlyName", "Model", "Description" }.Select(prop => managementObj[prop] as string).FirstOrDefault(info => !string.IsNullOrEmpty(info)) ?? string.Empty;ushort mediaType = managementObj["MediaType"] != null ? (ushort)managementObj["MediaType"] : (ushort)0;- string storageType = mediaType switch- {- 3 => "(HDD)",- 4 => "(SSD)",- 5 => "(SCM)",- _ => "(Unspecified)"- };+ string storageType = GetStorageType(mediaType);if (storageType == "(Unspecified)" && ((ushort)managementObj["BusType"]) == 7)storageType = "(Media-Type)";@@ -391,15 +395,9 @@ namespace GTweak.Utilities.Configuration{string data = new[] { "Model", "Caption" }.Select(prop => managementObj[prop] as string).FirstOrDefault(info => !string.IsNullOrEmpty(info)) ?? string.Empty;string mediaType = managementObj["MediaType"] as string ?? string.Empty;- string storageType = mediaType switch- {- "Removable Media" => "(HDD)",- "Fixed hard disk media" => "(SSD)",- "Unknown" => "(SCM)",- _ => "(Unspecified)"- };-+ string storageType = GetStorageType(mediaType);string interfaceType = managementObj["InterfaceType"] as string ?? string.Empty;+if ((storageType == "(Unspecified)" || storageType == "(HDD)") && (string.IsNullOrEmpty(interfaceType) || interfaceType.IndexOf("USB", StringComparison.OrdinalIgnoreCase) >= 0))storageType = "(Media-Type)";