Skip to content

Portable Tool for an Ideal Windows Setup

4.90.2 -fixed a bug where all settings were not saved -added a check for an empty settings file -refactoring

Greedeks9caff536f55f
diff --git a/.Source/GTweak/Language/lang.ru.xaml b/.Source/GTweak/Language/lang.ru.xaml
index 28da2ada..523d3408 100644
--- a/.Source/GTweak/Language/lang.ru.xaml
+++ b/.Source/GTweak/Language/lang.ru.xaml
@@ -53,6 +53,8 @@
<v:String x:Key="firewalloff_notification">У вас отключен брандмауэр, включите и примените твик снова</v:String>
<v:String x:Key="clearingcache_notification">Произведена очистка системного кэша файлов</v:String>
<v:String x:Key="import_warning_notification">Данный файл не подходит для импорта</v:String>
+ <v:String x:Key="import_empty_notification">Этот файл пуст, применение твиков невозможно</v:String>
+ <v:String x:Key="export_warning_notification">Это не имеет смысла, файл будет пустым. Сначала примените хотя бы один твик</v:String>
<v:String x:Key="clear_ram_notification">Очистка кратковременной памяти и временных файлов произведена</v:String>
<v:String x:Key="disable_recovery_notification">Восстановление системы отключено, точки восстановления недоступны</v:String>
<v:String x:Key="warndisable_recovery_notification">У вас уже отключена система восстановления</v:String>
diff --git a/.Source/GTweak/Language/lang.xaml b/.Source/GTweak/Language/lang.xaml
index 22a01cb9..16a35686 100644
--- a/.Source/GTweak/Language/lang.xaml
+++ b/.Source/GTweak/Language/lang.xaml
@@ -53,6 +53,8 @@
<v:String x:Key="firewalloff_notification">Your firewall is disabled, turn it on and apply the tweak again</v:String>
<v:String x:Key="clearingcache_notification">The system file cache has been cleared</v:String>
<v:String x:Key="import_warning_notification">This file is not suitable for import</v:String>
+ <v:String x:Key="import_empty_notification">This file is empty, the application of tweaks is not possible</v:String>
+ <v:String x:Key="export_warning_notification">It doesn't make sense, the file will be empty. First, apply at least one tweak</v:String>
<v:String x:Key="clear_ram_notification">Short-term memory and temporary files have been cleared</v:String>
<v:String x:Key="disable_recovery_notification">System recovery is disabled, recovery points are unavailable</v:String>
<v:String x:Key="warndisable_recovery_notification">You have already disabled the recovery system</v:String>
diff --git a/.Source/GTweak/Properties/AssemblyInfo.cs b/.Source/GTweak/Properties/AssemblyInfo.cs
index 65c01a19..f35963fb 100644
--- a/.Source/GTweak/Properties/AssemblyInfo.cs
+++ b/.Source/GTweak/Properties/AssemblyInfo.cs
@@ -10,8 +10,8 @@ using System.Windows;
[assembly: AssemblyCopyright("Copyright © 2024 Greedeks")]
[assembly: AssemblyTrademark("Greedeks")]
[assembly: AssemblyCulture("")]
-[assembly: AssemblyInformationalVersion("Build: 4.90.1")]
-[assembly: AssemblyFileVersion("4.90.1")]
+[assembly: AssemblyInformationalVersion("Build: 4.90.2")]
+[assembly: AssemblyFileVersion("4.90.2")]
[assembly: ComVisible(false)]
diff --git a/.Source/GTweak/Utilities/Helpers/BrushAnimation.cs b/.Source/GTweak/Utilities/Helpers/BrushAnimation.cs
index 244d9f93..6c984433 100644
--- a/.Source/GTweak/Utilities/Helpers/BrushAnimation.cs
+++ b/.Source/GTweak/Utilities/Helpers/BrushAnimation.cs
@@ -6,7 +6,7 @@ using System.Windows.Media.Animation;
namespace GTweak.Utilities.Helpers
{
- internal class BrushAnimation : AnimationTimeline
+ internal sealed class BrushAnimation : AnimationTimeline
{
protected override Freezable CreateInstanceCore()
{
diff --git a/.Source/GTweak/Utilities/Helpers/ButtonNavigation.cs b/.Source/GTweak/Utilities/Helpers/ButtonNavigation.cs
index dd10612c..d3b1dc2d 100644
--- a/.Source/GTweak/Utilities/Helpers/ButtonNavigation.cs
+++ b/.Source/GTweak/Utilities/Helpers/ButtonNavigation.cs
@@ -3,7 +3,7 @@ using System.Windows.Controls;
namespace GTweak.Utilities.Helpers
{
- internal class ButtonNavigation : RadioButton
+ internal sealed class ButtonNavigation : RadioButton
{
static ButtonNavigation() => DefaultStyleKeyProperty.OverrideMetadata(typeof(ButtonNavigation), new FrameworkPropertyMetadata(typeof(ButtonNavigation)));
}
diff --git a/.Source/GTweak/Utilities/Helpers/RegistryHelp.cs b/.Source/GTweak/Utilities/Helpers/RegistryHelp.cs
index f7c69070..16065ab0 100644
--- a/.Source/GTweak/Utilities/Helpers/RegistryHelp.cs
+++ b/.Source/GTweak/Utilities/Helpers/RegistryHelp.cs
@@ -4,9 +4,9 @@ using System;
namespace GTweak.Utilities.Helpers
{
- internal struct RegistryHelp
+ internal readonly struct RegistryHelp
{
- internal static void DeleteFolderTree(in RegistryKey _registrykey, in string _subkey)
+ internal static void DeleteFolderTree(in RegistryKey _registrykey, in string _subkey)
{
if (_registrykey.OpenSubKey(_subkey) != null)
try { _registrykey.DeleteSubKeyTree(_subkey); } catch (Exception ex) { Debug.WriteLine(ex.Message.ToString()); }
diff --git a/.Source/GTweak/Utilities/Helpers/WorkWithText.cs b/.Source/GTweak/Utilities/Helpers/WorkWithText.cs
index 2e36d4e2..66ac99ef 100644
--- a/.Source/GTweak/Utilities/Helpers/WorkWithText.cs
+++ b/.Source/GTweak/Utilities/Helpers/WorkWithText.cs
@@ -5,7 +5,7 @@ using System.Windows.Media.Animation;
namespace GTweak.Utilities.Helpers
{
- internal struct WorkWithText
+ internal readonly struct WorkWithText
{
internal static void TypeWriteAnimation(string textToAnimate, TextBlock _textBlock, TimeSpan _timeSpan)
{
diff --git a/.Source/GTweak/Utilities/Settings.cs b/.Source/GTweak/Utilities/Settings.cs
index 985337ec..e34fdfdf 100644
--- a/.Source/GTweak/Utilities/Settings.cs
+++ b/.Source/GTweak/Utilities/Settings.cs
@@ -6,12 +6,14 @@ using System.Collections.Generic;
using System.Diagnostics;
using System.Globalization;
using System.IO;
+using System.Linq;
using System.Reflection;
using System.Threading.Tasks;
+using System.Windows;
namespace GTweak.Utilities
{
- internal struct Settings
+ internal readonly struct Settings
{
internal static string PathConfig = string.Empty;
internal static string PathSound => Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData)) + @"\GTweak\Sound.mp3";
@@ -101,44 +103,51 @@ namespace GTweak.Utilities
internal static void SaveFileConfig()
{
- SaveFileDialog saveFileDialog = new SaveFileDialog
- {
- FileName = "Config GTweak",
- Filter = "(*.INI)|*.INI",
- RestoreDirectory = true
- };
-
- Nullable<bool> isResult = saveFileDialog.ShowDialog();
+ if (СonfigSettings.configConfidentiality.Count == 0 && СonfigSettings.configInterface.Count == 0
+ && СonfigSettings.configServices.Count == 0 && СonfigSettings.configSystem.Count == 0)
+ new ViewNotification().Show("", (string)Application.Current.Resources["title1_notification"], (string)Application.Current.Resources["export_warning_notification"]);
- if (isResult == true)
+ else
{
- string path = Path.GetDirectoryName(saveFileDialog.FileName);
- string filename = Path.GetFileNameWithoutExtension(saveFileDialog.FileName);
+ SaveFileDialog saveFileDialog = new SaveFileDialog
+ {
+ FileName = "Config GTweak",
+ Filter = "(*.INI)|*.INI",
+ RestoreDirectory = true
+ };
- try
+ Nullable<bool> isResult = saveFileDialog.ShowDialog();
+
+ if (isResult == true)
{
- PathConfig = path + @"\" + filename + ".ini";
+ string path = Path.GetDirectoryName(saveFileDialog.FileName);
+ string filename = Path.GetFileNameWithoutExtension(saveFileDialog.FileName);
+
+ try
+ {
+ PathConfig = path + @"\" + filename + ".ini";
- if (File.Exists(PathConfig))
- File.Delete(PathConfig);
+ if (File.Exists(PathConfig))
+ File.Delete(PathConfig);
- СonfigSettings settingsFileINI = new СonfigSettings(PathConfig);
- settingsFileINI.WriteConfig("GTweak", "Author", "Greedeks");
- settingsFileINI.WriteConfig("GTweak", "Release", "v4");
+ СonfigSettings settingsFileINI = new СonfigSettings(PathConfig);
+ settingsFileINI.WriteConfig("GTweak", "Author", "Greedeks");
+ settingsFileINI.WriteConfig("GTweak", "Release", "v4");
- foreach (KeyValuePair<string, string> addConfidentiality in СonfigSettings.configConfidentiality)
- settingsFileINI.WriteConfig("Confidentiality Tweaks", addConfidentiality.Key, addConfidentiality.Value);
+ foreach (KeyValuePair<string, string> addConfidentiality in СonfigSettings.configConfidentiality)
+ settingsFileINI.WriteConfig("Confidentiality Tweaks", addConfidentiality.Key, addConfidentiality.Value);
- foreach (KeyValuePair<string, string> addInterface in СonfigSettings.configInterface)
- settingsFileINI.WriteConfig("Interface Tweaks", addInterface.Key, addInterface.Value);
+ foreach (KeyValuePair<string, string> addInterface in СonfigSettings.configInterface)
+ settingsFileINI.WriteConfig("Interface Tweaks", addInterface.Key, addInterface.Value);
- foreach (KeyValuePair<string, string> addServices in СonfigSettings.configServices)
- settingsFileINI.WriteConfig("Services Tweaks", addServices.Key, addServices.Value);
+ foreach (KeyValuePair<string, string> addServices in СonfigSettings.configServices)
+ settingsFileINI.WriteConfig("Services Tweaks", addServices.Key, addServices.Value);
- foreach (KeyValuePair<string,string> addSystem in СonfigSettings.configSystem)
- settingsFileINI.WriteConfig("System Tweaks", addSystem.Key, addSystem.Value);
+ foreach (KeyValuePair<string, string> addSystem in СonfigSettings.configSystem)
+ settingsFileINI.WriteConfig("System Tweaks", addSystem.Key, addSystem.Value);
+ }
+ catch (Exception ex) { Debug.WriteLine(ex.Message.ToString()); }
}
- catch (Exception ex) { Debug.WriteLine(ex.Message.ToString()); }
}
}
@@ -156,9 +165,14 @@ namespace GTweak.Utilities
СonfigSettings settingsFileINI = new СonfigSettings(PathConfig);
if (settingsFileINI.ReadConfig("GTweak", "Author").Contains("Greedeks") && settingsFileINI.ReadConfig("GTweak", "Release").Contains("v4"))
- new ImportWindow().ShowDialog();
+ {
+ 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"]);
+ }
else
- new ViewNotification().Show("", (string)System.Windows.Application.Current.Resources["title1_notification"], (string)System.Windows.Application.Current.Resources["import_warning_notification"]);
+ new ViewNotification().Show("", (string)Application.Current.Resources["title1_notification"], (string)Application.Current.Resources["import_warning_notification"]);
}
}
@@ -170,7 +184,7 @@ namespace GTweak.Utilities
RegistryHelp.DeleteFolderTree(Registry.LocalMachine, @"SOFTWARE\Microsoft\Tracing\GTweak_RASAPI32");
RegistryHelp.DeleteFolderTree(Registry.LocalMachine, @"SOFTWARE\Microsoft\Tracing\GTweak_RASMANCS");
- System.Windows.Application.Current.Shutdown();
+ Application.Current.Shutdown();
Process.Start(new ProcessStartInfo()
{
Arguments = "/C choice /C Y /N /D Y /T 3 & Del \"" + (new FileInfo(new Uri(Assembly.GetExecutingAssembly().CodeBase).LocalPath)).Name + "\" & " +
diff --git "a/.Source/GTweak/Utilities/\320\241onfigSettings.cs" "b/.Source/GTweak/Utilities/\320\241onfigSettings.cs"
index 113ab3c7..f3cf26fa 100644
--- "a/.Source/GTweak/Utilities/\320\241onfigSettings.cs"
+++ "b/.Source/GTweak/Utilities/\320\241onfigSettings.cs"
@@ -7,10 +7,10 @@ namespace GTweak.Utilities
{
internal sealed class СonfigSettings
{
- internal static Dictionary<string, string> configConfidentiality = new Dictionary<string, string>(18);
- internal static Dictionary<string, string> configInterface = new Dictionary<string, string>(28);
- internal static Dictionary<string, string> configServices = new Dictionary<string, string>(28);
- internal static Dictionary<string, string> configSystem = new Dictionary<string, string>(23);
+ internal static Dictionary<string, string> configConfidentiality = new Dictionary<string, string>();
+ internal static Dictionary<string, string> configInterface = new Dictionary<string, string>();
+ internal static Dictionary<string, string> configServices = new Dictionary<string, string>();
+ internal static Dictionary<string, string> configSystem = new Dictionary<string, string>();
private readonly string pathToConfig;
[DllImport("kernel32")]