Skip to content

Portable Tool for an Ideal Windows Setup

-added BIOS or UEFI definition

Greedeksa69858213368
diff --git a/.Source/GTweak/App.xaml b/.Source/GTweak/App.xaml
index ee76dd59..b45b70c6 100644
--- a/.Source/GTweak/App.xaml
+++ b/.Source/GTweak/App.xaml
@@ -23,9 +23,9 @@
<ResourceDictionary Source="Styles/Inputs/Slider.xaml" />
<ResourceDictionary Source="Styles/Inputs/TextBox.xaml" />
<ResourceDictionary Source="Styles/Inputs/ComboBox.xaml" />
- <ResourceDictionary Source="Styles/Media/Page.xaml" />
- <ResourceDictionary Source="Styles/Media/Images.xaml" />
- <ResourceDictionary Source="Styles/Media/Rectangle.xaml" />
+ <ResourceDictionary Source="Styles/Page.xaml" />
+ <ResourceDictionary Source="Styles/Images.xaml" />
+ <ResourceDictionary Source="Styles/Rectangle.xaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Application.Resources>
diff --git a/.Source/GTweak/App.xaml.cs b/.Source/GTweak/App.xaml.cs
index ccd84583..83f37897 100644
--- a/.Source/GTweak/App.xaml.cs
+++ b/.Source/GTweak/App.xaml.cs
@@ -41,10 +41,12 @@ namespace GTweak
"en" => new Uri("Languages/en/Localize.xaml", UriKind.Relative),
"ko" => new Uri("Languages/ko/Localize.xaml", UriKind.Relative),
"ru" => new Uri("Languages/ru/Localize.xaml", UriKind.Relative),
- _ => GettingSystemLanguage switch {
+ _ => GettingSystemLanguage switch
+ {
string lang when lang.Contains("ko") => new Uri("Languages/ko/Localize.xaml", UriKind.Relative),
string lang when lang.Contains("ru") => new Uri("Languages/ru/Localize.xaml", UriKind.Relative),
- _ => new Uri("Languages/en/Localize.xaml", UriKind.Relative) }
+ _ => new Uri("Languages/en/Localize.xaml", UriKind.Relative)
+ }
}
};
diff --git a/.Source/GTweak/Core/ViewModel/DataSystemVM.cs b/.Source/GTweak/Core/ViewModel/DataSystemVM.cs
index 3fa1bbfa..5a22820e 100644
--- a/.Source/GTweak/Core/ViewModel/DataSystemVM.cs
+++ b/.Source/GTweak/Core/ViewModel/DataSystemVM.cs
@@ -46,6 +46,7 @@ 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 = "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"] },
diff --git a/.Source/GTweak/GTweak.csproj b/.Source/GTweak/GTweak.csproj
index a2421619..0766895b 100644
--- a/.Source/GTweak/GTweak.csproj
+++ b/.Source/GTweak/GTweak.csproj
@@ -365,11 +365,11 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
- <Page Include="Styles\Media\Images.xaml">
+ <Page Include="Styles\Images.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
- <Page Include="Styles\Media\Page.xaml">
+ <Page Include="Styles\Page.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
@@ -397,7 +397,7 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
- <Page Include="Styles\Media\Rectangle.xaml">
+ <Page Include="Styles\Rectangle.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
diff --git a/.Source/GTweak/Languages/en/Localize.xaml b/.Source/GTweak/Languages/en/Localize.xaml
index dc69a62a..71de54b4 100644
--- a/.Source/GTweak/Languages/en/Localize.xaml
+++ b/.Source/GTweak/Languages/en/Localize.xaml
@@ -388,7 +388,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_bios_systemInformation">BIOS:</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_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>
diff --git a/.Source/GTweak/Languages/ko/Localize.xaml b/.Source/GTweak/Languages/ko/Localize.xaml
index 08c0629b..05dc053b 100644
--- a/.Source/GTweak/Languages/ko/Localize.xaml
+++ b/.Source/GTweak/Languages/ko/Localize.xaml
@@ -388,7 +388,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_bios_systemInformation">BIOS:</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_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 61837cea..f14b583f 100644
--- a/.Source/GTweak/Languages/ru/Localize.xaml
+++ b/.Source/GTweak/Languages/ru/Localize.xaml
@@ -388,7 +388,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_bios_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_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/Styles/Media/Images.xaml b/.Source/GTweak/Styles/Images.xaml
similarity index 100%
rename from .Source/GTweak/Styles/Media/Images.xaml
rename to .Source/GTweak/Styles/Images.xaml
diff --git a/.Source/GTweak/Styles/Media/Page.xaml b/.Source/GTweak/Styles/Page.xaml
similarity index 100%
rename from .Source/GTweak/Styles/Media/Page.xaml
rename to .Source/GTweak/Styles/Page.xaml
diff --git a/.Source/GTweak/Styles/Media/Rectangle.xaml b/.Source/GTweak/Styles/Rectangle.xaml
similarity index 100%
rename from .Source/GTweak/Styles/Media/Rectangle.xaml
rename to .Source/GTweak/Styles/Rectangle.xaml
diff --git a/.Source/GTweak/Utilities/Configuration/SystemDiagnostics.cs b/.Source/GTweak/Utilities/Configuration/SystemDiagnostics.cs
index 8e7e449d..81b1f60d 100644
--- a/.Source/GTweak/Utilities/Configuration/SystemDiagnostics.cs
+++ b/.Source/GTweak/Utilities/Configuration/SystemDiagnostics.cs
@@ -1,4 +1,5 @@
-using Microsoft.Win32;
+using GTweak.Utilities.Helpers;
+using Microsoft.Win32;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
@@ -13,6 +14,7 @@ using System.Windows;
using System.Windows.Media;
using System.Windows.Media.Imaging;
+
namespace GTweak.Utilities.Configuration
{
internal sealed class SystemDiagnostics
@@ -37,6 +39,7 @@ 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>()
{
@@ -107,8 +110,11 @@ namespace GTweak.Utilities.Configuration
HardwareData["Windows"] = $"\n{HardwareData["Windows"].TrimEnd('\n')}";
}
- private void GetBiosInfo()
+ 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();
+
foreach (var managementObj in new ManagementObjectSearcher(@"root\cimv2", "select Name, Caption, Description, SMBIOSBIOSVersion, SerialNumber from Win32_BIOS", new EnumerationOptions { ReturnImmediately = true }).Get())
{
string data = new[] { "Name", "Caption", "Description", "SMBIOSBIOSVersion" }.Select(prop => (string)managementObj[prop]).FirstOrDefault(info => !string.IsNullOrEmpty(info)) ?? string.Empty;
diff --git a/.Source/GTweak/Utilities/Helpers/RegistryHelp.cs b/.Source/GTweak/Utilities/Helpers/RegistryHelp.cs
index a924e4d4..9171cc32 100644
--- a/.Source/GTweak/Utilities/Helpers/RegistryHelp.cs
+++ b/.Source/GTweak/Utilities/Helpers/RegistryHelp.cs
@@ -63,7 +63,8 @@ namespace GTweak.Utilities.Helpers
{
Task.Run(delegate
{
- try {
+ try
+ {
registrykey.CreateSubKey(subkey);
}
catch (Exception ex) { Debug.WriteLine(ex.Message); }
diff --git a/.Source/GTweak/View/DataSystemView.xaml b/.Source/GTweak/View/DataSystemView.xaml
index 4b35f1a4..955fb986 100644
--- a/.Source/GTweak/View/DataSystemView.xaml
+++ b/.Source/GTweak/View/DataSystemView.xaml
@@ -114,7 +114,7 @@
<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 [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"/>
</StackPanel>
</Grid>