Skip to content

Portable Tool for an Ideal Windows Setup

fix configuration loading error

Greedeks374cff5d969c
diff --git a/.Source/GTweak/App.xaml.cs b/.Source/GTweak/App.xaml.cs
index 9a28e5ed..c5fd258e 100644
--- a/.Source/GTweak/App.xaml.cs
+++ b/.Source/GTweak/App.xaml.cs
@@ -6,6 +6,7 @@ using System.Globalization;
using System.Linq;
using System.Runtime.CompilerServices;
using System.Text.RegularExpressions;
+using System.Threading.Tasks;
using System.Windows;
using System.Windows.Threading;
@@ -29,7 +30,7 @@ namespace GTweak
AppDomain.CurrentDomain.UnhandledException += OnUnhandledException;
}
- private void App_Startup(object sender, StartupEventArgs e)
+ private async void App_Startup(object sender, StartupEventArgs e)
{
if (e.Args.Any(arg => arg.Equals("uninstall", StringComparison.OrdinalIgnoreCase)))
{
@@ -41,7 +42,7 @@ namespace GTweak
Theme = RegistryHelp.GetValue(@"HKEY_CURRENT_USER\Software\GTweak", "Theme", "Dark");
BlockRunTweaker.CheckingApplicationCopies();
- BlockRunTweaker.CheckingSystemRequirements();
+ await BlockRunTweaker.CheckingSystemRequirements();
new LoadingWindow().Show();
}
diff --git a/.Source/GTweak/Languages/fr/Localize.xaml b/.Source/GTweak/Languages/fr/Localize.xaml
index 0be20caa..6305051d 100644
--- a/.Source/GTweak/Languages/fr/Localize.xaml
+++ b/.Source/GTweak/Languages/fr/Localize.xaml
@@ -441,7 +441,7 @@
<v:String x:Key="text1_more">recommandé</v:String>
<v:String x:Key="text2_more">de créer un point de restauration avant d’utiliser l’utilitaire</v:String>
<v:String x:Key="title_licens_more">Activation de Windows</v:String>
- <v:String x:Key="text_licens_more">Méthode HWID ou KMS: peut échouer sans clé pour cette édition</v:String>
+ <v:String x:Key="text_licens_more">Méthode HWID ou KMS: peut échouer sans clé pour cette édition.</v:String>
<v:String x:Key="btn_activation">Activer</v:String>
<v:String x:Key="title_createpoint_more">Sauvegarder le système</v:String>
<v:String x:Key="text_createpoint_more">Crée un point de restauration Windows, même si cette fonction est désactivée.</v:String>
@@ -462,7 +462,7 @@
<v:String x:Key="title_defrag_on_more">Activer la défragmentation</v:String>
<v:String x:Key="text_defrag_on_more">Active la défragmentation qui réorganise les fichiers, efficace uniquement sur disque dur (HDD).</v:String>
<v:String x:Key="title_compression_more">Compression NTFS</v:String>
- <v:String x:Key="text_compression_more">Compresse les fichiers (surtout texte) pour gagner de l’espace sans perte</v:String>
+ <v:String x:Key="text_compression_more">Compresse les fichiers (surtout texte) pour gagner de l’espace sans perte.</v:String>
<v:String x:Key="title_decompression_more">Décompression NTFS</v:String>
<v:String x:Key="text_decompression_more">Désactive la compression en restaurant la taille d’origine des fichiers et accélère leur accès.</v:String>
<v:String x:Key="btn_overview">Aperçu</v:String>
diff --git a/.Source/GTweak/Utilities/Controls/BlockRunTweaker.cs b/.Source/GTweak/Utilities/Controls/BlockRunTweaker.cs
index 030bb9c6..eef5203c 100644
--- a/.Source/GTweak/Utilities/Controls/BlockRunTweaker.cs
+++ b/.Source/GTweak/Utilities/Controls/BlockRunTweaker.cs
@@ -42,11 +42,13 @@ namespace GTweak.Utilities.Controls
}
}
- internal static void CheckingSystemRequirements()
+ internal static async Task CheckingSystemRequirements()
{
- Task.Run(delegate { new SystemDiagnostics().GetOperatingSystemInfo(); }).Wait();
+ await Task.Run(() => new SystemDiagnostics().GetOperatingSystemInfo());
+
+ if ((SystemDiagnostics.IsWindowsVersion[11] || SystemDiagnostics.IsWindowsVersion[10]) && SystemDiagnostics.HardwareData.OSBuild.CompareTo("18362.116") >= 0)
+ return;
- if ((SystemDiagnostics.IsWindowsVersion[11] || SystemDiagnostics.IsWindowsVersion[10]) && SystemDiagnostics.HardwareData.OSBuild.CompareTo("18362.116") >= 0) return;
new MessageWindow(true).ShowDialog();
}
}
diff --git a/.Source/GTweak/Windows/MessageWindow.xaml b/.Source/GTweak/Windows/MessageWindow.xaml
index a2ed4e06..418005dc 100644
--- a/.Source/GTweak/Windows/MessageWindow.xaml
+++ b/.Source/GTweak/Windows/MessageWindow.xaml
@@ -27,7 +27,7 @@
</Style>
</Image.Style>
</Image>
- <TextBlock Text="{DynamicResource title_message}" Margin="10,0,0,0" Foreground="{StaticResource Color_Highlighted}" Height="auto" Width="auto" FontFamily="{StaticResource Jura}" FontSize="20px" HorizontalAlignment="Left" TextAlignment="Center"/>
+ <TextBlock Text="{DynamicResource title_message}" Margin="10,2,0,0" Foreground="{StaticResource Color_Highlighted}" Height="auto" Width="auto" FontFamily="{StaticResource Jura}" FontSize="18px" HorizontalAlignment="Left" TextAlignment="Center"/>
</StackPanel>
<TextBlock Foreground="{StaticResource Color_TetBlock_Inactivity}" Height="auto" Width="340" FontFamily="{StaticResource Jura}" FontSize="14px" TextWrapping="Wrap"
HorizontalAlignment="Center" TextAlignment="Left" FontStretch="Medium" Margin="0,10,0,0">
@@ -59,7 +59,7 @@
</Grid>
<Grid Grid.Row="2" VerticalAlignment="Bottom" Margin="0,0,20,10">
- <TextBlock Text="{DynamicResource noty_message}" Foreground="{StaticResource Color_Inactive}" Height="auto" Width="auto" MaxWidth="350" FontFamily="{StaticResource Jura}" FontSize="12px" HorizontalAlignment="Left" TextAlignment="Center" Margin="20,5,0,0"/>
+ <TextBlock Text="{DynamicResource noty_message}" Foreground="{StaticResource Color_Inactive}" Height="auto" Width="auto" MaxWidth="350" FontFamily="{StaticResource Jura}" FontSize="12px" HorizontalAlignment="Left" TextAlignment="Center" Margin="20,8,0,0"/>
<Button x:Name="BtnAccept" Content="{DynamicResource button_message}" Style="{StaticResource BtnDefault}" HorizontalAlignment="Right" VerticalAlignment="Top" Width="110" Height="30" Cursor="Hand" PreviewMouseDown="BtnAccept_PreviewMouseDown"/>
</Grid>
</Grid>
diff --git a/.Source/GTweak/Windows/UpdateWindow.xaml b/.Source/GTweak/Windows/UpdateWindow.xaml
index 3882be98..b00406bf 100644
--- a/.Source/GTweak/Windows/UpdateWindow.xaml
+++ b/.Source/GTweak/Windows/UpdateWindow.xaml
@@ -64,7 +64,7 @@
</Grid>
<Grid Grid.Row="1">
- <StackPanel Orientation="Vertical" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="20,5,0,0">
+ <StackPanel Orientation="Vertical" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="20,0,0,0">
<StackPanel Orientation="Horizontal">
<Image Width="25">
<Image.Style>
@@ -75,12 +75,12 @@
</Image>
<TextBlock Text="{DynamicResource title_update}" Foreground="{StaticResource Color_Highlighted}" Height="auto" Width="auto" FontFamily="{StaticResource Jura}" FontSize="18px" HorizontalAlignment="Left" TextAlignment="Center" Margin="10,0,0,0"/>
</StackPanel>
- <TextBlock Foreground="{StaticResource Color_Highlighted}" Height="auto" Width="auto" FontFamily="{StaticResource Jura}" FontSize="16px" HorizontalAlignment="Left" TextAlignment="Center" Margin="0,2,0,0">
- <Run x:Name="CurrentVerison" Text="0.00.0" Foreground="{StaticResource Color_Accent}"/>
+ <TextBlock Foreground="{StaticResource Color_Highlighted}" Height="auto" Width="auto" FontFamily="{StaticResource Jura}" FontSize="16px" HorizontalAlignment="Left" TextAlignment="Center" Margin="0,3,0,0">
+ <Run x:Name="CurrentVerison" Text="0.0.0" Foreground="{StaticResource Color_Accent}"/>
<Run Text="➔"/>
- <Run x:Name="NewVerison" Text="0.00.0" Foreground="{StaticResource Color_Accent}"/>
+ <Run x:Name="NewVerison" Text="0.0.0" Foreground="{StaticResource Color_Accent}"/>
</TextBlock>
- <TextBlock Margin="0,5,0,0" Text="{DynamicResource text_update}" Foreground="{StaticResource Color_TetBlock_Inactivity}" Height="auto" Width="370" FontFamily="{StaticResource Jura}" FontSize="14px" TextAlignment="Left" FontStretch="Medium" TextWrapping="Wrap"/>
+ <TextBlock Margin="0,6,0,0" Text="{DynamicResource text_update}" Foreground="{StaticResource Color_TetBlock_Inactivity}" Height="auto" Width="370" FontFamily="{StaticResource Jura}" FontSize="14px" TextAlignment="Left" FontStretch="Medium" TextWrapping="Wrap"/>
<Grid Margin="0,15,0,0">
<Button x:Name="BtnLog" Content="{DynamicResource btn_log}" Style="{StaticResource BtnDefaultM}" HorizontalAlignment="Left" VerticalAlignment="Top" Width="110" Height="30" Cursor="Hand" PreviewMouseDown="BtnLog_PreviewMouseDown"/>
<Button x:Name="BtnUpdate" Content="{DynamicResource btn_upd}" Style="{StaticResource BtnDefault}" HorizontalAlignment="Right" VerticalAlignment="Top" Width="110" Height="30" Cursor="Hand" PreviewMouseDown="BtnUpdate_PreviewMouseDown" Margin="0,0,20,0"/>