Portable Tool for an Ideal Windows Setup
C# activatorbloatware-removalcsharpdebloatdebloaterdisable-servicesmonitoring-systemportableprivacy-toolsregistry-tweakssystem-tuningsystem-utilitytelemetrytweakerwindows-10windows-11windows-debloatwindows-defenderwindows-optimizationwindows-tweaks
-corrections name and localization
Greedeks39a5a844e3d7
diff --git a/.Source/GTweak/Core/Model/MainModel.cs b/.Source/GTweak/Core/Model/MainModel.csindex de1b665d..0a160764 100644--- a/.Source/GTweak/Core/Model/MainModel.cs+++ b/.Source/GTweak/Core/Model/MainModel.cs@@ -6,17 +6,17 @@ namespace GTweak.Core.Model{internal sealed class InformationSystemModel{- internal string WindowsName { get; set; }- internal string BIOSName { get; set; }- internal string MotherBrName { get; set; }- internal string CPUName { get; set; }- internal string GPUName { get; set; }- internal string RAMName { get; set; }- internal string DiskName { get; set; }- internal string SoundName { get; set; }- internal string NetAdapterName { get; set; }- internal string IpAddress { get; set; }- internal string CountProcess { get; set; }+ internal string WindowsDescriptions { get; set; }+ internal string BiosDescriptions { get; set; }+ internal string MotherBrDescriptions { get; set; }+ internal string CpuDescriptions { get; set; }+ internal string GpuDescriptions { get; set; }+ internal string RamDescriptions { get; set; }+ internal string StorageDescriptions { get; set; }+ internal string AudioDescriptions { get; set; }+ internal string NetworkDescriptions { get; set; }+ internal string UserIpAddress { get; set; }+ internal string NumberProcesses { get; set; }internal int BlurValue { get; set; }internal Visibility IpVisibility { get; set; }}diff --git a/.Source/GTweak/Core/ViewModel/PagesViewModel.cs b/.Source/GTweak/Core/ViewModel/PagesViewModel.csindex d72b7398..d49b5df9 100644--- a/.Source/GTweak/Core/ViewModel/PagesViewModel.cs+++ b/.Source/GTweak/Core/ViewModel/PagesViewModel.cs@@ -21,70 +21,70 @@ namespace GTweak.Core.ViewModel{private readonly InformationSystemModel model;- public string DisplayWindowsName+ public string DisplayWindows{- get => model.WindowsName;- set { model.WindowsName = value; OnPropertyChanged(); }+ get => model.WindowsDescriptions;+ set { model.WindowsDescriptions = value; OnPropertyChanged(); }}- public string DisplayBiosName+ public string DisplayBios{- get => model.BIOSName;- set { model.BIOSName = value; OnPropertyChanged(); }+ get => model.BiosDescriptions;+ set { model.BiosDescriptions = value; OnPropertyChanged(); }}- public string DisplayMotherBrName+ public string DisplayMotherBr{- get => model.MotherBrName;- set { model.MotherBrName = value; OnPropertyChanged(); }+ get => model.MotherBrDescriptions;+ set { model.MotherBrDescriptions = value; OnPropertyChanged(); }}- public string DisplayCpuName+ public string DisplayCpu{- get => model.CPUName;- set { model.CPUName = value; OnPropertyChanged(); }+ get => model.CpuDescriptions;+ set { model.CpuDescriptions = value; OnPropertyChanged(); }}- public string DisplayGpuName+ public string DisplayGpu{- get => model.GPUName;- set { model.GPUName = value; OnPropertyChanged(); }+ get => model.GpuDescriptions;+ set { model.GpuDescriptions = value; OnPropertyChanged(); }}- public string DisplayRamName+ public string DisplayRam{- get => model.RAMName;- set { model.RAMName = value; OnPropertyChanged(); }+ get => model.RamDescriptions;+ set { model.RamDescriptions = value; OnPropertyChanged(); }}- public string DisplayDiskName+ public string DisplayStorage{- get => model.DiskName;- set { model.DiskName = value; OnPropertyChanged(); }+ get => model.StorageDescriptions;+ set { model.StorageDescriptions = value; OnPropertyChanged(); }}- public string DisplaySoundName+ public string DisplayAudio{- get => model.SoundName;- set { model.SoundName = value; OnPropertyChanged(); }+ get => model.AudioDescriptions;+ set { model.AudioDescriptions = value; OnPropertyChanged(); }}- public string DisplayNetAdapterName+ public string DisplayNetwork{- get => model.NetAdapterName;- set { model.NetAdapterName = value; OnPropertyChanged(); }+ get => model.NetworkDescriptions;+ set { model.NetworkDescriptions = value; OnPropertyChanged(); }}public string DisplayIpAddress{- get => model.IpAddress;- set { model.IpAddress = value; OnPropertyChanged(); }+ get => model.UserIpAddress;+ set { model.UserIpAddress = value; OnPropertyChanged(); }}- public string DisplayCountProcess+ public string DisplayNumberProcesses{- get => model.CountProcess;- set { model.CountProcess = value; OnPropertyChanged(); }+ get => model.NumberProcesses;+ set { model.NumberProcesses = value; OnPropertyChanged(); }}public int SetBlurValue@@ -105,35 +105,23 @@ namespace GTweak.Core.ViewModelset { Settings.IsHiddenIpAddress = value; OnPropertyChanged(); }}-public InformationSystemVM(){model = new InformationSystemModel();- DisplayWindowsName = SystemData.СomputerСonfiguration.СonfigurationData["Windows"];- DisplayBiosName = SystemData.СomputerСonfiguration.СonfigurationData["BIOS"];- DisplayMotherBrName = SystemData.СomputerСonfiguration.СonfigurationData["MotherBr"];- DisplayCpuName = SystemData.СomputerСonfiguration.СonfigurationData["CPU"];-- if (!string.IsNullOrEmpty(SystemData.СomputerСonfiguration.СonfigurationData["GPU"]))- DisplayGpuName = SystemData.СomputerСonfiguration.СonfigurationData["GPU"];- else- DisplayGpuName = (string)Application.Current.Resources["driver_not_installed_systemInformatin"];- DisplayRamName = SystemData.СomputerСonfiguration.СonfigurationData["RAM"];- DisplayDiskName = SystemData.СomputerСonfiguration.СonfigurationData["Disk"];+ DisplayWindows = SystemData.СomputerСonfiguration.СonfigurationData["Windows"];+ DisplayNumberProcesses = new SystemData.MonitoringSystem().CountProcess.ToString();- if (!string.IsNullOrEmpty(SystemData.СomputerСonfiguration.СonfigurationData["Sound"]))- DisplaySoundName = SystemData.СomputerСonfiguration.СonfigurationData["Sound"];- else- DisplaySoundName = (string)Application.Current.Resources["driver_not_installed_systemInformatin"];-- if (!string.IsNullOrEmpty(SystemData.СomputerСonfiguration.СonfigurationData["NetAdapter"]))- DisplayNetAdapterName = SystemData.СomputerСonfiguration.СonfigurationData["NetAdapter"];- else- DisplayNetAdapterName = (string)Application.Current.Resources["driver_not_installed_systemInformatin"];+ DisplayBios = !string.IsNullOrEmpty(SystemData.СomputerСonfiguration.СonfigurationData["BIOS"]) ? SystemData.СomputerСonfiguration.СonfigurationData["BIOS"] : (string)Application.Current.Resources["no_device_information_systemInformatin"];+ DisplayMotherBr = !string.IsNullOrEmpty(SystemData.СomputerСonfiguration.СonfigurationData["MotherBr"]) ? SystemData.СomputerСonfiguration.СonfigurationData["MotherBr"] : (string)Application.Current.Resources["no_device_information_systemInformatin"];+ DisplayCpu = !string.IsNullOrEmpty(SystemData.СomputerСonfiguration.СonfigurationData["CPU"]) ? SystemData.СomputerСonfiguration.СonfigurationData["CPU"] : (string)Application.Current.Resources["no_device_information_systemInformatin"];+ DisplayGpu = !string.IsNullOrEmpty(SystemData.СomputerСonfiguration.СonfigurationData["GPU"]) ? SystemData.СomputerСonfiguration.СonfigurationData["GPU"] : (string)Application.Current.Resources["driver_not_installed_systemInformatin"];+ DisplayRam = !string.IsNullOrEmpty(SystemData.СomputerСonfiguration.СonfigurationData["RAM"]) ? SystemData.СomputerСonfiguration.СonfigurationData["RAM"] : (string)Application.Current.Resources["no_device_information_systemInformatin"];+ DisplayStorage = !string.IsNullOrEmpty(SystemData.СomputerСonfiguration.СonfigurationData["Storage"]) ? SystemData.СomputerСonfiguration.СonfigurationData["Storage"] : (string)Application.Current.Resources["no_device_information_systemInformatin"];+ DisplayAudio = !string.IsNullOrEmpty(SystemData.СomputerСonfiguration.СonfigurationData["Audio"]) ? SystemData.СomputerСonfiguration.СonfigurationData["Audio"] : (string)Application.Current.Resources["driver_not_installed_systemInformatin"];+ DisplayNetwork = !string.IsNullOrEmpty(SystemData.СomputerСonfiguration.СonfigurationData["NetAdapter"]) ? SystemData.СomputerСonfiguration.СonfigurationData["NetAdapter"] : (string)Application.Current.Resources["driver_not_installed_systemInformatin"];- DisplayIpAddress = SystemData.СomputerСonfiguration.СonfigurationData["IpAddress"];- DisplayCountProcess = new SystemData.MonitoringSystem().CountProcess.ToString();+ DisplayIpAddress = SystemData.СomputerСonfiguration.СonfigurationData["UserIpAddress"];if (Settings.IsHiddenIpAddress & SystemData.СomputerСonfiguration.ConnectionStatus == 0){diff --git a/.Source/GTweak/Languages/en/Lang.xaml b/.Source/GTweak/Languages/en/Lang.xamlindex 4fa79018..040387ab 100644--- a/.Source/GTweak/Languages/en/Lang.xaml+++ b/.Source/GTweak/Languages/en/Lang.xaml@@ -385,22 +385,23 @@<!--#endregion--><!--#region Information System Page -->- <v:String x:Key="title_win_systemInformation">The operating system:</v:String>+ <v:String x:Key="title_win_systemInformation">Operating system:</v:String><v:String x:Key="runprocces_systemInformation">Number of running processes:</v:String><v:String x:Key="title_bios_systemInformation">BIOS:</v:String>- <v:String x:Key="title_motherbr_systemInformation">The motherboard:</v:String>+ <v:String x:Key="title_motherbr_systemInformation">Motherboard:</v:String><v:String x:Key="title_cpu_systemInformation">Processor:</v:String>- <v:String x:Key="title_gpu_systemInformation">Graphics card:</v:String>- <v:String x:Key="title_ram_systemInformation">RAM memory:</v:String>- <v:String x:Key="title_disk_systemInformation">Disk devices:</v:String>- <v:String x:Key="title_sound_systemInformation">Sound devices:</v:String>+ <v:String x:Key="title_gpu_systemInformation">Graphics:</v:String>+ <v:String x:Key="title_ram_systemInformation">Memory:</v:String>+ <v:String x:Key="title_disk_systemInformation">Storage devices:</v:String>+ <v:String x:Key="title_sound_systemInformation">Playback devices:</v:String><v:String x:Key="title_netadapter_systemInformation">Network adapters:</v:String>- <v:String x:Key="title_ip_systemInformation">IP address:</v:String>+ <v:String x:Key="title_ip_systemInformation">Your IP address:</v:String><v:String x:Key="limited_systemInformation">Network access is limited</v:String><v:String x:Key="connection_block_systemInformation">Connecting without network access</v:String><v:String x:Key="connection_lose_systemInformation">There is no internet connection</v:String><v:String x:Key="text_copy_systemInformatin">Copied!</v:String><v:String x:Key="driver_not_installed_systemInformatin">You don't have a driver installed</v:String>+ <v:String x:Key="no_device_information_systemInformatin">No device information was found</v:String><!--#endregion--><!--#region More Page -->diff --git a/.Source/GTweak/Languages/ru/Lang.xaml b/.Source/GTweak/Languages/ru/Lang.xamlindex 64d1dca4..57455128 100644--- a/.Source/GTweak/Languages/ru/Lang.xaml+++ b/.Source/GTweak/Languages/ru/Lang.xaml@@ -392,15 +392,16 @@<v:String x:Key="title_cpu_systemInformation">Процессор:</v:String><v:String x:Key="title_gpu_systemInformation">Видеокарта:</v:String><v:String x:Key="title_ram_systemInformation">Оперативная память:</v:String>- <v:String x:Key="title_disk_systemInformation">Дисковые устройства:</v:String>- <v:String x:Key="title_sound_systemInformation">Звуковые устройства:</v:String>+ <v:String x:Key="title_disk_systemInformation">Устройства хранения данных:</v:String>+ <v:String x:Key="title_sound_systemInformation">Устройства воспроизведения:</v:String><v:String x:Key="title_netadapter_systemInformation">Сетевые адаптеры:</v:String>- <v:String x:Key="title_ip_systemInformation">IP-адрес:</v:String>+ <v:String x:Key="title_ip_systemInformation">Ваш IP адрес:</v:String><v:String x:Key="limited_systemInformation">Доступ к сети ограничен</v:String><v:String x:Key="connection_block_systemInformation">Подключение без доступа к сети</v:String><v:String x:Key="connection_lose_systemInformation">Отсутствует подключения к интернету</v:String><v:String x:Key="text_copy_systemInformatin">Скопировано!</v:String><v:String x:Key="driver_not_installed_systemInformatin">У вас не установлен драйвер</v:String>+ <v:String x:Key="no_device_information_systemInformatin">Сведения об устройстве не найдено</v:String><!--#endregion--><!--#region More Page -->diff --git a/.Source/GTweak/Utilities/Tweaks/SystemData.cs b/.Source/GTweak/Utilities/Tweaks/SystemData.csindex 863d46f6..a9bea364 100644--- a/.Source/GTweak/Utilities/Tweaks/SystemData.cs+++ b/.Source/GTweak/Utilities/Tweaks/SystemData.cs@@ -140,16 +140,16 @@ namespace GTweak.Utilities.Tweaksinternal static readonly Dictionary<string, string> СonfigurationData = new Dictionary<string, string>(){- {"Windows", string.Empty },- {"BIOS", string.Empty },- {"MotherBr", string.Empty },- {"CPU", string.Empty },- {"GPU", string.Empty },- {"RAM", string.Empty },- {"Disk", string.Empty },- {"Sound", string.Empty },- {"NetAdapter", string.Empty },- {"IpAddress", string.Empty }+ {"Windows", Registry.GetValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion", "ProductName", string.Empty).ToString() },+ {"BIOS", string.Empty },+ {"MotherBr", string.Empty },+ {"CPU", string.Empty },+ {"GPU", string.Empty },+ {"RAM", string.Empty },+ {"Storage", string.Empty },+ {"Audio", string.Empty },+ {"NetAdapter", string.Empty },+ {"UserIpAddress", (string)Application.Current.Resources["connection_lose_systemInformation"] }};internal void GetСonfigurationComputer()@@ -205,7 +205,7 @@ namespace GTweak.Utilities.Tweaks{Parallel.Invoke(delegate{- СonfigurationData["Disk"] = string.Empty;+ СonfigurationData["Storage"] = string.Empty;foreach (var managementObj in new ManagementObjectSearcher(@"\\.\root\microsoft\windows\storage", "select FriendlyName,MediaType,Size,BusType from MSFT_PhysicalDisk", optionsObj).Get()){_type = (ushort)(managementObj["MediaType"]) switch@@ -216,23 +216,23 @@ namespace GTweak.Utilities.Tweaks_ => "(Unspecified)",};if (_type == "(Unspecified)" && ((ushort)(managementObj["BusType"])) == 7) _type = "(Media-Type)";- СonfigurationData["Disk"] += Convert.ToString((ulong)managementObj["Size"] / 1024000000) + " GB " + "[" + (string)managementObj["FriendlyName"] + "] " + _type + "\n";+ СonfigurationData["Storage"] += Convert.ToString((ulong)managementObj["Size"] / 1024000000) + " GB " + "[" + (string)managementObj["FriendlyName"] + "] " + _type + "\n";}- СonfigurationData["Disk"] = СonfigurationData["Disk"].TrimEnd('\n');+ СonfigurationData["Storage"] = СonfigurationData["Storage"].TrimEnd('\n');},delegate{- СonfigurationData["Sound"] = string.Empty;+ СonfigurationData["Audio"] = string.Empty;foreach (var managementObj in new ManagementObjectSearcher(@"root\cimv2", "select Name,Caption,Description from Win32_SoundDevice", optionsObj).Get()){if (!string.IsNullOrEmpty((string)managementObj["Name"]))- СonfigurationData["Sound"] += (string)managementObj["Name"] + "\n";+ СonfigurationData["Audio"] += (string)managementObj["Name"] + "\n";else if (!string.IsNullOrEmpty((string)managementObj["Caption"]))- СonfigurationData["Sound"] += (string)managementObj["Caption"] + "\n";+ СonfigurationData["Audio"] += (string)managementObj["Caption"] + "\n";else if (!string.IsNullOrEmpty((string)managementObj["Description"]))- СonfigurationData["Sound"] += (string)managementObj["Description"] + "\n";+ СonfigurationData["Audio"] += (string)managementObj["Description"] + "\n";}- СonfigurationData["Sound"] = СonfigurationData["Sound"].TrimEnd('\n');+ СonfigurationData["Audio"] = СonfigurationData["Audio"].TrimEnd('\n');},delegate{@@ -282,7 +282,7 @@ namespace GTweak.Utilities.Tweaks}catch{- СonfigurationData["IpAddress"] = (string)Application.Current.Resources["limited_systemInformation"];+ СonfigurationData["UserIpAddress"] = (string)Application.Current.Resources["limited_systemInformation"];ConnectionStatus = 3;}finally@@ -298,19 +298,19 @@ namespace GTweak.Utilities.Tweaksif (IPAddress.TryParse(clientInternetProtocol.Ip, out _) && !string.IsNullOrEmpty(clientInternetProtocol.Ip) && !string.IsNullOrEmpty(clientInternetProtocol.Country)){ConnectionStatus = 0;- СonfigurationData["IpAddress"] = clientInternetProtocol.Ip + " (" + clientInternetProtocol.Country + ")";+ СonfigurationData["UserIpAddress"] = clientInternetProtocol.Ip + " (" + clientInternetProtocol.Country + ")";}else{ConnectionStatus = 2;- СonfigurationData["IpAddress"] = (string)Application.Current.Resources["connection_block_systemInformation"];+ СonfigurationData["UserIpAddress"] = (string)Application.Current.Resources["connection_block_systemInformation"];}}}else{ConnectionStatus = 1;- СonfigurationData["IpAddress"] = (string)Application.Current.Resources["connection_lose_systemInformation"];+ СonfigurationData["UserIpAddress"] = (string)Application.Current.Resources["connection_lose_systemInformation"];}});}diff --git a/.Source/GTweak/View/InformationSystemView.xaml b/.Source/GTweak/View/InformationSystemView.xamlindex 07fab0b3..bfb3d1e8 100644--- a/.Source/GTweak/View/InformationSystemView.xaml+++ b/.Source/GTweak/View/InformationSystemView.xaml@@ -57,13 +57,13 @@<StackPanel Orientation="Horizontal"><TextBlock Style="{StaticResource Text}" FontSize="15pt" Width="Auto" Height="65"><Run Foreground="{StaticResource Color_Accent}" Text="{DynamicResource title_win_systemInformation}"/>- <Run Foreground="{StaticResource Color_Highlighted}" Text="{Binding DisplayWindowsName}" PreviewMouseDown="TextComputerData_PreviewMouseDown" Cursor="Hand"/>+ <Run Foreground="{StaticResource Color_Highlighted}" Text="{Binding DisplayWindows}" PreviewMouseDown="TextComputerData_PreviewMouseDown" Cursor="Hand"/></TextBlock><Image x:Name="ImageWindows" Source="{StaticResource DI_LogoWin}" Height="80" Width="80" HorizontalAlignment="Right" Margin="30,0,0,0"/></StackPanel><TextBlock x:Name="ViewCountProcess" HorizontalAlignment="Left" FontFamily="{StaticResource Jura}" FontSize="14" MaxWidth="300" Foreground="{StaticResource Color_Inactive}"><Run Text="{DynamicResource runprocces_systemInformation}"/>- <Run Text="{Binding DisplayCountProcess}"/>+ <Run Text="{Binding DisplayNumberProcesses}"/></TextBlock></StackPanel></Grid>@@ -108,28 +108,28 @@<Grid Grid.Row="0"><StackPanel Orientation="Vertical" Margin="50,20,0,0"><TextBlock Text="{DynamicResource title_bios_systemInformation}" Style="{StaticResource Text}" Foreground="{StaticResource Color_Accent}" Height="Auto" Width="Auto"/>- <TextBlock Text="{Binding DisplayBiosName}" Style="{StaticResource Text}" HorizontalAlignment="Left" Margin="15,0,0,0" Foreground="{StaticResource Color_Highlighted}" Height="Auto" Width="Auto" PreviewMouseLeftButtonDown="TextComputerData_PreviewMouseDown" Cursor="Hand"/>+ <TextBlock Text="{Binding DisplayBios}" Style="{StaticResource Text}" HorizontalAlignment="Left" Margin="15,0,0,0" Foreground="{StaticResource Color_Highlighted}" Height="Auto" Width="Auto" PreviewMouseLeftButtonDown="TextComputerData_PreviewMouseDown" Cursor="Hand"/></StackPanel></Grid><Grid Grid.Row="1"><StackPanel Orientation="Vertical" Margin="50,20,0,0"><TextBlock Text="{DynamicResource title_motherbr_systemInformation}" Style="{StaticResource Text}" Foreground="{StaticResource Color_Accent}" Height="Auto" Width="Auto"/>- <TextBlock Text="{Binding DisplayMotherBrName}" Style="{StaticResource Text}" HorizontalAlignment="Left" Margin="15,0,0,0" Foreground="{StaticResource Color_Highlighted}" Height="Auto" Width="Auto" PreviewMouseLeftButtonDown="TextComputerData_PreviewMouseDown" Cursor="Hand"/>+ <TextBlock Text="{Binding DisplayMotherBr}" Style="{StaticResource Text}" HorizontalAlignment="Left" Margin="15,0,0,0" Foreground="{StaticResource Color_Highlighted}" Height="Auto" Width="Auto" PreviewMouseLeftButtonDown="TextComputerData_PreviewMouseDown" Cursor="Hand"/></StackPanel></Grid><Grid Grid.Row="2"><StackPanel Orientation="Vertical" Margin="50,20,0,0"><TextBlock Text="{DynamicResource title_cpu_systemInformation}" Style="{StaticResource Text}" Foreground="{StaticResource Color_Accent}" Height="Auto" Width="Auto"/>- <TextBlock Text="{Binding DisplayCpuName}" Style="{StaticResource Text}" HorizontalAlignment="Left" Margin="15,0,0,0" Foreground="{StaticResource Color_Highlighted}" Height="Auto" Width="Auto" PreviewMouseLeftButtonDown="TextComputerData_PreviewMouseDown" Cursor="Hand"/>+ <TextBlock Text="{Binding DisplayCpu}" Style="{StaticResource Text}" HorizontalAlignment="Left" Margin="15,0,0,0" Foreground="{StaticResource Color_Highlighted}" Height="Auto" Width="Auto" PreviewMouseLeftButtonDown="TextComputerData_PreviewMouseDown" Cursor="Hand"/></StackPanel></Grid><Grid Grid.Row="3"><StackPanel Orientation="Vertical" Margin="50,20,0,0"><TextBlock Text="{DynamicResource title_gpu_systemInformation}" Style="{StaticResource Text}" Foreground="{StaticResource Color_Accent}" Height="Auto" Width="Auto"/>- <TextBlock Text="{Binding DisplayGpuName}" Style="{StaticResource Text}" HorizontalAlignment="Left" Margin="15,0,0,0" Foreground="{StaticResource Color_Highlighted}" Height="Auto" Width="Auto" PreviewMouseLeftButtonDown="TextComputerData_PreviewMouseDown" Cursor="Hand"/>+ <TextBlock Text="{Binding DisplayGpu}" Style="{StaticResource Text}" HorizontalAlignment="Left" Margin="15,0,0,0" Foreground="{StaticResource Color_Highlighted}" Height="Auto" Width="Auto" PreviewMouseLeftButtonDown="TextComputerData_PreviewMouseDown" Cursor="Hand"/></StackPanel></Grid>@@ -137,7 +137,7 @@<Grid Grid.Row="4"><StackPanel Orientation="Vertical" Margin="50,20,0,0"><TextBlock Text="{DynamicResource title_ram_systemInformation}" Style="{StaticResource Text}" Foreground="{StaticResource Color_Accent}" Height="Auto" Width="Auto"/>- <TextBlock Text="{Binding DisplayRamName}" Style="{StaticResource Text}" HorizontalAlignment="Left" Margin="15,0,0,0" Foreground="{StaticResource Color_Highlighted}" Height="Auto" Width="Auto" PreviewMouseLeftButtonDown="TextComputerData_PreviewMouseDown" Cursor="Hand"/>+ <TextBlock Text="{Binding DisplayRam}" Style="{StaticResource Text}" HorizontalAlignment="Left" Margin="15,0,0,0" Foreground="{StaticResource Color_Highlighted}" Height="Auto" Width="Auto" PreviewMouseLeftButtonDown="TextComputerData_PreviewMouseDown" Cursor="Hand"/></StackPanel></Grid></Grid>@@ -153,21 +153,21 @@<Grid Grid.Row="0"><StackPanel Orientation="Vertical" Margin="50,20,0,0"><TextBlock Text="{DynamicResource title_disk_systemInformation}" Style="{StaticResource Text}" Foreground="{StaticResource Color_Accent}" Height="Auto" Width="Auto"/>- <TextBlock Text="{Binding DisplayDiskName}" Style="{StaticResource Text}" HorizontalAlignment="Left" Margin="15,0,0,0" Foreground="{StaticResource Color_Highlighted}" Height="Auto" Width="Auto" PreviewMouseLeftButtonDown="TextComputerData_PreviewMouseDown" Cursor="Hand"/>+ <TextBlock Text="{Binding DisplayStorage}" Style="{StaticResource Text}" HorizontalAlignment="Left" Margin="15,0,0,0" Foreground="{StaticResource Color_Highlighted}" Height="Auto" Width="Auto" PreviewMouseLeftButtonDown="TextComputerData_PreviewMouseDown" Cursor="Hand"/></StackPanel></Grid><Grid Grid.Row="1"><StackPanel Orientation="Vertical" Margin="50,20,0,0"><TextBlock Text="{DynamicResource title_sound_systemInformation}" Style="{StaticResource Text}" Foreground="{StaticResource Color_Accent}" Height="Auto" Width="Auto"/>- <TextBlock Text="{Binding DisplaySoundName}" Style="{StaticResource Text}" HorizontalAlignment="Left" Margin="15,0,0,0" Foreground="{StaticResource Color_Highlighted}" Height="Auto" Width="Auto" PreviewMouseLeftButtonDown="TextComputerData_PreviewMouseDown" Cursor="Hand"/>+ <TextBlock Text="{Binding DisplayAudio}" Style="{StaticResource Text}" HorizontalAlignment="Left" Margin="15,0,0,0" Foreground="{StaticResource Color_Highlighted}" Height="Auto" Width="Auto" PreviewMouseLeftButtonDown="TextComputerData_PreviewMouseDown" Cursor="Hand"/></StackPanel></Grid><Grid Grid.Row="2"><StackPanel Orientation="Vertical" Margin="50,20,0,0"><TextBlock Text="{DynamicResource title_netadapter_systemInformation}" Style="{StaticResource Text}" Foreground="{StaticResource Color_Accent}" Height="Auto" Width="Auto"/>- <TextBlock Text="{Binding DisplayNetAdapterName}" Style="{StaticResource Text}" HorizontalAlignment="Left" Margin="15,0,0,0" Foreground="{StaticResource Color_Highlighted}" Height="Auto" Width="Auto" PreviewMouseLeftButtonDown="TextComputerData_PreviewMouseDown" Cursor="Hand"/>+ <TextBlock Text="{Binding DisplayNetwork}" Style="{StaticResource Text}" HorizontalAlignment="Left" Margin="15,0,0,0" Foreground="{StaticResource Color_Highlighted}" Height="Auto" Width="Auto" PreviewMouseLeftButtonDown="TextComputerData_PreviewMouseDown" Cursor="Hand"/></StackPanel></Grid>diff --git a/.Source/GTweak/View/InformationSystemView.xaml.cs b/.Source/GTweak/View/InformationSystemView.xaml.csindex c5fc076e..7afe5075 100644--- a/.Source/GTweak/View/InformationSystemView.xaml.cs+++ b/.Source/GTweak/View/InformationSystemView.xaml.cs@@ -30,13 +30,13 @@ namespace GTweak.Viewswitch (SystemData.СomputerСonfiguration.ConnectionStatus){case 1:- SystemData.СomputerСonfiguration.СonfigurationData["IpAddress"] = (string)FindResource("connection_lose_systemInformation");+ SystemData.СomputerСonfiguration.СonfigurationData["UserIpAddress"] = (string)FindResource("connection_lose_systemInformation");break;case 2:- SystemData.СomputerСonfiguration.СonfigurationData["IpAddress"] = (string)FindResource("connection_block_systemInformation");+ SystemData.СomputerСonfiguration.СonfigurationData["UserIpAddress"] = (string)FindResource("connection_block_systemInformation");break;case 3:- SystemData.СomputerСonfiguration.СonfigurationData["IpAddress"] = (string)FindResource("limited_systemInformation");+ SystemData.СomputerСonfiguration.СonfigurationData["UserIpAddress"] = (string)FindResource("limited_systemInformation");break;}DataContext = new InformationSystemVM();