Skip to content

Portable Tool for an Ideal Windows Setup

upd. apps catalog & add SourceForge API support/search toolsets deb v5.4.7

Greedeksc69de50b150b
diff --git a/.Source/GTweak/Assets/Images/DownloadApps/CPUz.png b/.Source/GTweak/Assets/Images/DownloadApps/CPUz.png
new file mode 100644
index 00000000..cce90c1a
Binary files /dev/null and b/.Source/GTweak/Assets/Images/DownloadApps/CPUz.png differ
diff --git a/.Source/GTweak/Assets/Images/DownloadApps/DiskInfo.png b/.Source/GTweak/Assets/Images/DownloadApps/DiskInfo.png
new file mode 100644
index 00000000..8e98f3fd
Binary files /dev/null and b/.Source/GTweak/Assets/Images/DownloadApps/DiskInfo.png differ
diff --git a/.Source/GTweak/Assets/Images/DownloadApps/DiskMark.png b/.Source/GTweak/Assets/Images/DownloadApps/DiskMark.png
new file mode 100644
index 00000000..bd2a7596
Binary files /dev/null and b/.Source/GTweak/Assets/Images/DownloadApps/DiskMark.png differ
diff --git a/.Source/GTweak/Assets/Images/ImageResources.xaml b/.Source/GTweak/Assets/Images/ImageResources.xaml
index 2c18767a..7a1740c7 100644
--- a/.Source/GTweak/Assets/Images/ImageResources.xaml
+++ b/.Source/GTweak/Assets/Images/ImageResources.xaml
@@ -3,7 +3,10 @@
<BitmapImage x:Key="Img_Amd" UriSource="/GTweak;component/Assets/Images/DownloadApps/Amd.png"/>
<BitmapImage x:Key="Img_Autoruns" UriSource="/GTweak;component/Assets/Images/DownloadApps/Autoruns.png"/>
+ <BitmapImage x:Key="Img_CPUz" UriSource="/GTweak;component/Assets/Images/DownloadApps/CPUz.png"/>
<BitmapImage x:Key="Img_DeviceTweaker" UriSource="/GTweak;component/Assets/Images/DownloadApps/DeviceTweaker.png"/>
+ <BitmapImage x:Key="Img_DiskInfo" UriSource="/GTweak;component/Assets/Images/DownloadApps/DiskInfo.png"/>
+ <BitmapImage x:Key="Img_DiskMark" UriSource="/GTweak;component/Assets/Images/DownloadApps/DiskMark.png"/>
<BitmapImage x:Key="Img_FirstEverTech" UriSource="/GTweak;component/Assets/Images/DownloadApps/FirstEverTech.png"/>
<BitmapImage x:Key="Img_Nvidia" UriSource="/GTweak;component/Assets/Images/DownloadApps/Nvidia.png"/>
<BitmapImage x:Key="Img_NvidiaPI" UriSource="/GTweak;component/Assets/Images/DownloadApps/NvidiaPI.png"/>
diff --git a/.Source/GTweak/Assets/UserControls/ToolsetCard.xaml b/.Source/GTweak/Assets/UserControls/ToolsetCard.xaml
index dc617cd3..ef133669 100644
--- a/.Source/GTweak/Assets/UserControls/ToolsetCard.xaml
+++ b/.Source/GTweak/Assets/UserControls/ToolsetCard.xaml
@@ -173,7 +173,7 @@
<ProgressBar Value="{Binding Progress, RelativeSource={RelativeSource AncestorType=local:ToolsetCard}}" Foreground="{StaticResource Brush_Accent}" Minimum="0" Maximum="100" Height="20" MinWidth="150" VerticalAlignment="Center"/>
</Grid>
- <Button Grid.Column="1" Content="{DynamicResource btn_cancel}" Style="{StaticResource ButtonContent}" Command="{Binding CancelCommand, RelativeSource={RelativeSource AncestorType=local:ToolsetCard}}" Margin="10,0,0,0"/>
+ <Button Grid.Column="1" Content="{DynamicResource btn_cancel}" Style="{StaticResource ButtonContent_Inverted}" Command="{Binding CancelCommand, RelativeSource={RelativeSource AncestorType=local:ToolsetCard}}" Margin="10,0,0,0"/>
</Grid>
</Grid>
diff --git a/.Source/GTweak/Core/Model/ToolsetModel.cs b/.Source/GTweak/Core/Model/ToolsetModel.cs
index ea8d51f5..6f0fd3ca 100644
--- a/.Source/GTweak/Core/Model/ToolsetModel.cs
+++ b/.Source/GTweak/Core/Model/ToolsetModel.cs
@@ -6,25 +6,27 @@ namespace GTweak.Core.Models
{
public string AppName { get; }
public string AuthorName { get; }
- public string SourceUrl { get; }
public string Group { get; }
- public string DownloadPathStr { get; }
- public string FilePattern { get; }
- public string UrlPattern { get; }
public string IconResourceName { get; }
public string AuthorIconUrl { get; }
+ public string SourceUrl { get; }
+ public string DownloadPath { get; }
+ public string FilePattern { get; }
+ public string UrlPattern { get; }
+ public string FileName { get; }
public ToolsetModel(XElement appElement)
{
AppName = appElement.Element("Name")?.Value ?? string.Empty;
AuthorName = appElement.Element("Author")?.Value ?? string.Empty;
- SourceUrl = appElement.Element("Source")?.Value ?? string.Empty;
Group = appElement.Element("Group")?.Value ?? string.Empty;
- DownloadPathStr = appElement.Element("DownloadPath")?.Value ?? string.Empty;
- FilePattern = appElement.Element("FilePattern")?.Value ?? string.Empty;
- UrlPattern = appElement.Element("UrlPattern")?.Value ?? string.Empty;
IconResourceName = appElement.Element("Icon")?.Value ?? string.Empty;
AuthorIconUrl = appElement.Element("AuthorIcon")?.Value ?? string.Empty;
+ SourceUrl = appElement.Element("Source")?.Value ?? string.Empty;
+ DownloadPath = appElement.Element("DownloadPath")?.Value ?? string.Empty;
+ FilePattern = appElement.Element("FilePattern")?.Value ?? string.Empty;
+ UrlPattern = appElement.Element("UrlPattern")?.Value ?? string.Empty;
+ FileName = appElement.Element("FileName")?.Value ?? string.Empty;
}
}
}
\ No newline at end of file
diff --git a/.Source/GTweak/Core/Services/ToolsetDownloadService.cs b/.Source/GTweak/Core/Services/ToolsetDownloadService.cs
index 084d7bed..24a3b3dc 100644
--- a/.Source/GTweak/Core/Services/ToolsetDownloadService.cs
+++ b/.Source/GTweak/Core/Services/ToolsetDownloadService.cs
@@ -33,17 +33,17 @@ namespace GTweak.Core.Services
{
if (string.IsNullOrEmpty(model.UrlPattern))
{
- return model.DownloadPathStr;
+ return model.DownloadPath;
}
- string htmlCode = await _httpClient.GetStringAsync(model.DownloadPathStr);
+ string htmlCode = await _httpClient.GetStringAsync(model.DownloadPath);
Match match = Regex.Match(htmlCode, model.UrlPattern);
return match.Success ? match.Value : null;
}
if (model.Group.Equals("github", StringComparison.OrdinalIgnoreCase))
{
- string apiUrl = $"https://api.github.com/repos/{model.DownloadPathStr}/releases/latest";
+ string apiUrl = $"https://api.github.com/repos/{model.DownloadPath}/releases/latest";
using HttpResponseMessage response = await _httpClient.GetAsync(apiUrl);
@@ -81,6 +81,41 @@ namespace GTweak.Core.Services
return firstFoundUrl;
}
}
+
+ if (model.Group.Equals("sourceforge", StringComparison.OrdinalIgnoreCase))
+ {
+ string projectName = model.DownloadPath;
+ Match match = Regex.Match(projectName, @"projects/([^/]+)");
+ if (match.Success)
+ {
+ projectName = match.Groups[1].Value;
+ }
+ else
+ {
+ projectName = projectName.Trim('/');
+ }
+
+ string apiUrl = $"https://sourceforge.net/projects/{projectName}/best_release.json";
+
+ using HttpResponseMessage response = await _httpClient.GetAsync(apiUrl);
+
+ if (!response.IsSuccessStatusCode)
+ {
+ throw new HttpRequestException();
+ }
+
+ string content = await response.Content.ReadAsStringAsync();
+ JObject json = JObject.Parse(content);
+
+ string filename = json["release"]?["filename"]?.ToString();
+ if (!string.IsNullOrEmpty(filename))
+ {
+ return $"https://downloads.sourceforge.net/project/{projectName}{filename}";
+ }
+
+ return null;
+ }
+
return null;
}
diff --git a/.Source/GTweak/Core/Services/ToolsetIconService.cs b/.Source/GTweak/Core/Services/ToolsetIconService.cs
index 8f9552f7..13bee375 100644
--- a/.Source/GTweak/Core/Services/ToolsetIconService.cs
+++ b/.Source/GTweak/Core/Services/ToolsetIconService.cs
@@ -30,9 +30,9 @@ namespace GTweak.Core.Services
}
string urlToDownload = iconSource;
- bool isWeb = string.Equals(group, "web", StringComparison.OrdinalIgnoreCase);
+ bool isWebBased = !string.Equals(group, "github", StringComparison.OrdinalIgnoreCase);
- if (isWeb)
+ if (isWebBased)
{
urlToDownload = $"https://www.google.com/s2/favicons?domain={iconSource}&sz=48";
}
@@ -50,7 +50,7 @@ namespace GTweak.Core.Services
}
catch
{
- if (isWeb)
+ if (isWebBased)
{
try
{
diff --git a/.Source/GTweak/Core/ViewModel/Components/DownloadSession.cs b/.Source/GTweak/Core/ViewModel/Components/DownloadSession.cs
index 1170a0a8..c879abaf 100644
--- a/.Source/GTweak/Core/ViewModel/Components/DownloadSession.cs
+++ b/.Source/GTweak/Core/ViewModel/Components/DownloadSession.cs
@@ -97,12 +97,12 @@ namespace GTweak.Core.ViewModel.Components
if (string.IsNullOrEmpty(Path.GetExtension(fileName)))
{
- return !string.IsNullOrEmpty(_model.FilePattern) ? _model.FilePattern : $"{_model.AppName}.exe";
+ return !string.IsNullOrEmpty(_model.FilePattern) ? _model.FilePattern : _model.FileName;
}
return fileName;
}
- catch { return $"{_model.AppName}.exe"; }
+ catch { return _model.FileName; }
}
}
}
diff --git a/.Source/GTweak/Core/ViewModel/ToolsetViewModel.cs b/.Source/GTweak/Core/ViewModel/ToolsetViewModel.cs
index 94e64e20..e110e39a 100644
--- a/.Source/GTweak/Core/ViewModel/ToolsetViewModel.cs
+++ b/.Source/GTweak/Core/ViewModel/ToolsetViewModel.cs
@@ -1,7 +1,9 @@
using System;
using System.Collections.ObjectModel;
+using System.ComponentModel;
using System.Diagnostics;
using System.IO;
+using System.Windows.Data;
using System.Windows.Input;
using System.Xml.Linq;
using GTweak.Core.Base;
@@ -16,18 +18,23 @@ namespace GTweak.Core.ViewModel
{
public ObservableCollection<ToolsetItem> Tools { get; } = new ObservableCollection<ToolsetItem>();
+ private string _searchText;
+
+ public ICollectionView ToolsView { get; }
+
public ICommand SelectFolderCommand { get; }
public ICommand OpenFolderCommand { get; }
- public string DownloadPath
+ public string SearchText
{
- get => SettingsEngine.DownloadPath;
+ get => _searchText;
set
{
- if (SettingsEngine.DownloadPath != value)
+ if (_searchText != value)
{
- SettingsEngine.DownloadPath = value;
+ _searchText = value;
OnPropertyChanged();
+ ToolsView.Refresh();
}
}
}
@@ -38,6 +45,27 @@ namespace GTweak.Core.ViewModel
OpenFolderCommand = new RelayCommand(_ => OpenFolder());
LoadApps();
+
+ ToolsView = CollectionViewSource.GetDefaultView(Tools);
+ ToolsView.Filter = FilterTools;
+ }
+
+ private bool FilterTools(object obj)
+ {
+ if (!string.IsNullOrWhiteSpace(SearchText))
+ {
+ if (obj is ToolsetItem item)
+ {
+ bool nameMatch = item.AppName?.IndexOf(SearchText, StringComparison.OrdinalIgnoreCase) >= 0;
+ bool authorMatch = item.AuthorName?.IndexOf(SearchText, StringComparison.OrdinalIgnoreCase) >= 0;
+
+ return nameMatch || authorMatch;
+ }
+
+ return false;
+ }
+
+ return true;
}
private void LoadApps()
@@ -57,10 +85,7 @@ namespace GTweak.Core.ViewModel
}
}
}
- catch (Exception ex)
- {
- ErrorLogging.LogDebug(ex);
- }
+ catch (Exception ex) { ErrorLogging.LogDebug(ex); }
}
private void SelectFolder()
@@ -78,34 +103,28 @@ namespace GTweak.Core.ViewModel
string selectedPath = folderDialog.SelectedPath;
if (!string.IsNullOrWhiteSpace(selectedPath) && Directory.Exists(selectedPath))
{
- DownloadPath = selectedPath;
+ SettingsEngine.DownloadPath = selectedPath;
}
}
}
- catch (Exception ex)
- {
- ErrorLogging.LogDebug(ex);
- }
+ catch (Exception ex) { ErrorLogging.LogDebug(ex); }
}
private void OpenFolder()
{
try
{
- if (Directory.Exists(DownloadPath))
+ if (Directory.Exists(SettingsEngine.DownloadPath))
{
Process.Start(new ProcessStartInfo
{
- FileName = DownloadPath,
+ FileName = SettingsEngine.DownloadPath,
UseShellExecute = true,
Verb = "open"
});
}
}
- catch (Exception ex)
- {
- ErrorLogging.LogDebug(ex);
- }
+ catch (Exception ex) { ErrorLogging.LogDebug(ex); }
}
}
}
\ No newline at end of file
diff --git a/.Source/GTweak/GTweak.csproj b/.Source/GTweak/GTweak.csproj
index 59882004..796df06f 100644
--- a/.Source/GTweak/GTweak.csproj
+++ b/.Source/GTweak/GTweak.csproj
@@ -633,6 +633,9 @@
<Resource Include="Assets\Images\DownloadApps\Nvidia.png" />
<Resource Include="Assets\Images\DownloadApps\NvidiaPI.png" />
<Resource Include="Assets\Images\DownloadApps\Occt.png" />
+ <Resource Include="Assets\Images\DownloadApps\DiskInfo.png" />
+ <Resource Include="Assets\Images\DownloadApps\DiskMark.png" />
+ <Resource Include="Assets\Images\DownloadApps\CPUz.png" />
<Content Include="Properties\AssemblyInfo.tt">
<Generator>TextTemplatingFileGenerator</Generator>
<LastGenOutput>AssemblyInfo.cs</LastGenOutput>
diff --git a/.Source/GTweak/Languages/en/Localize.xaml b/.Source/GTweak/Languages/en/Localize.xaml
index b7515f1d..6c6f0b59 100644
--- a/.Source/GTweak/Languages/en/Localize.xaml
+++ b/.Source/GTweak/Languages/en/Localize.xaml
@@ -542,17 +542,18 @@
<!--#endregion-->
<!--#region Addons Page -->
- <v:String x:Key="btn_open_dir">Select folder</v:String>
+ <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="text_info_adds">Select a directory or make sure it is not empty</v:String>
<v:String x:Key="scripts_info_adds">After that, you will be able to run scripts (.ps1, .cmd, .bat, .reg) on this page</v:String>
<!--#endregion-->
- <!--#region ToolsetCard Page -->
+ <!--#region Toolset Page -->
<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="download_folder_ts">Download Folder</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>
<!--#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 8f1ae913..a0116a0b 100644
--- a/.Source/GTweak/Languages/fr/Localize.xaml
+++ b/.Source/GTweak/Languages/fr/Localize.xaml
@@ -542,17 +542,18 @@
<!--#endregion-->
<!--#region Addons Page -->
- <v:String x:Key="btn_open_dir">Sélectionner un dossier</v:String>
+ <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="text_info_adds">Sélectionnez un répertoire ou assurez-vous qu'il n'est pas vide</v:String>
<v:String x:Key="scripts_info_adds">Après cela, vous pourrez exécuter des scripts (.ps1, .cmd, .bat, .reg) sur cette page</v:String>
<!--#endregion-->
- <!--#region ToolsetCard Page -->
+ <!--#region Toolset Page -->
<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="download_folder_ts">Download Folder</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>
<!--#endregion-->
</ResourceDictionary>
diff --git a/.Source/GTweak/Languages/hu/Localize.xaml b/.Source/GTweak/Languages/hu/Localize.xaml
index e8368e31..5a6516e2 100644
--- a/.Source/GTweak/Languages/hu/Localize.xaml
+++ b/.Source/GTweak/Languages/hu/Localize.xaml
@@ -542,17 +542,18 @@
<!--#endregion-->
<!--#region Addons Page -->
- <v:String x:Key="btn_open_dir">Mappa kiválasztása</v:String>
+ <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>
<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 ToolsetCard Page -->
+ <!--#region Toolset Page -->
<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="download_folder_ts">Download Folder</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>
<!--#endregion-->
</ResourceDictionary>
diff --git a/.Source/GTweak/Languages/it/Localize.xaml b/.Source/GTweak/Languages/it/Localize.xaml
index 7ee19a6b..287c464c 100644
--- a/.Source/GTweak/Languages/it/Localize.xaml
+++ b/.Source/GTweak/Languages/it/Localize.xaml
@@ -542,17 +542,18 @@
<!--#endregion-->
<!--#region Addons Page -->
- <v:String x:Key="btn_open_dir">Seleziona cartella</v:String>
+ <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="text_info_adds">Seleziona una directory o assicurati che non sia vuota</v:String>
<v:String x:Key="scripts_info_adds">Dopodiché, potrai eseguire script (.ps1, .cmd, .bat, .reg) su questa pagina</v:String>
<!--#endregion-->
- <!--#region ToolsetCard Page -->
+ <!--#region Toolset Page -->
<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="download_folder_ts">Download Folder</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>
<!--#endregion-->
</ResourceDictionary>
diff --git a/.Source/GTweak/Languages/ko/Localize.xaml b/.Source/GTweak/Languages/ko/Localize.xaml
index 8b2dbe09..547c0c13 100644
--- a/.Source/GTweak/Languages/ko/Localize.xaml
+++ b/.Source/GTweak/Languages/ko/Localize.xaml
@@ -542,17 +542,18 @@
<!--#endregion-->
<!--#region Addons Page -->
- <v:String x:Key="btn_open_dir">폴더 선택</v:String>
+ <v:String x:Key="btn_select_dir">폴더 선택</v:String>
<v:String x:Key="chk_run_ti_adds">TrustedInstaller로 실행</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 ToolsetCard Page -->
+ <!--#region Toolset Page -->
<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="download_folder_ts">Download Folder</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>
<!--#endregion-->
</ResourceDictionary>
diff --git a/.Source/GTweak/Languages/pl/Localize.xaml b/.Source/GTweak/Languages/pl/Localize.xaml
index 8d8909b1..1f82162b 100644
--- a/.Source/GTweak/Languages/pl/Localize.xaml
+++ b/.Source/GTweak/Languages/pl/Localize.xaml
@@ -542,17 +542,18 @@
<!--#endregion-->
<!--#region Addons Page -->
- <v:String x:Key="btn_open_dir">Wybierz folder</v:String>
+ <v:String x:Key="btn_select_dir">Wybierz folder</v:String>
<v:String x:Key="chk_run_ti_adds">Uruchom jako TrustedInstaller</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">Po tym będziesz mógł uruchamiać skrypty (.ps1, .cmd, .bat, .reg) na tej stronie</v:String>
<!--#endregion-->
- <!--#region ToolsetCard Page -->
+ <!--#region Toolset Page -->
<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="download_folder_ts">Download Folder</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>
<!--#endregion-->
</ResourceDictionary>
diff --git a/.Source/GTweak/Languages/pt-BR/Localize.xaml b/.Source/GTweak/Languages/pt-BR/Localize.xaml
index a44c8e17..8d314f8e 100644
--- a/.Source/GTweak/Languages/pt-BR/Localize.xaml
+++ b/.Source/GTweak/Languages/pt-BR/Localize.xaml
@@ -542,17 +542,18 @@
<!--#endregion-->
<!--#region Addons Page -->
- <v:String x:Key="btn_open_dir">Selecionar pasta</v:String>
+ <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="text_info_adds">Selecione um diretório ou certifique‑se de que não está vazio</v:String>
<v:String x:Key="scripts_info_adds">Depois disso, você poderá executar scripts (.ps1, .cmd, .bat, .reg) nesta página</v:String>
<!--#endregion-->
- <!--#region ToolsetCard Page -->
+ <!--#region Toolset Page -->
<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="download_folder_ts">Download Folder</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>
<!--#endregion-->
</ResourceDictionary>
diff --git a/.Source/GTweak/Languages/ru/Localize.xaml b/.Source/GTweak/Languages/ru/Localize.xaml
index 33320025..afed813d 100644
--- a/.Source/GTweak/Languages/ru/Localize.xaml
+++ b/.Source/GTweak/Languages/ru/Localize.xaml
@@ -542,17 +542,18 @@
<!--#endregion-->
<!--#region Addons Page -->
- <v:String x:Key="btn_open_dir">Выбрать папку</v:String>
+ <v:String x:Key="btn_select_dir">Выбрать папку</v:String>
<v:String x:Key="chk_run_ti_adds">Запуск от имени TrustedInstaller</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 ToolsetCard Page -->
+ <!--#region Toolset Page -->
<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="download_folder_ts">Папка загрузки</v:String>
+ <v:String x:Key="btn_open_dir">Открыть папку</v:String>
+ <v:String x:Key="text_ts">Поиск по названию или автору</v:String>
<!--#endregion-->
</ResourceDictionary>
diff --git a/.Source/GTweak/Languages/uk/Localize.xaml b/.Source/GTweak/Languages/uk/Localize.xaml
index 718e1bf1..426ee568 100644
--- a/.Source/GTweak/Languages/uk/Localize.xaml
+++ b/.Source/GTweak/Languages/uk/Localize.xaml
@@ -542,17 +542,18 @@
<!--#endregion-->
<!--#region Addons Page -->
- <v:String x:Key="btn_open_dir">Вибрати папку</v:String>
+ <v:String x:Key="btn_select_dir">Вибрати папку</v:String>
<v:String x:Key="chk_run_ti_adds">Запуск від імені TrustedInstaller</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 ToolsetCard Page -->
+ <!--#region Toolset Page -->
<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="download_folder_ts">Download Folder</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>
<!--#endregion-->
</ResourceDictionary>
diff --git a/.Source/GTweak/Languages/zh-CN/Localize.xaml b/.Source/GTweak/Languages/zh-CN/Localize.xaml
index 0b2be7f9..b3595de1 100644
--- a/.Source/GTweak/Languages/zh-CN/Localize.xaml
+++ b/.Source/GTweak/Languages/zh-CN/Localize.xaml
@@ -542,17 +542,18 @@
<!--#endregion-->
<!--#region Addons Page -->
- <v:String x:Key="btn_open_dir">选择文档夹</v:String>
+ <v:String x:Key="btn_select_dir">选择文档夹</v:String>
<v:String x:Key="chk_run_ti_adds">以 TrustedInstaller 身份运行</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 ToolsetCard Page -->
+ <!--#region Toolset Page -->
<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="download_folder_ts">Download Folder</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>
<!--#endregion-->
</ResourceDictionary>
diff --git a/.Source/GTweak/Languages/zh-TW/Localize.xaml b/.Source/GTweak/Languages/zh-TW/Localize.xaml
index ca386889..6d58f8fc 100644
--- a/.Source/GTweak/Languages/zh-TW/Localize.xaml
+++ b/.Source/GTweak/Languages/zh-TW/Localize.xaml
@@ -542,17 +542,18 @@
<!--#endregion-->
<!--#region Addons Page -->
- <v:String x:Key="btn_open_dir">選擇資料夾</v:String>
+ <v:String x:Key="btn_select_dir">選擇資料夾</v:String>
<v:String x:Key="chk_run_ti_adds">以 TrustedInstaller 的身份執行</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 ToolsetCard Page -->
+ <!--#region Toolset Page -->
<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="download_folder_ts">Download Folder</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>
<!--#endregion-->
</ResourceDictionary>
diff --git a/.Source/GTweak/Properties/AssemblyInfo.cs b/.Source/GTweak/Properties/AssemblyInfo.cs
index fc69aade..5fc38485 100644
--- a/.Source/GTweak/Properties/AssemblyInfo.cs
+++ b/.Source/GTweak/Properties/AssemblyInfo.cs
@@ -7,9 +7,9 @@ using System.Windows;
[assembly: AssemblyProduct("GTweak")]
[assembly: AssemblyCopyright("� 2024-2026 Greedeks")]
[assembly: AssemblyTrademark("Greedeks")]
-[assembly: AssemblyInformationalVersion("Build: 5.4.6")]
-[assembly: AssemblyVersion("5.4.40.710")]
-[assembly: AssemblyFileVersion("5.4.40.710")]
+[assembly: AssemblyInformationalVersion("Build: 5.4.7")]
+[assembly: AssemblyVersion("5.4.61.502")]
+[assembly: AssemblyFileVersion("5.4.61.502")]
[assembly: ComVisible(false)]
diff --git a/.Source/GTweak/Properties/AssemblyInfo.tt b/.Source/GTweak/Properties/AssemblyInfo.tt
index 84f92623..a63e932d 100644
--- a/.Source/GTweak/Properties/AssemblyInfo.tt
+++ b/.Source/GTweak/Properties/AssemblyInfo.tt
@@ -22,7 +22,7 @@ using System.Windows;
[assembly: AssemblyMetadata("RepositoryType", "git")]
<#+
- private const string majorVersion = "Build: 5.4.6";
+ private const string majorVersion = "Build: 5.4.7";
private string GenerateVersion()
{
diff --git a/.Source/GTweak/Resources/AppsCatalog.xml b/.Source/GTweak/Resources/AppsCatalog.xml
index fff47d9d..f93f8cf0 100644
--- a/.Source/GTweak/Resources/AppsCatalog.xml
+++ b/.Source/GTweak/Resources/AppsCatalog.xml
@@ -76,13 +76,44 @@
<DownloadPath>https://download.sysinternals.com/files/Autoruns.zip</DownloadPath>
</App>
+ <App>
+ <Icon>Img_CPUz</Icon>
+ <Name>CPU-Z</Name>
+ <Group>sourceforge</Group>
+ <Author>CPUID</Author>
+ <AuthorIcon>cpuid.com</AuthorIcon>
+ <Source>https://sourceforge.net/projects/cpu-z/</Source>
+ <DownloadPath>https://sourceforge.net/projects/cpu-z/files/latest/download</DownloadPath>
+ </App>
+
+ <App>
+ <Icon>Img_DiskInfo</Icon>
+ <Name>Crystal Disk Info</Name>
+ <Group>sourceforge</Group>
+ <Author>hiyohiyo</Author>
+ <AuthorIcon>crystalmark.info</AuthorIcon>
+ <Source>https://sourceforge.net/projects/crystaldiskinfo/</Source>
+ <DownloadPath>https://sourceforge.net/projects/crystaldiskinfo/files/latest/download</DownloadPath>
+ </App>
+
+ <App>
+ <Icon>Img_DiskMark</Icon>
+ <Name>Crystal Disk Mark</Name>
+ <Group>sourceforge</Group>
+ <Author>hiyohiyo</Author>
+ <AuthorIcon>crystalmark.info</AuthorIcon>
+ <Source>https://sourceforge.net/projects/crystaldiskmark/</Source>
+ <DownloadPath>https://sourceforge.net/projects/crystaldiskmark/files/latest/download</DownloadPath>
+ </App>
+
<App>
<Icon>Img_Occt</Icon>
<Name>OCCT</Name>
<Group>web</Group>
- <Author>OCCT</Author>
+ <Author>OCCT/OCBASE</Author>
<AuthorIcon>ocbase.com</AuthorIcon>
<Source>https://www.ocbase.com/download</Source>
<DownloadPath>https://www.ocbase.com/download/edition:Personal/os:Windows</DownloadPath>
+ <FileName>OCCT.exe</FileName>
</App>
</Apps>
\ No newline at end of file
diff --git a/.Source/GTweak/Styles/Buttons/RadioButtons.xaml b/.Source/GTweak/Styles/Buttons/RadioButtons.xaml
index 0b2bbc28..d745c119 100644
--- a/.Source/GTweak/Styles/Buttons/RadioButtons.xaml
+++ b/.Source/GTweak/Styles/Buttons/RadioButtons.xaml
@@ -18,10 +18,7 @@
<Setter.Value>
<ControlTemplate TargetType="RadioButton">
<Border x:Name="OuterPanel" CornerRadius="12" Width="50" Height="48" Background="{x:Null}" HorizontalAlignment="Left" SnapsToDevicePixels="True">
- <Grid RenderOptions.BitmapScalingMode="HighQuality">
- <Grid.CacheMode>
- <BitmapCache RenderAtScale="2" EnableClearType="True"/>
- </Grid.CacheMode>
+ <Grid>
<Border x:Name="ShadowPanel" CornerRadius="12" Opacity="0" Background="{StaticResource Brush_ShadowOverlay}" IsHitTestVisible="False" Width="{Binding ActualWidth, ElementName=InnerPanel}" Height="{Binding ActualHeight, ElementName=InnerPanel}" HorizontalAlignment="Left" VerticalAlignment="Center">
<Border.RenderTransform>
<TranslateTransform X="3" Y="4" />
diff --git a/.Source/GTweak/Styles/Inputs/TextBox.xaml b/.Source/GTweak/Styles/Inputs/TextBox.xaml
index 7362991b..f8fb28fb 100644
--- a/.Source/GTweak/Styles/Inputs/TextBox.xaml
+++ b/.Source/GTweak/Styles/Inputs/TextBox.xaml
@@ -23,7 +23,7 @@
<Grid>
<Border x:Name="border" Background="{StaticResource Brush_Background_TextBox}" BorderBrush="{StaticResource Brush_Accent}" BorderThickness="0,0,0,1" CornerRadius="5"/>
<ScrollViewer x:Name="PART_ContentHost" Margin="5,0,0,0" VerticalAlignment="Center" />
- <Label Margin="5,0,5,0" x:Name="WaterMarkLabel" Content="{TemplateBinding Tag}" VerticalAlignment="Center" Visibility="Collapsed" Foreground="{StaticResource Brush_TextBlock_Inactivity}" FontFamily="{StaticResource Jura}"/>
+ <Label Margin="5,0,5,0" x:Name="WaterMarkLabel" Content="{TemplateBinding Tag}" VerticalAlignment="Center" Visibility="Collapsed" Foreground="{StaticResource Brush_Inactive}" FontFamily="{StaticResource Jura}"/>
</Grid>
<ControlTemplate.Triggers>
<MultiTrigger>
diff --git a/.Source/GTweak/View/AddonsView.xaml b/.Source/GTweak/View/AddonsView.xaml
index 9499d1ea..55cd5296 100644
--- a/.Source/GTweak/View/AddonsView.xaml
+++ b/.Source/GTweak/View/AddonsView.xaml
@@ -23,7 +23,7 @@
<StackPanel Orientation="Horizontal" VerticalAlignment="Center">
<ui:SymbolIcon Symbol="FolderOpen20" FontSize="15" Margin="0,0,5,0"/>
<TextBlock VerticalAlignment="Center">
- <Run Text="{DynamicResource btn_open_dir}"/><Run Text="..."/>
+ <Run Text="{DynamicResource btn_select_dir}"/><Run Text="..."/>
</TextBlock>
</StackPanel>
</Button>
diff --git a/.Source/GTweak/View/ConfidentialityView.xaml b/.Source/GTweak/View/ConfidentialityView.xaml
index e1e2d843..ac498629 100644
--- a/.Source/GTweak/View/ConfidentialityView.xaml
+++ b/.Source/GTweak/View/ConfidentialityView.xaml
@@ -46,7 +46,7 @@
<uc:ToggleButton x:Name="TglButton14" Style="{StaticResource ToggleStyle}" State="{Binding [TglButton14].State}" TextResource="{DynamicResource tgl14_conf}" Description="{DynamicResource tgl14_desc_conf}" />
<uc:ToggleButton x:Name="TglButton15" Style="{StaticResource ToggleStyle}" State="{Binding [TglButton15].State}" TextResource="{DynamicResource tgl15_conf}" Description="{DynamicResource tgl15_desc_conf}" />
<uc:ToggleButton x:Name="TglButton16" Style="{StaticResource ToggleStyle}" State="{Binding [TglButton16].State}" TextResource="{DynamicResource tgl16_conf}" Description="{DynamicResource tgl16_desc_conf}" />
- <uc:ToggleButton x:Name="TglButton17" Style="{StaticResource ToggleStyle}" Visibility="{Binding NvSupportAvailable}" State="{Binding [TglButton17].State}" TextResource="{DynamicResource tgl17_conf}" Description="{DynamicResource tgl17_desc_conf}" />
+ <uc:ToggleButton x:Name="TglButton17" Style="{StaticResource ToggleStyle}" State="{Binding [TglButton17].State}" TextResource="{DynamicResource tgl17_conf}" Description="{DynamicResource tgl17_desc_conf}" />
<uc:ToggleButton x:Name="TglButton18" Style="{StaticResource ToggleStyle}" State="{Binding [TglButton18].State}" TextResource="{DynamicResource tgl18_conf}" Description="{DynamicResource tgl18_desc_conf}" />
<uc:ToggleButton x:Name="TglButton19" Style="{StaticResource ToggleStyle}" State="{Binding [TglButton19].State}" TextResource="{DynamicResource tgl19_conf}" Description="{DynamicResource tgl19_desc_conf}" />
<uc:ToggleButton x:Name="TglButton20" Style="{StaticResource ToggleStyle}" State="{Binding [TglButton20].State}" TextResource="{DynamicResource tgl20_conf}" Description="{DynamicResource tgl20_desc_conf}" />
diff --git a/.Source/GTweak/View/ToolsetView.xaml b/.Source/GTweak/View/ToolsetView.xaml
index 338813c0..9d656058 100644
--- a/.Source/GTweak/View/ToolsetView.xaml
+++ b/.Source/GTweak/View/ToolsetView.xaml
@@ -18,33 +18,41 @@
<RowDefinition Height="*" />
</Grid.RowDefinitions>
- <uc:FlowPanel Grid.Row="0" ContentAlignment="Left" Orientation="Horizontal" HorizontalSpacing="10" VerticalSpacing="5" Margin="10,5,10,0">
+ <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}" Width="300" MaxLength="50" HorizontalAlignment="Left" Height="28">
+ <TextBox.Tag>
+ <TextBlock>
+ <Run Text="🔍"/> <Run Text="{DynamicResource text_ts}"/>
+ </TextBlock>
+ </TextBox.Tag>
+ </TextBox>
+
<Button Command="{Binding SelectFolderCommand}" Style="{StaticResource ButtonContent}" HorizontalAlignment="Right">
<StackPanel Orientation="Horizontal" VerticalAlignment="Center">
<ui:SymbolIcon Symbol="FolderOpen20" FontSize="15" Margin="0,0,5,0"/>
<TextBlock VerticalAlignment="Center">
- <Run Text="{DynamicResource btn_open_dir}"/><Run Text="..."/>
+ <Run Text="{DynamicResource btn_select_dir}"/><Run Text="..."/>
</TextBlock>
</StackPanel>
</Button>
- <Border Grid.Column="0" BorderThickness="1" BorderBrush="{StaticResource Brush_Separator}" Height="29" CornerRadius="6" Background="Transparent" VerticalAlignment="Stretch" Padding="10,0" Cursor="Hand">
- <Border.InputBindings>
- <MouseBinding MouseAction="LeftClick" Command="{Binding OpenFolderCommand}"/>
- </Border.InputBindings>
- <TextBlock Style="{StaticResource Description}" FontSize="14px" VerticalAlignment="Center" HorizontalAlignment="Center" Padding="0,5" TextTrimming="CharacterEllipsis" Cursor="Hand">
- <Run Text="{DynamicResource download_folder_ts}"/><Run Text=": "/><Run Text="{Binding DownloadPath}" Foreground="{StaticResource Brush_Inactive}"/>
- </TextBlock>
- </Border>
-
+ <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>
+
</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">
<ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled">
<Grid>
- <ItemsControl ItemsSource="{Binding Tools}" VirtualizingPanel.IsVirtualizing="True">
+ <ItemsControl ItemsSource="{Binding ToolsView}" VirtualizingPanel.IsVirtualizing="True">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<uc:FlowPanel Margin="10,10,10,20" HorizontalSpacing="5" VerticalSpacing="10" ContentAlignment="Stretch" HorizontalAlignment="Stretch" VerticalAlignment="Top"/>
diff --git a/Assets/Images/DownloadApps/CPUz.png b/Assets/Images/DownloadApps/CPUz.png
new file mode 100644
index 00000000..cce90c1a
Binary files /dev/null and b/Assets/Images/DownloadApps/CPUz.png differ
diff --git a/Assets/Images/DownloadApps/DiskInfo.png b/Assets/Images/DownloadApps/DiskInfo.png
new file mode 100644
index 00000000..8e98f3fd
Binary files /dev/null and b/Assets/Images/DownloadApps/DiskInfo.png differ
diff --git a/Assets/Images/DownloadApps/DiskMark.png b/Assets/Images/DownloadApps/DiskMark.png
new file mode 100644
index 00000000..bd2a7596
Binary files /dev/null and b/Assets/Images/DownloadApps/DiskMark.png differ