Skip to content

Portable Tool for an Ideal Windows Setup

correcting names for objects v 5.1.9 debugging

Greedeks98057041f5b4
diff --git a/.Source/GTweak/Properties/AssemblyInfo.cs b/.Source/GTweak/Properties/AssemblyInfo.cs
index 0a2ffcd7..8156fd47 100644
--- a/.Source/GTweak/Properties/AssemblyInfo.cs
+++ b/.Source/GTweak/Properties/AssemblyInfo.cs
@@ -7,9 +7,9 @@ using System.Windows;
[assembly: AssemblyProduct("GTweak")]
[assembly: AssemblyCopyright("© 2024-2025 Greedeks")]
[assembly: AssemblyTrademark("Greedeks")]
-[assembly: AssemblyInformationalVersion("Build: 5.1.8")]
-[assembly: AssemblyVersion("5.1.44.807")]
-[assembly: AssemblyFileVersion("5.1.44.807")]
+[assembly: AssemblyInformationalVersion("Build: 5.1.9")]
+[assembly: AssemblyVersion("5.1.57.928")]
+[assembly: AssemblyFileVersion("5.1.57.928")]
[assembly: ComVisible(false)]
diff --git a/.Source/GTweak/Properties/AssemblyInfo.tt b/.Source/GTweak/Properties/AssemblyInfo.tt
index 96d8cd03..40aff845 100644
--- a/.Source/GTweak/Properties/AssemblyInfo.tt
+++ b/.Source/GTweak/Properties/AssemblyInfo.tt
@@ -9,7 +9,7 @@ using System.Windows;
[assembly: AssemblyProduct("GTweak")]
[assembly: AssemblyCopyright("© 2024-<#= DateTime.Now.Year #> Greedeks")]
[assembly: AssemblyTrademark("Greedeks")]
-[assembly: AssemblyInformationalVersion("Build: 5.1.8")]
+[assembly: AssemblyInformationalVersion("Build: 5.1.9")]
[assembly: AssemblyVersion("5.<#= GenerateVersion() #>")]
[assembly: AssemblyFileVersion("5.<#= GenerateVersion() #>")]
diff --git a/.Source/GTweak/Utilities/Helpers/Managers/ExplorerManager.cs b/.Source/GTweak/Utilities/Helpers/Managers/ExplorerManager.cs
index 9d833427..0a70b570 100644
--- a/.Source/GTweak/Utilities/Helpers/Managers/ExplorerManager.cs
+++ b/.Source/GTweak/Utilities/Helpers/Managers/ExplorerManager.cs
@@ -9,6 +9,23 @@ namespace GTweak.Utilities.Helpers.Managers
{
internal class ExplorerManager
{
+ internal static readonly Dictionary<string, bool> InterfBtnMapping = new[]
+ {
+ new { Button = "TglButton7", NeedRestart = true },
+ new { Button = "TglButton8", NeedRestart = true },
+ new { Button = "TglButton17", NeedRestart = true },
+ new { Button = "TglButton21", NeedRestart = true },
+ new { Button = "TglButton22", NeedRestart = true },
+ new { Button = "TglButton30", NeedRestart = true },
+ new { Button = "TglButton32", NeedRestart = true },
+ }.ToDictionary(x => x.Button, x => x.NeedRestart);
+
+ internal static readonly Dictionary<string, bool> AppImgMapping = new[]
+{
+ new { Package = "Widgets", NeedRestart = true },
+ new { Package = "Edge", NeedRestart = true }
+ }.ToDictionary(x => x.Package, x => x.NeedRestart);
+
internal static void Restart(Process launchExplorer, Action action = null)
{
Task.Run(delegate
@@ -38,22 +55,5 @@ namespace GTweak.Utilities.Helpers.Managers
}
});
}
-
- internal static readonly Dictionary<string, bool> GetIntfStorage = new[]
- {
- new { Button = "TglButton7", NeedRestart = true },
- new { Button = "TglButton8", NeedRestart = true },
- new { Button = "TglButton17", NeedRestart = true },
- new { Button = "TglButton21", NeedRestart = true },
- new { Button = "TglButton22", NeedRestart = true },
- new { Button = "TglButton30", NeedRestart = true },
- new { Button = "TglButton32", NeedRestart = true },
- }.ToDictionary(x => x.Button, x => x.NeedRestart);
-
- internal static readonly Dictionary<string, bool> GetAppsStorage = new[]
-{
- new { Package = "Widgets", NeedRestart = true },
- new { Package = "Edge", NeedRestart = true }
- }.ToDictionary(x => x.Package, x => x.NeedRestart);
}
}
diff --git a/.Source/GTweak/Utilities/Helpers/Storage/NotifActionsStorage.cs b/.Source/GTweak/Utilities/Helpers/Storage/NotifActionsStorage.cs
index bf6830f6..5173e0f3 100644
--- a/.Source/GTweak/Utilities/Helpers/Storage/NotifActionsStorage.cs
+++ b/.Source/GTweak/Utilities/Helpers/Storage/NotifActionsStorage.cs
@@ -5,13 +5,13 @@ namespace GTweak.Utilities.Helpers.Storage
{
internal class NotifActionsStorage
{
- internal static readonly Dictionary<string, string> GetConfActions = new[]
+ internal static readonly Dictionary<string, string> ConfNotifActions = new[]
{
new { Button = "TglButton8", Action = "restart" },
new { Button = "TglButton15", Action = "restart" }
}.ToDictionary(x => x.Button, x => x.Action);
- internal static readonly Dictionary<string, string> GetIntfActions = new[]
+ internal static readonly Dictionary<string, string> IntfNotifActions = new[]
{
new { Button = "TglButton1", Action = "logout" },
new { Button = "TglButton2", Action = "logout" },
@@ -27,7 +27,7 @@ namespace GTweak.Utilities.Helpers.Storage
new { Button = "TglButton20", Action = "restart" }
}.ToDictionary(x => x.Button, x => x.Action);
- internal static readonly Dictionary<string, string> GetSysActions = new[]
+ internal static readonly Dictionary<string, string> SysNotifActions = new[]
{
new { Button = "TglButton2", Action = "logout" },
new { Button = "TglButton7", Action = "restart" },
diff --git a/.Source/GTweak/View/ConfidentialityView.xaml.cs b/.Source/GTweak/View/ConfidentialityView.xaml.cs
index 0c344a35..e44d4035 100644
--- a/.Source/GTweak/View/ConfidentialityView.xaml.cs
+++ b/.Source/GTweak/View/ConfidentialityView.xaml.cs
@@ -37,7 +37,7 @@ namespace GTweak.View
ConfidentialityTweaks.ApplyTweaks(toggleButton.Name, toggleButton.State);
- if (NotifActionsStorage.GetConfActions.TryGetValue(toggleButton.Name, out string action))
+ if (NotifActionsStorage.ConfNotifActions.TryGetValue(toggleButton.Name, out string action))
new ViewNotification(300).Show(action);
Parallel.Invoke(async delegate { await Task.Delay(1000); new ConfidentialityTweaks().AnalyzeAndUpdate(this); });
diff --git a/.Source/GTweak/View/InterfaceView.xaml.cs b/.Source/GTweak/View/InterfaceView.xaml.cs
index 6fec4deb..48b7685b 100644
--- a/.Source/GTweak/View/InterfaceView.xaml.cs
+++ b/.Source/GTweak/View/InterfaceView.xaml.cs
@@ -70,10 +70,10 @@ namespace GTweak.View
ToggleButton toggleButton = (ToggleButton)sender;
InterfaceTweaks.ApplyTweaks(toggleButton.Name, toggleButton.State);
- if (ExplorerManager.GetIntfStorage.TryGetValue(toggleButton.Name, out bool needRestart))
+ if (ExplorerManager.InterfBtnMapping.TryGetValue(toggleButton.Name, out bool needRestart))
ExplorerManager.Restart(new Process());
- if (NotifActionsStorage.GetIntfActions.TryGetValue(toggleButton.Name, out string action))
+ if (NotifActionsStorage.IntfNotifActions.TryGetValue(toggleButton.Name, out string action))
new ViewNotification(300).Show(action);
Parallel.Invoke(async delegate { await Task.Delay(1000); new InterfaceTweaks().AnalyzeAndUpdate(this); });
diff --git a/.Source/GTweak/View/PakagesView.xaml.cs b/.Source/GTweak/View/PakagesView.xaml.cs
index eb5f6cf2..f99d2d7d 100644
--- a/.Source/GTweak/View/PakagesView.xaml.cs
+++ b/.Source/GTweak/View/PakagesView.xaml.cs
@@ -117,7 +117,7 @@ namespace GTweak.View
UninstallingPakages.HandleAvailabilityStatus(packageName, false);
UpdateViewStatePakages();
- if (ExplorerManager.GetAppsStorage.TryGetValue(packageName, out bool needRestart))
+ if (ExplorerManager.AppImgMapping.TryGetValue(packageName, out bool needRestart))
ExplorerManager.Restart(new Process());
});
diff --git a/.Source/GTweak/View/SystemView.xaml.cs b/.Source/GTweak/View/SystemView.xaml.cs
index 01a20486..b2db6cf8 100644
--- a/.Source/GTweak/View/SystemView.xaml.cs
+++ b/.Source/GTweak/View/SystemView.xaml.cs
@@ -48,7 +48,7 @@ namespace GTweak.View
{
SystemTweaks.ApplyTweaks(toggleButton.Name, toggleButton.State);
- if (NotifActionsStorage.GetSysActions.TryGetValue(toggleButton.Name, out string action))
+ if (NotifActionsStorage.SysNotifActions.TryGetValue(toggleButton.Name, out string action))
new ViewNotification(300).Show(action);
Parallel.Invoke(async delegate { await Task.Delay(1000); new SystemTweaks().AnalyzeAndUpdate(this); });
diff --git a/.Source/GTweak/Windows/ImportWindow.xaml.cs b/.Source/GTweak/Windows/ImportWindow.xaml.cs
index 363bc40c..0e706562 100644
--- a/.Source/GTweak/Windows/ImportWindow.xaml.cs
+++ b/.Source/GTweak/Windows/ImportWindow.xaml.cs
@@ -77,8 +77,8 @@ namespace GTweak.Windows
await Task.Delay(700, _token);
ConfidentialityTweaks.ApplyTweaks(set.Tweak, Convert.ToBoolean(set.Value));
- isRestartNeed = NotifActionsStorage.GetConfActions.Any(get => get.Key == set.Tweak && get.Value == "restart");
- isLogoutNeed = NotifActionsStorage.GetConfActions.Any(get => get.Key == set.Tweak && get.Value == "logout");
+ isRestartNeed = NotifActionsStorage.ConfNotifActions.Any(get => get.Key == set.Tweak && get.Value == "restart");
+ isLogoutNeed = NotifActionsStorage.ConfNotifActions.Any(get => get.Key == set.Tweak && get.Value == "logout");
}
}
@@ -96,9 +96,9 @@ namespace GTweak.Windows
await Task.Delay(700, _token);
InterfaceTweaks.ApplyTweaks(set.Tweak, Convert.ToBoolean(set.Value));
- isRestartNeed = NotifActionsStorage.GetIntfActions.Any(get => get.Key == set.Tweak && get.Value == "restart");
- isLogoutNeed = NotifActionsStorage.GetIntfActions.Any(get => get.Key == set.Tweak && get.Value == "logout");
- isExpRestartNeed = ExplorerManager.GetIntfStorage.Any(get => get.Key == set.Tweak && get.Value == true);
+ isRestartNeed = NotifActionsStorage.IntfNotifActions.Any(get => get.Key == set.Tweak && get.Value == "restart");
+ isLogoutNeed = NotifActionsStorage.IntfNotifActions.Any(get => get.Key == set.Tweak && get.Value == "logout");
+ isExpRestartNeed = ExplorerManager.InterfBtnMapping.Any(get => get.Key == set.Tweak && get.Value == true);
}
}
@@ -144,8 +144,8 @@ namespace GTweak.Windows
else
SystemTweaks.ApplyTweaksSlider(set.Tweak, Convert.ToUInt32(set.Value));
- isRestartNeed = NotifActionsStorage.GetSysActions.Any(get => get.Key == set.Tweak && get.Value == "restart");
- isLogoutNeed = NotifActionsStorage.GetSysActions.Any(get => get.Key == set.Tweak && get.Value == "logout");
+ isRestartNeed = NotifActionsStorage.SysNotifActions.Any(get => get.Key == set.Tweak && get.Value == "restart");
+ isLogoutNeed = NotifActionsStorage.SysNotifActions.Any(get => get.Key == set.Tweak && get.Value == "logout");
}
}
}