Skip to content

Portable Tool for an Ideal Windows Setup

upd. refine update interface design

Greedeksb776e8af66eb
diff --git a/.Source/GTweak/Assets/UserControls/ToolsetCard.xaml b/.Source/GTweak/Assets/UserControls/ToolsetCard.xaml
index d68f3053..3fe6465d 100644
--- a/.Source/GTweak/Assets/UserControls/ToolsetCard.xaml
+++ b/.Source/GTweak/Assets/UserControls/ToolsetCard.xaml
@@ -167,7 +167,7 @@
</Style.Triggers>
</Style>
</TextBlock.Style>
- <Run Text="{DynamicResource connecting_ts}" /><InlineUIContainer BaselineAlignment="Baseline">
+ <Run Text="{DynamicResource connecting}" /><InlineUIContainer BaselineAlignment="Baseline">
<Border Width="15" Margin="0,0,0,-2" Background="Transparent" VerticalAlignment="Bottom">
<TextBlock x:Name="DotText" Style="{StaticResource TextDefault}" FontSize="13px">
<TextBlock.Triggers>
diff --git a/.Source/GTweak/Core/ViewModel/MainWinViewModel.cs b/.Source/GTweak/Core/ViewModel/MainWinViewModel.cs
index 9be99061..6cd145e3 100644
--- a/.Source/GTweak/Core/ViewModel/MainWinViewModel.cs
+++ b/.Source/GTweak/Core/ViewModel/MainWinViewModel.cs
@@ -149,7 +149,10 @@ namespace GTweak.Core.ViewModel
public MainWinViewModel()
{
- App.TweaksImported += delegate { CurrentView = new UtilsView(); };
+ App.TweaksImported += delegate
+ {
+ CurrentView = new UtilsView();
+ };
CurrentView = new UtilsView();
diff --git a/.Source/GTweak/Languages/en/Localize.xaml b/.Source/GTweak/Languages/en/Localize.xaml
index 1d98d671..eefbbf70 100644
--- a/.Source/GTweak/Languages/en/Localize.xaml
+++ b/.Source/GTweak/Languages/en/Localize.xaml
@@ -112,9 +112,7 @@
<v:String x:Key="title_win_update">Update - GTweak</v:String>
<v:String x:Key="title_update">An update was found</v:String>
<v:String x:Key="btn_upd">Update</v:String>
- <v:String x:Key="download_update">Downloading</v:String>
- <v:String x:Key="noty_update">Please wait for the download to complete</v:String>
- <v:String x:Key="connection_update">Connecting to the server</v:String>
+ <v:String x:Key="connecting">Connecting</v:String>
<!--#endregion-->
<!--#region Utils Page -->
@@ -560,7 +558,6 @@
<v:String x:Key="btn_cancel">Сancel</v:String>
<v:String x:Key="btn_open_dir">Open folder</v:String>
<v:String x:Key="text_ts">Search by name or author</v:String>
- <v:String x:Key="connecting_ts">Connecting</v:String>
<!--#endregion-->
</ResourceDictionary>
\ No newline at end of file
diff --git a/.Source/GTweak/Languages/fr/Localize.xaml b/.Source/GTweak/Languages/fr/Localize.xaml
index 11151348..2da601ed 100644
--- a/.Source/GTweak/Languages/fr/Localize.xaml
+++ b/.Source/GTweak/Languages/fr/Localize.xaml
@@ -112,9 +112,7 @@
<v:String x:Key="title_win_update">Mise à jour - GTweak</v:String>
<v:String x:Key="title_update">Mise à jour disponible</v:String>
<v:String x:Key="btn_upd">Mettre à jour</v:String>
- <v:String x:Key="download_update">Téléchargement</v:String>
- <v:String x:Key="noty_update">Veuillez attendre la fin du téléchargement</v:String>
- <v:String x:Key="connection_update">Connexion au serveur</v:String>
+ <v:String x:Key="connecting">Connexion</v:String>
<!--#endregion-->
<!--#region Utils Page -->
@@ -560,7 +558,6 @@
<v:String x:Key="btn_cancel">Annuler</v:String>
<v:String x:Key="btn_open_dir">Ouvrir le dossier</v:String>
<v:String x:Key="text_ts">Rechercher par nom ou auteur</v:String>
- <v:String x:Key="connecting_ts">Connexion</v:String>
<!--#endregion-->
</ResourceDictionary>
diff --git a/.Source/GTweak/Languages/he/Localize.xaml b/.Source/GTweak/Languages/he/Localize.xaml
index 4967777c..28a8c304 100644
--- a/.Source/GTweak/Languages/he/Localize.xaml
+++ b/.Source/GTweak/Languages/he/Localize.xaml
@@ -112,9 +112,7 @@
<v:String x:Key="title_win_update">עדכון - GTweak</v:String>
<v:String x:Key="title_update">נמצא עדכון</v:String>
<v:String x:Key="btn_upd">עדכן</v:String>
- <v:String x:Key="download_update">מוריד</v:String>
- <v:String x:Key="noty_update">אנא המתן לסיום ההורדה</v:String>
- <v:String x:Key="connection_update">מתחבר לשרת</v:String>
+ <v:String x:Key="connecting">מתחבר</v:String>
<!--#endregion-->
<!--#region Utils Page -->
@@ -560,7 +558,6 @@
<v:String x:Key="btn_cancel">בטל</v:String>
<v:String x:Key="btn_open_dir">פתח תיקייה</v:String>
<v:String x:Key="text_ts">חפש לפי שם או מחבר</v:String>
- <v:String x:Key="connecting_ts">מתחבר</v:String>
<!--#endregion-->
</ResourceDictionary>
diff --git a/.Source/GTweak/Languages/hu/Localize.xaml b/.Source/GTweak/Languages/hu/Localize.xaml
index b1aeb6e7..7c334d08 100644
--- a/.Source/GTweak/Languages/hu/Localize.xaml
+++ b/.Source/GTweak/Languages/hu/Localize.xaml
@@ -112,9 +112,7 @@
<v:String x:Key="title_win_update">Frissítés - GTweak</v:String>
<v:String x:Key="title_update">Frissítés található</v:String>
<v:String x:Key="btn_upd">Frissítés</v:String>
- <v:String x:Key="download_update">Letöltés</v:String>
- <v:String x:Key="noty_update">Kérjük, várja meg a letöltés befejezését</v:String>
- <v:String x:Key="connection_update">Csatlakozás a szerverhez</v:String>
+ <v:String x:Key="connecting">Csatlakozás</v:String>
<!--#endregion-->
<!--#region Utils Page -->
@@ -560,7 +558,6 @@
<v:String x:Key="btn_cancel">Mégse</v:String>
<v:String x:Key="btn_open_dir">Mappa megnyitása</v:String>
<v:String x:Key="text_ts">Keresés név vagy szerző szerint</v:String>
- <v:String x:Key="connecting_ts">Csatlakozás</v:String>
<!--#endregion-->
</ResourceDictionary>
diff --git a/.Source/GTweak/Languages/it/Localize.xaml b/.Source/GTweak/Languages/it/Localize.xaml
index 843ac019..5a11f231 100644
--- a/.Source/GTweak/Languages/it/Localize.xaml
+++ b/.Source/GTweak/Languages/it/Localize.xaml
@@ -112,9 +112,7 @@
<v:String x:Key="title_win_update">Aggiornamento - GTweak</v:String>
<v:String x:Key="title_update">Aggiornamento trovato</v:String>
<v:String x:Key="btn_upd">Aggiorna</v:String>
- <v:String x:Key="download_update">Scaricamento</v:String>
- <v:String x:Key="noty_update">Attendere il completamento del download</v:String>
- <v:String x:Key="connection_update">Connessione al server</v:String>
+ <v:String x:Key="connecting">Connessione</v:String>
<!--#endregion-->
<!--#region Utils Page -->
@@ -560,7 +558,6 @@
<v:String x:Key="btn_cancel">Annulla</v:String>
<v:String x:Key="btn_open_dir">Apri cartella</v:String>
<v:String x:Key="text_ts">Cerca per nome o autore</v:String>
- <v:String x:Key="connecting_ts">Connessione</v:String>
<!--#endregion-->
</ResourceDictionary>
diff --git a/.Source/GTweak/Languages/ko/Localize.xaml b/.Source/GTweak/Languages/ko/Localize.xaml
index 1be267cc..79ab34a0 100644
--- a/.Source/GTweak/Languages/ko/Localize.xaml
+++ b/.Source/GTweak/Languages/ko/Localize.xaml
@@ -112,9 +112,7 @@
<v:String x:Key="title_win_update">업데이트 - GTweak</v:String>
<v:String x:Key="title_update">업데이트가 발견되었습니다</v:String>
<v:String x:Key="btn_upd">업데이트</v:String>
- <v:String x:Key="download_update">다운로드</v:String>
- <v:String x:Key="noty_update">다운로드가 완료될 때까지 기다려주세요</v:String>
- <v:String x:Key="connection_update">서버에 연결</v:String>
+ <v:String x:Key="connecting">연결 중</v:String>
<!--#endregion-->
<!--#region Utils Page -->
@@ -560,7 +558,6 @@
<v:String x:Key="btn_cancel">취소</v:String>
<v:String x:Key="btn_open_dir">폴더 열기</v:String>
<v:String x:Key="text_ts">이름 또는 작성자로 검색</v:String>
- <v:String x:Key="connecting_ts">연결 중</v:String>
<!--#endregion-->
</ResourceDictionary>
diff --git a/.Source/GTweak/Languages/pl/Localize.xaml b/.Source/GTweak/Languages/pl/Localize.xaml
index cf00b56b..f99bf8e2 100644
--- a/.Source/GTweak/Languages/pl/Localize.xaml
+++ b/.Source/GTweak/Languages/pl/Localize.xaml
@@ -112,9 +112,7 @@
<v:String x:Key="title_win_update">Aktualizacja - GTweak</v:String>
<v:String x:Key="title_update">Znaleziono aktualizację</v:String>
<v:String x:Key="btn_upd">Aktualizuj</v:String>
- <v:String x:Key="download_update">Pobieranie</v:String>
- <v:String x:Key="noty_update">Proszę poczekać na zakończenie pobierania</v:String>
- <v:String x:Key="connection_update">Łączenie z serwerem</v:String>
+ <v:String x:Key="connecting">Łączenie</v:String>
<!--#endregion-->
<!--#region Utils Page -->
@@ -177,7 +175,7 @@
<v:String x:Key="tgl18_conf">Prowadzenie rejestru zachowania użytkownika</v:String>
<v:String x:Key="tgl19_conf">Zbieranie danych i aktualizacje w tle map offline</v:String>
<v:String x:Key="tgl20_conf">Zbieranie i monitorowanie telemetrii Intel</v:String>
-
+
<v:String x:Key="tgl1_desc_conf">System Windows tworzy unikalny identyfikator reklamowy dla każdego użytkownika w celu śledzenia jego działań. Jest on używany przez deweloperów aplikacji i sam Windows do własnych celów, w tym do wyświetlania spersonalizowanych reklam w aplikacjach.</v:String>
<v:String x:Key="tgl2_desc_conf">Nawet korzystając z konta lokalnego, system Windows stale próbuje synchronizować dane z serwerami Microsoft. Dotyczy to m.in.: motywów, haseł, ustawień systemu Windows, ustawień przeglądarki, ustawień paska języka, ustawień ułatwień dostępu i innych ustawień dodatkowych.</v:String>
<v:String x:Key="tgl3_desc_conf">Telemetria (dane diagnostyczne) to dane, które system Windows automatycznie gromadzi i wysyła na serwery Microsoft, czyli w skrócie: „Co? Gdzie? Dlaczego i kiedy tego używasz?". Microsoft twierdzi, że dane są anonimowe i pomagają rozwijać system Windows. Nawet jeśli nie martwi Cię sam fakt zbierania informacji, może pojawić się inny problem — nadmierne obciążenie procesora, które z kolei spowalnia system.</v:String>
@@ -203,20 +201,24 @@
<!--#region Interface Page -->
<v:String x:Key="color1_intf">Kolor zaznaczenia kursorem:</v:String>
<v:String x:Key="color2_intf">Kolor podpowiedzi:</v:String>
+
<v:String x:Key="exblock1_intf">Elementy nawigacji Eksploratora:</v:String>
<v:String x:Key="chk_home_intf">Strona główna</v:String>
<v:String x:Key="chk_gallery_intf">Galeria</v:String>
+
<v:String x:Key="exblock2_intf">Ustawienia wyświetlania Eksploratora plików:</v:String>
<v:String x:Key="chk_hidden_intf">Pokazuj ukryte pliki i foldery</v:String>
<v:String x:Key="chk_system_intf">Pokazuj ukryte chronione pliki systemowe</v:String>
<v:String x:Key="chk_extension_intf">Wyświetlaj rozszerzenia nazw plików</v:String>
<v:String x:Key="chk_emptydrives_intf">Wyświetlaj puste dyski</v:String>
+
<v:String x:Key="exblock3_intf">Wyświetlanie ikon pulpitu:</v:String>
<v:String x:Key="chk_pc_intf">Ten komputer</v:String>
<v:String x:Key="chk_net_intf">Sieć</v:String>
<v:String x:Key="chk_trash_intf">Kosz</v:String>
<v:String x:Key="chk_panel_intf">Panel sterowania</v:String>
<v:String x:Key="chk_user_intf">Pliki użytkownika</v:String>
+
<v:String x:Key="tgl1_intf">Standardowy rozmiar przycisków systemowych</v:String>
<v:String x:Key="tgl2_intf">Standardowa częstotliwość migania kursora</v:String>
<v:String x:Key="tgl3_intf">Standardowy rozmiar paska przewijania</v:String>
@@ -246,6 +248,7 @@
<v:String x:Key="tgl27_intf">Wyszukiwanie z integracją «Bing» w menu Start</v:String>
<v:String x:Key="tgl28_intf">Otwieraj «Szybki dostęp» zamiast «Ten komputer»</v:String>
<v:String x:Key="tgl29_intf">Samoczynne zmiany jasności</v:String>
+
<v:String x:Key="color1_desc_intf">Zmienia kolor tła podczas zaznaczania tekstu lub obiektów kursorem w systemie.</v:String>
<v:String x:Key="color2_desc_intf">Zmienia kolor podpowiedzi w obsługiwanych aplikacjach.</v:String>
<v:String x:Key="exblock1_desc_intf">Zmienia widoczność wbudowanych elementów systemowych w panelu nawigacji, których nie można odpiąć zwykłymi metodami.</v:String>
@@ -286,6 +289,7 @@
<v:String x:Key="warn_part1_pkg">Aplikacje zostaną usunięte</v:String>
<v:String x:Key="warn_part2_pkg">na zawsze,</v:String>
<v:String x:Key="warn_part3_pkg">ale OneDrive można przywrócić klikając jego ikonę</v:String>
+
<v:String x:Key="MicrosoftStore_pkg">Microsoft Store</v:String>
<v:String x:Key="Xbox_pkg">Microsoft Xbox</v:String>
<v:String x:Key="OneNote_pkg">Microsoft Office OneNote</v:String>
@@ -359,6 +363,7 @@
<v:String x:Key="iHeartRadio_pkg">iHeart: Radio, Muzyka, Podcasty</v:String>
<v:String x:Key="Pandora_pkg">Pandora</v:String>
<v:String x:Key="DolbyAccess_pkg">Dolby Access</v:String>
+
<v:String x:Key="title_over_pkg">Potwierdzenie odinstalowania</v:String>
<v:String x:Key="text_over_pkg" xml:space="preserve">Zamierzasz odinstalować przeglądarkę Microsoft Edge. Spowoduje to również usunięcie komponentu EdgeWebView, który służy do wyświetlania treści internetowych w różnych aplikacjach — takich jak Microsoft Office (np. Meeting Insights, Room Finder), aplikacja Zdjęcia (nowa wersja używa WebView2), niektóre boty Telegrama i inne programy korzystające z osadzonego WebView. Przed kontynuowaniem upewnij się, że nie potrzebujesz tego komponentu.
W najnowszych kompilacjach systemu Windows 11 Copilot jest zaimplementowany przez EdgeWebView jako PWA lub nakładka systemowa. Po odinstalowaniu Edge, Copilot również zostaje usunięty, ponieważ działa jako nakładka internetowa.</v:String>
@@ -401,6 +406,7 @@
<v:String x:Key="tgl31_svc">Usługi związane z aktualizowaniem Microsoft Edge</v:String>
<v:String x:Key="tgl32_svc">Usługa harmonogramu klas multimediów</v:String>
<v:String x:Key="tgl33_svc">Usługa geolokalizacji Windows</v:String>
+
<v:String x:Key="tgl1_desc_svc">Wyłącz, jeśli nie korzystasz z historii plików i indeksowania zawartości.</v:String>
<v:String x:Key="tgl2_desc_svc">Wyłącz, jeśli nie korzystasz z Xbox i gamepadów Microsoft.</v:String>
<v:String x:Key="tgl3_desc_svc">Wyłącz, jeśli nie planujesz aktualizować systemu Windows. Oprócz usług, poprawka zmieni pliki odpowiedzialne za aktualizacje Windows. Z tego powodu nawet po włączeniu usług Centrum aktualizacji nie będzie działać. Pamiętaj, że poprawka wpływa na pobieranie i aktualizowanie aplikacji ze Sklepu Windows.</v:String>
@@ -471,6 +477,7 @@
<v:String x:Key="tgl28_sys">Defragmentacja dysku systemowego</v:String>
<v:String x:Key="tgl29_sys">Wstrzymaj aktualizacje systemu Windows</v:String>
<v:String x:Key="tgl30_sys">Multiplane Overlay (MPO)</v:String>
+
<v:String x:Key="slider1_desc_sys">Zmienia szybkość kursora myszy, oszczędzając czas na szukaniu parametrów myszy.</v:String>
<v:String x:Key="slider2_desc_sys">Zmieni opóźnienie przed rozpoczęciem powtarzania wprowadzonego znaku, zalecana wartość to 0.</v:String>
<v:String x:Key="slider3_desc_sys">Zmienia częstotliwość powtarzania wprowadzonego znaku, zalecana wartość to 31.</v:String>
@@ -551,7 +558,6 @@
<v:String x:Key="btn_cancel">Anuluj</v:String>
<v:String x:Key="btn_open_dir">Otwórz folder</v:String>
<v:String x:Key="text_ts">Szukaj według nazwy lub autora</v:String>
- <v:String x:Key="connecting_ts">Łączenie</v:String>
<!--#endregion-->
-</ResourceDictionary>
\ No newline at end of file
+</ResourceDictionary>
diff --git a/.Source/GTweak/Languages/pt-BR/Localize.xaml b/.Source/GTweak/Languages/pt-BR/Localize.xaml
index b41fcf2b..56e0a78b 100644
--- a/.Source/GTweak/Languages/pt-BR/Localize.xaml
+++ b/.Source/GTweak/Languages/pt-BR/Localize.xaml
@@ -112,9 +112,7 @@
<v:String x:Key="title_win_update">Atualização - GTweak</v:String>
<v:String x:Key="title_update">Uma atualização foi encontrada</v:String>
<v:String x:Key="btn_upd">Atualizar</v:String>
- <v:String x:Key="download_update">Baixando</v:String>
- <v:String x:Key="noty_update">Aguarde a conclusão do download</v:String>
- <v:String x:Key="connection_update">Conectando ao servidor</v:String>
+ <v:String x:Key="connecting">Conectando</v:String>
<!--#endregion-->
<!--#region Utils Page -->
@@ -408,7 +406,7 @@
<v:String x:Key="tgl31_svc">Serviços relacionados à atualização do Microsoft Edge</v:String>
<v:String x:Key="tgl32_svc">Serviço de Agendador de Classes Multimídia</v:String>
<v:String x:Key="tgl33_svc">Serviço de Geolocalização do Windows</v:String>
-
+
<v:String x:Key="tgl1_desc_svc">Desative se você não usa histórico de arquivos e indexação de conteúdo.</v:String>
<v:String x:Key="tgl2_desc_svc">Desative se você não usa Xbox e gamepads da Microsoft.</v:String>
<v:String x:Key="tgl3_desc_svc">Desative se você não planeja atualizar o Windows. Além dos serviços, o ajuste mudará os arquivos responsáveis pelas atualizações do Windows. Por causa disso, mesmo que os serviços estejam ativados, a Central de Atualizações não funcionará. Observe que o ajuste afeta o download e a atualização de aplicativos da Windows Store.</v:String>
@@ -560,7 +558,6 @@
<v:String x:Key="btn_cancel">Cancelar</v:String>
<v:String x:Key="btn_open_dir">Abrir pasta</v:String>
<v:String x:Key="text_ts">Pesquisar por nome ou autor</v:String>
- <v:String x:Key="connecting_ts">Conectando</v:String>
<!--#endregion-->
</ResourceDictionary>
diff --git a/.Source/GTweak/Languages/ru/Localize.xaml b/.Source/GTweak/Languages/ru/Localize.xaml
index 3a2d6cc0..343fcd4d 100644
--- a/.Source/GTweak/Languages/ru/Localize.xaml
+++ b/.Source/GTweak/Languages/ru/Localize.xaml
@@ -112,9 +112,7 @@
<v:String x:Key="title_win_update">Обновление - GTweak</v:String>
<v:String x:Key="title_update">Найдено обновление</v:String>
<v:String x:Key="btn_upd">Обновить</v:String>
- <v:String x:Key="download_update">Скачивания</v:String>
- <v:String x:Key="noty_update">Пожалуйста, дождитесь завершения загрузки</v:String>
- <v:String x:Key="connection_update">Подключение к серверу</v:String>
+ <v:String x:Key="connecting">Подключение</v:String>
<!--#endregion-->
<!--#region Utils Page -->
@@ -408,7 +406,7 @@
<v:String x:Key="tgl31_svc">Службы связанные с обновлением Microsoft Edge</v:String>
<v:String x:Key="tgl32_svc">Служба планировщика классов мультимедиа</v:String>
<v:String x:Key="tgl33_svc">Служба геолокации Windows</v:String>
-
+
<v:String x:Key="tgl1_desc_svc">Отключайте, если вы не используете историю файлов и индексирование контента.</v:String>
<v:String x:Key="tgl2_desc_svc">Отключайте, если вы не используете Xbox и геймпады Microsoft.</v:String>
<v:String x:Key="tgl3_desc_svc">Отключайте, если вы не планируете обновлять Windows. Помимо служб, твик изменит файлы, отвечающие за обновления Windows. Из-за этого, даже если службы будут включены, Центр обновлений работать не будет. Обратите внимание, что твик влияет на скачивание и обновление приложений из Магазина Windows.</v:String>
@@ -560,7 +558,6 @@
<v:String x:Key="btn_cancel">Отмена</v:String>
<v:String x:Key="btn_open_dir">Открыть папку</v:String>
<v:String x:Key="text_ts">Поиск по названию или автору</v:String>
- <v:String x:Key="connecting_ts">Подключение</v:String>
<!--#endregion-->
</ResourceDictionary>
diff --git a/.Source/GTweak/Languages/sl-SI/Localize.xaml b/.Source/GTweak/Languages/sl-SI/Localize.xaml
index 95806a8c..ac7284d5 100644
--- a/.Source/GTweak/Languages/sl-SI/Localize.xaml
+++ b/.Source/GTweak/Languages/sl-SI/Localize.xaml
@@ -112,9 +112,7 @@
<v:String x:Key="title_win_update">Posodobitev - GTweak</v:String>
<v:String x:Key="title_update">Najdena je bila posodobitev</v:String>
<v:String x:Key="btn_upd">Posodobi</v:String>
- <v:String x:Key="download_update">Prenos</v:String>
- <v:String x:Key="noty_update">Počakajte na dokončanje prenosa</v:String>
- <v:String x:Key="connection_update">Povezovanje s strežnikom</v:String>
+ <v:String x:Key="connecting">Povezovanje</v:String>
<!--#endregion-->
<!--#region Utils Page -->
@@ -560,7 +558,6 @@
<v:String x:Key="btn_cancel">Prekliči</v:String>
<v:String x:Key="btn_open_dir">Odpri mapo</v:String>
<v:String x:Key="text_ts">Iskanje po imenu ali avtorju</v:String>
- <v:String x:Key="connecting_ts">Povezovanje</v:String>
<!--#endregion-->
</ResourceDictionary>
diff --git a/.Source/GTweak/Languages/th/Localize.xaml b/.Source/GTweak/Languages/th/Localize.xaml
index 19d021f3..93c35136 100644
--- a/.Source/GTweak/Languages/th/Localize.xaml
+++ b/.Source/GTweak/Languages/th/Localize.xaml
@@ -112,9 +112,7 @@
<v:String x:Key="title_win_update">อัปเดต - GTweak</v:String>
<v:String x:Key="title_update">พบอัปเดต</v:String>
<v:String x:Key="btn_upd">อัปเดต</v:String>
- <v:String x:Key="download_update">กำลังดาวน์โหลด</v:String>
- <v:String x:Key="noty_update">โปรดรอให้การดาวน์โหลดเสร็จสมบูรณ์</v:String>
- <v:String x:Key="connection_update">กำลังเชื่อมต่อกับเซิร์ฟเวอร์</v:String>
+ <v:String x:Key="connecting">กำลังเชื่อมต่อ</v:String>
<!--#endregion-->
<!--#region Utils Page -->
@@ -560,7 +558,6 @@
<v:String x:Key="btn_cancel">ยกเลิก</v:String>
<v:String x:Key="btn_open_dir">เปิดโฟลเดอร์</v:String>
<v:String x:Key="text_ts">ค้นหาตามชื่อหรือผู้เขียน</v:String>
- <v:String x:Key="connecting_ts">กำลังเชื่อมต่อ</v:String>
<!--#endregion-->
</ResourceDictionary>
diff --git a/.Source/GTweak/Languages/tr/Localize.xaml b/.Source/GTweak/Languages/tr/Localize.xaml
index f604243d..fd3d2805 100644
--- a/.Source/GTweak/Languages/tr/Localize.xaml
+++ b/.Source/GTweak/Languages/tr/Localize.xaml
@@ -112,9 +112,7 @@
<v:String x:Key="title_win_update">Güncelleme - GTweak</v:String>
<v:String x:Key="title_update">Yeni bir güncelleme bulundu</v:String>
<v:String x:Key="btn_upd">Güncelle</v:String>
- <v:String x:Key="download_update">İndiriliyor</v:String>
- <v:String x:Key="noty_update">Lütfen indirme işleminin tamamlanmasını bekleyin</v:String>
- <v:String x:Key="connection_update">Sunucuya bağlanılıyor</v:String>
+ <v:String x:Key="connecting">Bağlanılıyor</v:String>
<!--#endregion-->
<!--#region Utils Page -->
@@ -560,7 +558,6 @@
<v:String x:Key="btn_cancel">İptal</v:String>
<v:String x:Key="btn_open_dir">Klasörü aç</v:String>
<v:String x:Key="text_ts">Ada veya yazara göre ara</v:String>
- <v:String x:Key="connecting_ts">Bağlanılıyor</v:String>
<!--#endregion-->
</ResourceDictionary>
diff --git a/.Source/GTweak/Languages/uk/Localize.xaml b/.Source/GTweak/Languages/uk/Localize.xaml
index b7f4a086..08ef5eef 100644
--- a/.Source/GTweak/Languages/uk/Localize.xaml
+++ b/.Source/GTweak/Languages/uk/Localize.xaml
@@ -112,9 +112,7 @@
<v:String x:Key="title_win_update">Оновити - GTweak</v:String>
<v:String x:Key="title_update">Знайдено оновлення</v:String>
<v:String x:Key="btn_upd">Оновити</v:String>
- <v:String x:Key="download_update">Завантаження</v:String>
- <v:String x:Key="noty_update">Будь ласка, дочекайтеся завершення завантаження</v:String>
- <v:String x:Key="connection_update">Підключення до сервера</v:String>
+ <v:String x:Key="connecting">Підключення</v:String>
<!--#endregion-->
<!--#region Utils Page -->
@@ -560,7 +558,6 @@
<v:String x:Key="btn_cancel">Скасувати</v:String>
<v:String x:Key="btn_open_dir">Відкрити папку</v:String>
<v:String x:Key="text_ts">Пошук за назвою або автором</v:String>
- <v:String x:Key="connecting_ts">Підключення</v:String>
<!--#endregion-->
</ResourceDictionary>
diff --git a/.Source/GTweak/Languages/zh-CN/Localize.xaml b/.Source/GTweak/Languages/zh-CN/Localize.xaml
index 40fd2a3e..209db491 100644
--- a/.Source/GTweak/Languages/zh-CN/Localize.xaml
+++ b/.Source/GTweak/Languages/zh-CN/Localize.xaml
@@ -112,9 +112,7 @@
<v:String x:Key="title_win_update">更新 - GTweak</v:String>
<v:String x:Key="title_update">已找到更新</v:String>
<v:String x:Key="btn_upd">更新</v:String>
- <v:String x:Key="download_update">正在下载</v:String>
- <v:String x:Key="noty_update">请等待下载完成</v:String>
- <v:String x:Key="connection_update">正在连接服务器</v:String>
+ <v:String x:Key="connecting">连接中</v:String>
<!--#endregion-->
<!--#region Utils Page -->
@@ -408,7 +406,7 @@
<v:String x:Key="tgl31_svc">与 Microsoft Edge 组件更新相关的服务</v:String>
<v:String x:Key="tgl32_svc">多媒体类调度服务</v:String>
<v:String x:Key="tgl33_svc">Windows 地理位置服务</v:String>
-
+
<v:String x:Key="tgl1_desc_svc">若您未使用文档历史记录与内容索引功能,请停用此设置。</v:String>
<v:String x:Key="tgl2_desc_svc">若您未使用 Xbox 与 Microsoft 游戏控制器,请停用此设置。</v:String>
<v:String x:Key="tgl3_desc_svc">若您不打算更新 Windows,请停用此设置。此调整除变更服务外,亦会修改负责 Windows 更新的文档。因此即使服务处于启用状态,更新中心仍将无法运作。请注意此调整将影响从 Windows 市集下载及更新应用程序。</v:String>
@@ -560,7 +558,6 @@
<v:String x:Key="btn_cancel">取消</v:String>
<v:String x:Key="btn_open_dir">打开文件夹</v:String>
<v:String x:Key="text_ts">按名称或作者搜索</v:String>
- <v:String x:Key="connecting_ts">连接中</v:String>
<!--#endregion-->
</ResourceDictionary>
diff --git a/.Source/GTweak/Languages/zh-TW/Localize.xaml b/.Source/GTweak/Languages/zh-TW/Localize.xaml
index 9104620b..53155f4d 100644
--- a/.Source/GTweak/Languages/zh-TW/Localize.xaml
+++ b/.Source/GTweak/Languages/zh-TW/Localize.xaml
@@ -112,9 +112,7 @@
<v:String x:Key="title_win_update">更新 - GTweak</v:String>
<v:String x:Key="title_update">已找到更新</v:String>
<v:String x:Key="btn_upd">更新</v:String>
- <v:String x:Key="download_update">正在下載</v:String>
- <v:String x:Key="noty_update">請等待下載完成</v:String>
- <v:String x:Key="connection_update">正在連接伺服器</v:String>
+ <v:String x:Key="connecting">連線中</v:String>
<!--#endregion-->
<!--#region Utils Page -->
@@ -560,7 +558,6 @@
<v:String x:Key="btn_cancel">取消</v:String>
<v:String x:Key="btn_open_dir">開啟資料夾</v:String>
<v:String x:Key="text_ts">依名稱或作者搜尋</v:String>
- <v:String x:Key="connecting_ts">連線中</v:String>
<!--#endregion-->
</ResourceDictionary>
diff --git a/.Source/GTweak/Windows/MainWindow.xaml b/.Source/GTweak/Windows/MainWindow.xaml
index 4ee1a225..4a40f729 100644
--- a/.Source/GTweak/Windows/MainWindow.xaml
+++ b/.Source/GTweak/Windows/MainWindow.xaml
@@ -253,7 +253,6 @@
<Grid Grid.ColumnSpan="2" Panel.ZIndex="100" VerticalAlignment="Top">
<Border Margin="0,15,0,50" MinWidth="70" MaxWidth="320" HorizontalAlignment="Left" ClipToBounds="True">
-
<ScrollViewer x:Name="NavScroll" Padding="0,0,15,0" SizeChanged="NavigationScrollViewer_SizeChanged" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled" FlowDirection="RightToLeft">
<StackPanel x:Name="NavPanel" Orientation="Vertical" FlowDirection="LeftToRight" RadioButton.Checked="NavigationRtbn_Checked">
@@ -329,26 +328,25 @@
<TranslateTransform Y="-20"/>
</Grid.RenderTransform>
- <Border Background="{StaticResource Brush_ShadowOverlay}" Opacity="0.7" IsHitTestVisible="False" CornerRadius="10" Panel.ZIndex="0">
+ <Border Background="{StaticResource Brush_ShadowOverlay}" Opacity="0.7" IsHitTestVisible="False" CornerRadius="7" Panel.ZIndex="0">
<Border.RenderTransform>
<TranslateTransform X="3" Y="4"/>
</Border.RenderTransform>
</Border>
- <Border Background="{StaticResource Brush_Background_TextBox}" Padding="14,10" CornerRadius="10" Panel.ZIndex="1" BorderBrush="{StaticResource Brush_Separator}" BorderThickness="1">
+ <Border Background="{StaticResource Brush_Background_NavPanel}" Padding="14,10" CornerRadius="7" Panel.ZIndex="1" BorderBrush="{StaticResource Brush_Separator}" BorderThickness="1">
<Grid>
<Grid.ColumnDefinitions>
- <ColumnDefinition Width="4"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
- <Border Grid.Column="0" Background="{StaticResource Brush_Separator}" CornerRadius="2"/>
-
- <ui:SymbolIcon Grid.Column="1" Symbol="Pin20" FontSize="25" Foreground="{StaticResource Brush_Accent}" Margin="12,0,10,0" VerticalAlignment="Center"/>
-
- <StackPanel Grid.Column="2" VerticalAlignment="Center">
+ <Border Grid.Column="0" Grid.RowSpan="2" Width="38" Height="38" CornerRadius="8" Background="{StaticResource Brush_Background_Labels}" BorderBrush="{StaticResource Brush_Accent}" BorderThickness="1" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="0,0,10,0">
+ <ui:SymbolIcon Symbol="Pin20" FontSize="20px" Foreground="{StaticResource Brush_Accent}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+ </Border>
+
+ <StackPanel Grid.Column="1" VerticalAlignment="Center">
<TextBlock Text="{DynamicResource title_update}" Style="{StaticResource TextDefault}"/>
<TextBlock FontSize="13" Style="{StaticResource TextDefault}" Foreground="{StaticResource Brush_Inactive}">
<Run Text="{Binding CurrentVersion, Mode=OneWay}"/>
@@ -357,7 +355,7 @@
</TextBlock>
</StackPanel>
- <Button Grid.Column="3" Style="{StaticResource ButtonContent_Inverted}" Content="{DynamicResource btn_upd}" Height="28" Margin="16,0,0,0" PreviewMouseLeftButtonUp="BtnUpdate_PreviewMouseLeftButtonUp"/>
+ <Button Grid.Column="2" Style="{StaticResource ButtonContent_Inverted}" Content="{DynamicResource btn_upd}" Height="28" Margin="16,0,0,0" PreviewMouseLeftButtonUp="BtnUpdate_PreviewMouseLeftButtonUp"/>
</Grid>
</Border>
</Grid>
diff --git a/.Source/GTweak/Windows/UpdateWindow.xaml b/.Source/GTweak/Windows/UpdateWindow.xaml
index 7590d474..450eb5ea 100644
--- a/.Source/GTweak/Windows/UpdateWindow.xaml
+++ b/.Source/GTweak/Windows/UpdateWindow.xaml
@@ -1,4 +1,4 @@
-<ui:FluentWindow x:Class="GTweak.Windows.UpdateWindow"
+<ui:FluentWindow x:Class="GTweak.Windows.UpdateWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -7,41 +7,79 @@
xmlns:local="clr-namespace:GTweak.Windows"
mc:Ignorable="d" Icon="/GTweak.ico"
Background="Transparent" WindowStyle="None" IsTabStop="False" SnapsToDevicePixels="True" UseLayoutRounding="True" KeyboardNavigation.TabNavigation="None"
- ExtendsContentIntoTitleBar="True" WindowBackdropType="Mica" SizeToContent="Height" ResizeMode="NoResize" WindowStartupLocation="CenterScreen"
- Title="{DynamicResource title_win_update}" Topmost="True" MaxWidth="400" MaxHeight="250" MinHeight="120" MinWidth="360" Loaded="Window_Loaded">
- <Grid Background="{StaticResource Brush_Background}">
+ ExtendsContentIntoTitleBar="True" WindowBackdropType="Mica" ResizeMode="NoResize" WindowStartupLocation="CenterScreen"
+ Title="{DynamicResource title_win_update}" Topmost="True"
+ SizeToContent="Width" Height="58" MinHeight="58" MaxHeight="58" MinWidth="200" Loaded="Window_Loaded">
+
+ <Grid Background="{StaticResource Brush_Background_NavPanel}" MouseDown="TitleBar_MouseDown">
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="Auto"/>
+ <ColumnDefinition Width="Auto"/>
+ <ColumnDefinition Width="Auto"/>
+ </Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
- <RowDefinition Height="*"/>
+ <RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
- <Grid Grid.Row="0" MouseDown="TitleBar_MouseDown" Background="Transparent">
- <DockPanel VerticalAlignment="Center" HorizontalAlignment="Left" LastChildFill="True" Height="48">
- <ui:SymbolIcon Symbol="CloudArrowDown24" FontSize="20px" Foreground="{StaticResource Brush_Accent}" Margin="15,5,0,0" HorizontalAlignment="Center"/>
- <Viewbox Stretch="None">
- <TextBlock Style="{StaticResource TextDefault}" FontSize="18px" Margin="5,0,100,0">
- <Run Text="{DynamicResource download_update}"/>
- <Run Text="“"/><Run Text="GTweak" Foreground="{StaticResource Brush_Accent}"/>
- <Run Text="{Binding DownloadVersion}" Foreground="{StaticResource Brush_Accent}"/><Run Text="”"/>
- </TextBlock>
- </Viewbox>
- </DockPanel>
- </Grid>
+ <Border Grid.Column="0" Grid.RowSpan="2" Width="38" Height="38" CornerRadius="8" Background="{StaticResource Brush_Background_Labels}" BorderBrush="{StaticResource Brush_Accent}" BorderThickness="1" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="12,10,12,10">
+ <ui:SymbolIcon Symbol="CloudArrowDown24" FontSize="20px" Foreground="{StaticResource Brush_Accent}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+ </Border>
- <Grid Grid.Row="1">
- <StackPanel>
- <TextBlock Text="{DynamicResource noty_update}" Foreground="{StaticResource Brush_TextBlock_Inactivity}" Height="auto" Width="auto" FontFamily="{StaticResource Jura}" FontSize="13px" HorizontalAlignment="Left" Margin="10,0,0,0"/>
- <ProgressBar x:Name="ProgressDownload" Value="0" Foreground="{StaticResource Brush_Accent}" HorizontalAlignment="Left" Margin="10,10,0,0" VerticalAlignment="Top" Width="340" Height="10"/>
- <StackPanel Orientation="Horizontal">
- <TextBlock TextAlignment="Center" Style="{StaticResource TextDefault}" Foreground="{StaticResource Brush_TextBlock_Inactivity}" FontSize="13px" Margin="10,5,0,0">
- <Run FontFamily="{StaticResource Play}" Text="{Binding ElementName=ProgressDownload, Path=Value, Mode=OneWay,StringFormat=N0}"/>
- <Run Text="% ● "/>
- <Run x:Name="SizeByte" Text="{DynamicResource connection_update}"/>
+ <TextBlock Grid.Column="1" Grid.Row="0" VerticalAlignment="Bottom" Margin="0,0,0,3" Style="{StaticResource TextDefault}" FontSize="15px">
+ <Run Text="GTweak" Foreground="{StaticResource Brush_Highlighted}"/> <Run Text="{Binding DownloadVersion}" Foreground="{StaticResource Brush_Accent}"/>
+ </TextBlock>
+
+ <TextBlock Grid.Column="2" Grid.Row="0" VerticalAlignment="Bottom" Margin="50,0,12,3" FontSize="13px" Foreground="{StaticResource Brush_TextBlock_Inactivity}">
+ <TextBlock.Style>
+ <Style TargetType="TextBlock" BasedOn="{StaticResource TextDefault}">
+ <Setter Property="Visibility" Value="Collapsed"/>
+ <Style.Triggers>
+ <DataTrigger Binding="{Binding ElementName=ProgressDownload, Path=Value}" Value="0">
+ <Setter Property="Visibility" Value="Visible"/>
+ </DataTrigger>
+ </Style.Triggers>
+ </Style>
+ </TextBlock.Style>
+ <Run Text="{DynamicResource connecting}"/><InlineUIContainer BaselineAlignment="Baseline">
+ <Border Width="16" Background="Transparent" VerticalAlignment="Bottom" Margin="0,0,0,-2">
+ <TextBlock x:Name="DotText" Style="{StaticResource TextDefault}" FontSize="14px" Foreground="{StaticResource Brush_TextBlock_Inactivity}">
+ <TextBlock.Triggers>
+ <EventTrigger RoutedEvent="FrameworkElement.Loaded">
+ <BeginStoryboard>
+ <Storyboard Timeline.DesiredFrameRate="60" RepeatBehavior="Forever" Duration="0:0:1">
+ <ObjectAnimationUsingKeyFrames Storyboard.TargetName="DotText" Storyboard.TargetProperty="Text">
+ <DiscreteObjectKeyFrame KeyTime="0:0:0" Value="" />
+ <DiscreteObjectKeyFrame KeyTime="0:0:0.2" Value="." />
+ <DiscreteObjectKeyFrame KeyTime="0:0:0.4" Value=".." />
+ <DiscreteObjectKeyFrame KeyTime="0:0:0.6" Value="..." />
+ </ObjectAnimationUsingKeyFrames>
+ </Storyboard>
+ </BeginStoryboard>
+ </EventTrigger>
+ </TextBlock.Triggers>
</TextBlock>
- </StackPanel>
- </StackPanel>
- </Grid>
+ </Border>
+ </InlineUIContainer>
+ </TextBlock>
+
+ <TextBlock Grid.Column="2" Grid.Row="0" VerticalAlignment="Bottom" Margin="30,0,12,3" FontFamily="{StaticResource Play}" FontSize="13px" Foreground="{StaticResource Brush_TextBlock_Inactivity}">
+ <TextBlock.Style>
+ <Style TargetType="TextBlock" BasedOn="{StaticResource TextDefault}">
+ <Setter Property="Visibility" Value="Visible"/>
+ <Style.Triggers>
+ <DataTrigger Binding="{Binding ElementName=ProgressDownload, Path=Value}" Value="0">
+ <Setter Property="Visibility" Value="Collapsed"/>
+ </DataTrigger>
+ </Style.Triggers>
+ </Style>
+ </TextBlock.Style>
+ <Run Text="{Binding ElementName=ProgressDownload, Path=Value, Mode=OneWay, StringFormat=N0}"/>
+ <Run Text="% · "/>
+ <Run x:Name="SizeByte" Text="0/0"/>
+ </TextBlock>
+ <ProgressBar x:Name="ProgressDownload" Grid.Column="1" Grid.Row="1" Grid.ColumnSpan="2" Value="0" Foreground="{StaticResource Brush_Accent}" Height="4" Margin="0,4,12,0" VerticalAlignment="Top"/>
</Grid>
-
-</ui:FluentWindow>
+
+</ui:FluentWindow>
\ No newline at end of file
diff --git a/.Source/GTweak/Windows/UpdateWindow.xaml.cs b/.Source/GTweak/Windows/UpdateWindow.xaml.cs
index 2c72bcd0..cc65dabc 100644
--- a/.Source/GTweak/Windows/UpdateWindow.xaml.cs
+++ b/.Source/GTweak/Windows/UpdateWindow.xaml.cs
@@ -12,7 +12,7 @@ namespace GTweak.Windows
{
public partial class UpdateWindow : FluentWindow
{
- public string DownloadVersion { get; set; } = HardwareProvider.DownloadVersion;
+ public string DownloadVersion { get; set; } = NetworkProvider.DownloadVersion;
public UpdateWindow()
{
@@ -38,7 +38,7 @@ namespace GTweak.Windows
webClient.DownloadProgressChanged += (_, e) =>
{
ProgressDownload.Value = e.ProgressPercentage;
- SizeByte.Text = $"{Math.Round(e.BytesReceived / 1024.0)} KB / {Math.Round(e.TotalBytesToReceive / 1024.0)} KB";
+ SizeByte.Text = $"{e.BytesReceived / 1048576.0:F1} MB / {e.TotalBytesToReceive / 1048576.0:F1} MB";
};
webClient.DownloadFileCompleted += delegate
{