Portable Tool for an Ideal Windows Setup
C# activatorbloatware-removalcsharpdebloatdebloaterdisable-servicesmonitoring-systemportableprivacy-toolsregistry-tweakssystem-tuningsystem-utilitytelemetrytweakerwindows-10windows-11windows-debloatwindows-defenderwindows-optimizationwindows-tweaks
fix updating cached settings
Greedeksdf951cdadb9f
diff --git a/.Source/GTweak/Utilities/Controls/SettingsRepository.cs b/.Source/GTweak/Utilities/Controls/SettingsRepository.csindex 4c8e7a14..1feabeec 100644--- a/.Source/GTweak/Utilities/Controls/SettingsRepository.cs+++ b/.Source/GTweak/Utilities/Controls/SettingsRepository.cs@@ -37,44 +37,40 @@ namespace GTweak.Utilities.Controlsinternal static readonly string currentName = AppDomain.CurrentDomain.FriendlyName;internal static readonly string currentLocation = Assembly.GetExecutingAssembly().Location;- private static readonly Dictionary<string, Action> _settingsRefreshActions = new Dictionary<string, Action>+ private static readonly Dictionary<string, object> _defaultSettings = new Dictionary<string, object>{- { "Notification", () => IsViewNotification = RegistryHelp.GetValue(StoragePaths.RegistryLocation, "Notification", IsViewNotification) },- { "Update", () => IsUpdateCheckRequired = RegistryHelp.GetValue(StoragePaths.RegistryLocation, "Update", IsUpdateCheckRequired) },- { "TopMost", () => IsTopMost = RegistryHelp.GetValue(StoragePaths.RegistryLocation, "TopMost", IsTopMost) },- { "Sound", () => IsPlayingSound = RegistryHelp.GetValue(StoragePaths.RegistryLocation, "Sound", IsPlayingSound) },- { "Volume", () => Volume = RegistryHelp.GetValue(StoragePaths.RegistryLocation, "Volume", Volume) },- { "Language", () => Language = RegistryHelp.GetValue(StoragePaths.RegistryLocation, "Language", Language) },- { "Theme", () => Theme = RegistryHelp.GetValue(StoragePaths.RegistryLocation, "Theme", Theme) },- { "HiddenIP", () => IsHiddenIpAddress = RegistryHelp.GetValue(StoragePaths.RegistryLocation, "HiddenIP", IsHiddenIpAddress) }+ ["Notification"] = true,+ ["Update"] = true,+ ["TopMost"] = false,+ ["Sound"] = true,+ ["Volume"] = 50,+ ["Language"] = App.GettingSystemLanguage,+ ["Theme"] = "Dark",+ ["HiddenIP"] = true};- internal static readonly Dictionary<string, object> registryDefaults = new Dictionary<string, object>- {- { "Notification", true },- { "Update", true },- { "TopMost", false },- { "Sound", true },- { "Volume", 50 },- { "Language", App.GettingSystemLanguage },- { "Theme", "Dark" },- { "HiddenIP", true }- };+ private static readonly Dictionary<string, object> _cachedSettings = new Dictionary<string, object>(_defaultSettings);++ internal static bool IsViewNotification { get => (bool)_cachedSettings["Notification"]; set => ChangingParameters(value, "Notification"); }+ internal static bool IsUpdateCheckRequired { get => (bool)_cachedSettings["Update"]; set => ChangingParameters(value, "Update"); }+ internal static bool IsTopMost { get => (bool)_cachedSettings["TopMost"]; set => ChangingParameters(value, "TopMost"); }+ internal static bool IsPlayingSound { get => (bool)_cachedSettings["Sound"]; set => ChangingParameters(value, "Sound"); }+ internal static int Volume { get => (int)_cachedSettings["Volume"]; set => ChangingParameters(value, "Volume"); }+ internal static string Language { get => (string)_cachedSettings["Language"]; set => ChangingParameters(value, "Language"); }+ internal static string Theme { get => (string)_cachedSettings["Theme"]; set => ChangingParameters(value, "Theme"); }+ internal static bool IsHiddenIpAddress { get => (bool)_cachedSettings["HiddenIP"]; set => ChangingParameters(value, "HiddenIP"); }- internal static bool IsViewNotification { get => (bool)registryDefaults["Notification"]; set => registryDefaults["Notification"] = value; }- internal static bool IsUpdateCheckRequired { get => (bool)registryDefaults["Update"]; set => registryDefaults["Update"] = value; }- internal static bool IsTopMost { get => (bool)registryDefaults["TopMost"]; set => registryDefaults["TopMost"] = value; }- internal static bool IsPlayingSound { get => (bool)registryDefaults["Sound"]; set => registryDefaults["Sound"] = value; }- internal static int Volume { get => (int)registryDefaults["Volume"]; set => registryDefaults["Volume"] = value; }- internal static string Language { get => (string)registryDefaults["Language"]; set => registryDefaults["Language"] = value; }- internal static string Theme { get => (string)registryDefaults["Theme"]; set => registryDefaults["Theme"] = value; }- internal static bool IsHiddenIpAddress { get => (bool)registryDefaults["HiddenIP"]; set => registryDefaults["HiddenIP"] = value; }+ private static void ChangingParameters<T>(T value, string key)+ {+ _cachedSettings[key] = value;+ RegistryHelp.Write(Registry.CurrentUser, @"Software\GTweak", key, value.ToString(), RegistryValueKind.String);+ }internal void СheckingParameters(){bool isRegistryEmpty = false;- foreach (string key in registryDefaults.Keys)+ foreach (string key in _defaultSettings.Keys){if (RegistryHelp.ValueExists(StoragePaths.RegistryLocation, key)){@@ -85,22 +81,20 @@ namespace GTweak.Utilities.Controlsif (isRegistryEmpty){- foreach (var subkey in registryDefaults)+ foreach (var subkey in _defaultSettings)RegistryHelp.Write(Registry.CurrentUser, @"Software\GTweak", subkey.Key, subkey.Value, RegistryValueKind.String);}else{- foreach (Action executeUpdate in _settingsRefreshActions.Values)- executeUpdate();+ foreach (var kv in _defaultSettings)+ {+ _cachedSettings[kv.Key] = kv.Value is bool defaultBool ? RegistryHelp.GetValue(StoragePaths.RegistryLocation, kv.Key, defaultBool) :+ kv.Value is int defaultInt ? RegistryHelp.GetValue(StoragePaths.RegistryLocation, kv.Key, defaultInt) :+ kv.Value is string defaultString ? RegistryHelp.GetValue(StoragePaths.RegistryLocation, kv.Key, defaultString) : kv.Value;+ }}}- internal static void ChangingParameters<T>(T value, string subkey)- {- RegistryHelp.Write(Registry.CurrentUser, @"Software\GTweak", subkey, value.ToString(), RegistryValueKind.String);- _settingsRefreshActions[subkey]();- }-internal static void SaveFileConfig(){if (INIManager.IsAllTempDictionaryEmpty)diff --git a/.Source/GTweak/Utilities/Helpers/RegistryHelp.cs b/.Source/GTweak/Utilities/Helpers/RegistryHelp.csindex b2e7b1c9..505126b3 100644--- a/.Source/GTweak/Utilities/Helpers/RegistryHelp.cs+++ b/.Source/GTweak/Utilities/Helpers/RegistryHelp.cs@@ -35,7 +35,7 @@ namespace GTweak.Utilities.Helpersregistrykey.OpenSubKey(subkey, true)?.DeleteValue(value);}catch (Exception ex) { ErrorLogging.LogDebug(ex); }- }).ConfigureAwait(false);+ }).GetAwaiter().GetResult();}internal static void Write<T>(RegistryKey registrykey, string subkey, string name, T data, RegistryValueKind kind, bool isTakingOwner = false)@@ -50,7 +50,7 @@ namespace GTweak.Utilities.Helpersregistrykey.CreateSubKey(subkey, true)?.SetValue(name, data, kind);}catch (Exception ex) { ErrorLogging.LogDebug(ex); }- }).ConfigureAwait(false);+ }).GetAwaiter().GetResult(); ;}internal static void CreateFolder(RegistryKey registrykey, string subkey)@@ -59,7 +59,7 @@ namespace GTweak.Utilities.Helpers{try { registrykey.CreateSubKey(subkey); }catch (Exception ex) { ErrorLogging.LogDebug(ex); }- }).ConfigureAwait(false);+ }).GetAwaiter().GetResult();}internal static void DeleteFolderTree(RegistryKey registrykey, string subkey, bool isTakingOwner = false)@@ -84,7 +84,7 @@ namespace GTweak.Utilities.Helpersregistrykey.DeleteSubKeyTree(subkey, false);}catch (Exception ex) { ErrorLogging.LogDebug(ex); }- }).ConfigureAwait(false);+ }).GetAwaiter().GetResult();}internal static bool KeyExists(in RegistryKey registrykey, in string subkey, in bool isNegation = true)diff --git a/.Source/GTweak/View/DataSystemView.xaml.cs b/.Source/GTweak/View/DataSystemView.xaml.csindex 211dfca9..01bfa35c 100644--- a/.Source/GTweak/View/DataSystemView.xaml.cs+++ b/.Source/GTweak/View/DataSystemView.xaml.cs@@ -59,7 +59,7 @@ namespace GTweak.Viewif (BtnHiddenIP.IsChecked.Value & BtnHiddenIP.Visibility == Visibility.Hidden & !SystemDiagnostics.isIPAddressFormatValid){DoubleAnimation doubleAnim = new DoubleAnimation(0, (Duration)TimeSpan.FromSeconds(0.18));- doubleAnim.Completed += delegate { SettingsRepository.ChangingParameters(false, "HiddenIP"); };+ doubleAnim.Completed += delegate { SettingsRepository.IsHiddenIpAddress = false; };Timeline.SetDesiredFrameRate(doubleAnim, 240);IpAddress.Effect.BeginAnimation(BlurEffect.RadiusProperty, doubleAnim);}@@ -123,7 +123,7 @@ namespace GTweak.Viewprivate void BtnHiddenIP_PreviewMouseLeftButtonUp(object sender, MouseButtonEventArgs e){- SettingsRepository.ChangingParameters(!BtnHiddenIP.IsChecked.Value, "HiddenIP");+ SettingsRepository.IsHiddenIpAddress = !BtnHiddenIP.IsChecked.Value;DoubleAnimation doubleAnim = new DoubleAnimation(){diff --git a/.Source/GTweak/Windows/MainWindow.xaml.cs b/.Source/GTweak/Windows/MainWindow.xaml.csindex 21f4c4b3..91cc5852 100644--- a/.Source/GTweak/Windows/MainWindow.xaml.cs+++ b/.Source/GTweak/Windows/MainWindow.xaml.cs@@ -123,36 +123,36 @@ namespace GTweak#endregion#region Settings Menu- private void BtnNotification_ChangedState(object sender, EventArgs e) => SettingsRepository.ChangingParameters(!BtnNotification.State, "Notification");+ private void BtnNotification_ChangedState(object sender, EventArgs e) => SettingsRepository.IsViewNotification = !BtnNotification.State;- private void BtnUpdate_ChangedState(object sender, EventArgs e) => SettingsRepository.ChangingParameters(!BtnUpdate.State, "Update");+ private void BtnUpdate_ChangedState(object sender, EventArgs e) => SettingsRepository.IsUpdateCheckRequired = !BtnUpdate.State;private void BtnTopMost_ChangedState(object sender, EventArgs e){- SettingsRepository.ChangingParameters(!BtnTopMost.State, "TopMost");+ SettingsRepository.IsTopMost = !BtnTopMost.State;Topmost = !BtnTopMost.State;}- private void BtnSoundNtn_PreviewMouseLeftButtonUp(object sender, MouseButtonEventArgs e) => SettingsRepository.ChangingParameters(!BtnSoundNtn.IsChecked, "Sound");+ private void BtnSoundNtn_PreviewMouseLeftButtonUp(object sender, MouseButtonEventArgs e) => SettingsRepository.IsPlayingSound = (bool)!BtnSoundNtn.IsChecked;private void SliderVolume_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e){SliderVolume.Value = SliderVolume.Value == 0 ? 1 : SliderVolume.Value;- SettingsRepository.ChangingParameters(SliderVolume.Value, "Volume");+ SettingsRepository.Volume = (int)SliderVolume.Value;SettingsRepository.waveOutSetVolume(IntPtr.Zero, ((uint)(double)(ushort.MaxValue / 100 * SliderVolume.Value) & 0x0000ffff) | ((uint)(double)(ushort.MaxValue / 100 * SliderVolume.Value) << 16));}private void LanguageSelectionMenu_SelectionChanged(object sender, SelectionChangedEventArgs e){string selectedLang = SettingsRepository.AvailableLangs.ElementAtOrDefault(LanguageSelectionMenu.SelectedIndex) ?? SettingsRepository.AvailableLangs.Last();- SettingsRepository.ChangingParameters(selectedLang, "Language");+ SettingsRepository.Language = selectedLang;App.Language = selectedLang;}private void ThemeSelectionMenu_SelectionChanged(object sender, SelectionChangedEventArgs e){string selectedTheme = SettingsRepository.AvailableThemes.ElementAtOrDefault(ThemeSelectionMenu.SelectedIndex) ?? SettingsRepository.AvailableThemes.Last();- SettingsRepository.ChangingParameters(selectedTheme, "Theme");+ SettingsRepository.Theme = selectedTheme;App.Theme = selectedTheme;}