Skip to content

Portable Tool for an Ideal Windows Setup

upd. loading steps and resource keys

Greedeksa2b2e7ea8e05
diff --git a/.Source/GTweak/Languages/en/Localize.xaml b/.Source/GTweak/Languages/en/Localize.xaml
index 37eaeffe..ffee312c 100644
--- a/.Source/GTweak/Languages/en/Localize.xaml
+++ b/.Source/GTweak/Languages/en/Localize.xaml
@@ -9,13 +9,12 @@
<!--#region Load Window -->
<v:String x:Key="title_load">Loading</v:String>
- <v:String x:Key="step1_load">Uploading a profile</v:String>
- <v:String x:Key="step2_load">Fetching data</v:String>
- <v:String x:Key="step3_load">Inspecting registry</v:String>
- <v:String x:Key="step4_load">Analyzing applications</v:String>
- <v:String x:Key="step5_load">Hardware Inventory</v:String>
- <v:String x:Key="step6_load">Checking the connection</v:String>
- <v:String x:Key="step7_load">Initialization</v:String>
+ <v:String x:Key="step1_load">Preparing environment</v:String>
+ <v:String x:Key="step2_load">Checking component status</v:String>
+ <v:String x:Key="step3_load">Scanning configuration</v:String>
+ <v:String x:Key="step4_load">Searching for installed packages</v:String>
+ <v:String x:Key="step5_load">Checking network &amp; updates</v:String>
+ <v:String x:Key="step6_load">Initializing</v:String>
<!--#endregion-->
<!--#region Message Window -->
diff --git a/.Source/GTweak/Languages/fr/Localize.xaml b/.Source/GTweak/Languages/fr/Localize.xaml
index c41ebfb3..fada7486 100644
--- a/.Source/GTweak/Languages/fr/Localize.xaml
+++ b/.Source/GTweak/Languages/fr/Localize.xaml
@@ -9,13 +9,12 @@
<!--#region Load Window -->
<v:String x:Key="title_load">Chargement</v:String>
- <v:String x:Key="step1_load">Téléversement du profil</v:String>
- <v:String x:Key="step2_load">Récupération des données</v:String>
- <v:String x:Key="step3_load">Inspection du registre</v:String>
- <v:String x:Key="step4_load">Analyse des applications</v:String>
- <v:String x:Key="step5_load">Inventaire du matériel</v:String>
- <v:String x:Key="step6_load">Vérification de la connexion</v:String>
- <v:String x:Key="step7_load">Initialisation</v:String>
+ <v:String x:Key="step1_load">Préparation de l'environnement</v:String>
+ <v:String x:Key="step2_load">Vérification de l'état des composants</v:String>
+ <v:String x:Key="step3_load">Analyse de la configuration</v:String>
+ <v:String x:Key="step4_load">Recherche des paquets installés</v:String>
+ <v:String x:Key="step5_load">Vérification du réseau et des mises à jour</v:String>
+ <v:String x:Key="step6_load">Initialisation</v:String>
<!--#endregion-->
<!--#region Message Window -->
diff --git a/.Source/GTweak/Languages/hu/Localize.xaml b/.Source/GTweak/Languages/hu/Localize.xaml
index 38068525..f44f9e2f 100644
--- a/.Source/GTweak/Languages/hu/Localize.xaml
+++ b/.Source/GTweak/Languages/hu/Localize.xaml
@@ -9,13 +9,12 @@
<!--#region Load Window -->
<v:String x:Key="title_load">Betöltés</v:String>
- <v:String x:Key="step1_load">Profil feltöltése</v:String>
- <v:String x:Key="step2_load">Adatok lekérése</v:String>
- <v:String x:Key="step3_load">A rendszerleíró adatbázis ellenőrzése</v:String>
- <v:String x:Key="step4_load">Alkalmazások elemzése</v:String>
- <v:String x:Key="step5_load">Hardver leltár</v:String>
- <v:String x:Key="step6_load">A kapcsolat ellenőrzése</v:String>
- <v:String x:Key="step7_load">Inicializálás</v:String>
+ <v:String x:Key="step1_load">Környezet előkészítése</v:String>
+ <v:String x:Key="step2_load">Összetevők állapotának ellenőrzése</v:String>
+ <v:String x:Key="step3_load">Konfiguráció vizsgálata</v:String>
+ <v:String x:Key="step4_load">Telepített csomagok keresése</v:String>
+ <v:String x:Key="step5_load">Hálózat és frissítések ellenőrzése</v:String>
+ <v:String x:Key="step6_load">Inicializálás</v:String>
<!--#endregion-->
<!--#region Message Window -->
diff --git a/.Source/GTweak/Languages/it/Localize.xaml b/.Source/GTweak/Languages/it/Localize.xaml
index 109127e7..2e2bd3df 100644
--- a/.Source/GTweak/Languages/it/Localize.xaml
+++ b/.Source/GTweak/Languages/it/Localize.xaml
@@ -9,13 +9,12 @@
<!--#region Load Window -->
<v:String x:Key="title_load">Caricamento</v:String>
- <v:String x:Key="step1_load">Caricamento del profilo</v:String>
- <v:String x:Key="step2_load">Recupero dati</v:String>
- <v:String x:Key="step3_load">Ispezione del registro</v:String>
- <v:String x:Key="step4_load">Analisi delle applicazioni</v:String>
- <v:String x:Key="step5_load">Inventario Hardware</v:String>
- <v:String x:Key="step6_load">Controllo della connessione</v:String>
- <v:String x:Key="step7_load">Inizializzazione</v:String>
+ <v:String x:Key="step1_load">Preparazione dell'ambiente</v:String>
+ <v:String x:Key="step2_load">Verifica dello stato dei componenti</v:String>
+ <v:String x:Key="step3_load">Scansione della configurazione</v:String>
+ <v:String x:Key="step4_load">Ricerca dei pacchetti installati</v:String>
+ <v:String x:Key="step5_load">Controllo rete e aggiornamenti</v:String>
+ <v:String x:Key="step6_load">Inizializzazione</v:String>
<!--#endregion-->
<!--#region Message Window -->
diff --git a/.Source/GTweak/Languages/ko/Localize.xaml b/.Source/GTweak/Languages/ko/Localize.xaml
index d69d2263..5a4d818f 100644
--- a/.Source/GTweak/Languages/ko/Localize.xaml
+++ b/.Source/GTweak/Languages/ko/Localize.xaml
@@ -9,13 +9,12 @@
<!--#region Load Window -->
<v:String x:Key="title_load">로드 중</v:String>
- <v:String x:Key="step1_load">프로필 업로드 중</v:String>
- <v:String x:Key="step2_load">데이터 확인 중</v:String>
- <v:String x:Key="step3_load">레지스트리 보기</v:String>
- <v:String x:Key="step4_load">응용 프로그램 분석</v:String>
- <v:String x:Key="step5_load">구성 보기</v:String>
- <v:String x:Key="step6_load">연결 확인 중</v:String>
- <v:String x:Key="step7_load">초기화</v:String>
+ <v:String x:Key="step1_load">환경 준비 중</v:String>
+ <v:String x:Key="step2_load">구성 요소 상태 확인 중</v:String>
+ <v:String x:Key="step3_load">구성 스캔 중</v:String>
+ <v:String x:Key="step4_load">설치된 패키지 검색 중</v:String>
+ <v:String x:Key="step5_load">네트워크 및 업데이트 확인 중</v:String>
+ <v:String x:Key="step6_load">초기화</v:String>
<!--#endregion-->
<!--#region Message Window -->
diff --git a/.Source/GTweak/Languages/pl/Localize.xaml b/.Source/GTweak/Languages/pl/Localize.xaml
index 8546569b..f370fbe4 100644
--- a/.Source/GTweak/Languages/pl/Localize.xaml
+++ b/.Source/GTweak/Languages/pl/Localize.xaml
@@ -9,13 +9,12 @@
<!--#region Load Window -->
<v:String x:Key="title_load">Ładowanie</v:String>
- <v:String x:Key="step1_load">Wgrywanie profilu</v:String>
- <v:String x:Key="step2_load">Pobieranie danych</v:String>
- <v:String x:Key="step3_load">Skanowanie rejestru</v:String>
- <v:String x:Key="step4_load">Analiza aplikacji</v:String>
- <v:String x:Key="step5_load">Inwentaryzacja sprzętu</v:String>
- <v:String x:Key="step6_load">Sprawdzanie połączenia</v:String>
- <v:String x:Key="step7_load">Inicjalizacja</v:String>
+ <v:String x:Key="step1_load">Przygotowywanie środowiska</v:String>
+ <v:String x:Key="step2_load">Sprawdzanie stanu komponentów</v:String>
+ <v:String x:Key="step3_load">Skanowanie konfiguracji</v:String>
+ <v:String x:Key="step4_load">Wyszukiwanie zainstalowanych pakietów</v:String>
+ <v:String x:Key="step5_load">Sprawdzanie sieci i aktualizacji</v:String>
+ <v:String x:Key="step6_load">Inicjalizacja</v:String>
<!--#endregion-->
<!--#region Message Window -->
diff --git a/.Source/GTweak/Languages/pt-BR/Localize.xaml b/.Source/GTweak/Languages/pt-BR/Localize.xaml
index 4885dc68..e3b3bd6b 100644
--- a/.Source/GTweak/Languages/pt-BR/Localize.xaml
+++ b/.Source/GTweak/Languages/pt-BR/Localize.xaml
@@ -9,13 +9,12 @@
<!--#region Load Window -->
<v:String x:Key="title_load">Carregando</v:String>
- <v:String x:Key="step1_load">Carregando perfil</v:String>
- <v:String x:Key="step2_load">Buscando dados</v:String>
- <v:String x:Key="step3_load">Inspecionando registro</v:String>
- <v:String x:Key="step4_load">Analisando aplicativos</v:String>
- <v:String x:Key="step5_load">Inventário de hardware</v:String>
- <v:String x:Key="step6_load">Verificando a conexão</v:String>
- <v:String x:Key="step7_load">Inicialização</v:String>
+ <v:String x:Key="step1_load">Preparando o ambiente</v:String>
+ <v:String x:Key="step2_load">Verificando o status dos componentes</v:String>
+ <v:String x:Key="step3_load">Escaneando a configuração</v:String>
+ <v:String x:Key="step4_load">Procurando pacotes instalados</v:String>
+ <v:String x:Key="step5_load">Verificando rede e atualizações</v:String>
+ <v:String x:Key="step6_load">Inicialização</v:String>
<!--#endregion-->
<!--#region Message Window -->
diff --git a/.Source/GTweak/Languages/ru/Localize.xaml b/.Source/GTweak/Languages/ru/Localize.xaml
index 23c77d3d..dc0ec441 100644
--- a/.Source/GTweak/Languages/ru/Localize.xaml
+++ b/.Source/GTweak/Languages/ru/Localize.xaml
@@ -9,13 +9,12 @@
<!--#region Load Window -->
<v:String x:Key="title_load">Загрузка</v:String>
- <v:String x:Key="step1_load">Загрузка профиля</v:String>
- <v:String x:Key="step2_load">Получение данных</v:String>
- <v:String x:Key="step3_load">Просмотр реестра</v:String>
- <v:String x:Key="step4_load">Анализ приложений</v:String>
- <v:String x:Key="step5_load">Получение конфигурации</v:String>
- <v:String x:Key="step6_load">Проверка соединения</v:String>
- <v:String x:Key="step7_load">Инициализация</v:String>
+ <v:String x:Key="step1_load">Подготовка среды</v:String>
+ <v:String x:Key="step2_load">Проверка статуса компонентов</v:String>
+ <v:String x:Key="step3_load">Сканирование конфигурации</v:String>
+ <v:String x:Key="step4_load">Поиск установленных пакетов</v:String>
+ <v:String x:Key="step5_load">Проверка сети и обновлений</v:String>
+ <v:String x:Key="step6_load">Инициализация</v:String>
<!--#endregion-->
<!--#region Message Window -->
diff --git a/.Source/GTweak/Languages/uk/Localize.xaml b/.Source/GTweak/Languages/uk/Localize.xaml
index 48314361..d42cb08b 100644
--- a/.Source/GTweak/Languages/uk/Localize.xaml
+++ b/.Source/GTweak/Languages/uk/Localize.xaml
@@ -9,13 +9,12 @@
<!--#region Load Window -->
<v:String x:Key="title_load">Завантаження</v:String>
- <v:String x:Key="step1_load">Завантаження профілю</v:String>
- <v:String x:Key="step2_load">Перевірка даних</v:String>
- <v:String x:Key="step3_load">Перегляд реєстру</v:String>
- <v:String x:Key="step4_load">Аналіз додатків</v:String>
- <v:String x:Key="step5_load">Перегляд конфігурації</v:String>
- <v:String x:Key="step6_load">Перевірка з'єднання</v:String>
- <v:String x:Key="step7_load">Ініціалізація</v:String>
+ <v:String x:Key="step1_load">Підготовка середовища</v:String>
+ <v:String x:Key="step2_load">Перевірка стану компонентів</v:String>
+ <v:String x:Key="step3_load">Сканування конфігурації</v:String>
+ <v:String x:Key="step4_load">Пошук встановлених пакетів</v:String>
+ <v:String x:Key="step5_load">Перевірка мережі та оновлень</v:String>
+ <v:String x:Key="step6_load">Ініціалізація</v:String>
<!--#endregion-->
<!--#region Message Window -->
diff --git a/.Source/GTweak/Languages/zh-CN/Localize.xaml b/.Source/GTweak/Languages/zh-CN/Localize.xaml
index 0c608c2f..d2a7597f 100644
--- a/.Source/GTweak/Languages/zh-CN/Localize.xaml
+++ b/.Source/GTweak/Languages/zh-CN/Localize.xaml
@@ -9,13 +9,12 @@
<!--#region Load Window -->
<v:String x:Key="title_load">载入中</v:String>
- <v:String x:Key="step1_load">载入个人数据</v:String>
- <v:String x:Key="step2_load">撷取数据</v:String>
- <v:String x:Key="step3_load">检查注册表</v:String>
- <v:String x:Key="step4_load">分析应用程序</v:String>
- <v:String x:Key="step5_load">硬件清单</v:String>
- <v:String x:Key="step6_load">检查连接状态</v:String>
- <v:String x:Key="step7_load">初始化程序</v:String>
+ <v:String x:Key="step1_load">正在准备环境</v:String>
+ <v:String x:Key="step2_load">正在检查组件状态</v:String>
+ <v:String x:Key="step3_load">正在扫描配置</v:String>
+ <v:String x:Key="step4_load">正在搜索已安装的包</v:String>
+ <v:String x:Key="step5_load">正在检查网络和更新</v:String>
+ <v:String x:Key="step6_load">初始化程序</v:String>
<!--#endregion-->
<!--#region Message Window -->
diff --git a/.Source/GTweak/Languages/zh-TW/Localize.xaml b/.Source/GTweak/Languages/zh-TW/Localize.xaml
index 774b5b7d..4e327163 100644
--- a/.Source/GTweak/Languages/zh-TW/Localize.xaml
+++ b/.Source/GTweak/Languages/zh-TW/Localize.xaml
@@ -9,13 +9,12 @@
<!--#region Load Window -->
<v:String x:Key="title_load">載入中</v:String>
- <v:String x:Key="step1_load">載入個人資料</v:String>
- <v:String x:Key="step2_load">擷取資料</v:String>
- <v:String x:Key="step3_load">檢查登錄檔</v:String>
- <v:String x:Key="step4_load">分析應用程式</v:String>
- <v:String x:Key="step5_load">硬體清單</v:String>
- <v:String x:Key="step6_load">檢查連線狀態</v:String>
- <v:String x:Key="step7_load">初始化程式</v:String>
+ <v:String x:Key="step1_load">正在準備環境</v:String>
+ <v:String x:Key="step2_load">正在檢查組件狀態</v:String>
+ <v:String x:Key="step3_load">正在掃描配置</v:String>
+ <v:String x:Key="step4_load">正在搜尋已安裝的包</v:String>
+ <v:String x:Key="step5_load">正在檢查網路和更新</v:String>
+ <v:String x:Key="step6_load">初始化程式</v:String>
<!--#endregion-->
<!--#region Message Window -->
diff --git a/.Source/GTweak/Utilities/Configuration/HardwareProvider.cs b/.Source/GTweak/Utilities/Configuration/HardwareProvider.cs
index 9caa96f1..3bf2e856 100644
--- a/.Source/GTweak/Utilities/Configuration/HardwareProvider.cs
+++ b/.Source/GTweak/Utilities/Configuration/HardwareProvider.cs
@@ -89,8 +89,7 @@ namespace GTweak.Utilities.Configuration
() => GetGraphicsInfo(),
() => GetPrimaryRefreshRate(),
() => GetMemoryInfo(),
- () => RefreshDevicesData(),
- () => GetUserIpAddress().GetAwaiter().GetResult()
+ () => RefreshDevicesData()
);
});
}
diff --git a/.Source/GTweak/Windows/LoadingWindow.xaml.cs b/.Source/GTweak/Windows/LoadingWindow.xaml.cs
index dc6dd943..18471d3f 100644
--- a/.Source/GTweak/Windows/LoadingWindow.xaml.cs
+++ b/.Source/GTweak/Windows/LoadingWindow.xaml.cs
@@ -1,7 +1,6 @@
using System;
using System.ComponentModel;
using System.Threading;
-using System.Threading.Tasks;
using GTweak.Utilities.Animation;
using GTweak.Utilities.Configuration;
using GTweak.Utilities.Controls;
@@ -28,22 +27,27 @@ namespace GTweak.Windows
backgroundWorker.WorkerReportsProgress = true;
backgroundWorker.DoWork += BackgroundWorker_DoWork;
backgroundWorker.ProgressChanged += BackgroundWorker_ProgressChanged;
- backgroundWorker.RunWorkerCompleted += async delegate
+ backgroundWorker.RunWorkerCompleted += delegate
{
- TypewriterAnimation.Create((string)FindResource("step7_load"), StatusLoading, TimeSpan.FromMilliseconds(300));
- await Task.Delay(400);
new MainWindow().Show();
Close();
};
+
backgroundWorker.RunWorkerAsync();
}
private void BackgroundWorker_DoWork(object sender, DoWorkEventArgs e)
{
- for (byte i = 0; i <= 100; i++)
+ BackgroundWorker worker = sender as BackgroundWorker;
+
+ void ReportStep(byte stepId, int percent, int delay = 0)
{
- (sender as BackgroundWorker)?.ReportProgress(i);
- Thread.Sleep(17);
+ worker?.ReportProgress(percent, stepId);
+
+ if (delay > 0)
+ {
+ Thread.Sleep(delay);
+ }
}
static void ExecuteWithLogging(Action action, string member)
@@ -52,29 +56,39 @@ namespace GTweak.Windows
catch (Exception ex) { ErrorLogging.LogWritingFile(ex, false, member); }
}
- ExecuteWithLogging(TrustedInstaller.StartTrustedInstallerService, nameof(TrustedInstaller.StartTrustedInstallerService));
+ ReportStep(1, 15, 300);
ExecuteWithLogging(WinLicenseHandler.LicenseStatus, nameof(WinLicenseHandler.LicenseStatus));
- ExecuteWithLogging(_uninstallingPakages.GetInstalledPackages, nameof(_uninstallingPakages.GetInstalledPackages));
- ExecuteWithLogging(UninstallingPakages.CheckingForLocalAccount, nameof(UninstallingPakages.CheckingForLocalAccount));
- ExecuteWithLogging(SystemTweaks.ViewNetshState, nameof(SystemTweaks.ViewNetshState));
- ExecuteWithLogging(SystemTweaks.ViewBluetoothStatus, nameof(SystemTweaks.ViewBluetoothStatus));
+ ExecuteWithLogging(TrustedInstaller.StartTrustedInstallerService, nameof(TrustedInstaller.StartTrustedInstallerService));
+ ExecuteWithLogging(RunGuard.CheckingDefenderExclusions, nameof(RunGuard.CheckingDefenderExclusions));
+
+ ReportStep(2, 35, 300);
ExecuteWithLogging(SystemTweaks.ViewConfigTick, nameof(SystemTweaks.ViewConfigTick));
+ ExecuteWithLogging(SystemTweaks.ViewBluetoothStatus, nameof(SystemTweaks.ViewBluetoothStatus));
+ ExecuteWithLogging(SystemTweaks.ViewNetshState, nameof(SystemTweaks.ViewNetshState));
+
+ ReportStep(3, 55, 150);
ExecuteWithLogging(_hardwareProvider.GetHardwareData, nameof(_hardwareProvider.GetHardwareData));
ExecuteWithLogging(() => _hardwareProvider.GetProcessCount().GetAwaiter().GetResult(), nameof(_hardwareProvider.GetProcessCount));
ExecuteWithLogging(() => _hardwareProvider.GetServicesCount().GetAwaiter().GetResult(), nameof(_hardwareProvider.GetServicesCount));
- ExecuteWithLogging(() => _hardwareProvider.ValidateVersionUpdates().GetAwaiter().GetResult(), nameof(_hardwareProvider.ValidateVersionUpdates));
ExecuteWithLogging(() => _hardwareProvider.GetTotalProcessorUsage().GetAwaiter().GetResult(), nameof(_hardwareProvider.GetTotalProcessorUsage));
ExecuteWithLogging(() => _hardwareProvider.GetPhysicalAvailableMemory().GetAwaiter().GetResult(), nameof(_hardwareProvider.GetPhysicalAvailableMemory));
- ExecuteWithLogging(RunGuard.CheckingDefenderExclusions, nameof(RunGuard.CheckingDefenderExclusions));
+
+ ReportStep(4, 75, 300);
+ ExecuteWithLogging(_uninstallingPakages.GetInstalledPackages, nameof(_uninstallingPakages.GetInstalledPackages));
+ ExecuteWithLogging(UninstallingPakages.CheckingForLocalAccount, nameof(UninstallingPakages.CheckingForLocalAccount));
+
+ ReportStep(5, 90, 150);
+ ExecuteWithLogging(() => _hardwareProvider.GetUserIpAddress().GetAwaiter().GetResult(), nameof(_hardwareProvider.GetUserIpAddress));
+ ExecuteWithLogging(() => _hardwareProvider.ValidateVersionUpdates().GetAwaiter().GetResult(), nameof(_hardwareProvider.ValidateVersionUpdates));
+ ReportStep(6, 100, 400);
}
private void BackgroundWorker_ProgressChanged(object sender, ProgressChangedEventArgs e)
{
- int index = Array.IndexOf(new[] { 0, 10, 30, 55, 75, 95 }, e?.ProgressPercentage ?? 0);
- if (index > 0)
+ if (e.UserState is byte index)
{
- TypewriterAnimation.Create((string)FindResource($"step{++index}_load"), StatusLoading, TimeSpan.FromMilliseconds(200));
+ TypewriterAnimation.Create((string)FindResource($"step{index}_load"), StatusLoading, TimeSpan.FromMilliseconds(200));
}
}
}
-}
+}
\ No newline at end of file