Skip to content

Portable Tool for an Ideal Windows Setup

upd. output of the name of the os & complete assembly with the revision number is divided into parts

Greedeksd713fefb2ec2
diff --git a/.Source/GTweak/Core/ViewModel/DataSystemVM.cs b/.Source/GTweak/Core/ViewModel/DataSystemVM.cs
index 894bbead..759e72f0 100644
--- a/.Source/GTweak/Core/ViewModel/DataSystemVM.cs
+++ b/.Source/GTweak/Core/ViewModel/DataSystemVM.cs
@@ -65,7 +65,8 @@ namespace GTweak.Core.ViewModel
DisplayData = new ObservableCollection<DataSystemModel>
{
- CreateModelCollection("Windows", SystemDiagnostics.HardwareData.OperatingSystem),
+ CreateModelCollection("OSName", SystemDiagnostics.HardwareData.OS.Name, "unknown_information_systemInformatin"),
+ CreateModelCollection("OSVersion", SystemDiagnostics.HardwareData.OS.Version, "unknown_information_systemInformatin"),
CreateModelCollection("Processes", new MonitoringService().GetNumberRunningProcesses),
CreateModelCollection("Services", new MonitoringService().GetNumberRunningService),
CreateModelCollection("Bios", SystemDiagnostics.HardwareData.Bios, "no_device_information_systemInformatin"),
diff --git a/.Source/GTweak/Languages/en/Localize.xaml b/.Source/GTweak/Languages/en/Localize.xaml
index 8a5a12dc..377f0a95 100644
--- a/.Source/GTweak/Languages/en/Localize.xaml
+++ b/.Source/GTweak/Languages/en/Localize.xaml
@@ -423,7 +423,8 @@
<!--#endregion-->
<!--#region Information System Page -->
- <v:String x:Key="title_win_systemInformation">Operating system:</v:String>
+ <v:String x:Key="title_win_name_systemInformation">Operating system:</v:String>
+ <v:String x:Key="title_win_ver_systemInformation">Version:</v:String>
<v:String x:Key="label_proc_systemInformation">Running processes:</v:String>
<v:String x:Key="label_svc_systemInformation">services:</v:String>
<v:String x:Key="title_bios_systemInformation">BIOS:</v:String>
diff --git a/.Source/GTweak/Languages/fr/Localize.xaml b/.Source/GTweak/Languages/fr/Localize.xaml
index 250038f8..cebdf6ce 100644
--- a/.Source/GTweak/Languages/fr/Localize.xaml
+++ b/.Source/GTweak/Languages/fr/Localize.xaml
@@ -425,7 +425,8 @@
<!--#endregion-->
<!--#region Information System Page -->
- <v:String x:Key="title_win_systemInformation">Système d’exploitation :</v:String>
+ <v:String x:Key="title_win_name_systemInformation">Système d’exploitation :</v:String>
+ <v:String x:Key="title_win_ver_systemInformation">Version :</v:String>
<v:String x:Key="label_proc_systemInformation">Processus en cours d’exécution :</v:String>
<v:String x:Key="label_svc_systemInformation">services :</v:String>
<v:String x:Key="title_bios_systemInformation">BIOS :</v:String>
diff --git a/.Source/GTweak/Languages/it/Localize.xaml b/.Source/GTweak/Languages/it/Localize.xaml
index 62787bbc..c0fed0b9 100644
--- a/.Source/GTweak/Languages/it/Localize.xaml
+++ b/.Source/GTweak/Languages/it/Localize.xaml
@@ -423,7 +423,8 @@
<!--#endregion-->
<!--#region Information System Page -->
- <v:String x:Key="title_win_systemInformation">Sistema operativo:</v:String>
+ <v:String x:Key="title_win_name_systemInformation">Sistema operativo:</v:String>
+ <v:String x:Key="title_win_ver_systemInformation">Versione:</v:String>
<v:String x:Key="label_proc_systemInformation">Processi in esecuzione:</v:String>
<v:String x:Key="label_svc_systemInformation">servizi:</v:String>
<v:String x:Key="title_bios_systemInformation">BIOS:</v:String>
diff --git a/.Source/GTweak/Languages/ko/Localize.xaml b/.Source/GTweak/Languages/ko/Localize.xaml
index b9b12f3f..acff57a7 100644
--- a/.Source/GTweak/Languages/ko/Localize.xaml
+++ b/.Source/GTweak/Languages/ko/Localize.xaml
@@ -423,7 +423,8 @@
<!--#endregion-->
<!--#region Information System Page -->
- <v:String x:Key="title_win_systemInformation">운영 체제:</v:String>
+ <v:String x:Key="title_win_name_systemInformation">운영 체제:</v:String>
+ <v:String x:Key="title_win_ver_systemInformation">버전:</v:String>
<v:String x:Key="label_proc_systemInformation">실행 중인 프로세스:</v:String>
<v:String x:Key="label_svc_systemInformation">서비스:</v:String>
<v:String x:Key="title_bios_systemInformation">BIOS:</v:String>
diff --git a/.Source/GTweak/Languages/pt-br/Localize.xaml b/.Source/GTweak/Languages/pt-br/Localize.xaml
index 34763ef5..d5df9d24 100644
--- a/.Source/GTweak/Languages/pt-br/Localize.xaml
+++ b/.Source/GTweak/Languages/pt-br/Localize.xaml
@@ -423,7 +423,8 @@
<!--#endregion-->
<!--#region Information System Page -->
- <v:String x:Key="title_win_systemInformation">Sistema operacional:</v:String>
+ <v:String x:Key="title_win_name_systemInformation">Sistema operacional:</v:String>
+ <v:String x:Key="title_win_ver_systemInformation">Versão:</v:String>
<v:String x:Key="label_proc_systemInformation">Processos em execução:</v:String>
<v:String x:Key="label_svc_systemInformation">serviços:</v:String>
<v:String x:Key="title_bios_systemInformation">BIOS:</v:String>
diff --git a/.Source/GTweak/Languages/ru/Localize.xaml b/.Source/GTweak/Languages/ru/Localize.xaml
index 23438d74..7ab07dfb 100644
--- a/.Source/GTweak/Languages/ru/Localize.xaml
+++ b/.Source/GTweak/Languages/ru/Localize.xaml
@@ -423,7 +423,8 @@
<!--#endregion-->
<!--#region Information System Page -->
- <v:String x:Key="title_win_systemInformation">Операционная система:</v:String>
+ <v:String x:Key="title_win_name_systemInformation">Операционная система:</v:String>
+ <v:String x:Key="title_win_ver_systemInformation">Версия:</v:String>
<v:String x:Key="label_proc_systemInformation">Работающих процессов:</v:String>
<v:String x:Key="label_svc_systemInformation">служб:</v:String>
<v:String x:Key="title_bios_systemInformation">BIOS:</v:String>
diff --git a/.Source/GTweak/Languages/uk/Localize.xaml b/.Source/GTweak/Languages/uk/Localize.xaml
index 941d09d5..992b667c 100644
--- a/.Source/GTweak/Languages/uk/Localize.xaml
+++ b/.Source/GTweak/Languages/uk/Localize.xaml
@@ -423,7 +423,8 @@
<!--#endregion-->
<!--#region Information System Page -->
- <v:String x:Key="title_win_systemInformation">Операційна система:</v:String>
+ <v:String x:Key="title_win_name_systemInformation">Операційна система:</v:String>
+ <v:String x:Key="title_win_ver_systemInformation">Версія :</v:String>
<v:String x:Key="label_proc_systemInformation">Запущені процеси:</v:String>
<v:String x:Key="label_svc_systemInformation">служби:</v:String>
<v:String x:Key="title_bios_systemInformation">BIOS:</v:String>
diff --git a/.Source/GTweak/Utilities/Configuration/MonitoringService.cs b/.Source/GTweak/Utilities/Configuration/MonitoringService.cs
index 53ff575e..7d3996c5 100644
--- a/.Source/GTweak/Utilities/Configuration/MonitoringService.cs
+++ b/.Source/GTweak/Utilities/Configuration/MonitoringService.cs
@@ -161,18 +161,18 @@ namespace GTweak.Utilities.Configuration
internal void StartDeviceMonitoring()
{
if (SystemDiagnostics.isMsftAvailable)
- SubscribeToDeviceEvents($"TargetInstance ISA 'MSFT_PhysicalDisk'", DeviceType.Storage, @"root\Microsoft\Windows\Storage");
+ SubscribeToDeviceEvents($"TargetInstance ISA 'MSFT_PhysicalDisk'", DeviceType.Storage, @"root\Microsoft\Windows\Storage").ConfigureAwait(false);
else
- SubscribeToDeviceEvents($"TargetInstance ISA 'Win32_DiskDrive'", DeviceType.Storage);
- SubscribeToDeviceEvents("TargetInstance ISA 'Win32_SoundDevice'", DeviceType.Audio);
- SubscribeToDeviceEvents("TargetInstance ISA 'Win32_NetworkAdapter' AND TargetInstance.NetConnectionStatus IS NOT NULL", DeviceType.Network);
+ SubscribeToDeviceEvents($"TargetInstance ISA 'Win32_DiskDrive'", DeviceType.Storage).ConfigureAwait(false);
+ SubscribeToDeviceEvents("TargetInstance ISA 'Win32_SoundDevice'", DeviceType.Audio).ConfigureAwait(false);
+ SubscribeToDeviceEvents("TargetInstance ISA 'Win32_NetworkAdapter' AND TargetInstance.NetConnectionStatus IS NOT NULL", DeviceType.Network).ConfigureAwait(false);
}
- private void SubscribeToDeviceEvents(string filter, DeviceType type, string scope = @"root\CIMV2")
+ private async Task SubscribeToDeviceEvents(string filter, DeviceType type, string scope = @"root\CIMV2")
{
try
{
- Task.Run(() =>
+ await Task.Run(() =>
{
WqlEventQuery query = new WqlEventQuery("__InstanceOperationEvent", TimeSpan.FromSeconds(1), filter);
ManagementEventWatcher managementEvent = new ManagementEventWatcher(new ManagementScope(scope), query);
diff --git a/.Source/GTweak/Utilities/Configuration/SystemDiagnostics.cs b/.Source/GTweak/Utilities/Configuration/SystemDiagnostics.cs
index 893e3def..8ed2f096 100644
--- a/.Source/GTweak/Utilities/Configuration/SystemDiagnostics.cs
+++ b/.Source/GTweak/Utilities/Configuration/SystemDiagnostics.cs
@@ -45,9 +45,14 @@ namespace GTweak.Utilities.Configuration
internal struct HardwareData
{
- internal static string OperatingSystem { get; set; } = $"\n{Registry.GetValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion", "ProductName", string.Empty)?.ToString()}" ?? string.Empty;
- internal static string OSVersion { get; set; } = string.Empty;
- internal static decimal OSBuild { get; set; } = default;
+ internal class OperatingSystemInfo
+ {
+ internal string Name { get; set; } = string.Empty;
+ internal string Version { get; set; } = string.Empty;
+ internal decimal Build { get; set; } = default;
+ }
+
+ internal static OperatingSystemInfo OS { get; set; } = new OperatingSystemInfo();
internal static string Bios { get; set; } = string.Empty;
internal static string BiosMode { get; set; } = string.Empty;
internal static string Motherboard { get; set; } = string.Empty;
@@ -162,19 +167,25 @@ namespace GTweak.Utilities.Configuration
internal void GetOperatingSystemInfo()
{
- string release = RegistryHelp.GetValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion", "DisplayVersion", string.Empty);
- foreach (var managementObj in new ManagementObjectSearcher(@"root\cimv2", "select Caption, OSArchitecture, BuildNumber, Version from Win32_OperatingSystem", new EnumerationOptions { ReturnImmediately = true }).Get())
+ string regPath = @"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion";
+ int revisionNumber = RegistryHelp.GetValue(regPath, "UBR", 0);
+ string release = RegistryHelp.GetValue(regPath, "DisplayVersion", string.Empty);
+
+ foreach (var managementObj in new ManagementObjectSearcher(@"root\cimv2", "select Caption, Description, OSArchitecture, BuildNumber, Version from Win32_OperatingSystem", new EnumerationOptions { ReturnImmediately = true }).Get())
{
- HardwareData.OSVersion = Convert.ToString(managementObj["Caption"]);
- HardwareData.OSBuild = decimal.TryParse($"{Convert.ToString(managementObj["BuildNumber"])}.{RegistryHelp.GetValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion", "UBR", 0)}", NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out decimal result) ? result : Convert.ToDecimal(managementObj["BuildNumber"]);
- HardwareData.OperatingSystem = $"{HardwareData.OSVersion.Substring(HardwareData.OSVersion.IndexOf('W'))} {Regex.Replace((string)managementObj["OSArchitecture"], @"\-.+", "-bit")}, V{(string)managementObj["Version"]} {(!string.IsNullOrWhiteSpace(release) ? $"({release})" : string.Empty)}\n";
+ string data = new[] { "Caption", "Description" }.Select(prop => managementObj[prop] as string).FirstOrDefault(info => !string.IsNullOrEmpty(info)) ?? string.Empty;
+ 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 = new Dictionary<byte, bool>()
{
- { 11, HardwareData.OSVersion.Contains("11") },
- { 10, HardwareData.OSVersion.Contains("10") }
+ { 11, HardwareData.OS.Name.Contains("11") },
+ { 10, HardwareData.OS.Name.Contains("10") }
};
}
- HardwareData.OperatingSystem = $"\n{HardwareData.OperatingSystem.TrimEnd('\n', '\r')}";
+ 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();
}
/// <summary>
diff --git a/.Source/GTweak/Utilities/Controls/ErrorLogging.cs b/.Source/GTweak/Utilities/Controls/ErrorLogging.cs
index eb123969..a54d0e91 100644
--- a/.Source/GTweak/Utilities/Controls/ErrorLogging.cs
+++ b/.Source/GTweak/Utilities/Controls/ErrorLogging.cs
@@ -42,7 +42,7 @@ namespace GTweak.Utilities.Controls
{
string headerLine = "---------------------------------------------------------";
await writer.WriteLineAsync($"GTweak has crashed!\n{headerLine}\nIf you wish to report this, please open an issue here:\nhttps://github.com/Greedeks/GTweak/issues\n{headerLine}\n");
- await writer.WriteLineAsync($"{headerLine}\n[{DateTime.Now}]\nOS: {SystemDiagnostics.HardwareData.OSVersion}\n{headerLine}\n\nMember: {memberName}\nError: {ex.Message}\nStack Trace:\n{ex.StackTrace}\n");
+ await writer.WriteLineAsync($"{headerLine}\n[{DateTime.Now}]\nOS: {SystemDiagnostics.HardwareData.OS.Name}\n{headerLine}\n\nMember: {memberName}\nError: {ex.Message}\nStack Trace:\n{ex.StackTrace}\n");
await writer.FlushAsync();
}
diff --git a/.Source/GTweak/Utilities/Controls/RunGuard.cs b/.Source/GTweak/Utilities/Controls/RunGuard.cs
index 25d6d75b..0a455b42 100644
--- a/.Source/GTweak/Utilities/Controls/RunGuard.cs
+++ b/.Source/GTweak/Utilities/Controls/RunGuard.cs
@@ -46,7 +46,7 @@ namespace GTweak.Utilities.Controls
{
await Task.Run(() => new SystemDiagnostics().GetOperatingSystemInfo());
- if ((SystemDiagnostics.IsWindowsVersion[11] || SystemDiagnostics.IsWindowsVersion[10]) && SystemDiagnostics.HardwareData.OSBuild.CompareTo(18362.116m) >= 0)
+ if ((SystemDiagnostics.IsWindowsVersion[11] || SystemDiagnostics.IsWindowsVersion[10]) && SystemDiagnostics.HardwareData.OS.Build.CompareTo(18362.116m) >= 0)
return;
new MessageWindow(true).ShowDialog();
diff --git a/.Source/GTweak/Utilities/Tweaks/InterfaceTweaks.cs b/.Source/GTweak/Utilities/Tweaks/InterfaceTweaks.cs
index 0dad4d49..addb7114 100644
--- a/.Source/GTweak/Utilities/Tweaks/InterfaceTweaks.cs
+++ b/.Source/GTweak/Utilities/Tweaks/InterfaceTweaks.cs
@@ -68,7 +68,7 @@ namespace GTweak.Utilities.Tweaks
interfaceV.TglButton16.StateNA =
SystemDiagnostics.IsWindowsVersion[11] &&
(RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced", "Start_Layout", "1") ||
- SystemDiagnostics.HardwareData.OSVersion.IndexOf("home", StringComparison.OrdinalIgnoreCase) < 0 &&
+ SystemDiagnostics.HardwareData.OS.Name.IndexOf("home", StringComparison.OrdinalIgnoreCase) < 0 &&
(RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PolicyManager\current\device\Start", "HideRecommendedSection", "1") ||
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")));
@@ -258,7 +258,7 @@ namespace GTweak.Utilities.Tweaks
case "TglButton16":
RegistryHelp.Write(Registry.CurrentUser, @"Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced", "Start_Layout", isDisabled ? 1 : 0, RegistryValueKind.DWord);
- if (SystemDiagnostics.HardwareData.OperatingSystem.IndexOf("Home", StringComparison.OrdinalIgnoreCase) < 0)
+ if (SystemDiagnostics.HardwareData.OS.Name.IndexOf("Home", StringComparison.OrdinalIgnoreCase) < 0)
{
if (isDisabled)
{
@@ -344,7 +344,7 @@ namespace GTweak.Utilities.Tweaks
RegistryHelp.Write(Registry.CurrentUser, @"Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced", "TaskbarMn", isDisabled ? 0 : 1, RegistryValueKind.DWord);
RegistryHelp.Write(Registry.CurrentUser, @"Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced", "EnableSnapAssistFlyout", isDisabled ? 0 : 1, RegistryValueKind.DWord);
- if (isDisabled && SystemDiagnostics.HardwareData.OSBuild.CompareTo(22635.3785m) >= 0)
+ if (isDisabled && SystemDiagnostics.HardwareData.OS.Build.CompareTo(22635.3785m) >= 0)
{
RegistryHelp.DeleteFolderTree(Registry.CurrentUser, @"Software\Microsoft\Windows\CurrentVersion\Explorer\Desktop\NameSpace\{2cc5ca98-6485-489a-920e-b3e88a6ccce3}");
RegistryHelp.Write(Registry.CurrentUser, @"Software\Microsoft\Windows\CurrentVersion\Explorer\HideDesktopIcons\NewStartPanel", "{2cc5ca98-6485-489a-920e-b3e88a6ccce3}", 1, RegistryValueKind.DWord);
diff --git a/.Source/GTweak/Utilities/Tweaks/SystemTweaks.cs b/.Source/GTweak/Utilities/Tweaks/SystemTweaks.cs
index faad9340..6645aca9 100644
--- a/.Source/GTweak/Utilities/Tweaks/SystemTweaks.cs
+++ b/.Source/GTweak/Utilities/Tweaks/SystemTweaks.cs
@@ -385,7 +385,7 @@ namespace GTweak.Utilities.Tweaks
case "TglButton20":
RegistryHelp.Write(Registry.LocalMachine, @"SYSTEM\CurrentControlSet\Services\mpssvc", "Start", isDisabled ? 4 : 2, RegistryValueKind.DWord);
CommandExecutor.RunCommand($"/c netsh advfirewall set allprofiles state {(isDisabled ? "off" : "on")}");
- if (SystemDiagnostics.HardwareData.OSBuild.CompareTo(22621.521m) >= 0)
+ if (SystemDiagnostics.HardwareData.OS.Build.CompareTo(22621.521m) >= 0)
RegistryHelp.Write(Registry.LocalMachine, @"SYSTEM\CurrentControlSet\Services\wtd", "Start", isDisabled ? 4 : 2, RegistryValueKind.DWord);
break;
case "TglButton21":
diff --git a/.Source/GTweak/Utilities/Tweaks/WindowsLicense.cs b/.Source/GTweak/Utilities/Tweaks/WindowsLicense.cs
index c8328ee6..2cb6b060 100644
--- a/.Source/GTweak/Utilities/Tweaks/WindowsLicense.cs
+++ b/.Source/GTweak/Utilities/Tweaks/WindowsLicense.cs
@@ -20,7 +20,7 @@ namespace GTweak.Utilities.Tweaks
{
internal static bool IsWindowsActivated = false;
- private static bool IsVersionWindows(string pattern, byte words) => new Regex(pattern, RegexOptions.IgnoreCase | RegexOptions.CultureInvariant | RegexOptions.IgnorePatternWhitespace | RegexOptions.Compiled).Matches(SystemDiagnostics.HardwareData.OSVersion).Count == words;
+ private static bool IsVersionWindows(string pattern, byte words) => new Regex(pattern, RegexOptions.IgnoreCase | RegexOptions.CultureInvariant | RegexOptions.IgnorePatternWhitespace | RegexOptions.Compiled).Matches(SystemDiagnostics.HardwareData.OS.Name).Count == words;
internal static void LicenseStatus()
{
diff --git a/.Source/GTweak/View/DataSystemView.xaml b/.Source/GTweak/View/DataSystemView.xaml
index a997f44f..9b6fb2bd 100644
--- a/.Source/GTweak/View/DataSystemView.xaml
+++ b/.Source/GTweak/View/DataSystemView.xaml
@@ -26,7 +26,7 @@
</Border>
</Popup>
- <Grid Grid.Row="0" Margin="0,0,0,20">
+ <Grid Grid.Row="0" Margin="0,0,0,15">
<Grid HorizontalAlignment="Left" Margin="50,0,0,0" Width="110" Height="110">
<Ellipse Height="90" Width="90" Stroke="{StaticResource Color_Background_RadialProgressBar}" StrokeThickness="4.5" VerticalAlignment="Center" HorizontalAlignment="Center" Opacity="0.2"/>
@@ -50,11 +50,12 @@
<Grid HorizontalAlignment="Center" Margin="0,14,0,0">
<StackPanel Orientation="Vertical">
-
<StackPanel Orientation="Horizontal" VerticalAlignment="Top">
<TextBlock Style="{StaticResource Text}" FontSize="15pt" TextWrapping="Wrap" VerticalAlignment="Top" Height="Auto">
- <Run Foreground="{StaticResource Color_Accent}" Text="{DynamicResource title_win_systemInformation}"/>
- <Run Foreground="{StaticResource Color_Highlighted}" Text="{Binding [Windows].Data}" PreviewMouseDown="HandleCopyingData_PreviewMouseDown" Cursor="Hand"/>
+ <Run Foreground="{StaticResource Color_Accent}" Text="{DynamicResource title_win_name_systemInformation}"/><LineBreak/>
+ <Run Foreground="{StaticResource Color_Highlighted}" Text="{Binding [OSName].Data}" PreviewMouseDown="HandleCopyingData_PreviewMouseDown" Cursor="Hand"/><LineBreak/>
+ <Run FontSize="14pt" Foreground="{StaticResource Color_Accent}" Text="{DynamicResource title_win_ver_systemInformation}"/>
+ <Run FontSize="14pt" Foreground="{StaticResource Color_Highlighted}" Text="{Binding [OSVersion].Data}" PreviewMouseDown="HandleCopyingData_PreviewMouseDown" Cursor="Hand"/>
</TextBlock>
<Image Height="80" Width="80" HorizontalAlignment="Right" Margin="30,0,0,0">
diff --git a/.Source/GTweak/View/DataSystemView.xaml.cs b/.Source/GTweak/View/DataSystemView.xaml.cs
index 8311271f..585d2d04 100644
--- a/.Source/GTweak/View/DataSystemView.xaml.cs
+++ b/.Source/GTweak/View/DataSystemView.xaml.cs
@@ -22,7 +22,7 @@ namespace GTweak.View
private readonly MonitoringService _monitoringService = new MonitoringService();
private readonly SystemDiagnostics _systemDiagnostics = new SystemDiagnostics();
private readonly BackgroundQueue backgroundQueue = new BackgroundQueue();
- private readonly TimerControlManager timer = default;
+ private readonly TimerControlManager _timer = default;
public DataSystemView()
{
@@ -47,7 +47,7 @@ namespace GTweak.View
});
};
- timer = new TimerControlManager(TimeSpan.Zero, TimerControlManager.TimerMode.CountUp, async time =>
+ _timer = new TimerControlManager(TimeSpan.Zero, TimerControlManager.TimerMode.CountUp, async time =>
{
if ((int)time.TotalSeconds % 2 == 0)
{
@@ -135,13 +135,13 @@ namespace GTweak.View
private void Page_Loaded(object sender, RoutedEventArgs e)
{
_monitoringService.StartDeviceMonitoring();
- timer.Start();
+ _timer.Start();
}
private void Page_Unloaded(object sender, RoutedEventArgs e)
{
_monitoringService.StopDeviceMonitoring();
- timer.Stop();
+ _timer.Stop();
}
}
}
diff --git a/.Source/GTweak/View/InterfaceView.xaml.cs b/.Source/GTweak/View/InterfaceView.xaml.cs
index 5bb1a23c..a1ea1c5e 100644
--- a/.Source/GTweak/View/InterfaceView.xaml.cs
+++ b/.Source/GTweak/View/InterfaceView.xaml.cs
@@ -24,7 +24,7 @@ namespace GTweak.View
if (!WindowsLicense.IsWindowsActivated)
new NotificationManager().Show("info", "warn_activate_notification").Perform();
- if (SystemDiagnostics.HardwareData.OSBuild.CompareTo(22621.2361m) < 0)
+ if (SystemDiagnostics.HardwareData.OS.Build.CompareTo(22621.2361m) < 0)
TglButton21.IsEnabled = false;
}