Skip to content

Portable Tool for an Ideal Windows Setup

-bios mode information output has been changed

Greedeks55b55c32ed6e
diff --git a/.Source/GTweak/Core/ViewModel/DataSystemVM.cs b/.Source/GTweak/Core/ViewModel/DataSystemVM.cs
index 5a22820e..eb22e9a3 100644
--- a/.Source/GTweak/Core/ViewModel/DataSystemVM.cs
+++ b/.Source/GTweak/Core/ViewModel/DataSystemVM.cs
@@ -46,8 +46,8 @@ namespace GTweak.Core.ViewModel
{
new DataSystemModel { Name = "Windows", Data = SystemDiagnostics.HardwareData["Windows"] },
new DataSystemModel { Name = "Processes", Data = new MonitoringSystem().GetNumberRunningProcesses },
- new DataSystemModel { Name = "Firmware", Data = SystemDiagnostics.Firmware },
new DataSystemModel { Name = "Bios", Data = !string.IsNullOrEmpty(SystemDiagnostics.HardwareData["BIOS"]) ? SystemDiagnostics.HardwareData["BIOS"] : (string)Application.Current.Resources["no_device_information_systemInformatin"] },
+ new DataSystemModel { Name = "Mode", Data = !string.IsNullOrEmpty(SystemDiagnostics.HardwareData["Mode"]) ? SystemDiagnostics.HardwareData["Mode"] : (string)Application.Current.Resources["no_device_information_systemInformatin"] },
new DataSystemModel { Name = "Motherboard", Data = !string.IsNullOrEmpty(SystemDiagnostics.HardwareData["MotherBr"]) ? SystemDiagnostics.HardwareData["MotherBr"] : (string)Application.Current.Resources["no_device_information_systemInformatin"] },
new DataSystemModel { Name = "Processor", Data = !string.IsNullOrEmpty(SystemDiagnostics.HardwareData["CPU"]) ? SystemDiagnostics.HardwareData["CPU"] : (string)Application.Current.Resources["no_device_information_systemInformatin"] },
new DataSystemModel { Name = "Graphics", Data = !string.IsNullOrEmpty(SystemDiagnostics.HardwareData["GPU"]) ? SystemDiagnostics.HardwareData["GPU"] : (string)Application.Current.Resources["driver_not_installed_systemInformatin"] },
diff --git a/.Source/GTweak/Languages/en/Localize.xaml b/.Source/GTweak/Languages/en/Localize.xaml
index 0aaf5164..fbd594c4 100644
--- a/.Source/GTweak/Languages/en/Localize.xaml
+++ b/.Source/GTweak/Languages/en/Localize.xaml
@@ -390,8 +390,8 @@
<!--#region Information System Page -->
<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_firmware_b_systemInformation">BIOS:</v:String>
- <v:String x:Key="title_firmware_u_systemInformation">UEFI:</v:String>
+ <v:String x:Key="title_bios_systemInformation">BIOS:</v:String>
+ <v:String x:Key="title_mode_systemInformation">Mode:</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:</v:String>
@@ -406,6 +406,7 @@
<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>
+ <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/ko/Localize.xaml b/.Source/GTweak/Languages/ko/Localize.xaml
index 9819db61..02a53cd3 100644
--- a/.Source/GTweak/Languages/ko/Localize.xaml
+++ b/.Source/GTweak/Languages/ko/Localize.xaml
@@ -390,8 +390,8 @@
<!--#region Information System Page -->
<v:String x:Key="title_win_systemInformation">운영 체제:</v:String>
<v:String x:Key="runprocces_systemInformation">실행 중인 프로세스 번호:</v:String>
- <v:String x:Key="title_firmware_b_systemInformation">BIOS:</v:String>
- <v:String x:Key="title_firmware_u_systemInformation">UEFI:</v:String>
+ <v:String x:Key="title_bios_systemInformation">BIOS:</v:String>
+ <v:String x:Key="title_mode_systemInformation">모드:</v:String>
<v:String x:Key="title_motherbr_systemInformation">머더보드:</v:String>
<v:String x:Key="title_cpu_systemInformation">프로세스:</v:String>
<v:String x:Key="title_gpu_systemInformation">그래픽:</v:String>
diff --git a/.Source/GTweak/Languages/ru/Localize.xaml b/.Source/GTweak/Languages/ru/Localize.xaml
index 7e7629bd..f0732dcf 100644
--- a/.Source/GTweak/Languages/ru/Localize.xaml
+++ b/.Source/GTweak/Languages/ru/Localize.xaml
@@ -390,8 +390,8 @@
<!--#region Information System Page -->
<v:String x:Key="title_win_systemInformation">Операционная система:</v:String>
<v:String x:Key="runprocces_systemInformation">Кол-во запущенных процессов:</v:String>
- <v:String x:Key="title_firmware_b_systemInformation">BIOS:</v:String>
- <v:String x:Key="title_firmware_u_systemInformation">UEFI:</v:String>
+ <v:String x:Key="title_bios_systemInformation">BIOS:</v:String>
+ <v:String x:Key="title_mode_systemInformation">Режим:</v:String>
<v:String x:Key="title_motherbr_systemInformation">Материнская плата:</v:String>
<v:String x:Key="title_cpu_systemInformation">Процессор:</v:String>
<v:String x:Key="title_gpu_systemInformation">Видеокарта:</v:String>
diff --git a/.Source/GTweak/Utilities/Configuration/SystemDiagnostics.cs b/.Source/GTweak/Utilities/Configuration/SystemDiagnostics.cs
index 81b1f60d..f5696ca5 100644
--- a/.Source/GTweak/Utilities/Configuration/SystemDiagnostics.cs
+++ b/.Source/GTweak/Utilities/Configuration/SystemDiagnostics.cs
@@ -39,13 +39,13 @@ namespace GTweak.Utilities.Configuration
internal static ConnectionStatus CurrentConnection = ConnectionStatus.Lose;
internal static string WindowsClientVersion { get; set; } = string.Empty;
- internal static string Firmware { get; set; } = Application.Current.Resources["title_firmware_b_systemInformation"].ToString();
internal static readonly Dictionary<string, string> HardwareData = new Dictionary<string, string>()
{
{ "Windows", Registry.GetValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion", "ProductName", string.Empty)?.ToString() ?? string.Empty },
{ "BIOS", string.Empty },
+ { "Mode", string.Empty },
{ "MotherBr", string.Empty },
{ "CPU", string.Empty },
{ "GPU", string.Empty },
@@ -113,7 +113,7 @@ namespace GTweak.Utilities.Configuration
private async void GetBiosInfo()
{
string output = await CommandExecutor.GetCommandOutput("bcdedit");
- Firmware = Application.Current.Resources[output.Contains(@"\EFI") ? "title_firmware_u_systemInformation" : "title_firmware_b_systemInformation"].ToString();
+ HardwareData["Mode"] = output.Contains(@"efi") ? "UEFI" : "Legacy BIOS";
foreach (var managementObj in new ManagementObjectSearcher(@"root\cimv2", "select Name, Caption, Description, SMBIOSBIOSVersion, SerialNumber from Win32_BIOS", new EnumerationOptions { ReturnImmediately = true }).Get())
{
diff --git a/.Source/GTweak/View/DataSystemView.xaml b/.Source/GTweak/View/DataSystemView.xaml
index 191fd11e..1fffa67d 100644
--- a/.Source/GTweak/View/DataSystemView.xaml
+++ b/.Source/GTweak/View/DataSystemView.xaml
@@ -114,8 +114,12 @@
<Grid Grid.Row="0">
<StackPanel Orientation="Vertical" Margin="50,20,0,0">
- <TextBlock Text="{Binding [Firmware].Data}" Style="{StaticResource Text}" Foreground="{StaticResource Color_Accent}" Height="Auto" Width="Auto"/>
- <TextBlock Text="{Binding [Bios].Data}" 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="{DynamicResource title_bios_systemInformation}" Style="{StaticResource Text}" Foreground="{StaticResource Color_Accent}" Height="Auto" Width="Auto"/>
+ <TextBlock Style="{StaticResource Text}" HorizontalAlignment="Left" Margin="15,0,0,0" Foreground="{StaticResource Color_Highlighted}" Height="Auto" Width="Auto">
+ <Run Text="{Binding [Bios].Data}" PreviewMouseDown="TextComputerData_PreviewMouseDown" Cursor="Hand"/><LineBreak/>
+ <Run Text="{DynamicResource title_mode_systemInformation}" Foreground="{StaticResource Color_Accent}"/>
+ <Run Text="{Binding [Mode].Data}" PreviewMouseDown="TextComputerData_PreviewMouseDown" Cursor="Hand"/>
+ </TextBlock>
</StackPanel>
</Grid>