Skip to content

Portable Tool for an Ideal Windows Setup

-Correction when the system language was not selected -edit

Greedeksb0c592c8d78a
diff --git a/.Source/GTweak/App.xaml.cs b/.Source/GTweak/App.xaml.cs
index 932af006..580c70da 100644
--- a/.Source/GTweak/App.xaml.cs
+++ b/.Source/GTweak/App.xaml.cs
@@ -13,6 +13,8 @@ namespace GTweak
internal static event EventHandler ThemeChanged;
internal static event EventHandler ImportTweaksUpdate;
+ internal static string GettingSystemLanguage => Regex.Replace(CultureInfo.CurrentCulture.ToString(), @"-.+$", "", RegexOptions.Multiline);
+
public App()
{
InitializeComponent();
@@ -22,7 +24,7 @@ namespace GTweak
internal static void ViewingSettings()
{
- Language = Registry.CurrentUser.OpenSubKey(@"Software\GTweak")?.GetValue("Language")?.ToString() ?? Regex.Replace(CultureInfo.CurrentCulture.ToString(), @"-.+$", "", RegexOptions.Multiline);
+ Language = Registry.CurrentUser.OpenSubKey(@"Software\GTweak")?.GetValue("Language")?.ToString() ?? GettingSystemLanguage;
Theme = Registry.CurrentUser.OpenSubKey(@"Software\GTweak")?.GetValue("Theme")?.ToString() ?? "Dark";
}
@@ -30,14 +32,15 @@ namespace GTweak
{
set
{
- value ??= Regex.Replace(CultureInfo.CurrentCulture.ToString(), @"-.+$", "", RegexOptions.Multiline);
+ value ??= GettingSystemLanguage;
ResourceDictionary dictionary = new ResourceDictionary
{
Source = value switch
{
- "ru" => new Uri($"Languages/ru/Lang.xaml", UriKind.Relative),
- _ => new Uri("Languages/en/Lang.xaml", UriKind.Relative),
+ "ru" => new Uri("Languages/ru/Lang.xaml", UriKind.Relative),
+ "en" => new Uri("Languages/en/Lang.xaml", UriKind.Relative),
+ _ => GettingSystemLanguage.Contains("ru") ? new Uri("Languages/ru/Lang.xaml", UriKind.Relative) : new Uri("Languages/en/Lang.xaml", UriKind.Relative)
}
};
diff --git a/.Source/GTweak/Utilities/Settings.cs b/.Source/GTweak/Utilities/Settings.cs
index 620c1798..7d971441 100644
--- a/.Source/GTweak/Utilities/Settings.cs
+++ b/.Source/GTweak/Utilities/Settings.cs
@@ -23,7 +23,7 @@ namespace GTweak.Utilities
private static bool _isViewNotification = true;
private static bool _isSoundNotification = true;
private static byte _volumeNotification = 100;
- private static string _language = string.Empty;
+ private static string _language = App.GettingSystemLanguage;
private static string _theme = "Dark";
private static bool _isTopMost = false;
internal static int PID = 0;
@@ -45,81 +45,69 @@ namespace GTweak.Utilities
private readonly void СheckingParameters()
{
- RegistryKey registryKey = Registry.CurrentUser.OpenSubKey(@"Software\GTweak");
+ RegistryKey registryKey = Registry.CurrentUser.CreateSubKey(@"Software\GTweak");
if (registryKey == null || registryKey.GetValue("Notification", null) == null || registryKey.GetValue("Sound", null) == null || registryKey.GetValue("Volume", null) == null ||
registryKey.GetValue("TopMost", null) == null || registryKey.GetValue("Language", null) == null || registryKey.GetValue("HiddenIP", null) == null || registryKey.GetValue("Theme", null) == null)
{
- registryKey = Registry.CurrentUser.CreateSubKey(@"Software\GTweak");
registryKey?.SetValue("Notification", IsViewNotification, RegistryValueKind.String);
registryKey?.SetValue("Sound", IsSoundNotification, RegistryValueKind.String);
registryKey?.SetValue("Volume", VolumeNotification, RegistryValueKind.String);
registryKey?.SetValue("TopMost", IsTopMost, RegistryValueKind.String);
registryKey?.SetValue("HiddenIP", IsHiddenIpAddress, RegistryValueKind.String);
registryKey?.SetValue("Theme", Theme, RegistryValueKind.String);
- if (string.IsNullOrEmpty(Language))
- {
- registryKey?.SetValue("Language", System.Text.RegularExpressions.Regex.Replace(CultureInfo.CurrentCulture.ToString(), @"-.+$", "",
- System.Text.RegularExpressions.RegexOptions.Multiline).Contains("ru")
- ? "ru"
- : "en", RegistryValueKind.String);
- }
- else
- registryKey?.SetValue("Language", Language, RegistryValueKind.String);
+ registryKey?.SetValue("Language", App.GettingSystemLanguage, RegistryValueKind.String);
}
else
{
- registryKey = Registry.CurrentUser.OpenSubKey(@"Software\GTweak");
IsViewNotification = bool.Parse(registryKey?.GetValue("Notification").ToString() ?? "True");
IsSoundNotification = bool.Parse(registryKey?.GetValue("Sound").ToString() ?? "True");
VolumeNotification = byte.Parse(registryKey?.GetValue("Volume").ToString() ?? "100");
IsTopMost = bool.Parse(registryKey?.GetValue("TopMost").ToString() ?? "False");
IsHiddenIpAddress = bool.Parse(registryKey?.GetValue("HiddenIP").ToString() ?? "False");
- Language = registryKey?.GetValue("Language").ToString();
+ Language = registryKey?.GetValue("Language").ToString() ?? App.GettingSystemLanguage;
Theme = registryKey?.GetValue("Theme").ToString() ?? "Dark";
}
registryKey?.Close();
}
- internal static void ChangingParameters<T>(T value, string selection)
+ internal static void ChangingParameters<T>(T value, string selection) => Parallel.Invoke(delegate
{
- Parallel.Invoke(() => {
- RegistryKey registryKey = Registry.CurrentUser.CreateSubKey(@"Software\GTweak");
- registryKey?.SetValue(selection, value.ToString(), RegistryValueKind.String);
+ RegistryKey registryKey = Registry.CurrentUser.CreateSubKey(@"Software\GTweak");
+ registryKey?.SetValue(selection, value.ToString(), RegistryValueKind.String);
switch (selection)
{
case "Notification":
IsViewNotification = bool.Parse(registryKey?.GetValue("Notification").ToString() ?? "True");
- break;
+ break;
case "Sound":
IsSoundNotification = bool.Parse(registryKey?.GetValue("Sound").ToString() ?? "True");
- break;
+ break;
case "Volume":
VolumeNotification = byte.Parse(registryKey?.GetValue("Volume").ToString() ?? "100");
- break;
+ break;
case "TopMost":
IsTopMost = bool.Parse(registryKey?.GetValue("TopMost").ToString() ?? "False");
- break;
+ break;
case "Language":
- Language = registryKey?.GetValue("Language").ToString();
- break;
+ Language = registryKey?.GetValue("Language").ToString() ?? App.GettingSystemLanguage;
+ break;
case "Theme":
Theme = registryKey?.GetValue("Theme").ToString() ?? "Dark";
- break;
- case "HiddenIP":
+ break;
+ case "HiddenIP":
IsHiddenIpAddress = bool.Parse(registryKey?.GetValue("HiddenIP").ToString() ?? "False");
- break;
- }
- registryKey?.Close();
- });
- }
+ break;
+ }
+
+ registryKey?.Close();
+ });
+
internal static void SaveFileConfig()
{
- if (INIManager.UserTweaksConfidentiality.Count == 0 && INIManager.UserTweaksInterface.Count == 0
- && INIManager.UserTweaksServices.Count == 0 && INIManager.UserTweaksSystem.Count == 0)
+ if (INIManager.UserTweaksConfidentiality.Count == 0 && INIManager.UserTweaksInterface.Count == 0 && INIManager.UserTweaksServices.Count == 0 && INIManager.UserTweaksSystem.Count == 0)
new ViewNotification().Show("", (string)Application.Current.Resources["title1_notification"], (string)Application.Current.Resources["export_warning_notification"]);
-
else
{
SaveFileDialog saveFileDialog = new SaveFileDialog
@@ -132,6 +120,7 @@ namespace GTweak.Utilities
bool? isResult = saveFileDialog.ShowDialog();
if (isResult != true) return;
+
try
{
PathConfig = Path.GetDirectoryName(saveFileDialog.FileName) + @"\" + Path.GetFileNameWithoutExtension(saveFileDialog.FileName) + ".ini";
@@ -160,21 +149,20 @@ namespace GTweak.Utilities
bool? isResult = openFileDialog.ShowDialog();
- if (isResult == true)
- {
- PathConfig = openFileDialog.FileName;
- INIManager iniManager = new INIManager(PathConfig);
+ if (isResult != true) return;
- if (iniManager.Read("GTweak", "Author").Contains("Greedeks") && iniManager.Read("GTweak", "Release").Contains("v4"))
- {
- if (File.ReadLines(PathConfig).Any(line => line.Contains("TglButton")) || File.ReadLines(PathConfig).Any(line => line.Contains("Slider")))
- new ImportWindow().ShowDialog();
- else
- new ViewNotification().Show("", (string)Application.Current.Resources["title1_notification"], (string)Application.Current.Resources["import_empty_notification"]);
- }
+ PathConfig = openFileDialog.FileName;
+ INIManager iniManager = new INIManager(PathConfig);
+
+ if (iniManager.Read("GTweak", "Author").Contains("Greedeks") && iniManager.Read("GTweak", "Release").Contains("v4"))
+ {
+ if (File.ReadLines(PathConfig).Any(line => line.Contains("TglButton")) || File.ReadLines(PathConfig).Any(line => line.Contains("Slider")))
+ new ImportWindow().ShowDialog();
else
- new ViewNotification().Show("", (string)Application.Current.Resources["title1_notification"], (string)Application.Current.Resources["import_warning_notification"]);
+ new ViewNotification().Show("", (string)Application.Current.Resources["title1_notification"], (string)Application.Current.Resources["import_empty_notification"]);
}
+ else
+ new ViewNotification().Show("", (string)Application.Current.Resources["title1_notification"], (string)Application.Current.Resources["import_warning_notification"]);
}
internal static void SelfRemoval()
diff --git a/.Source/GTweak/Utilities/ViewNotification.cs b/.Source/GTweak/Utilities/ViewNotification.cs
index cfd9b42e..60e43066 100644
--- a/.Source/GTweak/Utilities/ViewNotification.cs
+++ b/.Source/GTweak/Utilities/ViewNotification.cs
@@ -38,7 +38,7 @@ namespace GTweak.Utilities
TextNotice = content,
ActionChoice = action,
};
- await Task.Delay(200);
+ await Task.Delay(100);
notificationWindow.Show();
notificationWindow.Closed += (s, e) => { isAlreadyLaunch = false; };