Skip to content

Portable Tool for an Ideal Windows Setup

add tag filtering, refine Toolset/Addons views & input controls

Greedeksb17de8dbab75
diff --git a/.Source/GTweak/Behaviors/TextBoxClearBehavior.cs b/.Source/GTweak/Behaviors/TextBoxClearBehavior.cs
index fc408fa5..aaf532c1 100644
--- a/.Source/GTweak/Behaviors/TextBoxClearBehavior.cs
+++ b/.Source/GTweak/Behaviors/TextBoxClearBehavior.cs
@@ -1,5 +1,6 @@
using System.Windows;
using System.Windows.Controls;
+using System.Windows.Input;
namespace GTweak.Behaviors
{
@@ -53,7 +54,7 @@ namespace GTweak.Behaviors
if (sender is Button clearButton && clearButton.TemplatedParent is TextBox textBox)
{
textBox.Clear();
- textBox.Focus();
+ Keyboard.ClearFocus();
}
}
diff --git a/.Source/GTweak/Core/Model/ToolsetModel.cs b/.Source/GTweak/Core/Model/ToolsetModel.cs
index bdbb82f2..501bcef9 100644
--- a/.Source/GTweak/Core/Model/ToolsetModel.cs
+++ b/.Source/GTweak/Core/Model/ToolsetModel.cs
@@ -1,14 +1,18 @@
+using System;
using System.Windows;
using System.Windows.Media;
using Newtonsoft.Json.Linq;
namespace GTweak.Core.Models
{
+ internal enum FilterTag { All, Driver, Tool, Diagnostics, Benchmark, Overclock }
+
internal class ToolsetModel
{
public ImageSource AppIcon { get; }
public string AppName { get; }
public string Group { get; }
+ public FilterTag[] Tags { get; }
public ImageSource PlaceholderIcon { get; }
public string AuthorName { get; }
public string AuthorIconUrl { get; }
@@ -35,6 +39,7 @@ namespace GTweak.Core.Models
AppIcon = Application.Current?.TryFindResource(appObject["icon"]?.ToString() ?? string.Empty) as ImageSource;
AppName = appObject["name"]?.ToString() ?? string.Empty;
Group = appObject["group"]?.ToString() ?? string.Empty;
+ Tags = ParseTags(appObject["tags"]?.ToObject<string[]>());
PlaceholderIcon = Application.Current?.TryFindResource(appObject["placeholderIcon"]?.ToString() ?? string.Empty) as ImageSource;
AuthorName = appObject["author"]?.ToString() ?? string.Empty;
AuthorIconUrl = appObject["authorIcon"]?.ToString() ?? string.Empty;
@@ -44,5 +49,21 @@ namespace GTweak.Core.Models
UrlPattern = appObject["urlPattern"]?.ToString() ?? string.Empty;
FileName = appObject["fileName"]?.ToString() ?? string.Empty;
}
+
+ private static FilterTag[] ParseTags(string[] values)
+ {
+ if (values == null || values.Length == 0)
+ {
+ return Array.Empty<FilterTag>();
+ }
+
+ FilterTag[] tags = new FilterTag[values.Length];
+ for (int i = 0; i < values.Length; i++)
+ {
+ tags[i] = Enum.TryParse(values[i], true, out FilterTag tag) ? tag : FilterTag.All;
+ }
+
+ return tags;
+ }
}
}
\ No newline at end of file
diff --git a/.Source/GTweak/Core/ViewModel/AddonsViewModel.cs b/.Source/GTweak/Core/ViewModel/AddonsViewModel.cs
index eee3b4f0..1fa23f45 100644
--- a/.Source/GTweak/Core/ViewModel/AddonsViewModel.cs
+++ b/.Source/GTweak/Core/ViewModel/AddonsViewModel.cs
@@ -2,6 +2,7 @@ using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.ComponentModel;
+using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
@@ -20,6 +21,7 @@ namespace GTweak.Core.ViewModel
public ObservableCollection<AddonModel> Addons { get; } = new ObservableCollection<AddonModel>();
public ICommand SelectFolderCommand { get; }
+ public ICommand OpenFolderCommand { get; }
public ICommand UpdateCommand { get; }
private bool _isRunAsTrustedInstaller;
@@ -39,6 +41,7 @@ namespace GTweak.Core.ViewModel
if (!DesignerProperties.GetIsInDesignMode(new DependencyObject()))
{
SelectFolderCommand = new RelayCommand(_ => SelectFolder());
+ OpenFolderCommand = new RelayCommand(_ => OpenFolder());
UpdateCommand = new RelayCommand(_ => ScanFolder());
if (!string.IsNullOrWhiteSpace(GlobalOptions.UserAddonsPath) && Directory.Exists(GlobalOptions.UserAddonsPath))
@@ -68,6 +71,23 @@ namespace GTweak.Core.ViewModel
catch (Exception ex) { ErrorLogger.LogDebug(ex); }
}
+ private void OpenFolder()
+ {
+ try
+ {
+ if (Directory.Exists(GlobalOptions.UserAddonsPath))
+ {
+ Process.Start(new ProcessStartInfo
+ {
+ FileName = GlobalOptions.UserAddonsPath,
+ UseShellExecute = true,
+ Verb = "open"
+ });
+ }
+ }
+ catch (Exception ex) { ErrorLogger.LogDebug(ex); }
+ }
+
private void RunFile(AddonModel addon)
{
try
diff --git a/.Source/GTweak/Core/ViewModel/Components/ToolsetItem.cs b/.Source/GTweak/Core/ViewModel/Components/ToolsetItem.cs
index cc276640..16704571 100644
--- a/.Source/GTweak/Core/ViewModel/Components/ToolsetItem.cs
+++ b/.Source/GTweak/Core/ViewModel/Components/ToolsetItem.cs
@@ -22,6 +22,7 @@ namespace GTweak.Core.Item
public ImageSource AppIconSource { get => _appIconSource; set { _appIconSource = value; OnPropertyChanged(); } }
public string AppName => _model.AppName;
+ public FilterTag[] Tags => _model.Tags;
public string AuthorName => _model.AuthorName;
public ImageSource AuthorIconSource { get => _authorIconSource; set { _authorIconSource = value; OnPropertyChanged(); } }
public bool IsSquareIcon { get => _isSquareIcon; set { _isSquareIcon = value; OnPropertyChanged(); } }
diff --git a/.Source/GTweak/Core/ViewModel/ToolsetViewModel.cs b/.Source/GTweak/Core/ViewModel/ToolsetViewModel.cs
index 80935046..cf7a04c5 100644
--- a/.Source/GTweak/Core/ViewModel/ToolsetViewModel.cs
+++ b/.Source/GTweak/Core/ViewModel/ToolsetViewModel.cs
@@ -22,10 +22,14 @@ namespace GTweak.Core.ViewModel
private readonly FuzzySearchService _fuzzyService = new FuzzySearchService();
private string _searchText = string.Empty;
+ private FilterTag _selectedTag = FilterTag.All;
public ICollectionView ToolsView { get; }
public ICommand SelectFolderCommand { get; }
public ICommand OpenFolderCommand { get; }
+ public ICommand FilterTagCommand { get; }
+
+ public string DirectoryPath => GlobalOptions.DownloadPath;
public string SearchText
{
@@ -47,6 +51,15 @@ namespace GTweak.Core.ViewModel
{
SelectFolderCommand = new RelayCommand(_ => SelectFolder());
OpenFolderCommand = new RelayCommand(_ => OpenFolder());
+ FilterTagCommand = new RelayCommand(tag =>
+ {
+ if (tag is FilterTag t)
+ {
+ _selectedTag = t;
+ }
+
+ ToolsView?.Refresh();
+ });
ToolsView = CollectionViewSource.GetDefaultView(Tools);
ToolsView.Filter = FilterTools;
@@ -80,6 +93,11 @@ namespace GTweak.Core.ViewModel
{
if (obj is ToolsetItem item)
{
+ if (!(_selectedTag == FilterTag.All || item.Tags.Contains(_selectedTag)))
+ {
+ return false;
+ }
+
if (string.IsNullOrWhiteSpace(_searchText))
{
return true;
@@ -104,6 +122,7 @@ namespace GTweak.Core.ViewModel
if (folderDialog.ShowDialog() == true)
{
GlobalOptions.DownloadPath = folderDialog.SelectedPath;
+ OnPropertyChanged(nameof(DirectoryPath));
}
}
catch (Exception ex) { ErrorLogger.LogDebug(ex); }
diff --git a/.Source/GTweak/Languages/en/Localize.xaml b/.Source/GTweak/Languages/en/Localize.xaml
index 32c0ddca..45ea3e47 100644
--- a/.Source/GTweak/Languages/en/Localize.xaml
+++ b/.Source/GTweak/Languages/en/Localize.xaml
@@ -555,7 +555,6 @@
<!--#endregion-->
<!--#region Addons Page -->
- <v:String x:Key="btn_select_dir">Select folder</v:String>
<v:String x:Key="chk_run_ti_adds">Run as TrustedInstaller</v:String>
<v:String x:Key="label_directory_adds">Directory</v:String>
<v:String x:Key="label_count_adds">Count</v:String>
@@ -564,12 +563,18 @@
<!--#endregion-->
<!--#region Toolset Page -->
+ <v:String x:Key="text_ts">Search by name or author</v:String>
+ <v:String x:Key="tag_all_ts">All</v:String>
+ <v:String x:Key="tag_drivers_ts">Drivers</v:String>
+ <v:String x:Key="tag_tools_ts">Tools</v:String>
+ <v:String x:Key="tag_diagnostics_ts">Diagnostics</v:String>
+ <v:String x:Key="tag_benchmark_ts">Benchmark</v:String>
+ <v:String x:Key="tag_overclocking_ts">Overclocking</v:String>
+ <v:String x:Key="label_download_dir_ts">Download directory</v:String>
<v:String x:Key="source_ts">Source</v:String>
<v:String x:Key="btn_download">Download</v:String>
<v:String x:Key="btn_cancel">Сancel</v:String>
- <v:String x:Key="btn_open_dir">Open folder</v:String>
<v:String x:Key="btn_done">Done</v:String>
- <v:String x:Key="text_ts">Search by name or author</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 d110f6f3..410522ab 100644
--- a/.Source/GTweak/Languages/fr/Localize.xaml
+++ b/.Source/GTweak/Languages/fr/Localize.xaml
@@ -555,7 +555,6 @@
<!--#endregion-->
<!--#region Addons Page -->
- <v:String x:Key="btn_select_dir">Sélectionner un dossier</v:String>
<v:String x:Key="chk_run_ti_adds">Exécuter en tant que TrustedInstaller</v:String>
<v:String x:Key="label_directory_adds">Directory</v:String>
<v:String x:Key="label_count_adds">Count</v:String>
@@ -564,12 +563,18 @@
<!--#endregion-->
<!--#region Toolset Page -->
+ <v:String x:Key="text_ts">Rechercher par nom ou auteur</v:String>
+ <v:String x:Key="tag_all_ts">All</v:String>
+ <v:String x:Key="tag_drivers_ts">Drivers</v:String>
+ <v:String x:Key="tag_tools_ts">Tools</v:String>
+ <v:String x:Key="tag_diagnostics_ts">Diagnostics</v:String>
+ <v:String x:Key="tag_benchmark_ts">Benchmark</v:String>
+ <v:String x:Key="tag_overclocking_ts">Overclocking</v:String>
+ <v:String x:Key="label_download_dir_ts">Download directory</v:String>
<v:String x:Key="source_ts">Source</v:String>
<v:String x:Key="btn_download">Télécharger</v:String>
<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="btn_done">Terminé</v:String>
- <v:String x:Key="text_ts">Rechercher par nom ou auteur</v:String>
<!--#endregion-->
</ResourceDictionary>
diff --git a/.Source/GTweak/Languages/he/Localize.xaml b/.Source/GTweak/Languages/he/Localize.xaml
index df11d9df..9bb61df9 100644
--- a/.Source/GTweak/Languages/he/Localize.xaml
+++ b/.Source/GTweak/Languages/he/Localize.xaml
@@ -555,7 +555,6 @@
<!--#endregion-->
<!--#region Addons Page -->
- <v:String x:Key="btn_select_dir">בחר תיקייה</v:String>
<v:String x:Key="chk_run_ti_adds">הרץ כ-TrustedInstaller</v:String>
<v:String x:Key="label_directory_adds">Directory</v:String>
<v:String x:Key="label_count_adds">Count</v:String>
@@ -564,12 +563,18 @@
<!--#endregion-->
<!--#region Toolset Page -->
+ <v:String x:Key="text_ts">חפש לפי שם או מחבר</v:String>
+ <v:String x:Key="tag_all_ts">All</v:String>
+ <v:String x:Key="tag_drivers_ts">Drivers</v:String>
+ <v:String x:Key="tag_tools_ts">Tools</v:String>
+ <v:String x:Key="tag_diagnostics_ts">Diagnostics</v:String>
+ <v:String x:Key="tag_benchmark_ts">Benchmark</v:String>
+ <v:String x:Key="tag_overclocking_ts">Overclocking</v:String>
+ <v:String x:Key="label_download_dir_ts">Download directory</v:String>
<v:String x:Key="source_ts">מקור</v:String>
<v:String x:Key="btn_download">הורד</v:String>
<v:String x:Key="btn_cancel">בטל</v:String>
- <v:String x:Key="btn_open_dir">פתח תיקייה</v:String>
<v:String x:Key="btn_done">בוצע</v:String>
- <v:String x:Key="text_ts">חפש לפי שם או מחבר</v:String>
<!--#endregion-->
</ResourceDictionary>
diff --git a/.Source/GTweak/Languages/hu/Localize.xaml b/.Source/GTweak/Languages/hu/Localize.xaml
index e365a742..da52813a 100644
--- a/.Source/GTweak/Languages/hu/Localize.xaml
+++ b/.Source/GTweak/Languages/hu/Localize.xaml
@@ -218,7 +218,6 @@
<v:String x:Key="chk_panel_intf">Vezérlőpult</v:String>
<v:String x:Key="chk_user_intf">Felhasználói fájlok</v:String>
- <!--not translated-->
<v:String x:Key="exblock4_intf">Folders in «This PC»:</v:String>
<v:String x:Key="chk_folder_3d_intf">3D Objects</v:String>
<v:String x:Key="chk_folder_desktop_intf">Desktop</v:String>
@@ -261,7 +260,7 @@
<v:String x:Key="exblock1_desc_intf">Módosítja a beépített rendszer-elemek megjelenését a Fájlkezelő navigációs paneljén, amelyeket nem lehet a szokásos módon eltávolítani.</v:String>
<v:String x:Key="exblock2_desc_intf">Módosítja a rendszer megjelenítési szabályait a Fájlkezelőben, beleértve a rejtett elemek, kiterjesztések és meghajtók láthatóságát. Figyelem, a képernyő villoghat.</v:String>
<v:String x:Key="exblock3_desc_intf">Módosítja a rendszerikonok megjelenítését az asztalon — ezek beépített rendszerobjektumok, nem rendes parancsikonok.</v:String>
- <!--not translated--><v:String x:Key="exblock4_desc_intf">Changes the display of standard user folders within «This PC». Allows you to hide them so that only connected drives are shown in the list. Attention the screen may blink.</v:String>
+ <v:String x:Key="exblock4_desc_intf">Changes the display of standard user folders within «This PC». Allows you to hide them so that only connected drives are shown in the list. Attention the screen may blink.</v:String>
<v:String x:Key="tgl1_desc_intf">Ez a módosítás csökkenti a Minimalizálás, a Maximalizálás és a Bezárás gombok méretét, így kevésbé terjedelmesek. Beállítja az összes ablak méretét, beleértve a Fájlkezelőt, a Fényképeket, a böngészőket és más ismerős programokat.</v:String>
<v:String x:Key="tgl2_desc_intf">Ez a beállítás növeli a szövegkurzor villogásának gyakoriságát. Alapértelmezés szerint a kurzor 530 ezredmásodpercenként villog.</v:String>
<v:String x:Key="tgl3_desc_intf">A módosítás csökkenti a görgetősávok vastagságát a klasszikus Windows-alkalmazásokban, beleértve a File Explorert, a böngészőket és más régi programokat. Ez azonban nem érinti a modern interfészeket, mivel azok a rendszerbeállításoktól független saját vezérlőelemeiket használják.</v:String>
@@ -556,21 +555,26 @@
<!--#endregion-->
<!--#region Addons Page -->
- <v:String x:Key="btn_select_dir">Mappa kiválasztása</v:String>
<v:String x:Key="chk_run_ti_adds">Futtassa TrustedInstallerként</v:String>
- <!--not translated--><v:String x:Key="label_directory_adds">Directory</v:String>
- <!--not translated--><v:String x:Key="label_count_adds">Count</v:String>
+ <v:String x:Key="label_directory_adds">Directory</v:String>
+ <v:String x:Key="label_count_adds">Count</v:String>
<v:String x:Key="text_info_adds">Válasszon ki egy könyvtárat, vagy győződjön meg róla, hogy nem üres</v:String>
<v:String x:Key="scripts_info_adds">Ezután képes lesz futtatni szkripteket (.ps1, .cmd, .bat, .reg) ezen az oldalon</v:String>
<!--#endregion-->
<!--#region Toolset Page -->
+ <v:String x:Key="text_ts">Keresés név vagy szerző szerint</v:String>
+ <v:String x:Key="tag_all_ts">All</v:String>
+ <v:String x:Key="tag_drivers_ts">Drivers</v:String>
+ <v:String x:Key="tag_tools_ts">Tools</v:String>
+ <v:String x:Key="tag_diagnostics_ts">Diagnostics</v:String>
+ <v:String x:Key="tag_benchmark_ts">Benchmark</v:String>
+ <v:String x:Key="tag_overclocking_ts">Overclocking</v:String>
+ <v:String x:Key="label_download_dir_ts">Download directory</v:String>
<v:String x:Key="source_ts">Forrás</v:String>
<v:String x:Key="btn_download">Letöltés</v:String>
<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="btn_done">Kész</v:String>
- <v:String x:Key="text_ts">Keresés név vagy szerző szerint</v:String>
<!--#endregion-->
</ResourceDictionary>
diff --git a/.Source/GTweak/Languages/it/Localize.xaml b/.Source/GTweak/Languages/it/Localize.xaml
index 6508791b..83f9e934 100644
--- a/.Source/GTweak/Languages/it/Localize.xaml
+++ b/.Source/GTweak/Languages/it/Localize.xaml
@@ -555,7 +555,6 @@
<!--#endregion-->
<!--#region Addons Page -->
- <v:String x:Key="btn_select_dir">Seleziona cartella</v:String>
<v:String x:Key="chk_run_ti_adds">Esegui come TrustedInstaller</v:String>
<v:String x:Key="label_directory_adds">Directory</v:String>
<v:String x:Key="label_count_adds">Count</v:String>
@@ -564,12 +563,18 @@
<!--#endregion-->
<!--#region Toolset Page -->
+ <v:String x:Key="text_ts">Cerca per nome o autore</v:String>
+ <v:String x:Key="tag_all_ts">All</v:String>
+ <v:String x:Key="tag_drivers_ts">Drivers</v:String>
+ <v:String x:Key="tag_tools_ts">Tools</v:String>
+ <v:String x:Key="tag_diagnostics_ts">Diagnostics</v:String>
+ <v:String x:Key="tag_benchmark_ts">Benchmark</v:String>
+ <v:String x:Key="tag_overclocking_ts">Overclocking</v:String>
+ <v:String x:Key="label_download_dir_ts">Download directory</v:String>
<v:String x:Key="source_ts">Fonte</v:String>
<v:String x:Key="btn_download">Scarica</v:String>
<v:String x:Key="btn_cancel">Annulla</v:String>
- <v:String x:Key="btn_open_dir">Apri cartella</v:String>
<v:String x:Key="btn_done">Fatto</v:String>
- <v:String x:Key="text_ts">Cerca per nome o autore</v:String>
<!--#endregion-->
</ResourceDictionary>
diff --git a/.Source/GTweak/Languages/ko/Localize.xaml b/.Source/GTweak/Languages/ko/Localize.xaml
index e692054c..3ebd88d7 100644
--- a/.Source/GTweak/Languages/ko/Localize.xaml
+++ b/.Source/GTweak/Languages/ko/Localize.xaml
@@ -218,7 +218,6 @@
<v:String x:Key="chk_panel_intf">제어판</v:String>
<v:String x:Key="chk_user_intf">사용자 파일</v:String>
- <!--not translated-->
<v:String x:Key="exblock4_intf">Folders in «This PC»:</v:String>
<v:String x:Key="chk_folder_3d_intf">3D Objects</v:String>
<v:String x:Key="chk_folder_desktop_intf">Desktop</v:String>
@@ -261,7 +260,7 @@
<v:String x:Key="exblock1_desc_intf">일반적인 방법으로 고정 해제할 수 없는 내장 시스템 항목의 탐색 창 표시 여부를 변경합니다.</v:String>
<v:String x:Key="exblock2_desc_intf">파일 탐색기에서 항목 표시 규칙을 변경합니다. 숨김 항목, 파일 확장자 및 드라이브 구조의 표시가 포함됩니다. 화면이 깜박일 수 있으니 주의하세요.</v:String>
<v:String x:Key="exblock3_desc_intf">바탕 화면에 표시되는 시스템 아이콘을 변경합니다. 이들은 일반 바로가기와 달리 시스템에 내장된 항목입니다.</v:String>
- <!--not translated--><v:String x:Key="exblock4_desc_intf">Changes the display of standard user folders within «This PC». Allows you to hide them so that only connected drives are shown in the list. Attention the screen may blink.</v:String>
+ <v:String x:Key="exblock4_desc_intf">Changes the display of standard user folders within «This PC». Allows you to hide them so that only connected drives are shown in the list. Attention the screen may blink.</v:String>
<v:String x:Key="tgl1_desc_intf">이 조정으로 축소, 확장, 닫기 버튼의 크기가 줄어들어 부피가 줄어듭니다. 탐색기, Windows 사진, 브라우저 및 기타 프로그램을 포함한 모든 창 크기를 조정합니다.</v:String>
<v:String x:Key="tgl2_desc_intf">이 조정은 텍스트 커서의 깜박임 빈도를 가속화합니다. 기본적으로 530밀리초마다 깜박입니다.</v:String>
<v:String x:Key="tgl3_desc_intf">이 조정으로 브라우저와 프로그램을 포함한 창에서 스크롤 막대의 두께가 더 얇아집니다.</v:String>
@@ -556,21 +555,26 @@
<!--#endregion-->
<!--#region Addons Page -->
- <v:String x:Key="btn_select_dir">폴더 선택</v:String>
<v:String x:Key="chk_run_ti_adds">TrustedInstaller로 실행</v:String>
- <!--not translated--><v:String x:Key="label_directory_adds">Directory</v:String>
- <!--not translated--><v:String x:Key="label_count_adds">Count</v:String>
+ <v:String x:Key="label_directory_adds">Directory</v:String>
+ <v:String x:Key="label_count_adds">Count</v:String>
<v:String x:Key="text_info_adds">디렉터리를 선택하거나 비어 있지 않은지 확인하세요</v:String>
<v:String x:Key="scripts_info_adds">그 후, 이 페이지에서 스크립트 (.ps1, .cmd, .bat, .reg)를 실행할 수 있습니다</v:String>
<!--#endregion-->
<!--#region Toolset Page -->
+ <v:String x:Key="text_ts">이름 또는 작성자로 검색</v:String>
+ <v:String x:Key="tag_all_ts">All</v:String>
+ <v:String x:Key="tag_drivers_ts">Drivers</v:String>
+ <v:String x:Key="tag_tools_ts">Tools</v:String>
+ <v:String x:Key="tag_diagnostics_ts">Diagnostics</v:String>
+ <v:String x:Key="tag_benchmark_ts">Benchmark</v:String>
+ <v:String x:Key="tag_overclocking_ts">Overclocking</v:String>
+ <v:String x:Key="label_download_dir_ts">Download directory</v:String>
<v:String x:Key="source_ts">출처</v:String>
<v:String x:Key="btn_download">다운로드</v:String>
<v:String x:Key="btn_cancel">취소</v:String>
- <v:String x:Key="btn_open_dir">폴더 열기</v:String>
<v:String x:Key="btn_done">완료</v:String>
- <v:String x:Key="text_ts">이름 또는 작성자로 검색</v:String>
<!--#endregion-->
</ResourceDictionary>
diff --git a/.Source/GTweak/Languages/pl/Localize.xaml b/.Source/GTweak/Languages/pl/Localize.xaml
index aa5e252e..3c1290c7 100644
--- a/.Source/GTweak/Languages/pl/Localize.xaml
+++ b/.Source/GTweak/Languages/pl/Localize.xaml
@@ -218,7 +218,6 @@
<v:String x:Key="chk_panel_intf">Panel sterowania</v:String>
<v:String x:Key="chk_user_intf">Pliki użytkownika</v:String>
- <!--not translated-->
<v:String x:Key="exblock4_intf">Folders in «This PC»:</v:String>
<v:String x:Key="chk_folder_3d_intf">3D Objects</v:String>
<v:String x:Key="chk_folder_desktop_intf">Desktop</v:String>
@@ -261,7 +260,7 @@
<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>
<v:String x:Key="exblock2_desc_intf">Zmienia systemowe reguły wyświetlania elementów w Eksploratorze plików, w tym widoczność ukrytych elementów, rozszerzeń plików i struktury dysków. Uwaga: ekran może migać.</v:String>
<v:String x:Key="exblock3_desc_intf">Zmienia wyświetlanie ikon systemowych na pulpicie, które są wbudowanymi obiektami systemu, a nie zwykłymi skrótami.</v:String>
- <!--not translated--><v:String x:Key="exblock4_desc_intf">Changes the display of standard user folders within «This PC». Allows you to hide them so that only connected drives are shown in the list. Attention the screen may blink.</v:String>
+ <v:String x:Key="exblock4_desc_intf">Changes the display of standard user folders within «This PC». Allows you to hide them so that only connected drives are shown in the list. Attention the screen may blink.</v:String>
<v:String x:Key="tgl1_desc_intf">Poprawka zmniejsza rozmiar przycisków Minimalizuj, Maksymalizuj i Zamknij, czyniąc je mniej masywnym. Dostosowuje rozmiar dla wszystkich okien, w tym Eksploratora plików, Zdjęć, przeglądarek i innych znanych programów.</v:String>
<v:String x:Key="tgl2_desc_intf">Poprawka zwiększa częstotliwość migania kursora tekstowego. Domyślnie kursor miga co 530 milisekund.</v:String>
<v:String x:Key="tgl3_desc_intf">Poprawka zmniejsza grubość pasków przewijania w klasycznych aplikacjach Windows, w tym w Eksploratorze plików, przeglądarkach i innych starszych programach. Nie dotyczy jednak nowoczesnych interfejsów, ponieważ korzystają one z własnych elementów sterujących niezależnych od ustawień systemowych.</v:String>
@@ -556,21 +555,26 @@
<!--#endregion-->
<!--#region Addons Page -->
- <v:String x:Key="btn_select_dir">Wybierz folder</v:String>
<v:String x:Key="chk_run_ti_adds">Uruchom jako TrustedInstaller</v:String>
- <!--not translated--><v:String x:Key="label_directory_adds">Directory</v:String>
- <!--not translated--><v:String x:Key="label_count_adds">Count</v:String>
+ <v:String x:Key="label_directory_adds">Directory</v:String>
+ <v:String x:Key="label_count_adds">Count</v:String>
<v:String x:Key="text_info_adds">Wybierz katalog lub upewnij się, że nie jest pusty</v:String>
<v:String x:Key="scripts_info_adds">Następnie będziesz mógł uruchamiać skrypty (.ps1, .cmd, .bat, .reg) na tej stronie</v:String>
<!--#endregion-->
<!--#region Toolset Page -->
+ <v:String x:Key="text_ts">Szukaj według nazwy lub autora</v:String>
+ <v:String x:Key="tag_all_ts">All</v:String>
+ <v:String x:Key="tag_drivers_ts">Drivers</v:String>
+ <v:String x:Key="tag_tools_ts">Tools</v:String>
+ <v:String x:Key="tag_diagnostics_ts">Diagnostics</v:String>
+ <v:String x:Key="tag_benchmark_ts">Benchmark</v:String>
+ <v:String x:Key="tag_overclocking_ts">Overclocking</v:String>
+ <v:String x:Key="label_download_dir_ts">Download directory</v:String>
<v:String x:Key="source_ts">Źródło</v:String>
<v:String x:Key="btn_download">Pobierz</v:String>
<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="btn_done">Gotowe</v:String>
- <v:String x:Key="text_ts">Szukaj według nazwy lub autora</v:String>
<!--#endregion-->
</ResourceDictionary>
diff --git a/.Source/GTweak/Languages/pt-BR/Localize.xaml b/.Source/GTweak/Languages/pt-BR/Localize.xaml
index e60eb88f..9a1e7ffb 100644
--- a/.Source/GTweak/Languages/pt-BR/Localize.xaml
+++ b/.Source/GTweak/Languages/pt-BR/Localize.xaml
@@ -555,7 +555,6 @@
<!--#endregion-->
<!--#region Addons Page -->
- <v:String x:Key="btn_select_dir">Selecionar pasta</v:String>
<v:String x:Key="chk_run_ti_adds">Executar como TrustedInstaller</v:String>
<v:String x:Key="label_directory_adds">Directory</v:String>
<v:String x:Key="label_count_adds">Count</v:String>
@@ -564,12 +563,18 @@
<!--#endregion-->
<!--#region Toolset Page -->
+ <v:String x:Key="text_ts">Pesquisar por nome ou autor</v:String>
+ <v:String x:Key="tag_all_ts">All</v:String>
+ <v:String x:Key="tag_drivers_ts">Drivers</v:String>
+ <v:String x:Key="tag_tools_ts">Tools</v:String>
+ <v:String x:Key="tag_diagnostics_ts">Diagnostics</v:String>
+ <v:String x:Key="tag_benchmark_ts">Benchmark</v:String>
+ <v:String x:Key="tag_overclocking_ts">Overclocking</v:String>
+ <v:String x:Key="label_download_dir_ts">Download directory</v:String>
<v:String x:Key="source_ts">Fonte</v:String>
<v:String x:Key="btn_download">Baixar</v:String>
<v:String x:Key="btn_cancel">Cancelar</v:String>
- <v:String x:Key="btn_open_dir">Abrir pasta</v:String>
<v:String x:Key="btn_done">Concluído</v:String>
- <v:String x:Key="text_ts">Pesquisar por nome ou autor</v:String>
<!--#endregion-->
</ResourceDictionary>
diff --git a/.Source/GTweak/Languages/ru/Localize.xaml b/.Source/GTweak/Languages/ru/Localize.xaml
index 501d959d..62a58877 100644
--- a/.Source/GTweak/Languages/ru/Localize.xaml
+++ b/.Source/GTweak/Languages/ru/Localize.xaml
@@ -555,7 +555,6 @@
<!--#endregion-->
<!--#region Addons Page -->
- <v:String x:Key="btn_select_dir">Выбрать папку</v:String>
<v:String x:Key="chk_run_ti_adds">Запуск от имени TrustedInstaller</v:String>
<v:String x:Key="label_directory_adds">Каталог</v:String>
<v:String x:Key="label_count_adds">Кол-во</v:String>
@@ -564,12 +563,18 @@
<!--#endregion-->
<!--#region Toolset Page -->
+ <v:String x:Key="text_ts">Поиск по названию или автору</v:String>
+ <v:String x:Key="tag_all_ts">Все</v:String>
+ <v:String x:Key="tag_drivers_ts">Драйверы</v:String>
+ <v:String x:Key="tag_tools_ts">Инструменты</v:String>
+ <v:String x:Key="tag_diagnostics_ts">Диагностика</v:String>
+ <v:String x:Key="tag_benchmark_ts">Стресс-тест</v:String>
+ <v:String x:Key="tag_overclocking_ts">Разгон</v:String>
+ <v:String x:Key="label_download_dir_ts">Каталог загрузки</v:String>
<v:String x:Key="source_ts">Источник</v:String>
<v:String x:Key="btn_download">Скачать</v:String>
<v:String x:Key="btn_cancel">Отмена</v:String>
- <v:String x:Key="btn_open_dir">Открыть папку</v:String>
<v:String x:Key="btn_done">Готово</v:String>
- <v:String x:Key="text_ts">Поиск по названию или автору</v:String>
<!--#endregion-->
</ResourceDictionary>
diff --git a/.Source/GTweak/Languages/sl-SI/Localize.xaml b/.Source/GTweak/Languages/sl-SI/Localize.xaml
index 574fd345..77df5cac 100644
--- a/.Source/GTweak/Languages/sl-SI/Localize.xaml
+++ b/.Source/GTweak/Languages/sl-SI/Localize.xaml
@@ -555,7 +555,6 @@
<!--#endregion-->
<!--#region Addons Page -->
- <v:String x:Key="btn_select_dir">Izberi mapo</v:String>
<v:String x:Key="chk_run_ti_adds">Zaženi kot TrustedInstaller</v:String>
<v:String x:Key="label_directory_adds">Directory</v:String>
<v:String x:Key="label_count_adds">Count</v:String>
@@ -564,12 +563,18 @@
<!--#endregion-->
<!--#region Toolset Page -->
+ <v:String x:Key="text_ts">Iskanje po imenu ali avtorju</v:String>
+ <v:String x:Key="tag_all_ts">All</v:String>
+ <v:String x:Key="tag_drivers_ts">Drivers</v:String>
+ <v:String x:Key="tag_tools_ts">Tools</v:String>
+ <v:String x:Key="tag_diagnostics_ts">Diagnostics</v:String>
+ <v:String x:Key="tag_benchmark_ts">Benchmark</v:String>
+ <v:String x:Key="tag_overclocking_ts">Overclocking</v:String>
+ <v:String x:Key="label_download_dir_ts">Download directory</v:String>
<v:String x:Key="source_ts">Vir</v:String>
<v:String x:Key="btn_download">Prenesi</v:String>
<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="btn_done">Končano</v:String>
- <v:String x:Key="text_ts">Iskanje po imenu ali avtorju</v:String>
<!--#endregion-->
</ResourceDictionary>
diff --git a/.Source/GTweak/Languages/th/Localize.xaml b/.Source/GTweak/Languages/th/Localize.xaml
index ef04406b..b8949a0a 100644
--- a/.Source/GTweak/Languages/th/Localize.xaml
+++ b/.Source/GTweak/Languages/th/Localize.xaml
@@ -555,7 +555,6 @@
<!--#endregion-->
<!--#region Addons Page -->
- <v:String x:Key="btn_select_dir">เลือกโฟลเดอร์</v:String>
<v:String x:Key="chk_run_ti_adds">เรียกใช้ในฐานะ TrustedInstaller</v:String>
<v:String x:Key="label_directory_adds">Directory</v:String>
<v:String x:Key="label_count_adds">Count</v:String>
@@ -564,12 +563,18 @@
<!--#endregion-->
<!--#region Toolset Page -->
+ <v:String x:Key="text_ts">ค้นหาตามชื่อหรือผู้เขียน</v:String>
+ <v:String x:Key="tag_all_ts">All</v:String>
+ <v:String x:Key="tag_drivers_ts">Drivers</v:String>
+ <v:String x:Key="tag_tools_ts">Tools</v:String>
+ <v:String x:Key="tag_diagnostics_ts">Diagnostics</v:String>
+ <v:String x:Key="tag_benchmark_ts">Benchmark</v:String>
+ <v:String x:Key="tag_overclocking_ts">Overclocking</v:String>
+ <v:String x:Key="label_download_dir_ts">Download directory</v:String>
<v:String x:Key="source_ts">แหล่งที่มา</v:String>
<v:String x:Key="btn_download">ดาวน์โหลด</v:String>
<v:String x:Key="btn_cancel">ยกเลิก</v:String>
- <v:String x:Key="btn_open_dir">เปิดโฟลเดอร์</v:String>
<v:String x:Key="btn_done">เสร็จสิ้น</v:String>
- <v:String x:Key="text_ts">ค้นหาตามชื่อหรือผู้เขียน</v:String>
<!--#endregion-->
</ResourceDictionary>
diff --git a/.Source/GTweak/Languages/tr/Localize.xaml b/.Source/GTweak/Languages/tr/Localize.xaml
index 6d1e0f57..b1cb80a6 100644
--- a/.Source/GTweak/Languages/tr/Localize.xaml
+++ b/.Source/GTweak/Languages/tr/Localize.xaml
@@ -555,7 +555,6 @@
<!--#endregion-->
<!--#region Addons Page -->
- <v:String x:Key="btn_select_dir">Klasör seç</v:String>
<v:String x:Key="chk_run_ti_adds">TrustedInstaller olarak çalıştır</v:String>
<v:String x:Key="label_directory_adds">Directory</v:String>
<v:String x:Key="label_count_adds">Count</v:String>
@@ -564,12 +563,18 @@
<!--#endregion-->
<!--#region Toolset Page -->
+ <v:String x:Key="text_ts">Ada veya yazara göre ara</v:String>
+ <v:String x:Key="tag_all_ts">All</v:String>
+ <v:String x:Key="tag_drivers_ts">Drivers</v:String>
+ <v:String x:Key="tag_tools_ts">Tools</v:String>
+ <v:String x:Key="tag_diagnostics_ts">Diagnostics</v:String>
+ <v:String x:Key="tag_benchmark_ts">Benchmark</v:String>
+ <v:String x:Key="tag_overclocking_ts">Overclocking</v:String>
+ <v:String x:Key="label_download_dir_ts">Download directory</v:String>
<v:String x:Key="source_ts">Kaynak</v:String>
<v:String x:Key="btn_download">İndir</v:String>
<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="btn_done">Tamamlandı</v:String>
- <v:String x:Key="text_ts">Ada veya yazara göre ara</v:String>
<!--#endregion-->
</ResourceDictionary>
diff --git a/.Source/GTweak/Languages/uk/Localize.xaml b/.Source/GTweak/Languages/uk/Localize.xaml
index 2b6aef88..668e7f6a 100644
--- a/.Source/GTweak/Languages/uk/Localize.xaml
+++ b/.Source/GTweak/Languages/uk/Localize.xaml
@@ -555,7 +555,6 @@
<!--#endregion-->
<!--#region Addons Page -->
- <v:String x:Key="btn_select_dir">Вибрати папку</v:String>
<v:String x:Key="chk_run_ti_adds">Запуск від імені TrustedInstaller</v:String>
<v:String x:Key="label_directory_adds">Directory</v:String>
<v:String x:Key="label_count_adds">Count</v:String>
@@ -564,12 +563,18 @@
<!--#endregion-->
<!--#region Toolset Page -->
+ <v:String x:Key="text_ts">Пошук за назвою або автором</v:String>
+ <v:String x:Key="tag_all_ts">All</v:String>
+ <v:String x:Key="tag_drivers_ts">Drivers</v:String>
+ <v:String x:Key="tag_tools_ts">Tools</v:String>
+ <v:String x:Key="tag_diagnostics_ts">Diagnostics</v:String>
+ <v:String x:Key="tag_benchmark_ts">Benchmark</v:String>
+ <v:String x:Key="tag_overclocking_ts">Overclocking</v:String>
+ <v:String x:Key="label_download_dir_ts">Download directory</v:String>
<v:String x:Key="source_ts">Джерело</v:String>
<v:String x:Key="btn_download">Завантажити</v:String>
<v:String x:Key="btn_cancel">Скасувати</v:String>
- <v:String x:Key="btn_open_dir">Відкрити папку</v:String>
<v:String x:Key="btn_done">Готово</v:String>
- <v:String x:Key="text_ts">Пошук за назвою або автором</v:String>
<!--#endregion-->
</ResourceDictionary>
diff --git a/.Source/GTweak/Languages/zh-CN/Localize.xaml b/.Source/GTweak/Languages/zh-CN/Localize.xaml
index de2a0fef..a1923a73 100644
--- a/.Source/GTweak/Languages/zh-CN/Localize.xaml
+++ b/.Source/GTweak/Languages/zh-CN/Localize.xaml
@@ -555,7 +555,6 @@
<!--#endregion-->
<!--#region Addons Page -->
- <v:String x:Key="btn_select_dir">选择文档夹</v:String>
<v:String x:Key="chk_run_ti_adds">以 TrustedInstaller 身份运行</v:String>
<v:String x:Key="label_directory_adds">Directory</v:String>
<v:String x:Key="label_count_adds">Count</v:String>
@@ -564,12 +563,18 @@
<!--#endregion-->
<!--#region Toolset Page -->
+ <v:String x:Key="text_ts">按名称或作者搜索</v:String>
+ <v:String x:Key="tag_all_ts">All</v:String>
+ <v:String x:Key="tag_drivers_ts">Drivers</v:String>
+ <v:String x:Key="tag_tools_ts">Tools</v:String>
+ <v:String x:Key="tag_diagnostics_ts">Diagnostics</v:String>
+ <v:String x:Key="tag_benchmark_ts">Benchmark</v:String>
+ <v:String x:Key="tag_overclocking_ts">Overclocking</v:String>
+ <v:String x:Key="label_download_dir_ts">Download directory</v:String>
<v:String x:Key="source_ts">来源</v:String>
<v:String x:Key="btn_download">下载</v:String>
<v:String x:Key="btn_cancel">取消</v:String>
- <v:String x:Key="btn_open_dir">打开文件夹</v:String>
<v:String x:Key="btn_done">完成</v:String>
- <v:String x:Key="text_ts">按名称或作者搜索</v:String>
<!--#endregion-->
</ResourceDictionary>
diff --git a/.Source/GTweak/Languages/zh-TW/Localize.xaml b/.Source/GTweak/Languages/zh-TW/Localize.xaml
index e12ee99d..1bacfc55 100644
--- a/.Source/GTweak/Languages/zh-TW/Localize.xaml
+++ b/.Source/GTweak/Languages/zh-TW/Localize.xaml
@@ -555,7 +555,6 @@
<!--#endregion-->
<!--#region Addons Page -->
- <v:String x:Key="btn_select_dir">選擇資料夾</v:String>
<v:String x:Key="chk_run_ti_adds">以 TrustedInstaller 的身份執行</v:String>
<v:String x:Key="label_directory_adds">Directory</v:String>
<v:String x:Key="label_count_adds">Count</v:String>
@@ -564,12 +563,18 @@
<!--#endregion-->
<!--#region Toolset Page -->
+ <v:String x:Key="text_ts">依名稱或作者搜尋</v:String>
+ <v:String x:Key="tag_all_ts">All</v:String>
+ <v:String x:Key="tag_drivers_ts">Drivers</v:String>
+ <v:String x:Key="tag_tools_ts">Tools</v:String>
+ <v:String x:Key="tag_diagnostics_ts">Diagnostics</v:String>
+ <v:String x:Key="tag_benchmark_ts">Benchmark</v:String>
+ <v:String x:Key="tag_overclocking_ts">Overclocking</v:String>
+ <v:String x:Key="label_download_dir_ts">Download directory</v:String>
<v:String x:Key="source_ts">來源</v:String>
<v:String x:Key="btn_download">下載</v:String>
<v:String x:Key="btn_cancel">取消</v:String>
- <v:String x:Key="btn_open_dir">開啟資料夾</v:String>
<v:String x:Key="btn_done">完成</v:String>
- <v:String x:Key="text_ts">依名稱或作者搜尋</v:String>
<!--#endregion-->
</ResourceDictionary>
diff --git a/.Source/GTweak/Resources/ToolsetStore.json b/.Source/GTweak/Resources/ToolsetStore.json
index 19277da5..2bff5743 100644
--- a/.Source/GTweak/Resources/ToolsetStore.json
+++ b/.Source/GTweak/Resources/ToolsetStore.json
@@ -3,6 +3,7 @@
"icon": "Img_Nvidia",
"name": "NVIDIA App",
"group": "web",
+ "tags": [ "driver" ],
"placeholderIcon": "Icon_Website",
"author": "NVIDIA Corporation",
"authorIcon": "nvidia.com",
@@ -14,6 +15,7 @@
"icon": "Img_Amd",
"name": "AMD Software: Adrenalin Edition™",
"group": "web",
+ "tags": [ "driver" ],
"placeholderIcon": "Icon_Website",
"author": "Advanced Micro Devices, Inc",
"authorIcon": "amd.com",
@@ -25,6 +27,7 @@
"icon": "Img_FirstEverTech",
"name": "Universal Intel Chipset Device Updater",
"group": "github",
+ "tags": [ "driver" ],
"placeholderIcon": "Icon_Git",
"author": "FirstEverTech",
"authorIcon": "https://github.com/FirstEverTech.png",
@@ -36,6 +39,7 @@
"icon": "Img_FirstEverTech",
"name": "Universal Intel Wi-Fi and Bluetooth Drivers Updater",
"group": "github",
+ "tags": [ "driver" ],
"placeholderIcon": "Icon_Git",
"author": "FirstEverTech",
"authorIcon": "https://github.com/FirstEverTech.png",
@@ -47,6 +51,7 @@
"icon": "Img_Hidusbf",
"name": "HIDUSBF",
"group": "github",
+ "tags": [ "driver", "overclock" ],
"placeholderIcon": "Icon_Git",
"author": "LordOfMice",
"authorIcon": "https://github.com/LordOfMice.png",
@@ -58,6 +63,7 @@
"icon": "Img_Rapr",
"name": "Driver Store Explorer",
"group": "github",
+ "tags": [ "driver", "tool" ],
"placeholderIcon": "Icon_Git",
"author": "lostindark",
"authorIcon": "https://github.com/lostindark.png",
@@ -69,6 +75,7 @@
"icon": "Img_NvidiaPI",
"name": "NVIDIA Profile Inspector",
"group": "github",
+ "tags": [ "driver", "overclock" ],
"placeholderIcon": "Icon_Git",
"author": "Orbmu2k",
"authorIcon": "https://github.com/Orbmu2k.png",
@@ -80,6 +87,7 @@
"icon": "Img_DeviceTweaker",
"name": "DEVICE TWEAKER",
"group": "github",
+ "tags": [ "tool", "overclock" ],
"placeholderIcon": "Icon_Git",
"author": "arsenzaaa",
"authorIcon": "https://github.com/arsenzaaa.png",
@@ -91,6 +99,7 @@
"icon": "Img_Autoruns",
"name": "Autoruns",
"group": "web",
+ "tags": [ "tool" ],
"placeholderIcon": "Icon_Website",
"author": "Mark Russinovich",
"authorIcon": "microsoft.com",
@@ -101,6 +110,7 @@
"icon": "Img_Rufus",
"name": "Rufus",
"group": "github",
+ "tags": [ "tool" ],
"placeholderIcon": "Icon_Git",
"author": "pbatard",
"authorIcon": "https://github.com/pbatard.png",
@@ -112,6 +122,7 @@
"icon": "Img_RawAccel",
"name": "RawAccel",
"group": "github",
+ "tags": [ "tool", "overclock" ],
"placeholderIcon": "Icon_Git",
"author": "a1xd",
"authorIcon": "https://github.com/a1xd.png",
@@ -123,6 +134,7 @@
"icon": "Img_SystemInfo",
"name": "SystemInformer",
"group": "github",
+ "tags": [ "tool", "diagnostics" ],
"placeholderIcon": "Icon_Git",
"author": "Winsider Seminars & Solutions, Inc",
"authorIcon": "https://github.com/winsiderss.png",
@@ -134,6 +146,7 @@
"icon": "Img_ThrottleStop",
"name": "ThrottleStop",
"group": "techpowerup",
+ "tags": [ "tool", "overclock" ],
"placeholderIcon": "Icon_Website",
"author": "TechPowerUp",
"authorIcon": "techpowerup.com",
@@ -144,6 +157,7 @@
"icon": "Img_CPUz",
"name": "CPU-Z",
"group": "sourceforge",
+ "tags": [ "diagnostics" ],
"placeholderIcon": "Icon_Website",
"author": "CPUID",
"authorIcon": "cpuid.com",
@@ -154,6 +168,7 @@
"icon": "Img_GPUz",
"name": "GPU-Z",
"group": "techpowerup",
+ "tags": [ "diagnostics" ],
"placeholderIcon": "Icon_Website",
"author": "TechPowerUp",
"authorIcon": "techpowerup.com",
@@ -164,6 +179,7 @@
"icon": "Img_PCIz",
"name": "PCI-Z",
"group": "web",
+ "tags": [ "diagnostics" ],
"placeholderIcon": "Icon_Website",
"author": "Bruno Banelli",
"authorIcon": "pci-z.com",
@@ -174,6 +190,7 @@
"icon": "Img_ZenTimings",
"name": "ZenTimings",
"group": "github",
+ "tags": [ "diagnostics" ],
"placeholderIcon": "Icon_Git",
"author": "irusanov",
"authorIcon": "https://github.com/irusanov.png",
@@ -185,6 +202,7 @@
"icon": "Img_DiskInfo",
"name": "CrystalDiskInfo",
"group": "sourceforge",
+ "tags": [ "diagnostics" ],
"placeholderIcon": "Icon_Website",
"author": "hiyohiyo",
"authorIcon": "crystalmark.info",
@@ -195,6 +213,7 @@
"icon": "Img_DiskMark",
"name": "CrystalDiskMark",
"group": "sourceforge",
+ "tags": [ "benchmark" ],
"placeholderIcon": "Icon_Website",
"author": "hiyohiyo",
"authorIcon": "crystalmark.info",
@@ -205,6 +224,7 @@
"icon": "Img_BatteryInfo",
"name": "BatteryInfoView",
"group": "web",
+ "tags": [ "diagnostics" ],
"placeholderIcon": "Icon_Website",
"author": "Nir Sofer",
"authorIcon": "nirsoft.net",
@@ -215,6 +235,7 @@
"icon": "Img_CapFrameX",
"name": "CapFrameX",
"group": "github",
+ "tags": [ "benchmark" ],
"placeholderIcon": "Icon_Git",
"author": "CXWorld",
"authorIcon": "https://github.com/CXWorld.png",
@@ -226,6 +247,7 @@
"icon": "Img_Cinebench",
"name": "Cinebench",
"group": "maxon",
+ "tags": [ "benchmark" ],
"placeholderIcon": "Icon_Website",
"author": "Maxon Computer GmbH",
"authorIcon": "maxon.net",
@@ -237,6 +259,7 @@
"icon": "Img_Occt",
"name": "OCCT",
"group": "web",
+ "tags": [ "benchmark" ],
"placeholderIcon": "Icon_Website",
"author": "OCCT/OCBASE",
"authorIcon": "ocbase.com",
@@ -248,6 +271,7 @@
"icon": "Img_FurMark",
"name": "FurMark 2",
"group": "techpowerup",
+ "tags": [ "benchmark" ],
"placeholderIcon": "Icon_Website",
"author": "Geeks3D",
"authorIcon": "geeks3d.com",
diff --git a/.Source/GTweak/Styles/Buttons/RadioButtons.xaml b/.Source/GTweak/Styles/Buttons/RadioButtons.xaml
index 48ca5217..da1ff5ea 100644
--- a/.Source/GTweak/Styles/Buttons/RadioButtons.xaml
+++ b/.Source/GTweak/Styles/Buttons/RadioButtons.xaml
@@ -1,7 +1,7 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
- <Style TargetType="{x:Type RadioButton}" x:Key="BtnNavigation">
+ <Style TargetType="{x:Type RadioButton}" x:Key="RadioNavigation">
<Setter Property="Height" Value="60"/>
<Setter Property="Background" Value="Transparent"/>
<Setter Property="Foreground" Value="{StaticResource Brush_Inactive}"/>
@@ -87,5 +87,65 @@
</Setter.Value>
</Setter>
</Style>
-
+
+ <Style x:Key="RadioTag" TargetType="RadioButton">
+ <Setter Property="KeyboardNavigation.TabNavigation" Value="None"/>
+ <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+ <Setter Property="IsTabStop" Value="False"/>
+ <Setter Property="Focusable" Value="False"/>
+ <Setter Property="Cursor" Value="Hand"/>
+ <Setter Property="Margin" Value="4,0"/>
+ <Setter Property="Template">
+ <Setter.Value>
+ <ControlTemplate TargetType="RadioButton">
+ <Grid>
+ <Border CornerRadius="6" Opacity="0.4" Background="{StaticResource Brush_ShadowOverlay}" IsHitTestVisible="False" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+ <Border.RenderTransform>
+ <TranslateTransform X="3" Y="6"/>
+ </Border.RenderTransform>
+ </Border>
+ <Border x:Name="Root" Padding="12,4" CornerRadius="6" Background="{StaticResource Brush_Background_TextBox}" BorderBrush="{StaticResource Brush_Border_Description}" BorderThickness="1" RenderTransformOrigin="0.5,0.5">
+ <Border.CacheMode>
+ <BitmapCache RenderAtScale="2" EnableClearType="True"/>
+ </Border.CacheMode>
+ <Border.RenderTransform>
+ <ScaleTransform x:Name="ContentScale" ScaleX="1" ScaleY="1"/>
+ </Border.RenderTransform>
+ <TextBlock x:Name="ContentText" Text="{TemplateBinding Content}" FontFamily="{StaticResource Jura}" FontSize="13" FontWeight="Medium" Foreground="{StaticResource Brush_Inactive}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+ </Border>
+ </Grid>
+ <ControlTemplate.Triggers>
+ <Trigger Property="IsMouseOver" Value="True">
+ <Setter TargetName="ContentText" Property="Foreground" Value="{StaticResource Brush_TextBlock_Inactivity}"/>
+ <Setter TargetName="Root" Property="BorderBrush" Value="{StaticResource Brush_Separator}"/>
+ </Trigger>
+ <Trigger Property="IsChecked" Value="True">
+ <Setter TargetName="Root" Property="Background" Value="{StaticResource Brush_Background_Labels}"/>
+ <Setter TargetName="Root" Property="BorderBrush" Value="{StaticResource Brush_Separator}"/>
+ <Setter TargetName="ContentText" Property="Foreground" Value="{StaticResource Brush_Accent}"/>
+ </Trigger>
+ <Trigger Property="IsPressed" Value="True">
+ <Trigger.EnterActions>
+ <BeginStoryboard>
+ <Storyboard Timeline.DesiredFrameRate="120">
+ <DoubleAnimation Storyboard.TargetName="ContentScale" Storyboard.TargetProperty="ScaleX" To="0.95" Duration="0:0:0.08"/>
+ <DoubleAnimation Storyboard.TargetName="ContentScale" Storyboard.TargetProperty="ScaleY" To="0.95" Duration="0:0:0.08"/>
+ </Storyboard>
+ </BeginStoryboard>
+ </Trigger.EnterActions>
+ <Trigger.ExitActions>
+ <BeginStoryboard>
+ <Storyboard Timeline.DesiredFrameRate="120">
+ <DoubleAnimation Storyboard.TargetName="ContentScale" Storyboard.TargetProperty="ScaleX" To="1.0" Duration="0:0:0.08"/>
+ <DoubleAnimation Storyboard.TargetName="ContentScale" Storyboard.TargetProperty="ScaleY" To="1.0" Duration="0:0:0.08"/>
+ </Storyboard>
+ </BeginStoryboard>
+ </Trigger.ExitActions>
+ </Trigger>
+ </ControlTemplate.Triggers>
+ </ControlTemplate>
+ </Setter.Value>
+ </Setter>
+ </Style>
+
</ResourceDictionary>
\ No newline at end of file
diff --git a/.Source/GTweak/Styles/Inputs/CheckBox.xaml b/.Source/GTweak/Styles/Inputs/CheckBox.xaml
index 54ab64d8..91a8b442 100644
--- a/.Source/GTweak/Styles/Inputs/CheckBox.xaml
+++ b/.Source/GTweak/Styles/Inputs/CheckBox.xaml
@@ -20,15 +20,22 @@
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="CheckBox">
- <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
- <Border x:Name="Box" Width="18" Height="18" CornerRadius="4" Background="Transparent" BorderBrush="{StaticResource Brush_Separator}" BorderThickness="1" VerticalAlignment="Center" RenderTransformOrigin="0.5,0.5">
+ <Grid>
+ <Border Width="18" Height="18" CornerRadius="4" Opacity="0.4" Background="{StaticResource Brush_ShadowOverlay}" IsHitTestVisible="False" HorizontalAlignment="Left" VerticalAlignment="Center">
<Border.RenderTransform>
- <ScaleTransform ScaleX="1" ScaleY="1"/>
+ <TranslateTransform X="3" Y="6"/>
</Border.RenderTransform>
- <Path x:Name="CheckMark" Width="12" Height="12" Visibility="Collapsed" Stretch="None" Data="M1,6 L5,10 L11,2" Stroke="{StaticResource Brush_Highlighted_Inverted}" StrokeThickness="2" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeDashArray="30" StrokeDashOffset="30"/>
</Border>
- <ContentPresenter Margin="8,0,0,0" VerticalAlignment="Center"/>
- </StackPanel>
+ <StackPanel x:Name="Root" Orientation="Horizontal" VerticalAlignment="Center" RenderTransformOrigin="0.5,0.5">
+ <StackPanel.RenderTransform>
+ <ScaleTransform x:Name="ContentScale" ScaleX="1" ScaleY="1"/>
+ </StackPanel.RenderTransform>
+ <Border x:Name="Box" Width="18" Height="18" CornerRadius="4" Background="Transparent" BorderBrush="{StaticResource Brush_Separator}" BorderThickness="1" VerticalAlignment="Center" RenderTransformOrigin="0.5,0.5">
+ <Path x:Name="CheckMark" Width="12" Height="12" Visibility="Collapsed" Stretch="None" Data="M1,6 L5,10 L11,2" Stroke="{StaticResource Brush_Highlighted_Inverted}" StrokeThickness="2" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeDashArray="30" StrokeDashOffset="30"/>
+ </Border>
+ <ContentPresenter Margin="8,0,0,0" VerticalAlignment="Center"/>
+ </StackPanel>
+ </Grid>
<ControlTemplate.Triggers>
<Trigger Property="IsChecked"
Value="True">
diff --git a/.Source/GTweak/Styles/Inputs/TextBox.xaml b/.Source/GTweak/Styles/Inputs/TextBox.xaml
index 297230fc..1f83e437 100644
--- a/.Source/GTweak/Styles/Inputs/TextBox.xaml
+++ b/.Source/GTweak/Styles/Inputs/TextBox.xaml
@@ -12,8 +12,7 @@
<Setter Property="FocusVisualStyle" Value="{x:Null}" />
<Setter Property="IsTabStop" Value="False"/>
<Setter Property="TextAlignment" Value="Left"/>
- <Setter Property="Width" Value="350" />
- <Setter Property="Height" Value="27" />
+ <Setter Property="Height" Value="30" />
<Setter Property="Cursor" Value="IBeam" />
<Setter Property="VerticalContentAlignment" Value="Center" />
<Setter Property="CaretBrush" Value="{StaticResource Brush_Highlighted}"/>
@@ -26,30 +25,33 @@
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
-
- <Border Grid.ColumnSpan="2" x:Name="border" Background="{StaticResource Brush_Background_TextBox}" BorderBrush="{StaticResource Brush_Accent}" BorderThickness="0,0,0,1" CornerRadius="5"/>
+ <Border Grid.ColumnSpan="2" CornerRadius="6" Opacity="0.4" Background="{StaticResource Brush_ShadowOverlay}" IsHitTestVisible="False" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+ <Border.RenderTransform>
+ <TranslateTransform X="3" Y="6"/>
+ </Border.RenderTransform>
+ </Border>
+ <Border Grid.ColumnSpan="2" x:Name="border" Background="{StaticResource Brush_Background_TextBox}" BorderBrush="Transparent" BorderThickness="1" CornerRadius="6"/>
<ScrollViewer Grid.Column="0" x:Name="PART_ContentHost" Margin="5,0,0,0" VerticalAlignment="Center" />
<Label Grid.Column="0" Margin="5,0,5,0" x:Name="WaterMarkLabel" Content="{TemplateBinding Tag}" VerticalAlignment="Center" Visibility="Collapsed" Foreground="{StaticResource Brush_Inactive}" FontFamily="{StaticResource Jura}"/>
- <Button Grid.Column="1" x:Name="PART_ClearButton" Style="{StaticResource ButtonClearTextBox}" Width="20" Height="20" Margin="0,0,5,0" Visibility="Collapsed"/>
+ <Button Grid.Column="1" x:Name="PART_ClearButton" Style="{StaticResource ButtonClearTextBox}" Width="20" Height="20" Margin="0,0,8,0" Visibility="Collapsed"/>
</Grid>
<ControlTemplate.Triggers>
<Trigger Property="Text" Value="">
<Setter Property="Visibility" TargetName="WaterMarkLabel" Value="Visible"/>
</Trigger>
<Trigger Property="IsEnabled" Value="False">
- <Setter Property="Foreground" Value="{StaticResource Brush_Highlighted}"/>
- <Setter Property="BorderBrush" Value="{StaticResource Brush_TextBox_Border}" TargetName="border"/>
+ <Setter Property="Foreground" Value="{StaticResource Brush_Inactive}"/>
</Trigger>
- <Trigger Property="IsFocused" Value="False">
- <Setter Property="BorderBrush" Value="{StaticResource Brush_TextBox_Border}" TargetName="border"/>
+ <Trigger Property="IsMouseOver" Value="True">
+ <Setter Property="BorderBrush" Value="{StaticResource Brush_Border_Description}" TargetName="border"/>
</Trigger>
- <Trigger Property="IsKeyboardFocused" Value="False">
- <Setter Property="BorderBrush" Value="{StaticResource Brush_TextBox_Border}" TargetName="border"/>
+ <Trigger Property="IsKeyboardFocused" Value="True">
+ <Setter Property="BorderBrush" Value="{StaticResource Brush_Separator}" TargetName="border"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
-
+
</ResourceDictionary>
\ No newline at end of file
diff --git a/.Source/GTweak/View/AddonsView.xaml b/.Source/GTweak/View/AddonsView.xaml
index a6af06a4..ee33ebf8 100644
--- a/.Source/GTweak/View/AddonsView.xaml
+++ b/.Source/GTweak/View/AddonsView.xaml
@@ -12,43 +12,47 @@
<UserControl.DataContext>
<vm:AddonsViewModel />
</UserControl.DataContext>
+
<Grid>
<Grid.RowDefinitions>
- <RowDefinition Height="auto" />
- <RowDefinition Height="auto" />
+ <RowDefinition Height="Auto" />
<RowDefinition Height="*" />
- <RowDefinition Height="auto" />
+ <RowDefinition Height="Auto" />
</Grid.RowDefinitions>
- <uc:FlowPanel Grid.Row="0" ContentAlignment="Left" Orientation="Horizontal" HorizontalSpacing="10" VerticalSpacing="5" Margin="10,5,10,0">
- <Button Command="{Binding SelectFolderCommand}" Style="{StaticResource ButtonContent}" HorizontalAlignment="Right" Margin="0,0,0,0">
- <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
- <ui:SymbolIcon Symbol="FolderOpen20" FontSize="15" Margin="0,0,5,0"/>
- <TextBlock VerticalAlignment="Center">
- <Run Text="{DynamicResource btn_select_dir}"/><Run Text="..."/>
- </TextBlock>
- </StackPanel>
- </Button>
-
- <Button Command="{Binding UpdateCommand}" Style="{StaticResource ButtonContent_Inverted}" HorizontalAlignment="Right">
- <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
- <ui:SymbolIcon Symbol="ArrowClockwise20" FontSize="15" Margin="0,0,5,0"/>
- <TextBlock Text="{DynamicResource btn_upd}" VerticalAlignment="Center"/>
- </StackPanel>
- </Button>
-
- <CheckBox VerticalAlignment="Top" IsChecked="{Binding IsRunAsTrustedInstaller}" Content="{DynamicResource chk_run_ti_adds}" Margin="0,6,0,0"/>
- </uc:FlowPanel>
-
- <Border Grid.Row="1" Background="{StaticResource Brush_Separator}" Height="1.2" Margin="10,10,10,0" CornerRadius="10" HorizontalAlignment="Stretch"/>
-
- <Grid Grid.Row="2" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+ <Grid Grid.Row="0" Margin="10,5,20,0">
+ <Border Background="{StaticResource Brush_ShadowOverlay}" Opacity="{StaticResource DataElement_Opacity}" IsHitTestVisible="False" CornerRadius="8">
+ <Border.RenderTransform>
+ <TranslateTransform X="3" Y="4"/>
+ </Border.RenderTransform>
+ </Border>
+
+ <Border Background="{StaticResource Brush_Background_Card}" BorderBrush="{StaticResource Brush_Separator}" BorderThickness="1" CornerRadius="8" Padding="12,7">
+ <Grid>
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="*" />
+ <ColumnDefinition Width="Auto" />
+ </Grid.ColumnDefinitions>
+
+ <CheckBox Grid.Column="0" VerticalAlignment="Center" IsChecked="{Binding IsRunAsTrustedInstaller}" Content="{DynamicResource chk_run_ti_adds}"/>
+
+ <Button Grid.Column="1" Command="{Binding UpdateCommand}" Style="{StaticResource ButtonContent_Inverted}" Padding="12,5" HorizontalAlignment="Right">
+ <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
+ <ui:SymbolIcon Symbol="ArrowClockwise20" FontSize="13" Margin="0,0,5,0"/>
+ <TextBlock Text="{DynamicResource btn_upd}" VerticalAlignment="Center" FontSize="13"/>
+ </StackPanel>
+ </Button>
+ </Grid>
+ </Border>
+ </Grid>
+
+ <Grid Grid.Row="1" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
<ScrollViewer b:ScrollFadeBehavior.EnableFade="True" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled">
<Grid>
<ItemsControl ItemsSource="{Binding Addons}" VirtualizingPanel.IsVirtualizing="True">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
- <uc:FlowPanel Margin="20,10,5,20" EqualizeItemSize="True" ItemWidth="200" UseMasonryLayout="True" HorizontalSpacing="5" VerticalSpacing="5" ContentAlignment="Stretch" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+ <uc:FlowPanel Margin="10,10,20,10" EqualizeItemSize="True" ItemWidth="200" UseMasonryLayout="True" HorizontalSpacing="5" VerticalSpacing="5" ContentAlignment="Stretch" HorizontalAlignment="Left" VerticalAlignment="Top"/>
</ItemsPanelTemplate>
</ItemsControl.ItemsPanel>
@@ -137,29 +141,68 @@
</ScrollViewer>
</Grid>
- <Border Grid.Row="3" Margin="10,5,10,5" Background="{StaticResource Brush_Background_Card}" BorderBrush="{StaticResource Brush_Separator}" BorderThickness="1" CornerRadius="8" Padding="10,6">
- <Grid>
- <Grid.ColumnDefinitions>
- <ColumnDefinition Width="*" />
- <ColumnDefinition Width="Auto" />
- </Grid.ColumnDefinitions>
-
- <StackPanel Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center">
- <ui:SymbolIcon Symbol="Folder20" FontSize="15" Foreground="{StaticResource Brush_Inactive}" VerticalAlignment="Center" Margin="0,0,5,0"/>
- <TextBlock Style="{StaticResource TextDefault}" Foreground="{StaticResource Brush_Inactive}" FontSize="13" TextTrimming="CharacterEllipsis">
- <Run Text="{DynamicResource label_directory_adds}"/><Run Text=": "/>
- <Run Text="{Binding DirectoryPath, Mode=OneWay}" Foreground="{StaticResource Brush_TextBlock_Inactivity}"/>
- </TextBlock>
- </StackPanel>
-
- <StackPanel Grid.Column="1" Orientation="Horizontal" VerticalAlignment="Center">
- <ui:SymbolIcon Symbol="DocumentMultiple20" FontSize="15" Foreground="{StaticResource Brush_Inactive}" VerticalAlignment="Center" Margin="0,0,5,0"/>
- <TextBlock Style="{StaticResource TextDefault}" Foreground="{StaticResource Brush_Inactive}" FontSize="13" TextTrimming="CharacterEllipsis">
- <Run Text="{DynamicResource label_count_adds}"/><Run Text=": "/>
- <Run Text="{Binding Addons.Count, Mode=OneWay}" Foreground="{StaticResource Brush_TextBlock_Inactivity}"/>
- </TextBlock>
- </StackPanel>
- </Grid>
- </Border>
+ <Grid Grid.Row="2" Margin="10,0,20,5">
+ <Border Background="{StaticResource Brush_ShadowOverlay}" Opacity="{StaticResource DataElement_Opacity}" IsHitTestVisible="False" CornerRadius="8">
+ <Border.RenderTransform>
+ <TranslateTransform X="3" Y="4"/>
+ </Border.RenderTransform>
+ </Border>
+
+ <Border Background="{StaticResource Brush_Background_Card}" BorderBrush="{StaticResource Brush_Separator}" BorderThickness="1" CornerRadius="8" Padding="12,8">
+ <Grid>
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="*" />
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="*" />
+ </Grid.ColumnDefinitions>
+
+ <Grid Grid.Column="0" VerticalAlignment="Center" Margin="0,0,15,0" HorizontalAlignment="Left">
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="*" />
+ </Grid.ColumnDefinitions>
+
+ <ui:SymbolIcon Grid.Column="0" Symbol="Folder20" FontSize="15" Foreground="{StaticResource Brush_Inactive}" VerticalAlignment="Center" Margin="0,0,8,0"/>
+
+ <TextBlock Grid.Column="1" Style="{StaticResource TextDefault}" Foreground="{StaticResource Brush_Inactive}" FontSize="13" VerticalAlignment="Center" Margin="0,0,4,0">
+ <Run Text="{DynamicResource label_directory_adds}"/><Run Text=":" />
+ </TextBlock>
+
+ <TextBlock Grid.Column="2" Text="{Binding DirectoryPath, Mode=OneWay}" FontSize="13" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" VerticalAlignment="Center" ToolTip="{Binding DirectoryPath}" Background="Transparent" Cursor="Hand">
+ <TextBlock.InputBindings>
+ <MouseBinding MouseAction="LeftClick" Command="{Binding OpenFolderCommand}" />
+ </TextBlock.InputBindings>
+ <TextBlock.Style>
+ <Style TargetType="TextBlock" BasedOn="{StaticResource TextDefault}">
+ <Setter Property="Foreground" Value="{StaticResource Brush_TextBlock_Inactivity}"/>
+ <Style.Triggers>
+ <Trigger Property="IsMouseOver" Value="True">
+ <Setter Property="Foreground" Value="{StaticResource Brush_Highlighted}"/>
+ <Setter Property="TextDecorations" Value="Underline"/>
+ </Trigger>
+ </Style.Triggers>
+ </Style>
+ </TextBlock.Style>
+ </TextBlock>
+ </Grid>
+
+ <StackPanel Grid.Column="1" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center">
+ <ui:SymbolIcon Symbol="DocumentMultiple20" FontSize="15" Foreground="{StaticResource Brush_Inactive}" VerticalAlignment="Center" Margin="0,0,5,0"/>
+ <TextBlock Style="{StaticResource TextDefault}" Foreground="{StaticResource Brush_Inactive}" FontSize="13" VerticalAlignment="Center">
+ <Run Text="{DynamicResource label_count_adds}"/><Run Text=": "/>
+ <Run Text="{Binding Addons.Count, Mode=OneWay}" Foreground="{StaticResource Brush_TextBlock_Inactivity}"/>
+ </TextBlock>
+ </StackPanel>
+
+ <Button Grid.Column="2" Command="{Binding SelectFolderCommand}" Style="{StaticResource ButtonContent}" Padding="12,5" HorizontalAlignment="Right">
+ <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
+ <ui:SymbolIcon Symbol="Edit20" FontSize="13" Margin="0,0,6,0"/>
+ <TextBlock VerticalAlignment="Center" Text="{DynamicResource btn_change}" FontSize="13"/>
+ </StackPanel>
+ </Button>
+ </Grid>
+ </Border>
+ </Grid>
</Grid>
-</UserControl>
+</UserControl>
\ No newline at end of file
diff --git a/.Source/GTweak/View/ToolsetView.xaml b/.Source/GTweak/View/ToolsetView.xaml
index 0ba5e72d..1810f6e9 100644
--- a/.Source/GTweak/View/ToolsetView.xaml
+++ b/.Source/GTweak/View/ToolsetView.xaml
@@ -5,6 +5,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:b="clr-namespace:GTweak.Behaviors"
xmlns:vm="clr-namespace:GTweak.Core.ViewModel"
+ xmlns:mdl="clr-namespace:GTweak.Core.Models"
xmlns:uc="clr-namespace:GTweak.Assets.UserControls"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
xmlns:local="clr-namespace:GTweak.View"
@@ -12,54 +13,57 @@
<UserControl.DataContext>
<vm:ToolsetViewModel />
</UserControl.DataContext>
+
<Grid>
<Grid.RowDefinitions>
- <RowDefinition Height="auto" />
- <RowDefinition Height="auto" />
+ <RowDefinition Height="Auto" />
<RowDefinition Height="*" />
+ <RowDefinition Height="Auto" />
</Grid.RowDefinitions>
- <uc:FlowPanel Grid.Row="0" HorizontalAlignment="Left" Margin="10,5,10,0" ContentAlignment="Left" Orientation="Horizontal" HorizontalSpacing="10" VerticalSpacing="5">
-
- <TextBox Text="{Binding SearchText, UpdateSourceTrigger=PropertyChanged, Delay=250}" b:TextBoxClearBehavior.ClearButton="True" Width="300" MaxLength="55" HorizontalAlignment="Left" Height="29">
- <TextBox.Tag>
- <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
- <ui:SymbolIcon Symbol="Search20" FontSize="14" Margin="0,0,6,0" VerticalAlignment="Center"/>
- <TextBlock VerticalAlignment="Center"><Run Text="{DynamicResource text_ts}"/><Run Text="..."/></TextBlock>
- </StackPanel>
- </TextBox.Tag>
- </TextBox>
-
- <StackPanel Orientation="Horizontal">
- <Button Command="{Binding SelectFolderCommand}" Style="{StaticResource ButtonContent}" HorizontalAlignment="Left" Margin="0,0,10,0">
- <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
- <ui:SymbolIcon Symbol="FolderOpen20" FontSize="15" Margin="0,0,5,0"/>
- <TextBlock VerticalAlignment="Center">
- <Run Text="{DynamicResource btn_select_dir}"/><Run Text="..."/>
- </TextBlock>
- </StackPanel>
- </Button>
-
- <Button Command="{Binding OpenFolderCommand}" Style="{StaticResource ButtonContent}" HorizontalAlignment="Right">
- <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
- <ui:SymbolIcon Symbol="CloudArrowDown20" FontSize="15" Margin="0,0,5,0"/>
- <TextBlock VerticalAlignment="Center" Text="{DynamicResource btn_open_dir}"/>
- </StackPanel>
- </Button>
- </StackPanel>
+ <Grid Grid.Row="0" Margin="10,5,20,0">
+ <Border Background="{StaticResource Brush_ShadowOverlay}" Opacity="{StaticResource DataElement_Opacity}" IsHitTestVisible="False" CornerRadius="8">
+ <Border.RenderTransform>
+ <TranslateTransform X="3" Y="4"/>
+ </Border.RenderTransform>
+ </Border>
- </uc:FlowPanel>
+ <Border Background="{StaticResource Brush_Background_Card}" BorderBrush="{StaticResource Brush_Separator}" BorderThickness="1" CornerRadius="8" Padding="12,6">
+ <Grid>
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="*"/>
+ <ColumnDefinition Width="auto"/>
+ </Grid.ColumnDefinitions>
+ <uc:FlowPanel Grid.Column="0" Orientation="Horizontal" ContentAlignment="Left" HorizontalSpacing="0" VerticalSpacing="4">
+ <RadioButton IsChecked="True" Style="{StaticResource RadioTag}" Content="{DynamicResource tag_all_ts}" GroupName="Filters" Command="{Binding FilterTagCommand}" CommandParameter="{x:Static mdl:FilterTag.All}" />
+ <RadioButton Style="{StaticResource RadioTag}" Content="{DynamicResource tag_drivers_ts}" GroupName="Filters" Command="{Binding FilterTagCommand}" CommandParameter="{x:Static mdl:FilterTag.Driver}" />
+ <RadioButton Style="{StaticResource RadioTag}" Content="{DynamicResource tag_tools_ts}" GroupName="Filters" Command="{Binding FilterTagCommand}" CommandParameter="{x:Static mdl:FilterTag.Tool}" />
+ <RadioButton Style="{StaticResource RadioTag}" Content="{DynamicResource tag_diagnostics_ts}" GroupName="Filters" Command="{Binding FilterTagCommand}" CommandParameter="{x:Static mdl:FilterTag.Diagnostics}" />
+ <RadioButton Style="{StaticResource RadioTag}" Content="{DynamicResource tag_benchmark_ts}" GroupName="Filters" Command="{Binding FilterTagCommand}" CommandParameter="{x:Static mdl:FilterTag.Benchmark}" />
+ <RadioButton Style="{StaticResource RadioTag}" Content="{DynamicResource tag_overclocking_ts}" GroupName="Filters" Command="{Binding FilterTagCommand}" CommandParameter="{x:Static mdl:FilterTag.Overclock}" />
+ </uc:FlowPanel>
- <Border Grid.Row="1" Background="{StaticResource Brush_Separator}" Height="1.2" Margin="10,10,10,0" CornerRadius="10" HorizontalAlignment="Stretch"/>
+ <TextBox Grid.Column="1" Text="{Binding SearchText, UpdateSourceTrigger=PropertyChanged, Delay=250}" b:TextBoxClearBehavior.ClearButton="True" Width="280" MaxLength="55">
+ <TextBox.Tag>
+ <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
+ <ui:SymbolIcon Symbol="Search20" FontSize="14" Margin="0,0,6,0" VerticalAlignment="Center"/>
+ <TextBlock VerticalAlignment="Center"><Run Text="{DynamicResource text_ts}"/><Run Text="..."/></TextBlock>
+ </StackPanel>
+ </TextBox.Tag>
+ </TextBox>
+
+ </Grid>
+ </Border>
+ </Grid>
- <Grid Grid.Row="2" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+ <Grid Grid.Row="1" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
<ScrollViewer b:ScrollFadeBehavior.EnableFade="True" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled">
<Grid>
<ItemsControl ItemsSource="{Binding ToolsView}">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
- <uc:FlowPanel Margin="10,10,10,20" HorizontalSpacing="5" VerticalSpacing="10" ContentAlignment="Stretch" HorizontalAlignment="Stretch" VerticalAlignment="Top"/>
+ <uc:FlowPanel Margin="10,10,20,10" HorizontalSpacing="5" VerticalSpacing="10" ContentAlignment="Stretch" HorizontalAlignment="Stretch" VerticalAlignment="Top"/>
</ItemsPanelTemplate>
</ItemsControl.ItemsPanel>
@@ -72,5 +76,60 @@
</Grid>
</ScrollViewer>
</Grid>
+
+ <Grid Grid.Row="2" Margin="10,0,20,5">
+ <Border Background="{StaticResource Brush_ShadowOverlay}" Opacity="{StaticResource DataElement_Opacity}" IsHitTestVisible="False" CornerRadius="8">
+ <Border.RenderTransform>
+ <TranslateTransform X="3" Y="4"/>
+ </Border.RenderTransform>
+ </Border>
+
+ <Border Background="{StaticResource Brush_Background_Card}" BorderBrush="{StaticResource Brush_Separator}" BorderThickness="1" CornerRadius="8" Padding="12,8">
+ <Grid>
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="*"/>
+ <ColumnDefinition Width="Auto"/>
+ </Grid.ColumnDefinitions>
+
+ <Grid Grid.Column="0" VerticalAlignment="Center" Margin="0,0,15,0" HorizontalAlignment="Left">
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="*" />
+ </Grid.ColumnDefinitions>
+
+ <ui:SymbolIcon Grid.Column="0" Symbol="Folder20" FontSize="15" Foreground="{StaticResource Brush_Inactive}" VerticalAlignment="Center" Margin="0,0,8,0"/>
+
+ <TextBlock Grid.Column="1" Style="{StaticResource TextDefault}" Foreground="{StaticResource Brush_Inactive}" FontSize="13" VerticalAlignment="Center" Margin="0,0,4,0">
+ <Run Text="{DynamicResource label_download_dir_ts}"/><Run Text=":" />
+ </TextBlock>
+
+ <TextBlock Grid.Column="2" Text="{Binding DirectoryPath, Mode=OneWay}" FontSize="13" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" VerticalAlignment="Center" ToolTip="{Binding DirectoryPath}" Background="Transparent" Cursor="Hand">
+ <TextBlock.InputBindings>
+ <MouseBinding MouseAction="LeftClick" Command="{Binding OpenFolderCommand}" />
+ </TextBlock.InputBindings>
+ <TextBlock.Style>
+ <Style TargetType="TextBlock" BasedOn="{StaticResource TextDefault}">
+ <Setter Property="Foreground" Value="{StaticResource Brush_TextBlock_Inactivity}"/>
+ <Style.Triggers>
+ <Trigger Property="IsMouseOver" Value="True">
+ <Setter Property="Foreground" Value="{StaticResource Brush_Highlighted}"/>
+ <Setter Property="TextDecorations" Value="Underline"/>
+ </Trigger>
+ </Style.Triggers>
+ </Style>
+ </TextBlock.Style>
+ </TextBlock>
+ </Grid>
+
+ <Button Grid.Column="1" Command="{Binding SelectFolderCommand}" Style="{StaticResource ButtonContent}" Padding="12,5">
+ <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
+ <ui:SymbolIcon Symbol="Edit20" FontSize="13" Margin="0,0,6,0"/>
+ <TextBlock VerticalAlignment="Center" Text="{DynamicResource btn_change}" FontSize="13"/>
+ </StackPanel>
+ </Button>
+ </Grid>
+ </Border>
+ </Grid>
</Grid>
-</UserControl>
+</UserControl>
\ No newline at end of file
diff --git a/.Source/GTweak/Windows/MainWindow.xaml b/.Source/GTweak/Windows/MainWindow.xaml
index b9c36c59..7336aadf 100644
--- a/.Source/GTweak/Windows/MainWindow.xaml
+++ b/.Source/GTweak/Windows/MainWindow.xaml
@@ -103,40 +103,40 @@
<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">
-
- <RadioButton Name="BtnUtils" Style="{StaticResource BtnNavigation}" Tag="{DynamicResource rbtn_utils_main}" Command="{Binding NavigateToUtilsCommand}" IsChecked="True" >
+
+ <RadioButton Name="BtnUtils" Style="{StaticResource RadioNavigation}" Tag="{DynamicResource rbtn_utils_main}" Command="{Binding NavigateToUtilsCommand}" IsChecked="True" >
<ui:SymbolIcon Symbol="Toolbox20" FontSize="20"/>
</RadioButton>
-
- <RadioButton Style="{StaticResource BtnNavigation}" Tag="{DynamicResource rbtn_conf_main}" Command="{Binding NavigateToConfidentialityCommand}">
+
+ <RadioButton Style="{StaticResource RadioNavigation}" Tag="{DynamicResource rbtn_conf_main}" Command="{Binding NavigateToConfidentialityCommand}">
<ui:SymbolIcon Symbol="PersonLock20" FontSize="20"/>
</RadioButton>
- <RadioButton Style="{StaticResource BtnNavigation}" Tag="{DynamicResource rbtn_int_main}" Command="{Binding NavigateToInterfaceCommand}">
+ <RadioButton Style="{StaticResource RadioNavigation}" Tag="{DynamicResource rbtn_int_main}" Command="{Binding NavigateToInterfaceCommand}">
<ui:SymbolIcon Symbol="Color20" FontSize="20"/>
</RadioButton>
- <RadioButton Style="{StaticResource BtnNavigation}" Tag="{DynamicResource rbtn_app_main}" Command="{Binding NavigateToPackagesCommand}" Checked="NavigationRtbn_Checked">
+ <RadioButton Style="{StaticResource RadioNavigation}" Tag="{DynamicResource rbtn_app_main}" Command="{Binding NavigateToPackagesCommand}" Checked="NavigationRtbn_Checked">
<ui:SymbolIcon Symbol="Apps20" FontSize="20"/>
</RadioButton>
- <RadioButton Style="{StaticResource BtnNavigation}" Tag="{DynamicResource rbtn_svc_main}" Command="{Binding NavigateToServicesCommand}">
+ <RadioButton Style="{StaticResource RadioNavigation}" Tag="{DynamicResource rbtn_svc_main}" Command="{Binding NavigateToServicesCommand}">
<ui:SymbolIcon Symbol="TaskListSquareLtr20" FontSize="20"/>
</RadioButton>
- <RadioButton Style="{DynamicResource BtnNavigation}" Tag="{DynamicResource rbtn_sys_main}" Command="{Binding NavigateToSystemCommand}">
+ <RadioButton Style="{DynamicResource RadioNavigation}" Tag="{DynamicResource rbtn_sys_main}" Command="{Binding NavigateToSystemCommand}">
<ui:SymbolIcon Symbol="HardDrive20" FontSize="20"/>
</RadioButton>
- <RadioButton Style="{StaticResource BtnNavigation}" Tag="{DynamicResource rbtn_sysinfo_main}" Command="{Binding NavigateToDataSystemCommand}">
+ <RadioButton Style="{StaticResource RadioNavigation}" Tag="{DynamicResource rbtn_sysinfo_main}" Command="{Binding NavigateToDataSystemCommand}">
<ui:SymbolIcon Symbol="Desktop20" FontSize="20"/>
</RadioButton>
- <RadioButton Style="{StaticResource BtnNavigation}" Tag="{DynamicResource rbtn_adds_main}" Command="{Binding NavigateToAddonsCommand}">
+ <RadioButton Style="{StaticResource RadioNavigation}" Tag="{DynamicResource rbtn_adds_main}" Command="{Binding NavigateToAddonsCommand}">
<ui:SymbolIcon Symbol="PuzzlePieceShield20" FontSize="20"/>
</RadioButton>
- <RadioButton Style="{StaticResource BtnNavigation}" Tag="{DynamicResource rbtn_ts_main}" Command="{Binding NavigateToToolsetCommand}">
+ <RadioButton Style="{StaticResource RadioNavigation}" Tag="{DynamicResource rbtn_ts_main}" Command="{Binding NavigateToToolsetCommand}">
<ui:SymbolIcon Symbol="WindowApps20" FontSize="20"/>
</RadioButton>
</StackPanel>
@@ -328,7 +328,7 @@
<TranslateTransform Y="-20"/>
</Grid.RenderTransform>
- <Border Background="{StaticResource Brush_ShadowOverlay}" Opacity="0.7" IsHitTestVisible="False" CornerRadius="7" Panel.ZIndex="0">
+ <Border Background="{StaticResource Brush_ShadowOverlay}" Opacity="{StaticResource IconNavigation_Opacity}" IsHitTestVisible="False" CornerRadius="7" Panel.ZIndex="0">
<Border.RenderTransform>
<TranslateTransform X="3" Y="4"/>
</Border.RenderTransform>