Skip to content

Portable Tool for an Ideal Windows Setup

moved logic from code-behind into ViewModel (AnalyzeAndUpdate); deb v 5.3.3

Greedeks6d1a66121a92
diff --git a/.Source/GTweak/Core/BasePageVM.cs b/.Source/GTweak/Core/BasePageVM.cs
new file mode 100644
index 00000000..e73d15a1
--- /dev/null
+++ b/.Source/GTweak/Core/BasePageVM.cs
@@ -0,0 +1,54 @@
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace GTweak.Core
+{
+ internal interface IToggleModel
+ {
+ string Name { get; set; }
+ bool State { get; set; }
+ }
+
+ internal interface ISliderModel : IToggleModel
+ {
+ double Value { get; set; }
+ }
+
+ internal abstract class BasePageVM<TModel, TTweaksClass> : ViewModelBase
+ where TModel : IToggleModel, new()
+ where TTweaksClass : new()
+ {
+ public ObservableCollection<TModel> Toggles { get; private set; }
+
+ public TModel this[string name] => Toggles.FirstOrDefault(d => d.Name == name);
+
+ protected abstract Dictionary<string, object> GetControlStates();
+
+ protected abstract void Analyze(TTweaksClass tweaks);
+
+ protected BasePageVM()
+ {
+ var tweaks = new TTweaksClass();
+ Parallel.Invoke(() => Analyze(tweaks));
+
+ Toggles = new ObservableCollection<TModel>(
+ GetControlStates().Select(kvp =>
+ {
+ var model = new TModel { Name = kvp.Key };
+
+ if (kvp.Value is bool b)
+ model.State = b;
+
+ if (kvp.Value is double d && model is ISliderModel sliderModel)
+ sliderModel.Value = d;
+
+ return model;
+ }));
+
+ OnPropertyChanged(nameof(Toggles));
+ }
+
+ }
+}
diff --git a/.Source/GTweak/Core/Model/ConfidentialityModel.cs b/.Source/GTweak/Core/Model/ConfidentialityModel.cs
new file mode 100644
index 00000000..e149d5bb
--- /dev/null
+++ b/.Source/GTweak/Core/Model/ConfidentialityModel.cs
@@ -0,0 +1,8 @@
+namespace GTweak.Core.Model
+{
+ internal sealed class ConfidentialityModel : IToggleModel
+ {
+ public string Name { get; set; }
+ public bool State { get; set; }
+ }
+}
diff --git a/.Source/GTweak/Core/Model/InterfaceModel.cs b/.Source/GTweak/Core/Model/InterfaceModel.cs
new file mode 100644
index 00000000..79aa14a1
--- /dev/null
+++ b/.Source/GTweak/Core/Model/InterfaceModel.cs
@@ -0,0 +1,8 @@
+namespace GTweak.Core.Model
+{
+ internal sealed class InterfaceModel : IToggleModel
+ {
+ public string Name { get; set; }
+ public bool State { get; set; }
+ }
+}
diff --git a/.Source/GTweak/Core/Model/ServicesModel.cs b/.Source/GTweak/Core/Model/ServicesModel.cs
new file mode 100644
index 00000000..0eef9eda
--- /dev/null
+++ b/.Source/GTweak/Core/Model/ServicesModel.cs
@@ -0,0 +1,8 @@
+namespace GTweak.Core.Model
+{
+ internal class ServicesModel : IToggleModel
+ {
+ public string Name { get; set; }
+ public bool State { get; set; }
+ }
+}
diff --git a/.Source/GTweak/Core/Model/SystemModel.cs b/.Source/GTweak/Core/Model/SystemModel.cs
new file mode 100644
index 00000000..124fee93
--- /dev/null
+++ b/.Source/GTweak/Core/Model/SystemModel.cs
@@ -0,0 +1,9 @@
+namespace GTweak.Core.Model
+{
+ internal class SystemModel : ISliderModel
+ {
+ public string Name { get; set; }
+ public bool State { get; set; }
+ public double Value { get; set; }
+ }
+}
diff --git a/.Source/GTweak/Core/ViewModel/ConfidentialityVM.cs b/.Source/GTweak/Core/ViewModel/ConfidentialityVM.cs
new file mode 100644
index 00000000..4a6ec466
--- /dev/null
+++ b/.Source/GTweak/Core/ViewModel/ConfidentialityVM.cs
@@ -0,0 +1,14 @@
+using GTweak.Core.Model;
+using GTweak.Utilities.Tweaks;
+using System.Collections.Generic;
+
+namespace GTweak.Core.ViewModel
+{
+ internal class ConfidentialityVM : BasePageVM<ConfidentialityModel, ConfidentialityTweaks>
+ {
+ protected override Dictionary<string, object> GetControlStates() => ConfidentialityTweaks.ControlStates;
+
+ protected override void Analyze(ConfidentialityTweaks tweaks) => tweaks.AnalyzeAndUpdate();
+ }
+
+}
diff --git a/.Source/GTweak/Core/ViewModel/InterfaceVM.cs b/.Source/GTweak/Core/ViewModel/InterfaceVM.cs
index 5ae4e27a..16874f81 100644
--- a/.Source/GTweak/Core/ViewModel/InterfaceVM.cs
+++ b/.Source/GTweak/Core/ViewModel/InterfaceVM.cs
@@ -1,11 +1,17 @@
-using GTweak.Utilities.Configuration;
+using GTweak.Core.Model;
+using GTweak.Utilities.Configuration;
using GTweak.Utilities.Tweaks;
+using System.Collections.Generic;
namespace GTweak.Core.ViewModel
{
- internal class InterfaceVM : ViewModelBase
+ internal class InterfaceVM : BasePageVM<InterfaceModel, InterfaceTweaks>
{
public bool IsBlockForWin10 => SystemDiagnostics.IsWindowsVersion[11];
public bool IsBlockWithoutLicense => WindowsLicense.IsWindowsActivated;
+
+ protected override Dictionary<string, object> GetControlStates() => InterfaceTweaks.ControlStates;
+
+ protected override void Analyze(InterfaceTweaks tweaks) => tweaks.AnalyzeAndUpdate();
}
}
diff --git a/.Source/GTweak/Core/ViewModel/OtherContextVM.cs b/.Source/GTweak/Core/ViewModel/OtherContextVM.cs
index 3957170b..796665bd 100644
--- a/.Source/GTweak/Core/ViewModel/OtherContextVM.cs
+++ b/.Source/GTweak/Core/ViewModel/OtherContextVM.cs
@@ -1,8 +1,5 @@
namespace GTweak.Core.ViewModel
{
- internal class ConfidentialityVM : ViewModelBase { }
internal class PakagesVM : ViewModelBase { }
- internal class ServicesVM : ViewModelBase { }
- internal class SystemVM : ViewModelBase { }
internal class MoreVM : ViewModelBase { }
}
diff --git a/.Source/GTweak/Core/ViewModel/ServicesVM.cs b/.Source/GTweak/Core/ViewModel/ServicesVM.cs
new file mode 100644
index 00000000..73dda165
--- /dev/null
+++ b/.Source/GTweak/Core/ViewModel/ServicesVM.cs
@@ -0,0 +1,13 @@
+using GTweak.Core.Model;
+using GTweak.Utilities.Tweaks;
+using System.Collections.Generic;
+
+namespace GTweak.Core.ViewModel
+{
+ internal class ServicesVM : BasePageVM<ServicesModel, ServicesTweaks>
+ {
+ protected override Dictionary<string, object> GetControlStates() => ServicesTweaks.ControlStates;
+
+ protected override void Analyze(ServicesTweaks tweaks) => tweaks.AnalyzeAndUpdate();
+ }
+}
diff --git a/.Source/GTweak/Core/ViewModel/SystemVM.cs b/.Source/GTweak/Core/ViewModel/SystemVM.cs
new file mode 100644
index 00000000..97d3dc4f
--- /dev/null
+++ b/.Source/GTweak/Core/ViewModel/SystemVM.cs
@@ -0,0 +1,13 @@
+using GTweak.Core.Model;
+using GTweak.Utilities.Tweaks;
+using System.Collections.Generic;
+
+namespace GTweak.Core.ViewModel
+{
+ internal sealed class SystemVM : BasePageVM<SystemModel, SystemTweaks>
+ {
+ protected override Dictionary<string, object> GetControlStates() => SystemTweaks.ControlStates;
+
+ protected override void Analyze(SystemTweaks tweaks) => tweaks.AnalyzeAndUpdate();
+ }
+}
diff --git a/.Source/GTweak/GTweak.csproj b/.Source/GTweak/GTweak.csproj
index db6169a7..6f9c9b7e 100644
--- a/.Source/GTweak/GTweak.csproj
+++ b/.Source/GTweak/GTweak.csproj
@@ -248,13 +248,21 @@
<Compile Include="Assets\UserControl\ProggressRing.xaml.cs">
<DependentUpon>ProggressRing.xaml</DependentUpon>
</Compile>
+ <Compile Include="Core\BasePageVM.cs" />
+ <Compile Include="Core\Model\InterfaceModel.cs" />
+ <Compile Include="Core\Model\ConfidentialityModel.cs" />
<Compile Include="Core\Model\MainModel.cs" />
+ <Compile Include="Core\Model\ServicesModel.cs" />
+ <Compile Include="Core\Model\SystemModel.cs" />
+ <Compile Include="Core\ViewModel\ConfidentialityVM.cs" />
<Compile Include="Core\ViewModel\DataSystemVM.cs" />
<Compile Include="Core\ViewModel\InterfaceVM.cs" />
<Compile Include="Assets\UserControl\Card.xaml.cs">
<DependentUpon>Card.xaml</DependentUpon>
</Compile>
<Compile Include="Core\Model\DataSystemModel.cs" />
+ <Compile Include="Core\ViewModel\ServicesVM.cs" />
+ <Compile Include="Core\ViewModel\SystemVM.cs" />
<Compile Include="Properties\AssemblyInfo.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
diff --git a/.Source/GTweak/Properties/AssemblyInfo.cs b/.Source/GTweak/Properties/AssemblyInfo.cs
index 46f4d17d..c5a51d97 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.3.2")]
-[assembly: AssemblyVersion("5.3.45.159")]
-[assembly: AssemblyFileVersion("5.3.45.159")]
+[assembly: AssemblyInformationalVersion("Build: 5.3.3")]
+[assembly: AssemblyVersion("5.3.42.714")]
+[assembly: AssemblyFileVersion("5.3.42.714")]
[assembly: ComVisible(false)]
diff --git a/.Source/GTweak/Properties/AssemblyInfo.tt b/.Source/GTweak/Properties/AssemblyInfo.tt
index 113a6191..d244463f 100644
--- a/.Source/GTweak/Properties/AssemblyInfo.tt
+++ b/.Source/GTweak/Properties/AssemblyInfo.tt
@@ -20,7 +20,7 @@ using System.Windows;
ResourceDictionaryLocation.SourceAssembly
)]
<#+
- private const string majorVersion = "Build: 5.3.2";
+ private const string majorVersion = "Build: 5.3.3";
private string GenerateVersion()
{
diff --git a/.Source/GTweak/Utilities/Configuration/SystemDiagnostics.cs b/.Source/GTweak/Utilities/Configuration/SystemDiagnostics.cs
index b1440529..a58ba36f 100644
--- a/.Source/GTweak/Utilities/Configuration/SystemDiagnostics.cs
+++ b/.Source/GTweak/Utilities/Configuration/SystemDiagnostics.cs
@@ -88,7 +88,11 @@ namespace GTweak.Utilities.Configuration
internal static bool IsNeedUpdate { get; private set; } = false;
internal static string DownloadVersion { get; private set; } = string.Empty;
- internal static Dictionary<byte, bool> IsWindowsVersion = default;
+ internal static Dictionary<byte, bool> IsWindowsVersion = new Dictionary<byte, bool>
+ {
+ { 10, default },
+ { 11, default }
+ };
internal static bool isIPAddressFormatValid = false, isMsftAvailable = false;
@@ -178,12 +182,9 @@ namespace GTweak.Utilities.Configuration
HardwareData.OS.Name = $"{data.Substring(data.IndexOf('W'))} {Regex.Replace((string)managementObj["OSArchitecture"], @"\-.+", "-bit")} {(!string.IsNullOrWhiteSpace(release) ? $"({release})" : string.Empty)}\n";
HardwareData.OS.Version = $"{(string)managementObj["Version"]}.{revisionNumber}\n";
HardwareData.OS.Build = decimal.TryParse($"{Convert.ToString(managementObj["BuildNumber"])}.{revisionNumber}", NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out decimal result) ? result : Convert.ToDecimal(Registry.GetValue(regPath, "CurrentBuild", 0)?.ToString());
+ IsWindowsVersion[10] = HardwareData.OS.Name.Contains("10");
+ IsWindowsVersion[11] = HardwareData.OS.Name.Contains("11");
- IsWindowsVersion = new Dictionary<byte, bool>()
- {
- { 11, HardwareData.OS.Name.Contains("11") },
- { 10, HardwareData.OS.Name.Contains("10") }
- };
}
HardwareData.OS.Name = !string.IsNullOrWhiteSpace(HardwareData.OS.Name) ? HardwareData.OS.Name.TrimEnd('\n', '\r') : Registry.GetValue(regPath, "ProductName", "Windows")?.ToString();
HardwareData.OS.Version = !string.IsNullOrWhiteSpace(HardwareData.OS.Version) ? HardwareData.OS.Version.TrimEnd('\n', '\r') : Registry.GetValue(regPath, "LCUVer", 0)?.ToString();
diff --git a/.Source/GTweak/Utilities/Tweaks/ConfidentialityTweaks.cs b/.Source/GTweak/Utilities/Tweaks/ConfidentialityTweaks.cs
index 20fa2847..33e6d8f9 100644
--- a/.Source/GTweak/Utilities/Tweaks/ConfidentialityTweaks.cs
+++ b/.Source/GTweak/Utilities/Tweaks/ConfidentialityTweaks.cs
@@ -3,9 +3,9 @@ using GTweak.Utilities.Configuration;
using GTweak.Utilities.Controls;
using GTweak.Utilities.Helpers;
using GTweak.Utilities.Managers;
-using GTweak.View;
using Microsoft.Win32;
using System;
+using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
@@ -14,13 +14,15 @@ namespace GTweak.Utilities.Tweaks
{
internal sealed class ConfidentialityTweaks : FirewallManager
{
- internal void AnalyzeAndUpdate(ConfidentialityView confidentialityV)
+ internal static Dictionary<string, object> ControlStates = new Dictionary<string, object>();
+
+ internal void AnalyzeAndUpdate()
{
- confidentialityV.TglButton1.StateNA =
+ ControlStates["TglButton1"] =
RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\AdvertisingInfo", "Enabled", "0") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PolicyManager\current\device\Bluetooth", "AllowAdvertising", "0");
- confidentialityV.TglButton2.StateNA =
+ ControlStates["TglButton2"] =
RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\SettingSync\Groups\Accessibility", "Enabled", "0") ||
RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\SettingSync\Groups\BrowserSettings", "Enabled", "0") ||
RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\SettingSync\Groups\Credentials", "Enabled", "0") ||
@@ -28,62 +30,62 @@ namespace GTweak.Utilities.Tweaks
RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\SettingSync\Groups\Personalization", "Enabled", "0") ||
RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\SettingSync\Groups\Windows", "Enabled", "0");
- confidentialityV.TglButton3.StateNA =
+ ControlStates["TglButton3"] =
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\WMI\Autologger\Diagtrack-Listener", "Start", "0") ||
RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Policies\Attachments", "SaveZoneInformation", "1") || IsTaskEnabled(telemetryTasks);
- confidentialityV.TglButton4.StateNA = IsTaskEnabled(dataCollectTasks);
+ ControlStates["TglButton4"] = IsTaskEnabled(dataCollectTasks);
- confidentialityV.TglButton5.StateNA =
+ ControlStates["TglButton5"] =
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\AppCompat", "DisableInventory", "1");
- confidentialityV.TglButton6.StateNA =
+ ControlStates["TglButton6"] =
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\DataCollection", "AllowTelemetry", "0") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\AppCompat", "AITEnable", "0") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\DataCollection", "AllowDeviceNameInTelemetry", "0") ||
RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced", "Start_TrackProgs", "0");
- confidentialityV.TglButton7.StateNA =
+ ControlStates["TglButton7"] =
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\TabletPC", "PreventHandwritingDataSharing", "1") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\HandwritingErrorReports", "PreventHandwritingErrorReports", "1") ||
RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Software\Microsoft\Input\TIPC", "Enabled", "0");
- confidentialityV.TglButton8.StateNA =
+ ControlStates["TglButton8"] =
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\SQMClient\Windows", "CEIPEnable", "0");
- confidentialityV.TglButton9.StateNA = IsDefaultHosts();
+ ControlStates["TglButton9"] = IsDefaultHosts();
- confidentialityV.TglButton10.StateNA =
+ ControlStates["TglButton10"] =
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\LocationAndSensors", "DisableLocation", "1") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\LocationAndSensors", "DisableLocationScripting", "1") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\LocationAndSensors", "DisableWindowsLocationProvider", "1");
- confidentialityV.TglButton11.StateNA =
+ ControlStates["TglButton11"] =
RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Software\Microsoft\Siuf\Rules", "NumberOfSIUFInPeriod", "0") ||
RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Software\Microsoft\Siuf\Rules", "PeriodInNanoSeconds", "0") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\DataCollection", "DoNotShowFeedbackNotifications", "1");
- confidentialityV.TglButton12.StateNA =
+ ControlStates["TglButton12"] =
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Speech", "AllowSpeechModelUpdate", "0");
- confidentialityV.TglButton13.StateNA =
+ ControlStates["TglButton13"] =
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\CDPUserSvc", "Start", "4");
- confidentialityV.TglButton14.StateNA =
+ ControlStates["TglButton14"] =
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PolicyManager\current\device\System", "AllowExperimentation", "0");
- confidentialityV.TglButton15.StateNA =
+ ControlStates["TglButton15"] =
RegistryHelp.KeyExists(Registry.LocalMachine, @"SYSTEM\CurrentControlSet\Services\DiagTrack") ||
RegistryHelp.KeyExists(Registry.LocalMachine, @"SYSTEM\CurrentControlSet\Services\dmwappushservice") ||
RegistryHelp.KeyExists(Registry.LocalMachine, @"SYSTEM\CurrentControlSet\Services\diagsvc");
- confidentialityV.TglButton16.StateNA =
+ ControlStates["TglButton16"] =
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\diagnosticshub.standardcollector.service", "Start", "4");
- confidentialityV.TglButton17.StateNA = SystemDiagnostics.HardwareData.Graphics.IndexOf("nvidia", StringComparison.OrdinalIgnoreCase) >= 0
+ ControlStates["TglButton17"] = SystemDiagnostics.HardwareData.Graphics.IndexOf("nvidia", StringComparison.OrdinalIgnoreCase) >= 0
&& (RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\NvTelemetryContainer", "Start", "4") || IsTaskEnabled(nvidiaTasks));
- confidentialityV.TglButton18.StateNA =
+ ControlStates["TglButton18"] =
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\AppCompat", "DisableUAR", "1") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\Personalization", "NoLockScreenCamera", "1");
}
diff --git a/.Source/GTweak/Utilities/Tweaks/InterfaceTweaks.cs b/.Source/GTweak/Utilities/Tweaks/InterfaceTweaks.cs
index addb7114..512d625a 100644
--- a/.Source/GTweak/Utilities/Tweaks/InterfaceTweaks.cs
+++ b/.Source/GTweak/Utilities/Tweaks/InterfaceTweaks.cs
@@ -2,9 +2,9 @@
using GTweak.Utilities.Controls;
using GTweak.Utilities.Helpers;
using GTweak.Utilities.Managers;
-using GTweak.View;
using Microsoft.Win32;
using System;
+using System.Collections.Generic;
using System.IO;
using System.Text;
using System.Threading.Tasks;
@@ -13,59 +13,61 @@ namespace GTweak.Utilities.Tweaks
{
internal sealed class InterfaceTweaks
{
- internal void AnalyzeAndUpdate(InterfaceView interfaceV)
+ internal static Dictionary<string, object> ControlStates = new Dictionary<string, object>();
+
+ internal void AnalyzeAndUpdate()
{
- interfaceV.TglButton1.StateNA =
+ ControlStates["TglButton1"] =
RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Control Panel\Colors", "Hilight", "80 80 80") ||
RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Control Panel\Colors", "HotTrackingColor", "80 80 80");
- interfaceV.TglButton2.StateNA =
+ ControlStates["TglButton2"] =
RegistryHelp.CheckValue(@"HKEY_USERS\.DEFAULT\Control Panel\Colors", "InfoWindow", "240 255 255") ||
RegistryHelp.CheckValue(@"HKEY_USERS\S-1-5-19\Control Panel\Colors", "InfoWindow", "240 255 255") ||
RegistryHelp.CheckValue(@"HKEY_USERS\S-1-5-20\Control Panel\Colors", "InfoWindow", "240 255 255");
- interfaceV.TglButton3.StateNA =
+ ControlStates["TglButton3"] =
RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Control Panel\Desktop\WindowMetrics", "CaptionHeight", "-270") ||
RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Control Panel\Desktop\WindowMetrics", "CaptionWidth", "-270");
- interfaceV.TglButton4.StateNA =
+ ControlStates["TglButton4"] =
RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Control Panel\Desktop", "CursorBlinkRate", "530", false);
- interfaceV.TglButton5.StateNA =
+ ControlStates["TglButton5"] =
RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Control Panel\Desktop\WindowMetrics", "ScrollHeight", "-210") ||
RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Control Panel\Desktop\WindowMetrics", "ScrollWidth", "-210");
- interfaceV.TglButton6.StateNA =
+ ControlStates["TglButton6"] =
RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Themes\Personalize", "EnableTransparency", "0");
- interfaceV.TglButton7.StateNA =
+ ControlStates["TglButton7"] =
RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Themes\Personalize", "SystemUsesLightTheme", "1");
- interfaceV.TglButton8.StateNA =
+ ControlStates["TglButton8"] =
RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Themes\Personalize", "AppsUseLightTheme", "1");
- interfaceV.TglButton9.StateNA =
+ ControlStates["TglButton9"] =
RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Control Panel\Desktop", "MenuShowDelay", "20");
- interfaceV.TglButton10.StateNA =
+ ControlStates["TglButton10"] =
RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Control Panel\Mouse", "MouseHoverTime", "20");
- interfaceV.TglButton11.StateNA =
+ ControlStates["TglButton11"] =
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Icons", "29", @"%systemroot%\\Blank.ico,0");
- interfaceV.TglButton12.StateNA =
+ ControlStates["TglButton12"] =
RegistryHelp.CheckValueBytes(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer", "link", "0000");
- interfaceV.TglButton13.StateNA =
+ ControlStates["TglButton13"] =
RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\HideDesktopIcons\NewStartPanel", "{20D04FE0-3AEA-1069-A2D8-08002B30309D}", "0", false);
- interfaceV.TglButton14.StateNA =
+ ControlStates["TglButton14"] =
RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\HideDesktopIcons\NewStartPanel", "{645FF040-5081-101B-9F08-00AA002F954E}", "1");
- interfaceV.TglButton15.StateNA =
+ ControlStates["TglButton15"] =
SystemDiagnostics.IsWindowsVersion[11] && RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced", "TaskbarAl", "0");
- interfaceV.TglButton16.StateNA =
+ ControlStates["TglButton16"] =
SystemDiagnostics.IsWindowsVersion[11] &&
(RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced", "Start_Layout", "1") ||
SystemDiagnostics.HardwareData.OS.Name.IndexOf("home", StringComparison.OrdinalIgnoreCase) < 0 &&
@@ -73,18 +75,18 @@ namespace GTweak.Utilities.Tweaks
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PolicyManager\current\device\Education", "IsEducationEnvironment", "1") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\Explorer", "HideRecommendedSection", "1")));
- interfaceV.TglButton17.StateNA =
+ ControlStates["TglButton17"] =
SystemDiagnostics.IsWindowsVersion[11] && RegistryHelp.KeyExists(Registry.CurrentUser, @"Software\Classes\CLSID\{86ca1aa0-34aa-4e8b-a509-50c905bae2a2}\InprocServer32", false);
- interfaceV.TglButton18.StateNA =
+ ControlStates["TglButton18"] =
SystemDiagnostics.IsWindowsVersion[11] &&
(RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager", "SoftLandingEnabled", "0") ||
RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\UserProfileEngagement", "ScoobeSystemSettingEnabled", "0"));
- interfaceV.TglButton19.StateNA =
+ ControlStates["TglButton19"] =
SystemDiagnostics.IsWindowsVersion[11] && RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced", "UseCompactMode", "1", false);
- interfaceV.TglButton20.StateNA =
+ ControlStates["TglButton20"] =
SystemDiagnostics.IsWindowsVersion[11] &&
(RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Edge", "DefaultBrowserSettingsCampaignEnabled", "0") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Edge", "ComposeInlineEnabled", "0") ||
@@ -94,10 +96,10 @@ namespace GTweak.Utilities.Tweaks
RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Software\Policies\Microsoft\Windows\WindowsAI", "DisableAIDataAnalysis", "1") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsAI", "DisableAIDataAnalysis", "1"));
- interfaceV.TglButton21.StateNA =
+ ControlStates["TglButton21"] =
SystemDiagnostics.IsWindowsVersion[11] && RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced\TaskbarDeveloperSettings", "TaskbarEndTask", "1", false);
- interfaceV.TglButton22.StateNA =
+ ControlStates["TglButton22"] =
SystemDiagnostics.IsWindowsVersion[11] &&
(RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced", "ShowTaskViewButton", "0") ||
RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced", "TaskbarMn", "0") ||
@@ -110,7 +112,7 @@ namespace GTweak.Utilities.Tweaks
RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced", "ShowTaskViewButton", "0") ||
RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\Search", "SearchboxTaskbarMode", "0"));
- interfaceV.TglButton23.StateNA =
+ ControlStates["TglButton23"] =
SystemDiagnostics.IsWindowsVersion[11] &&
(RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\AdvertisingInfo", "Enabled", "0") ||
RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Privacy", "TailoredExperiencesWithDiagnosticDataEnabled", "0") ||
@@ -133,10 +135,10 @@ namespace GTweak.Utilities.Tweaks
RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\ContentDeliveryManager", "SubscribedContent-338393Enabled", "0") ||
RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\ContentDeliveryManager", "SubscribedContent-310093Enabled", "0"));
- interfaceV.TglButton24.StateNA =
+ ControlStates["TglButton24"] =
RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced", "PersistBrowsers", "0", false);
- interfaceV.TglButton25.StateNA =
+ ControlStates["TglButton25"] =
RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\PushNotifications", "ToastEnabled", "0") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Explorer", "AllowOnlineTips", "0") ||
@@ -147,7 +149,7 @@ namespace GTweak.Utilities.Tweaks
(SystemDiagnostics.IsWindowsVersion[10] &&
RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Software\Policies\Microsoft\Windows\Explorer", "DisableNotificationCenter", "1"));
- interfaceV.TglButton26.StateNA =
+ ControlStates["TglButton26"] =
RegistryHelp.KeyExists(Registry.LocalMachine, @"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\MyComputer\NameSpace\{088e3905-0323-4b02-9826-5d99428e115f}") ||
RegistryHelp.KeyExists(Registry.LocalMachine, @"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\MyComputer\NameSpace\{24ad3ad4-a569-4530-98e1-ab02f9417aa8}") ||
RegistryHelp.KeyExists(Registry.LocalMachine, @"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\MyComputer\NameSpace\{3dfdf296-dbec-4fb4-81d1-6a3438bcf4de}") ||
@@ -155,24 +157,24 @@ namespace GTweak.Utilities.Tweaks
RegistryHelp.KeyExists(Registry.LocalMachine, @"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\MyComputer\NameSpace\{d3162b92-9365-467a-956b-92703aca08af}") ||
RegistryHelp.KeyExists(Registry.LocalMachine, @"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\MyComputer\NameSpace\{f86fa3ab-70d2-4fc7-9c99-fcbf05467f3a}");
- interfaceV.TglButton27.StateNA =
+ ControlStates["TglButton27"] =
RegistryHelp.KeyExists(Registry.LocalMachine, @"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\MyComputer\NameSpace\{0DB7E03F-FC29-4DC6-9020-FF41B59E513A}") ||
RegistryHelp.KeyExists(Registry.LocalMachine, @"SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Explorer\MyComputer\NameSpace\{0DB7E03F-FC29-4DC6-9020-FF41B59E513A}");
- interfaceV.TglButton28.StateNA =
+ ControlStates["TglButton28"] =
RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Control Panel\Desktop", "JPEGImportQuality", "100");
- interfaceV.TglButton29.StateNA =
+ ControlStates["TglButton29"] =
RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced", "ShowInfoTip", "0");
- interfaceV.TglButton30.StateNA =
+ ControlStates["TglButton30"] =
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\Explorer", "DisableSearchBoxSuggestions", "1");
- interfaceV.TglButton31.StateNA =
+ ControlStates["TglButton31"] =
SystemDiagnostics.IsWindowsVersion[11] && RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer", "HubMode", "1") ||
SystemDiagnostics.IsWindowsVersion[10] && RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced", "LaunchTo", "1");
- interfaceV.TglButton32.StateNA =
+ ControlStates["TglButton32"] =
RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced", "HideFileExt", "1");
}
diff --git a/.Source/GTweak/Utilities/Tweaks/ServicesTweaks.cs b/.Source/GTweak/Utilities/Tweaks/ServicesTweaks.cs
index 98c20415..31650859 100644
--- a/.Source/GTweak/Utilities/Tweaks/ServicesTweaks.cs
+++ b/.Source/GTweak/Utilities/Tweaks/ServicesTweaks.cs
@@ -1,7 +1,6 @@
using GTweak.Utilities.Controls;
using GTweak.Utilities.Helpers;
using GTweak.Utilities.Managers;
-using GTweak.View;
using Microsoft.Win32;
using System;
using System.Collections.Generic;
@@ -16,6 +15,8 @@ namespace GTweak.Utilities.Tweaks
{
internal sealed class ServicesTweaks : FirewallManager
{
+ internal static Dictionary<string, object> ControlStates = new Dictionary<string, object>();
+
private static readonly Dictionary<string, (string Default, string Blocked)> _updateFilesWin = new Dictionary<string, (string Default, string Blocked)>()
{
{ "Uso", ("usoclient.exe", "BlockUOrchestrator-GTweak.exe") },
@@ -32,26 +33,26 @@ namespace GTweak.Utilities.Tweaks
return Path.Combine(basePath, program);
}
- internal void AnalyzeAndUpdate(ServicesView servicesV)
+ internal void AnalyzeAndUpdate()
{
- servicesV.TglButton1.StateNA =
+ ControlStates["TglButton1"] =
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\WSearch", "Start", "4") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\fhsvc", "Start", "4");
- servicesV.TglButton2.StateNA =
+ ControlStates["TglButton2"] =
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\XboxGipSvc", "Start", "4") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\XblAuthManager", "Start", "4") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\XboxNetApiSvc", "Start", "4") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\XblGameSave", "Start", "4");
- servicesV.TglButton3.StateNA =
+ ControlStates["TglButton3"] =
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\WwanSvc", "Start", "4") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\wlpasvc", "Start", "4") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\icssvc", "Start", "4") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\DusmSvc", "Start", "4") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\autotimesvc", "Start", "4");
- servicesV.TglButton4.StateNA =
+ ControlStates["TglButton4"] =
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\WalletService", "Start", "4") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\VacSvc", "Start", "4") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\spectrum", "Start", "4") ||
@@ -67,48 +68,48 @@ namespace GTweak.Utilities.Tweaks
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\ClipSVC", "Start", "4") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\InstallService", "Start", "4");
- servicesV.TglButton5.StateNA =
+ ControlStates["TglButton5"] =
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\wmiApSrv", "Start", "4") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\pla", "Start", "4") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\PerfHost", "Start", "4");
- servicesV.TglButton6.StateNA =
+ ControlStates["TglButton6"] =
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\WbioSrvc", "Start", "4");
- servicesV.TglButton7.StateNA =
+ ControlStates["TglButton7"] =
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\bthserv", "Start", "4") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\BthAvctpSvc", "Start", "4") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\BTAGService", "Start", "4");
- servicesV.TglButton8.StateNA =
+ ControlStates["TglButton8"] =
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Spooler", "Start", "4") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\PrintNotify", "Start", "4") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\McpManagementService", "Start", "4");
- servicesV.TglButton9.StateNA =
+ ControlStates["TglButton9"] =
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\WiaRpc", "Start", "4");
- servicesV.TglButton10.StateNA =
+ ControlStates["TglButton10"] =
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\TapiSrv", "Start", "4") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\PhoneSvc", "Start", "4") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Fax", "Start", "4");
- servicesV.TglButton11.StateNA =
+ ControlStates["TglButton11"] =
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\SensrSvc", "Start", "4") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\SensorService", "Start", "4") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\SensorDataService", "Start", "4") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\SEMgrSvc", "Start", "4") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\lfsvc", "Start", "4");
- servicesV.TglButton12.StateNA =
+ ControlStates["TglButton12"] =
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\WFDSConMgrSvc", "Start", "4");
- servicesV.TglButton13.StateNA =
+ ControlStates["TglButton13"] =
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\CDPSvc", "Start", "4") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\PushToInstall", "Start", "4") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\WpnService", "Start", "4");
- servicesV.TglButton14.StateNA =
+ ControlStates["TglButton14"] =
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Netlogon", "Start", "4") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\CscService", "Start", "4") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\lmhosts", "Start", "4") ||
@@ -117,64 +118,64 @@ namespace GTweak.Utilities.Tweaks
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\LanmanServer", "Start", "4") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\LanmanWorkstation", "Start", "4");
- servicesV.TglButton15.StateNA = _updateFilesWin.All(key => File.Exists(FilesPathUpdate(key.Value.Default)) || File.Exists(FilesPathUpdate(key.Value.Default, true)));
+ ControlStates["TglButton15"] = _updateFilesWin.All(key => File.Exists(FilesPathUpdate(key.Value.Default)) || File.Exists(FilesPathUpdate(key.Value.Default, true)));
- servicesV.TglButton16.StateNA =
+ ControlStates["TglButton16"] =
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\PolicyAgent", "Start", "4") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\IKEEXT", "Start", "4") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\p2pimsvc", "Start", "4");
- servicesV.TglButton17.StateNA =
+ ControlStates["TglButton17"] =
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\WPDBusEnum", "Start", "4") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\WMPNetworkSvc", "Start", "4");
- servicesV.TglButton18.StateNA =
+ ControlStates["TglButton18"] =
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\UmRdpService", "Start", "4") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\TermService", "Start", "4") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\SessionEnv", "Start", "4") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\DsSvc", "Start", "4") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\RemoteRegistry", "Start", "4");
- servicesV.TglButton19.StateNA =
+ ControlStates["TglButton19"] =
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\WerSvc", "Start", "4") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\wercplsupport", "Start", "4") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Wecsvc", "Start", "4");
- servicesV.TglButton20.StateNA =
+ ControlStates["TglButton20"] =
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\WebClient", "Start", "4");
- servicesV.TglButton21.StateNA =
+ ControlStates["TglButton21"] =
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\SCPolicySvc", "Start", "4") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\ScDeviceEnum", "Start", "4") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\SCardSvr", "Start", "4");
- servicesV.TglButton22.StateNA =
+ ControlStates["TglButton22"] =
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\AssignedAccessManagerSvc", "Start", "4") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\AppReadiness", "Start", "4");
- servicesV.TglButton23.StateNA =
+ ControlStates["TglButton23"] =
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\BDESVC", "Start", "4") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\EFS", "Start", "4");
- servicesV.TglButton24.StateNA =
+ ControlStates["TglButton24"] =
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\LxpSvc", "Start", "4");
- servicesV.TglButton25.StateNA =
+ ControlStates["TglButton25"] =
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\WarpJITSvc", "Start", "4");
- servicesV.TglButton26.StateNA =
+ ControlStates["TglButton26"] =
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\WdiSystemHost", "Start", "4") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\WdiServiceHost", "Start", "4") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\TroubleshootingSvc", "Start", "4") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\DPS", "Start", "4");
- servicesV.TglButton27.StateNA =
+ ControlStates["TglButton27"] =
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\workfolderssvc", "Start", "4") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\dot3svc", "Start", "4") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\DevQueryBroker", "Start", "4") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\AppMgmt", "Start", "4");
- servicesV.TglButton28.StateNA =
+ ControlStates["TglButton28"] =
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\vmicvmsession", "Start", "4") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\vmictimesync", "Start", "4") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\vmicshutdown", "Start", "4") ||
diff --git a/.Source/GTweak/Utilities/Tweaks/SystemTweaks.cs b/.Source/GTweak/Utilities/Tweaks/SystemTweaks.cs
index 540c0a37..5201507a 100644
--- a/.Source/GTweak/Utilities/Tweaks/SystemTweaks.cs
+++ b/.Source/GTweak/Utilities/Tweaks/SystemTweaks.cs
@@ -3,10 +3,10 @@ using GTweak.Utilities.Controls;
using GTweak.Utilities.Helpers;
using GTweak.Utilities.Managers;
using GTweak.Utilities.Tweaks.DefenderManager;
-using GTweak.View;
using GTweak.Windows;
using Microsoft.Win32;
using System;
+using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Linq;
@@ -32,36 +32,38 @@ namespace GTweak.Utilities.Tweaks
private static bool _isNetshState = false, _isBluetoothStatus = false, _isTickState = false;
private static string _currentPowerGuid = string.Empty;
- internal SystemTweaks() { _currentPowerGuid = RegistryHelp.GetValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes", "ActivePowerScheme", string.Empty); }
+ internal static Dictionary<string, object> ControlStates = new Dictionary<string, object>();
- internal void AnalyzeAndUpdate(SystemView systemV)
+ public SystemTweaks() { _currentPowerGuid = RegistryHelp.GetValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes", "ActivePowerScheme", string.Empty); }
+
+ internal void AnalyzeAndUpdate()
{
- systemV.Slider1.Value = RegistryHelp.GetValue<double>(@"HKEY_CURRENT_USER\Control Panel\Mouse", "MouseSensitivity", 10);
+ ControlStates["Slider1"] = RegistryHelp.GetValue<double>(@"HKEY_CURRENT_USER\Control Panel\Mouse", "MouseSensitivity", 10);
- systemV.Slider2.Value = RegistryHelp.GetValue<double>(@"HKEY_CURRENT_USER\Control Panel\Keyboard", "KeyboardDelay", 1);
+ ControlStates["Slider2"] = RegistryHelp.GetValue<double>(@"HKEY_CURRENT_USER\Control Panel\Keyboard", "KeyboardDelay", 1);
- systemV.Slider3.Value = RegistryHelp.GetValue<double>(@"HKEY_CURRENT_USER\Control Panel\Keyboard", "KeyboardSpeed", 31);
+ ControlStates["Slider3"] = RegistryHelp.GetValue<double>(@"HKEY_CURRENT_USER\Control Panel\Keyboard", "KeyboardSpeed", 31);
- systemV.TglButton1.StateNA =
+ ControlStates["TglButton1"] =
RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Control Panel\Mouse", "MouseSpeed", "0") ||
RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Control Panel\Mouse", "MouseThreshold1", "0") ||
RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Control Panel\Mouse", "MouseThreshold2", "0");
- systemV.TglButton2.StateNA =
+ ControlStates["TglButton2"] =
RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Control Panel\Accessibility\StickyKeys", "Flags", "26") ||
RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Control Panel\Accessibility\Keyboard Response", "Flags", "26");
- systemV.TglButton3.StateNA =
+ ControlStates["TglButton3"] =
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\7516b95f-f776-4464-8c53-06167f40cc99\8EC4B3A5-6868-48c2-BE75-4F3044BE88A7", "Attributes", "2");
- systemV.TglButton4.StateNA =
+ ControlStates["TglButton4"] =
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Power", "HiberbootEnabled", "0") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power", "HibernateEnabled", "0");
- systemV.TglButton5.StateNA =
+ ControlStates["TglButton5"] =
RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Control Panel\Desktop", "AutoEndTasks", "1");
- systemV.TglButton6.StateNA =
+ ControlStates["TglButton6"] =
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\WindowsStore", "AutoDownload", "2");
try
@@ -83,9 +85,9 @@ namespace GTweak.Utilities.Tweaks
if (powerSettingsKey != null)
{
if (!(powerSettingsKey.GetValue("ConservationIdleTime") is byte[] conservationIdleTime) || !(powerSettingsKey.GetValue("IdlePowerState") is byte[] idlePowerState) || !(powerSettingsKey.GetValue("PerformanceIdleTime") is byte[] performanceIdleTime))
- systemV.TglButton7.StateNA = false;
+ ControlStates["TglButton7"] = false;
else
- systemV.TglButton7.StateNA = conservationIdleTime?[0].ToString() != "255" || idlePowerState?[0].ToString() != "0" || performanceIdleTime?[0].ToString() != "255";
+ ControlStates["TglButton7"] = conservationIdleTime?[0].ToString() != "255" || idlePowerState?[0].ToString() != "0" || performanceIdleTime?[0].ToString() != "255";
}
}
}
@@ -94,9 +96,9 @@ namespace GTweak.Utilities.Tweaks
}
catch (Exception ex) { ErrorLogging.LogDebug(ex); }
- systemV.TglButton8.StateNA = File.Exists(Path.Combine(PathLocator.Folders.SystemDrive, @"Windows\System32\smartscreen.exe"));
+ ControlStates["TglButton8"] = File.Exists(Path.Combine(PathLocator.Folders.SystemDrive, @"Windows\System32\smartscreen.exe"));
- systemV.TglButton9.StateNA =
+ ControlStates["TglButton9"] =
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System", "PromptOnSecureDesktop", "0") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System", "EnableLUA", "0") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System", "EnableInstallerDetection", "0") ||
@@ -105,66 +107,66 @@ namespace GTweak.Utilities.Tweaks
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System", "EnableVirtualization", "0") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System", "ConsentPromptBehaviorAdmin", "0");
- systemV.TglButton10.StateNA =
+ ControlStates["TglButton10"] =
RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Notifications\Settings\Windows.SystemToast.SecurityAndMaintenance", "Enabled", "0");
- systemV.TglButton11.StateNA =
+ ControlStates["TglButton11"] =
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Internet Explorer\Security", "DisableSecuritySettingsCheck", "1") ||
RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\3", "1806", "0");
- systemV.TglButton12.StateNA = IsTaskEnabled(memoryDiagTasks);
+ ControlStates["TglButton12"] = IsTaskEnabled(memoryDiagTasks);
- systemV.TglButton13.StateNA = _isNetshState;
+ ControlStates["TglButton13"] = _isNetshState;
- systemV.TglButton14.StateNA =
+ ControlStates["TglButton14"] =
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Memory Management", "LargeSystemCache", "1");
- systemV.TglButton15.StateNA =
+ ControlStates["TglButton15"] =
RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Serialize", "Startupdelayinmsec", "0");
- systemV.TglButton16.StateNA =
+ ControlStates["TglButton16"] =
RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer", "ShowFrequent", "0") ||
RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer", "ShowRecent", "0") ||
RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced", "Start_TrackDocs", "0") ||
RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced", "Start_TrackProgs", "0");
- systemV.TglButton17.StateNA =
+ ControlStates["TglButton17"] =
RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers", "DisableAutoplay", "1");
- systemV.TglButton18.StateNA = !RegistryHelp.GetValue($@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes\{_currentPowerGuid}", "Description", string.Empty).Contains("-18") &&
+ ControlStates["TglButton18"] = !RegistryHelp.GetValue($@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes\{_currentPowerGuid}", "Description", string.Empty).Contains("-18") &&
!RegistryHelp.GetValue($@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes\{_currentPowerGuid}", "FriendlyName", string.Empty).Contains("-19");
- systemV.TglButton19.StateNA = _isBluetoothStatus;
+ ControlStates["TglButton19"] = _isBluetoothStatus;
- systemV.TglButton20.StateNA =
+ ControlStates["TglButton20"] =
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\mpssvc", "Start", "4");
- systemV.TglButton21.StateNA =
+ ControlStates["TglButton21"] =
RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Software\Microsoft\GameBar", "AutoGameModeEnabled", "0") ||
RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Software\Microsoft\GameBar", "AllowAutoGameMode", "0");
- systemV.TglButton22.StateNA =
+ ControlStates["TglButton22"] =
RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Software\Microsoft\GameBar", "UseNexusForGameBarEnabled", "0") ||
RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\GameDVR", "AppCaptureEnabled", "0") ||
RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\System\GameConfigStore", "GameDVR_Enabled", "0");
- systemV.TglButton23.StateNA =
+ ControlStates["TglButton23"] =
RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\BackgroundAccessApplications", "GlobalUserDisabled", "1") ||
RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Search", "BackgroundAppGlobalToggle", "0") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\AppPrivacy", "LetAppsRunInBackground", "2");
- systemV.TglButton24.StateNA =
+ ControlStates["TglButton24"] =
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\ReserveManager", "MiscPolicyInfo", "2") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\ReserveManager", "PassedPolicy", "0") ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\ReserveManager", "ShippedWithReserves", "0");
- systemV.TglButton25.StateNA = _isTickState;
+ ControlStates["TglButton25"] = _isTickState;
- systemV.TglButton26.StateNA =
+ ControlStates["TglButton26"] =
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PCHC", "PreviousUninstall", "1", false) ||
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PCHealthCheck", "installed", "1", false);
- systemV.TglButton27.StateNA = IsTaskEnabled(winInsiderTasks);
+ ControlStates["TglButton27"] = IsTaskEnabled(winInsiderTasks);
}
diff --git a/.Source/GTweak/View/ConfidentialityView.xaml b/.Source/GTweak/View/ConfidentialityView.xaml
index 4c8cd6b8..3993fe83 100644
--- a/.Source/GTweak/View/ConfidentialityView.xaml
+++ b/.Source/GTweak/View/ConfidentialityView.xaml
@@ -3,10 +3,15 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+ xmlns:vm="clr-namespace:GTweak.Core.ViewModel"
xmlns:local="clr-namespace:GTweak.View"
xmlns:uc="clr-namespace:GTweak.Assets.UserControl"
mc:Ignorable="d" d:DesignHeight="550" d:DesignWidth="1100"
- Style="{StaticResource LaunchPage}" Loaded="Page_Loaded">
+ Style="{StaticResource LaunchPage}">
+ <UserControl.DataContext>
+ <vm:ConfidentialityVM />
+ </UserControl.DataContext>
+
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="139*"/>
@@ -23,15 +28,15 @@
<Grid Grid.Column="0">
<StackPanel Orientation="Vertical" VerticalAlignment="Top" Width="Auto" Height="Auto">
- <uc:ToggleButton x:Name="TglButton1" Height="25" Width="Auto" Margin="20,25,0,0" TextResource="{DynamicResource tgl1_confidentiality}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton2" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl2_confidentiality}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton3" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl3_confidentiality}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton4" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl4_confidentiality}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton5" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl5_confidentiality}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton6" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl6_confidentiality}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton7" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl7_confidentiality}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton8" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl8_confidentiality}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton9" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl9_confidentiality}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton1" StateNA="{Binding [TglButton1].State}" Height="25" Width="Auto" Margin="20,25,0,0" TextResource="{DynamicResource tgl1_confidentiality}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton2" StateNA="{Binding [TglButton2].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl2_confidentiality}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton3" StateNA="{Binding [TglButton3].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl3_confidentiality}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton4" StateNA="{Binding [TglButton4].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl4_confidentiality}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton5" StateNA="{Binding [TglButton5].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl5_confidentiality}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton6" StateNA="{Binding [TglButton6].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl6_confidentiality}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton7" StateNA="{Binding [TglButton7].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl7_confidentiality}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton8" StateNA="{Binding [TglButton8].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl8_confidentiality}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton9" StateNA="{Binding [TglButton9].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl9_confidentiality}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
</StackPanel>
</Grid>
@@ -39,15 +44,15 @@
<Grid Grid.Column="1">
<StackPanel Orientation="Vertical" VerticalAlignment="Top" Width="Auto" Height="Auto">
- <uc:ToggleButton x:Name="TglButton10" Height="25" Width="Auto" Margin="30,25,0,0" TextResource="{DynamicResource tgl10_confidentiality}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton11" Height="25" Width="Auto" Margin="30,20,0,0" TextResource="{DynamicResource tgl11_confidentiality}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton12" Height="25" Width="Auto" Margin="30,20,0,0" TextResource="{DynamicResource tgl12_confidentiality}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton13" Height="25" Width="Auto" Margin="30,20,0,0" TextResource="{DynamicResource tgl13_confidentiality}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton14" Height="25" Width="Auto" Margin="30,20,0,0" TextResource="{DynamicResource tgl14_confidentiality}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton15" Height="25" Width="Auto" Margin="30,20,0,0" TextResource="{DynamicResource tgl15_confidentiality}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton16" Height="25" Width="Auto" Margin="30,20,0,0" TextResource="{DynamicResource tgl16_confidentiality}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton17" Height="25" Width="Auto" Margin="30,20,0,0" TextResource="{DynamicResource tgl17_confidentiality}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton18" Height="25" Width="Auto" Margin="30,20,0,0" TextResource="{DynamicResource tgl18_confidentiality}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton10" StateNA="{Binding [TglButton10].State}" Height="25" Width="Auto" Margin="30,25,0,0" TextResource="{DynamicResource tgl10_confidentiality}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton11" StateNA="{Binding [TglButton11].State}" Height="25" Width="Auto" Margin="30,20,0,0" TextResource="{DynamicResource tgl11_confidentiality}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton12" StateNA="{Binding [TglButton12].State}" Height="25" Width="Auto" Margin="30,20,0,0" TextResource="{DynamicResource tgl12_confidentiality}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton13" StateNA="{Binding [TglButton13].State}" Height="25" Width="Auto" Margin="30,20,0,0" TextResource="{DynamicResource tgl13_confidentiality}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton14" StateNA="{Binding [TglButton14].State}" Height="25" Width="Auto" Margin="30,20,0,0" TextResource="{DynamicResource tgl14_confidentiality}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton15" StateNA="{Binding [TglButton15].State}" Height="25" Width="Auto" Margin="30,20,0,0" TextResource="{DynamicResource tgl15_confidentiality}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton16" StateNA="{Binding [TglButton16].State}" Height="25" Width="Auto" Margin="30,20,0,0" TextResource="{DynamicResource tgl16_confidentiality}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton17" StateNA="{Binding [TglButton17].State}" Height="25" Width="Auto" Margin="30,20,0,0" TextResource="{DynamicResource tgl17_confidentiality}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton18" StateNA="{Binding [TglButton18].State}" Height="25" Width="Auto" Margin="30,20,0,0" TextResource="{DynamicResource tgl18_confidentiality}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
</StackPanel>
</Grid>
diff --git a/.Source/GTweak/View/ConfidentialityView.xaml.cs b/.Source/GTweak/View/ConfidentialityView.xaml.cs
index bcefa88c..19a8e0b3 100644
--- a/.Source/GTweak/View/ConfidentialityView.xaml.cs
+++ b/.Source/GTweak/View/ConfidentialityView.xaml.cs
@@ -3,7 +3,6 @@ using GTweak.Utilities.Managers;
using GTweak.Utilities.Tweaks;
using System;
using System.Threading.Tasks;
-using System.Windows;
using System.Windows.Controls;
using System.Windows.Input;
@@ -16,7 +15,6 @@ namespace GTweak.View
public ConfidentialityView()
{
InitializeComponent();
- throw new ApplicationException("Внешняя ошибка!");
}
private void Tweak_MouseEnter(object sender, MouseEventArgs e)
@@ -42,10 +40,7 @@ namespace GTweak.View
if (NotificationManager.ConfActions.TryGetValue(toggleButton.Name, out NotificationManager.NoticeAction action))
new NotificationManager(300).Show().Perform(action);
- Parallel.Invoke(async delegate { await Task.Delay(1000); Application.Current.Dispatcher.Invoke(() => { _confTweaks.AnalyzeAndUpdate(this); }); });
+ Parallel.Invoke(async delegate { await Task.Delay(1000); _confTweaks.AnalyzeAndUpdate(); });
}
-
- private void Page_Loaded(object sender, RoutedEventArgs e) => Parallel.Invoke(() => Application.Current.Dispatcher.Invoke(() => { _confTweaks.AnalyzeAndUpdate(this); }));
-
}
}
diff --git a/.Source/GTweak/View/InterfaceView.xaml b/.Source/GTweak/View/InterfaceView.xaml
index 1982c4db..21b7809c 100644
--- a/.Source/GTweak/View/InterfaceView.xaml
+++ b/.Source/GTweak/View/InterfaceView.xaml
@@ -4,10 +4,10 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:GTweak.View"
+ xmlns:vm="clr-namespace:GTweak.Core.ViewModel"
xmlns:uc="clr-namespace:GTweak.Assets.UserControl"
- xmlns:vm="clr-namespace:GTweak.Core.ViewModel"
mc:Ignorable="d" d:DesignHeight="550" d:DesignWidth="1100"
- Style="{StaticResource LaunchPage}" Loaded="Page_Loaded">
+ Style="{StaticResource LaunchPage}">
<UserControl.DataContext>
<vm:InterfaceVM/>
</UserControl.DataContext>
@@ -28,44 +28,44 @@
<Grid Grid.Column="0">
<StackPanel Orientation="Vertical" VerticalAlignment="Top" Width="Auto" Height="Auto">
- <uc:ToggleButton x:Name="TglButton1" Height="25" Width="Auto" Margin="20,15,0,0" TextResource="{DynamicResource tgl1_interface}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton2" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl2_interface}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton3" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl3_interface}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton4" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl4_interface}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton5" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl5_interface}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton6" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl6_interface}" IsEnabled="{Binding IsBlockWithoutLicense}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton7" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl7_interface}" IsEnabled="{Binding IsBlockWithoutLicense}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton8" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl8_interface}" IsEnabled="{Binding IsBlockWithoutLicense}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton9" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl9_interface}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton10" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl10_interface}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton11" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl11_interface}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton12" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl12_interface}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton13" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl13_interface}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton14" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl14_interface}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton30" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl30_interface}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton32" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl32_interface}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton1" StateNA="{Binding [TglButton1].State}" Height="25" Width="Auto" Margin="20,15,0,0" TextResource="{DynamicResource tgl1_interface}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton2" StateNA="{Binding [TglButton2].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl2_interface}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton3" StateNA="{Binding [TglButton3].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl3_interface}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton4" StateNA="{Binding [TglButton4].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl4_interface}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton5" StateNA="{Binding [TglButton5].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl5_interface}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton6" StateNA="{Binding [TglButton6].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl6_interface}" IsEnabled="{Binding IsBlockWithoutLicense}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton7" StateNA="{Binding [TglButton7].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl7_interface}" IsEnabled="{Binding IsBlockWithoutLicense}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton8" StateNA="{Binding [TglButton8].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl8_interface}" IsEnabled="{Binding IsBlockWithoutLicense}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton9" StateNA="{Binding [TglButton9].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl9_interface}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton10" StateNA="{Binding [TglButton10].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl10_interface}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton11" StateNA="{Binding [TglButton11].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl11_interface}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton12" StateNA="{Binding [TglButton12].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl12_interface}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton13" StateNA="{Binding [TglButton13].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl13_interface}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton14" StateNA="{Binding [TglButton14].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl14_interface}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton30" StateNA="{Binding [TglButton30].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl30_interface}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton32" StateNA="{Binding [TglButton32].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl32_interface}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
</StackPanel>
</Grid>
<Grid Grid.Column="1">
<StackPanel Orientation="Vertical" VerticalAlignment="Top" Width="Auto" Height="Auto">
- <uc:ToggleButton x:Name="TglButton15" Height="25" Width="Auto" Margin="20,15,0,0" TextResource="{DynamicResource tgl15_interface}" IsEnabled="{Binding IsBlockForWin10}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton16" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl16_interface}" IsEnabled="{Binding IsBlockForWin10}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton17" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl17_interface}" IsEnabled="{Binding IsBlockForWin10}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton18" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl18_interface}" IsEnabled="{Binding IsBlockForWin10}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton19" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl19_interface}" IsEnabled="{Binding IsBlockForWin10}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton20" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl20_interface}" IsEnabled="{Binding IsBlockForWin10}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton21" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl21_interface}" IsEnabled="{Binding IsBlockForWin10}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton22" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl22_interface}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton23" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl23_interface}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton24" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl24_interface}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton25" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl25_interface}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton26" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl26_interface}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton27" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl27_interface}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton28" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl28_interface}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton29" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl29_interface}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton31" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl31_interface}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton15" StateNA="{Binding [TglButton15].State}" Height="25" Width="Auto" Margin="20,15,0,0" TextResource="{DynamicResource tgl15_interface}" IsEnabled="{Binding IsBlockForWin10}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton16" StateNA="{Binding [TglButton16].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl16_interface}" IsEnabled="{Binding IsBlockForWin10}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton17" StateNA="{Binding [TglButton17].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl17_interface}" IsEnabled="{Binding IsBlockForWin10}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton18" StateNA="{Binding [TglButton18].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl18_interface}" IsEnabled="{Binding IsBlockForWin10}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton19" StateNA="{Binding [TglButton19].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl19_interface}" IsEnabled="{Binding IsBlockForWin10}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton20" StateNA="{Binding [TglButton20].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl20_interface}" IsEnabled="{Binding IsBlockForWin10}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton21" StateNA="{Binding [TglButton21].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl21_interface}" IsEnabled="{Binding IsBlockForWin10}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton22" StateNA="{Binding [TglButton22].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl22_interface}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton23" StateNA="{Binding [TglButton23].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl23_interface}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton24" StateNA="{Binding [TglButton24].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl24_interface}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton25" StateNA="{Binding [TglButton25].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl25_interface}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton26" StateNA="{Binding [TglButton26].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl26_interface}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton27" StateNA="{Binding [TglButton27].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl27_interface}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton28" StateNA="{Binding [TglButton28].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl28_interface}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton29" StateNA="{Binding [TglButton29].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl29_interface}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton31" StateNA="{Binding [TglButton31].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl31_interface}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
</StackPanel>
</Grid>
</Grid>
diff --git a/.Source/GTweak/View/InterfaceView.xaml.cs b/.Source/GTweak/View/InterfaceView.xaml.cs
index 3bbb6c76..daf73c8f 100644
--- a/.Source/GTweak/View/InterfaceView.xaml.cs
+++ b/.Source/GTweak/View/InterfaceView.xaml.cs
@@ -76,10 +76,7 @@ namespace GTweak.View
if (NotificationManager.IntfActions.TryGetValue(toggleButton.Name, out NotificationManager.NoticeAction action))
new NotificationManager(300).Show().Perform(action);
- Parallel.Invoke(async delegate { await Task.Delay(1000); Application.Current.Dispatcher.Invoke(() => { _intfTweaks.AnalyzeAndUpdate(this); }); });
+ Parallel.Invoke(async delegate { await Task.Delay(1000); _intfTweaks.AnalyzeAndUpdate(); });
}
-
- private void Page_Loaded(object sender, RoutedEventArgs e) => Parallel.Invoke(() => Application.Current.Dispatcher.Invoke(() => { _intfTweaks.AnalyzeAndUpdate(this); }));
-
}
}
diff --git a/.Source/GTweak/View/ServicesView.xaml b/.Source/GTweak/View/ServicesView.xaml
index d9c4c492..4a10be20 100644
--- a/.Source/GTweak/View/ServicesView.xaml
+++ b/.Source/GTweak/View/ServicesView.xaml
@@ -4,9 +4,14 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:GTweak.View"
+ xmlns:vm="clr-namespace:GTweak.Core.ViewModel"
xmlns:uc="clr-namespace:GTweak.Assets.UserControl"
mc:Ignorable="d" d:DesignHeight="550" d:DesignWidth="1100"
- Style="{StaticResource LaunchPage}" Loaded="Page_Loaded">
+ Style="{StaticResource LaunchPage}">
+ <UserControl.DataContext>
+ <vm:ServicesVM/>
+ </UserControl.DataContext>
+
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="139*"/>
@@ -23,39 +28,39 @@
<Grid Grid.Column="0">
<StackPanel Orientation="Vertical" VerticalAlignment="Top" Width="Auto" Height="Auto">
- <uc:ToggleButton x:Name="TglButton1" Height="25" Width="Auto" Margin="20,15,0,0" TextResource="{DynamicResource tgl1_services}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton2" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl2_services}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton3" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl3_services}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton4" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl4_services}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton5" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl5_services}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton6" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl6_services}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton7" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl7_services}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton8" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl8_services}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton9" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl9_services}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton10" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl10_services}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton11" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl11_services}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton12" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl12_services}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton13" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl13_services}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton14" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl14_services}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton1" StateNA="{Binding [TglButton1].State}" Height="25" Width="Auto" Margin="20,15,0,0" TextResource="{DynamicResource tgl1_services}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton2" StateNA="{Binding [TglButton2].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl2_services}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton3" StateNA="{Binding [TglButton3].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl3_services}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton4" StateNA="{Binding [TglButton4].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl4_services}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton5" StateNA="{Binding [TglButton5].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl5_services}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton6" StateNA="{Binding [TglButton6].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl6_services}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton7" StateNA="{Binding [TglButton7].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl7_services}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton8" StateNA="{Binding [TglButton8].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl8_services}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton9" StateNA="{Binding [TglButton9].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl9_services}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton10" StateNA="{Binding [TglButton10].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl10_services}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton11" StateNA="{Binding [TglButton11].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl11_services}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton12" StateNA="{Binding [TglButton12].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl12_services}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton13" StateNA="{Binding [TglButton13].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl13_services}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton14" StateNA="{Binding [TglButton14].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl14_services}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
</StackPanel>
</Grid>
<Grid Grid.Column="2">
<StackPanel Orientation="Vertical" VerticalAlignment="Top" Width="Auto" Height="Auto">
- <uc:ToggleButton x:Name="TglButton15" Height="25" Width="Auto" Margin="20,15,0,0" TextResource="{DynamicResource tgl15_services}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState" />
- <uc:ToggleButton x:Name="TglButton16" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl16_services}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton17" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl17_services}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton18" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl18_services}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton19" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl19_services}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton20" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl20_services}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton21" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl21_services}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton22" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl22_services}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton23" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl23_services}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton24" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl24_services}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton25" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl25_services}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton26" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl26_services}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton27" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl27_services}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton28" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl28_services}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton15" StateNA="{Binding [TglButton15].State}" Height="25" Width="Auto" Margin="20,15,0,0" TextResource="{DynamicResource tgl15_services}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState" />
+ <uc:ToggleButton x:Name="TglButton16" StateNA="{Binding [TglButton16].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl16_services}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton17" StateNA="{Binding [TglButton17].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl17_services}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton18" StateNA="{Binding [TglButton18].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl18_services}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton19" StateNA="{Binding [TglButton19].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl19_services}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton20" StateNA="{Binding [TglButton20].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl20_services}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton21" StateNA="{Binding [TglButton21].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl21_services}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton22" StateNA="{Binding [TglButton22].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl22_services}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton23" StateNA="{Binding [TglButton23].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl23_services}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton24" StateNA="{Binding [TglButton24].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl24_services}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton25" StateNA="{Binding [TglButton25].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl25_services}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton26" StateNA="{Binding [TglButton26].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl26_services}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton27" StateNA="{Binding [TglButton27].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl27_services}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton28" StateNA="{Binding [TglButton28].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl28_services}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
</StackPanel>
</Grid>
</Grid>
diff --git a/.Source/GTweak/View/ServicesView.xaml.cs b/.Source/GTweak/View/ServicesView.xaml.cs
index 47c56481..094fe0b6 100644
--- a/.Source/GTweak/View/ServicesView.xaml.cs
+++ b/.Source/GTweak/View/ServicesView.xaml.cs
@@ -3,7 +3,6 @@ using GTweak.Utilities.Managers;
using GTweak.Utilities.Tweaks;
using System;
using System.Threading.Tasks;
-using System.Windows;
using System.Windows.Controls;
using System.Windows.Input;
@@ -38,9 +37,7 @@ namespace GTweak.View
new NotificationManager(300).Show().Restart();
- Parallel.Invoke(async delegate { await Task.Delay(((ToggleButton)sender).Name.Contains("15") ? 2000 : 1000); Application.Current.Dispatcher.Invoke(() => { _svcTweaks.AnalyzeAndUpdate(this); }); });
+ Parallel.Invoke(async delegate { await Task.Delay(((ToggleButton)sender).Name.Contains("15") ? 2000 : 1000); _svcTweaks.AnalyzeAndUpdate(); });
}
-
- private void Page_Loaded(object sender, RoutedEventArgs e) => Parallel.Invoke(() => Application.Current.Dispatcher.Invoke(() => { _svcTweaks.AnalyzeAndUpdate(this); }));
}
}
diff --git a/.Source/GTweak/View/SystemView.xaml b/.Source/GTweak/View/SystemView.xaml
index 190659d7..ef0c0e76 100644
--- a/.Source/GTweak/View/SystemView.xaml
+++ b/.Source/GTweak/View/SystemView.xaml
@@ -4,9 +4,14 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:uc="clr-namespace:GTweak.Assets.UserControl"
+ xmlns:vm="clr-namespace:GTweak.Core.ViewModel"
xmlns:local="clr-namespace:GTweak.View"
mc:Ignorable="d" d:DesignHeight="550" d:DesignWidth="1100"
- Style="{StaticResource LaunchPage}" Loaded="Page_Loaded">
+ Style="{StaticResource LaunchPage}">
+ <UserControl.DataContext>
+ <vm:SystemVM />
+ </UserControl.DataContext>
+
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="139*"/>
@@ -24,53 +29,53 @@
<StackPanel Orientation="Vertical" VerticalAlignment="Top" Width="Auto" Height="Auto">
<StackPanel x:Name="TextSlider1" Orientation="Horizontal" Height="45" VerticalAlignment="Top" Margin="20,0,0,0" MouseEnter="TweakSlider_MouseEnter" MouseLeave="Tweak_MouseLeave">
<TextBlock Style="{StaticResource Text}" Foreground="{StaticResource Color_Highlighted}" Margin="0,2,0,0" Text="{DynamicResource slider1_system}"/>
- <Slider x:Name="Slider1" Style="{StaticResource VerticalText_Slider}" IsSnapToTickEnabled="True" Minimum="0" Maximum="20" Margin="7,12,0,0" Width="150" ValueChanged="Sliders_ValueChanged"/>
+ <Slider x:Name="Slider1" Value="{Binding [Slider1].Value}" Style="{StaticResource VerticalText_Slider}" IsSnapToTickEnabled="True" Minimum="0" Maximum="20" Margin="7,12,0,0" Width="150" ValueChanged="Sliders_ValueChanged"/>
</StackPanel>
<StackPanel x:Name="TextSlider2" Orientation="Horizontal" Height="45" VerticalAlignment="Top" Margin="20,4,0,0" MouseEnter="TweakSlider_MouseEnter" MouseLeave="Tweak_MouseLeave">
<TextBlock Style="{StaticResource Text}" Foreground="{StaticResource Color_Highlighted}" Margin="0,2,0,0" Text="{DynamicResource slider2_system}"/>
- <Slider x:Name="Slider2" Style="{StaticResource VerticalText_Slider}" IsSnapToTickEnabled="True" Minimum="0" Maximum="3" Margin="7,12,0,0" Width="150" ValueChanged="Sliders_ValueChanged"/>
+ <Slider x:Name="Slider2" Value="{Binding [Slider2].Value}" Style="{StaticResource VerticalText_Slider}" IsSnapToTickEnabled="True" Minimum="0" Maximum="3" Margin="7,12,0,0" Width="150" ValueChanged="Sliders_ValueChanged"/>
</StackPanel>
<StackPanel x:Name="TextSlider3" Orientation="Horizontal" Height="45" VerticalAlignment="Top" Margin="20,4,0,0" MouseEnter="TweakSlider_MouseEnter" MouseLeave="Tweak_MouseLeave">
<TextBlock Style="{StaticResource Text}" Foreground="{StaticResource Color_Highlighted}" Margin="0,2,0,0" Text="{DynamicResource slider3_system}"/>
- <Slider x:Name="Slider3" Style="{StaticResource VerticalText_Slider}" IsSnapToTickEnabled="True" Minimum="0" Maximum="31" Margin="7,12,0,0" Width="170" ValueChanged="Sliders_ValueChanged"/>
+ <Slider x:Name="Slider3" Value="{Binding [Slider3].Value}" Style="{StaticResource VerticalText_Slider}" IsSnapToTickEnabled="True" Minimum="0" Maximum="31" Margin="7,12,0,0" Width="170" ValueChanged="Sliders_ValueChanged"/>
</StackPanel>
<TextBox x:Name="TestKeybSettings" Margin="-100,5,0,0" Tag="{DynamicResource text_system}" Width="400" MaxLength="50" Cursor="IBeam"/>
- <uc:ToggleButton x:Name="TglButton1" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl1_system}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton2" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl2_system}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton3" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl3_system}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton4" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl4_system}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton5" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl5_system}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton6" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl6_system}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton7" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl7_system}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton19" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl19_system}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton21" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl21_system}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton23" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl23_system}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton25" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl25_system}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton27" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl27_system}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton1" StateNA="{Binding [TglButton1].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl1_system}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton2" StateNA="{Binding [TglButton2].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl2_system}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton3" StateNA="{Binding [TglButton3].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl3_system}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton4" StateNA="{Binding [TglButton4].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl4_system}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton5" StateNA="{Binding [TglButton5].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl5_system}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton6" StateNA="{Binding [TglButton6].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl6_system}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton7" StateNA="{Binding [TglButton7].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl7_system}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton19" StateNA="{Binding [TglButton19].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl19_system}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton21" StateNA="{Binding [TglButton21].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl21_system}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton23" StateNA="{Binding [TglButton23].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl23_system}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton25" StateNA="{Binding [TglButton25].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl25_system}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton27" StateNA="{Binding [TglButton27].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl27_system}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
</StackPanel>
</Grid>
<Grid Grid.Column="1">
<StackPanel Orientation="Vertical" VerticalAlignment="Top" Width="Auto" Height="Auto">
- <uc:ToggleButton x:Name="TglButton8" Height="25" Width="Auto" Margin="20,15,0,0" TextResource="{DynamicResource tgl8_system}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton9" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl9_system}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton10" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl10_system}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton11" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl11_system}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton12" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl12_system}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton13" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl13_system}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton14" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl14_system}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton15" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl15_system}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton16" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl16_system}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton17" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl17_system}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton18" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl18_system}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton20" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl20_system}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton22" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl22_system}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton24" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl24_system}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
- <uc:ToggleButton x:Name="TglButton26" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl26_system}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton8" StateNA="{Binding [TglButton8].State}" Height="25" Width="Auto" Margin="20,15,0,0" TextResource="{DynamicResource tgl8_system}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton9" StateNA="{Binding [TglButton9].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl9_system}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton10" StateNA="{Binding [TglButton10].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl10_system}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton11" StateNA="{Binding [TglButton11].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl11_system}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton12" StateNA="{Binding [TglButton12].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl12_system}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton13" StateNA="{Binding [TglButton13].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl13_system}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton14" StateNA="{Binding [TglButton14].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl14_system}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton15" StateNA="{Binding [TglButton15].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl15_system}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton16" StateNA="{Binding [TglButton16].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl16_system}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton17" StateNA="{Binding [TglButton17].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl17_system}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton18" StateNA="{Binding [TglButton18].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl18_system}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton20" StateNA="{Binding [TglButton20].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl20_system}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton22" StateNA="{Binding [TglButton22].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl22_system}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton24" StateNA="{Binding [TglButton24].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl24_system}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
+ <uc:ToggleButton x:Name="TglButton26" StateNA="{Binding [TglButton26].State}" Height="25" Width="Auto" Margin="20,20,0,0" TextResource="{DynamicResource tgl26_system}" MouseEnter="Tweak_MouseEnter" MouseLeave="Tweak_MouseLeave" ChangedState="TglButton_ChangedState"/>
</StackPanel>
</Grid>
</Grid>
diff --git a/.Source/GTweak/View/SystemView.xaml.cs b/.Source/GTweak/View/SystemView.xaml.cs
index 364894b4..2d140db3 100644
--- a/.Source/GTweak/View/SystemView.xaml.cs
+++ b/.Source/GTweak/View/SystemView.xaml.cs
@@ -52,12 +52,10 @@ namespace GTweak.View
if (NotificationManager.SysActions.TryGetValue(toggleButton.Name, out NotificationManager.NoticeAction action))
new NotificationManager(300).Show().Perform(action);
- Parallel.Invoke(async delegate { await Task.Delay(1000); Application.Current.Dispatcher.Invoke(() => { _sysTweaks.AnalyzeAndUpdate(this); }); });
+ Parallel.Invoke(async delegate { await Task.Delay(1000); _sysTweaks.AnalyzeAndUpdate(); });
}
else
_sysTweaks.ApplyTweaks(toggleButton.Name, toggleButton.State);
}
-
- private void Page_Loaded(object sender, RoutedEventArgs e) => Parallel.Invoke(() => { Application.Current.Dispatcher.Invoke(() => { _sysTweaks.AnalyzeAndUpdate(this); }); });
}
}