Skip to content

Free, open-source Windows optimization tool for performance, privacy, and simplicity.

refactor: use pattern for conditions and and logging

itsfatduck3b0f0129b351
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index 70e3179..3b9a633 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,2 +1 @@
-github: [itsfatduck]
ko_fi: itsfatduck
diff --git a/optimizerDuck/Resources/Languages/Translations.resx b/optimizerDuck/Resources/Languages/Translations.resx
index c2a10aa..30b9da7 100644
--- a/optimizerDuck/Resources/Languages/Translations.resx
+++ b/optimizerDuck/Resources/Languages/Translations.resx
@@ -927,6 +927,9 @@ This ensures you can always go back if anything goes wrong.</value>
</data>
<data name="Bloatware.Loading" xml:space="preserve">
<value>Looking for removable apps…</value>
+ </data>
+ <data name="Bloatware.Loading.Hint" xml:space="preserve">
+ <value>This may take a moment while the application scans for installed packages.</value>
</data>
<data name="Sidebar.Bloatware" xml:space="preserve">
<value>Bloatware</value>
@@ -1144,6 +1147,36 @@ Update now to enjoy the latest features, improvements, and bug fixes.</value>
</data>
<data name="StartupManager.Header.Description" xml:space="preserve">
<value>Manage applications and tasks that run automatically when Windows starts.</value>
+ </data>
+ <data name="OptimizationDetailsDialog.Other" xml:space="preserve">
+ <value>Other</value>
+ </data>
+ <data name="OptimizationDetailsDialog.Other.OpenRevertFile.Description" xml:space="preserve">
+ <value>Open the raw json file containing revert data for this optimization.</value>
+ </data>
+ <data name="OptimizationDetailsDialog.Other.OpenRevertFile.Title" xml:space="preserve">
+ <value>Open revert data</value>
+ </data>
+ <data name="OptimizationDetailsDialog.Other.ViewSource.Description" xml:space="preserve">
+ <value>Open the source code for this optimization in your browser.</value>
+ </data>
+ <data name="OptimizationDetailsDialog.Other.ViewSource.Title" xml:space="preserve">
+ <value>View Source on GitHub</value>
+ </data>
+ <data name="OptimizationDetailsDialog.Risk" xml:space="preserve">
+ <value>Risk Level</value>
+ </data>
+ <data name="OptimizationDetailsDialog.Tags" xml:space="preserve">
+ <value>Tags</value>
+ </data>
+ <data name="OptimizationDetailsDialog.TechnicalDetails" xml:space="preserve">
+ <value>Technical Details</value>
+ </data>
+ <data name="OptimizationDetailsDialog.Id" xml:space="preserve">
+ <value>Optimization ID</value>
+ </data>
+ <data name="OptimizationDetailsDialog.Class" xml:space="preserve">
+ <value>Class Name</value>
</data>
<data name="StartupManager.Apps.Title" xml:space="preserve">
<value>Startup Apps</value>
@@ -1172,4 +1205,13 @@ Update now to enjoy the latest features, improvements, and bug fixes.</value>
<data name="Common.Toggle.Off" xml:space="preserve">
<value>Off</value>
</data>
+ <data name="Common.SortBy.Status" xml:space="preserve">
+ <value>Status</value>
+ </data>
+ <data name="Common.Status.Applied" xml:space="preserve">
+ <value>Applied</value>
+ </data>
+ <data name="StartupManager.Menu.OpenSettings" xml:space="preserve">
+ <value>Open Settings</value>
+ </data>
</root>
\ No newline at end of file
diff --git a/optimizerDuck/Resources/Languages/Translations.ru-RU.resx b/optimizerDuck/Resources/Languages/Translations.ru-RU.resx
index 4687f21..675a11f 100644
--- a/optimizerDuck/Resources/Languages/Translations.ru-RU.resx
+++ b/optimizerDuck/Resources/Languages/Translations.ru-RU.resx
@@ -927,6 +927,9 @@
</data>
<data name="Bloatware.Loading" xml:space="preserve">
<value>Поиск удаляемых приложений…</value>
+ </data>
+ <data name="Bloatware.Loading.Hint" xml:space="preserve">
+ <value>Это может занять некоторое время, пока приложение сканирует установленные пакеты.</value>
</data>
<data name="Sidebar.Bloatware" xml:space="preserve">
<value>Ненужные приложения</value>
@@ -1142,4 +1145,73 @@
<data name="Common.Toggle.Off" xml:space="preserve">
<value>Выкл</value>
</data>
+ <data name="Sidebar.StartupManager" xml:space="preserve">
+ <value>Автозагрузка</value>
+ </data>
+ <data name="StartupManager.Header.Title" xml:space="preserve">
+ <value>Автозагрузка</value>
+ </data>
+ <data name="StartupManager.Header.Description" xml:space="preserve">
+ <value>Управление приложениями и задачами, которые автоматически запускаются при запуске Windows.</value>
+ </data>
+ <data name="OptimizationDetailsDialog.Other" xml:space="preserve">
+ <value>Другие действия</value>
+ </data>
+ <data name="OptimizationDetailsDialog.Other.OpenRevertFile.Description" xml:space="preserve">
+ <value>Откройте файл JSON, содержащий данные об отмене этой настройки.</value>
+ </data>
+ <data name="OptimizationDetailsDialog.Other.OpenRevertFile.Title" xml:space="preserve">
+ <value>Открыть данные отмены</value>
+ </data>
+ <data name="OptimizationDetailsDialog.Other.ViewSource.Description" xml:space="preserve">
+ <value>Откройте исходный код для этой настройки в вашем браузере.</value>
+ </data>
+ <data name="OptimizationDetailsDialog.Other.ViewSource.Title" xml:space="preserve">
+ <value>Просмотр исходного кода на GitHub</value>
+ </data>
+ <data name="OptimizationDetailsDialog.Risk" xml:space="preserve">
+ <value>Уровень риска</value>
+ </data>
+ <data name="OptimizationDetailsDialog.Tags" xml:space="preserve">
+ <value>Теги</value>
+ </data>
+ <data name="OptimizationDetailsDialog.TechnicalDetails" xml:space="preserve">
+ <value>Технические детали</value>
+ </data>
+ <data name="OptimizationDetailsDialog.Id" xml:space="preserve">
+ <value>ID Настройки</value>
+ </data>
+ <data name="OptimizationDetailsDialog.Class" xml:space="preserve">
+ <value>Имя класса</value>
+ </data>
+ <data name="StartupManager.Apps.Title" xml:space="preserve">
+ <value>Автозагрузка приложений</value>
+ </data>
+ <data name="StartupManager.Tasks.Title" xml:space="preserve">
+ <value>Запланированные задачи (Вход)</value>
+ </data>
+ <data name="StartupManager.Loading" xml:space="preserve">
+ <value>Сканирование элементов автозагрузки...</value>
+ </data>
+ <data name="StartupManager.Loading.Hint" xml:space="preserve">
+ <value>Это может занять некоторое время, приложение сканирует реестр и папки автозагрузки.</value>
+ </data>
+ <data name="StartupManager.Empty.Title" xml:space="preserve">
+ <value>Элементов автозагрузки нет</value>
+ </data>
+ <data name="StartupManager.Empty.Description" xml:space="preserve">
+ <value>В этой системе не было найдено ни одного приложения из автозагрузки или запланированной задачи.</value>
+ </data>
+ <data name="StartupManager.Menu.Refresh" xml:space="preserve">
+ <value>Обновить</value>
+ </data>
+ <data name="Common.SortBy.Status" xml:space="preserve">
+ <value>Статус</value>
+ </data>
+ <data name="Common.Status.Applied" xml:space="preserve">
+ <value>Применено</value>
+ </data>
+ <data name="StartupManager.Menu.OpenSettings" xml:space="preserve">
+ <value>Открыть параметры</value>
+ </data>
</root>
\ No newline at end of file
diff --git a/optimizerDuck/Resources/Languages/Translations.vi-VN.resx b/optimizerDuck/Resources/Languages/Translations.vi-VN.resx
index 40605f3..ffe7821 100644
--- a/optimizerDuck/Resources/Languages/Translations.vi-VN.resx
+++ b/optimizerDuck/Resources/Languages/Translations.vi-VN.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
@@ -398,12 +398,6 @@
</data>
<data name="Service.Shell.Error.TimedOut" xml:space="preserve">
<value>Hết thời gian chờ</value>
- </data>
- <data name="OptimizationDetailsDialog.Other.OpenRevertFile.Title" xml:space="preserve">
- <value>Tệp hoàn tác</value>
- </data>
- <data name="OptimizationDetailsDialog.Other.OpenRevertFile.Description" xml:space="preserve">
- <value>Mở thư mục và chọn tệp dữ liệu hoàn tác của tối ưu này.</value>
</data>
<data name="OptimizationResultDialog.Header" xml:space="preserve">
<value>{0} Bước bị lỗi</value>
@@ -927,6 +921,9 @@ Hãy yên tâm rằng hệ thống của bạn luôn có đường lui nếu có
</data>
<data name="Bloatware.Loading" xml:space="preserve">
<value>Đang tìm kiếm ứng dụng có thể gỡ…</value>
+ </data>
+ <data name="Bloatware.Loading.Hint" xml:space="preserve">
+ <value>Quá trình này có thể mất một lúc khi ứng dụng quét các gói đã được cài đặt.</value>
</data>
<data name="Sidebar.Bloatware" xml:space="preserve">
<value>Bloatware</value>
@@ -1144,6 +1141,33 @@ Cập nhật ngay để trải nghiệm các tính năng mới, cải tiến và
</data>
<data name="StartupManager.Header.Description" xml:space="preserve">
<value>Quản lý các ứng dụng và tác vụ tự động chạy khi Windows khởi động</value>
+ </data>
+ <data name="OptimizationDetailsDialog.Other.OpenRevertFile.Description" xml:space="preserve">
+ <value>Mở tệp JSON gốc chứa dữ liệu khôi phục cho tính năng tối ưu hóa này.</value>
+ </data>
+ <data name="OptimizationDetailsDialog.Other.OpenRevertFile.Title" xml:space="preserve">
+ <value>Mở dữ liệu khôi phục</value>
+ </data>
+ <data name="OptimizationDetailsDialog.Other.ViewSource.Description" xml:space="preserve">
+ <value>Mở mã nguồn của tính năng tối ưu hóa này trên trình duyệt của bạn.</value>
+ </data>
+ <data name="OptimizationDetailsDialog.Other.ViewSource.Title" xml:space="preserve">
+ <value>Xem mã nguồn trên GitHub</value>
+ </data>
+ <data name="OptimizationDetailsDialog.Risk" xml:space="preserve">
+ <value>Mức độ rủi ro</value>
+ </data>
+ <data name="OptimizationDetailsDialog.Tags" xml:space="preserve">
+ <value>Thẻ</value>
+ </data>
+ <data name="OptimizationDetailsDialog.TechnicalDetails" xml:space="preserve">
+ <value>Chi tiết kỹ thuật</value>
+ </data>
+ <data name="OptimizationDetailsDialog.Id" xml:space="preserve">
+ <value>ID Tối ưu hóa</value>
+ </data>
+ <data name="OptimizationDetailsDialog.Class" xml:space="preserve">
+ <value>Tên Lớp (Class)</value>
</data>
<data name="StartupManager.Apps.Title" xml:space="preserve">
<value>Ứng dụng Khởi động</value>
@@ -1172,4 +1196,13 @@ Cập nhật ngay để trải nghiệm các tính năng mới, cải tiến và
<data name="Common.Toggle.Off" xml:space="preserve">
<value>Tắt</value>
</data>
+ <data name="Common.SortBy.Status" xml:space="preserve">
+ <value>Trạng thái</value>
+ </data>
+ <data name="Common.Status.Applied" xml:space="preserve">
+ <value>Đã áp dụng</value>
+ </data>
+ <data name="StartupManager.Menu.OpenSettings" xml:space="preserve">
+ <value>Mở Cài đặt</value>
+ </data>
</root>
\ No newline at end of file
diff --git a/optimizerDuck/Resources/Languages/Translations.zh-Hans.resx b/optimizerDuck/Resources/Languages/Translations.zh-Hans.resx
index fe9a8e8..fcf6fbf 100644
--- a/optimizerDuck/Resources/Languages/Translations.zh-Hans.resx
+++ b/optimizerDuck/Resources/Languages/Translations.zh-Hans.resx
@@ -844,6 +844,9 @@
</data>
<data name="Bloatware.Loading" xml:space="preserve">
<value>正在搜索可移除的应用…</value>
+ </data>
+ <data name="Bloatware.Loading.Hint" xml:space="preserve">
+ <value>程序正在扫描已安装的包,这可能需要一点时间。</value>
</data>
<data name="Sidebar.Bloatware" xml:space="preserve">
<value>臃肿软件</value>
@@ -1059,4 +1062,73 @@
<data name="Common.Toggle.Off" xml:space="preserve">
<value>关闭</value>
</data>
+ <data name="Sidebar.StartupManager" xml:space="preserve">
+ <value>启动管理</value>
+ </data>
+ <data name="StartupManager.Header.Title" xml:space="preserve">
+ <value>启动管理</value>
+ </data>
+ <data name="StartupManager.Header.Description" xml:space="preserve">
+ <value>管理在 Windows 启动时自动运行的应用程序和任务。</value>
+ </data>
+ <data name="OptimizationDetailsDialog.Other" xml:space="preserve">
+ <value>其他操作</value>
+ </data>
+ <data name="OptimizationDetailsDialog.Other.OpenRevertFile.Description" xml:space="preserve">
+ <value>打开包含此优化恢复数据的原始 JSON 文件。</value>
+ </data>
+ <data name="OptimizationDetailsDialog.Other.OpenRevertFile.Title" xml:space="preserve">
+ <value>打开恢复数据</value>
+ </data>
+ <data name="OptimizationDetailsDialog.Other.ViewSource.Description" xml:space="preserve">
+ <value>在浏览器中打开此优化的源代码。</value>
+ </data>
+ <data name="OptimizationDetailsDialog.Other.ViewSource.Title" xml:space="preserve">
+ <value>在 GitHub 上查看源码</value>
+ </data>
+ <data name="OptimizationDetailsDialog.Risk" xml:space="preserve">
+ <value>风险等级</value>
+ </data>
+ <data name="OptimizationDetailsDialog.Tags" xml:space="preserve">
+ <value>标签</value>
+ </data>
+ <data name="OptimizationDetailsDialog.TechnicalDetails" xml:space="preserve">
+ <value>技术细节</value>
+ </data>
+ <data name="OptimizationDetailsDialog.Id" xml:space="preserve">
+ <value>优化 ID</value>
+ </data>
+ <data name="OptimizationDetailsDialog.Class" xml:space="preserve">
+ <value>类名</value>
+ </data>
+ <data name="StartupManager.Apps.Title" xml:space="preserve">
+ <value>启动应用</value>
+ </data>
+ <data name="StartupManager.Tasks.Title" xml:space="preserve">
+ <value>计划任务 (登录时)</value>
+ </data>
+ <data name="StartupManager.Loading" xml:space="preserve">
+ <value>正在扫描启动项...</value>
+ </data>
+ <data name="StartupManager.Loading.Hint" xml:space="preserve">
+ <value>程序正在扫描注册表和启动文件夹,这可能需要一点时间。</value>
+ </data>
+ <data name="StartupManager.Empty.Title" xml:space="preserve">
+ <value>没有启动项</value>
+ </data>
+ <data name="StartupManager.Empty.Description" xml:space="preserve">
+ <value>在此系统上未找到启动应用程序或计划任务。</value>
+ </data>
+ <data name="StartupManager.Menu.Refresh" xml:space="preserve">
+ <value>刷新</value>
+ </data>
+ <data name="Common.SortBy.Status" xml:space="preserve">
+ <value>状态</value>
+ </data>
+ <data name="Common.Status.Applied" xml:space="preserve">
+ <value>已应用</value>
+ </data>
+ <data name="StartupManager.Menu.OpenSettings" xml:space="preserve">
+ <value>打开设置</value>
+ </data>
</root>
\ No newline at end of file
diff --git a/optimizerDuck/Services/DiskCleanupService.cs b/optimizerDuck/Services/DiskCleanupService.cs
index 77bd686..0d13265 100644
--- a/optimizerDuck/Services/DiskCleanupService.cs
+++ b/optimizerDuck/Services/DiskCleanupService.cs
@@ -175,7 +175,7 @@ public class DiskCleanupService(ILogger<DiskCleanupService> logger)
public async Task<long> CleanSelectedAsync(IEnumerable<CleanupItem> items)
{
long totalFreed = 0;
- foreach (var item in items.Where(i => i.IsSelected && i.SizeBytes > 0))
+ foreach (var item in items.Where(i => i is { IsSelected: true, SizeBytes: > 0 }))
totalFreed += await CleanAsync(item);
return totalFreed;
}
diff --git a/optimizerDuck/Services/OptimizationRegistry.cs b/optimizerDuck/Services/OptimizationRegistry.cs
index 0dccafe..ac247b6 100644
--- a/optimizerDuck/Services/OptimizationRegistry.cs
+++ b/optimizerDuck/Services/OptimizationRegistry.cs
@@ -58,17 +58,6 @@ public class OptimizationRegistry(ILoggerFactory loggerFactory)
await OptimizationService.UpdateOptimizationStateAsync(optimizationCategories.SelectMany(c => c.Optimizations));
- foreach (var category in optimizationCategories)
- {
- var sorted = category.Optimizations
- .OrderBy(o => o.Risk)
- .ThenByDescending(o => o.State.IsApplied ? 1 : 0)
- .ToList();
-
- category.Optimizations.Clear();
- foreach (var opt in sorted)
- category.Optimizations.Add(opt);
- }
OptimizationCategories = optimizationCategories;
}
diff --git a/optimizerDuck/Services/StartupManagerService.cs b/optimizerDuck/Services/StartupManagerService.cs
index 108d2f6..02050d1 100644
--- a/optimizerDuck/Services/StartupManagerService.cs
+++ b/optimizerDuck/Services/StartupManagerService.cs
@@ -43,7 +43,7 @@ public class StartupManagerService(ILogger<StartupManagerService> logger)
{
var appInfo = GetAppInfo(app.Command);
var publisher = !string.IsNullOrWhiteSpace(appInfo.Publisher) ? appInfo.Publisher : appInfo.Description;
- if (string.IsNullOrWhiteSpace(publisher)) publisher = app.Location == StartupAppLocation.UserStartupFolder || app.Location == StartupAppLocation.CommonStartupFolder ? "Folder Shortcut" : "Registry";
+ if (string.IsNullOrWhiteSpace(publisher)) publisher = app.Location is StartupAppLocation.UserStartupFolder or StartupAppLocation.CommonStartupFolder ? "Folder Shortcut" : "Registry";
app.Publisher = publisher;
app.FilePath = appInfo.FilePath;
@@ -102,7 +102,7 @@ public class StartupManagerService(ILogger<StartupManagerService> logger)
try
{
- if (approvedKey.GetValue(valueName) is byte[] data && data.Length >= 4)
+ if (approvedKey.GetValue(valueName) is byte[] { Length: >= 4 } data)
// Disabled flags: 03, 07; Enabled flags: 02, 06
return data[0] != 0x03 && data[0] != 0x07;
}
@@ -166,6 +166,8 @@ public class StartupManagerService(ILogger<StartupManagerService> logger)
ToggleRegistryStartupApp(app, enable);
else // Folders
ToggleFolderStartupApp(app, enable);
+
+ logger.LogInformation("Toggled startup app {Name} to {Enable}", app.Name, enable);
}
catch (Exception ex)
{
@@ -189,7 +191,7 @@ public class StartupManagerService(ILogger<StartupManagerService> logger)
};
if (rootKey == null) return;
- // Write enable/disable to StartupApproved\Run (same mechanism as Task Manager)
+ // Write enable/disable to StartupApproved\Run
var isRunOnce =
app.Location is StartupAppLocation.RegistryHKCURunOnce or StartupAppLocation.RegistryHKLMRunOnce;
var approvedSubKeyPath = isRunOnce
@@ -286,6 +288,8 @@ public class StartupManagerService(ILogger<StartupManagerService> logger)
if (result.ExitCode != 0)
logger.LogWarning("Toggle tasks returned exit code {ExitCode}. Stderr: {Stderr}", result.ExitCode,
result.Stderr);
+
+ logger.LogInformation("Toggled scheduled task {Name} to {Enable}", task.TaskName, enable);
}
catch (Exception ex)
{
diff --git a/optimizerDuck/UI/ViewModels/Dialogs/OptimizationDetailsViewModel.cs b/optimizerDuck/UI/ViewModels/Dialogs/OptimizationDetailsViewModel.cs
index 5bcbd5f..60109f1 100644
--- a/optimizerDuck/UI/ViewModels/Dialogs/OptimizationDetailsViewModel.cs
+++ b/optimizerDuck/UI/ViewModels/Dialogs/OptimizationDetailsViewModel.cs
@@ -47,4 +47,56 @@ public partial class OptimizationDetailsViewModel(
logger.LogError(ex, "Failed to open revert file for optimization {Id}", Optimization.Id);
}
}
+
+ [RelayCommand]
+ private async Task ViewSourceOnGitHubAsync()
+ {
+ if (Optimization is not Core.Optimizers.BaseOptimization baseOpt || baseOpt.OwnerType == null)
+ return;
+
+ var fileName = baseOpt.OwnerType.Name;
+ var className = Optimization.OptimizationKey;
+ var relativePath = $"optimizerDuck/Core/Optimizers/{fileName}.cs";
+ var url = $"{Shared.GitHubRepoURL}/blob/master/{relativePath}";
+
+ // Fetch source from GitHub raw content to find the class line number
+ try
+ {
+ var rawUrl = $"https://raw.githubusercontent.com/itsfatduck/optimizerDuck/master/{relativePath}";
+
+ using var httpClient = new System.Net.Http.HttpClient { Timeout = TimeSpan.FromSeconds(5) };
+ string source = await httpClient.GetStringAsync(rawUrl);
+
+ var lines = source.Split('\n');
+ for (var i = 0; i < lines.Length; i++)
+ if (lines[i].Contains($"class {className}", StringComparison.OrdinalIgnoreCase))
+ {
+ url += $"#L{i + 1}";
+ break;
+ }
+ }
+ catch (Exception ex)
+ {
+ logger.LogWarning(ex, "Could not fetch source to find line number for {Class}", className);
+ }
+
+ try
+ {
+ Process.Start(new ProcessStartInfo
+ {
+ FileName = url,
+ UseShellExecute = true
+ });
+ }
+ catch (Exception ex)
+ {
+ logger.LogError(ex, "Failed to open GitHub URL: {Url}", url);
+ snackbarService.Show(
+ Translations.Snackbar_OpenLinkFailed_Title,
+ Translations.Snackbar_OpenLinkFailed_Message,
+ ControlAppearance.Danger,
+ new SymbolIcon { Symbol = SymbolRegular.ErrorCircle24, Filled = true },
+ TimeSpan.FromSeconds(5));
+ }
+ }
}
\ No newline at end of file
diff --git a/optimizerDuck/UI/ViewModels/Optimizer/OptimizationCategoryViewModel.cs b/optimizerDuck/UI/ViewModels/Optimizer/OptimizationCategoryViewModel.cs
index a6154c1..db583ac 100644
--- a/optimizerDuck/UI/ViewModels/Optimizer/OptimizationCategoryViewModel.cs
+++ b/optimizerDuck/UI/ViewModels/Optimizer/OptimizationCategoryViewModel.cs
@@ -40,7 +40,7 @@ public partial class OptimizationCategoryViewModel : ViewModel
[ObservableProperty] private string _searchText = string.Empty;
[ObservableProperty] private int _selectedRiskFilterIndex; // 0=All, 1=Safe, 2=Moderate, 3=Risky
- [ObservableProperty] private int _selectedSortByIndex; // 0=Default, 1=Name, 2=Risk
+ [ObservableProperty] private int _selectedSortByIndex; // 0=Risk & Status, 1=Name, 2=Risk
public OptimizationCategoryViewModel(
IOptimizationCategory category,
@@ -132,7 +132,7 @@ public partial class OptimizationCategoryViewModel : ViewModel
{
1 => query.OrderBy(o => o.Name),
2 => query.OrderBy(o => o.Risk),
- _ => query // default order from registry
+ _ => query.OrderBy(o => o.Risk).ThenByDescending(o => o.State.IsApplied ? 1 : 0) // Risk & Status (default)
};
var filtered = query.ToList();
diff --git a/optimizerDuck/UI/ViewModels/Pages/BloatwareViewModel.cs b/optimizerDuck/UI/ViewModels/Pages/BloatwareViewModel.cs
index 0f3451d..465ed55 100644
--- a/optimizerDuck/UI/ViewModels/Pages/BloatwareViewModel.cs
+++ b/optimizerDuck/UI/ViewModels/Pages/BloatwareViewModel.cs
@@ -27,7 +27,7 @@ public partial class BloatwareViewModel : ViewModel
[ObservableProperty] private string _searchText = string.Empty;
[ObservableProperty] private int _selectedRiskFilterIndex; // 0=All, 1=Safe, 2=Caution
- [ObservableProperty] private int _selectedSortByIndex; // 0=Default, 1=Name, 2=Publisher, 3=Risk
+ [ObservableProperty] private int _selectedSortByIndex; // 0=Name, 1=Publisher, 2=Risk
[ObservableProperty] private bool isLoading;
public BloatwareViewModel(BloatwareService bloatwareService, IContentDialogService contentDialogService, ILogger<BloatwareViewModel> logger)
@@ -115,9 +115,9 @@ public partial class BloatwareViewModel : ViewModel
// Sort
query = SelectedSortByIndex switch
{
- 1 => query.OrderBy(p => p.Name),
- 2 => query.OrderBy(p => p.Publisher),
- 3 => query.OrderBy(p => p.Risk),
+ 0 => query.OrderBy(p => p.Name),
+ 1 => query.OrderBy(p => p.Publisher),
+ 2 => query.OrderBy(p => p.Risk),
_ => query
};
diff --git a/optimizerDuck/UI/ViewModels/Pages/DiskCleanupViewModel.cs b/optimizerDuck/UI/ViewModels/Pages/DiskCleanupViewModel.cs
index ead62ae..293254e 100644
--- a/optimizerDuck/UI/ViewModels/Pages/DiskCleanupViewModel.cs
+++ b/optimizerDuck/UI/ViewModels/Pages/DiskCleanupViewModel.cs
@@ -25,7 +25,7 @@ public partial class DiskCleanupViewModel(
private List<CleanupItem> _originalOrder = [];
// Sort
- [ObservableProperty] private int _selectedSortByIndex; // 0=Default, 1=Size, 2=Name, 3=Path
+ [ObservableProperty] private int _selectedSortByIndex; // 0=Size, 1=Name, 2=Path
public bool HasData => CleanupItems.Count > 0 && !IsLoading;
public bool IsAllScanned => CleanupItems.Count > 0 && CleanupItems.All(i => i.IsScanned);
@@ -155,9 +155,9 @@ public partial class DiskCleanupViewModel(
{
var sorted = SelectedSortByIndex switch
{
- 1 => CleanupItems.OrderByDescending(i => i.SizeBytes).ToList(),
- 2 => CleanupItems.OrderBy(i => i.Name).ToList(),
- 3 => CleanupItems.OrderBy(i => i.Path).ToList(),
+ 0 => CleanupItems.OrderByDescending(i => i.SizeBytes).ToList(),
+ 1 => CleanupItems.OrderBy(i => i.Name).ToList(),
+ 2 => CleanupItems.OrderBy(i => i.Path).ToList(),
_ => _originalOrder.ToList()
};
diff --git a/optimizerDuck/UI/ViewModels/Pages/StartupManagerViewModel.cs b/optimizerDuck/UI/ViewModels/Pages/StartupManagerViewModel.cs
index e761356..2102010 100644
--- a/optimizerDuck/UI/ViewModels/Pages/StartupManagerViewModel.cs
+++ b/optimizerDuck/UI/ViewModels/Pages/StartupManagerViewModel.cs
@@ -21,6 +21,7 @@ public partial class StartupManagerViewModel : ViewModel
private bool _isLoading;
[ObservableProperty] private string _searchText = string.Empty;
+ [ObservableProperty] private int _selectedSortByIndex;
public StartupManagerViewModel(StartupManagerService startupManagerService, ILogger<StartupManagerViewModel> logger)
{
@@ -52,6 +53,19 @@ public partial class StartupManagerViewModel : ViewModel
await LoadDataAsync();
}
+ [RelayCommand]
+ private void OpenStartupSettings()
+ {
+ try
+ {
+ Process.Start(new ProcessStartInfo("ms-settings:startupapps") { UseShellExecute = true });
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError(ex, "Failed to open Startup Settings");
+ }
+ }
+
[RelayCommand]
private void OpenLocation(StartupApp? app)
{
@@ -71,6 +85,11 @@ public partial class StartupManagerViewModel : ViewModel
ApplyFilter();
}
+ partial void OnSelectedSortByIndexChanged(int value)
+ {
+ ApplyFilter();
+ }
+
private async Task LoadDataAsync()
{
IsLoading = true;
@@ -113,7 +132,15 @@ public partial class StartupManagerViewModel : ViewModel
var search = SearchText.Trim();
var hasSearch = !string.IsNullOrWhiteSpace(search);
- foreach (var app in _allApps)
+ var sortedApps = SelectedSortByIndex switch
+ {
+ 0 => _allApps.OrderBy(a => a.Name),
+ 1 => _allApps.OrderBy(a => !a.IsEnabled).ThenBy(a => a.Name),
+ 2 => _allApps.OrderBy(a => a.LocationDisplay).ThenBy(a => a.Name),
+ _ => _allApps.OrderBy(a => a.Name)
+ };
+
+ foreach (var app in sortedApps)
{
if (hasSearch &&
!app.Name.Contains(search, StringComparison.OrdinalIgnoreCase) &&
@@ -126,7 +153,15 @@ public partial class StartupManagerViewModel : ViewModel
Apps.Add(app);
}
- foreach (var task in _allTasks)
+ var sortedTasks = SelectedSortByIndex switch
+ {
+ 0 => _allTasks.OrderBy(t => t.TaskName),
+ 1 => _allTasks.OrderBy(t => !t.IsEnabled).ThenBy(t => t.TaskName),
+ 2 => _allTasks.OrderBy(t => t.TaskPath).ThenBy(t => t.TaskName),
+ _ => _allTasks.OrderBy(t => t.TaskName)
+ };
+
+ foreach (var task in sortedTasks)
{
if (hasSearch &&
!task.TaskName.Contains(search, StringComparison.OrdinalIgnoreCase) &&
diff --git a/optimizerDuck/UI/Views/Dialogs/OptimizationDetailsDialog.xaml b/optimizerDuck/UI/Views/Dialogs/OptimizationDetailsDialog.xaml
index 6a96d08..cb4b342 100644
--- a/optimizerDuck/UI/Views/Dialogs/OptimizationDetailsDialog.xaml
+++ b/optimizerDuck/UI/Views/Dialogs/OptimizationDetailsDialog.xaml
@@ -1,6 +1,7 @@
<UserControl
- d:DesignHeight="450"
- d:DesignWidth="800"
+ ScrollViewer.CanContentScroll="False"
+ d:DesignHeight="700"
+ d:DesignWidth="600"
mc:Ignorable="d"
x:Class="optimizerDuck.UI.Views.Dialogs.OptimizationDetailsDialog"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
@@ -9,159 +10,264 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
- <ScrollViewer VerticalScrollBarVisibility="Auto">
- <StackPanel>
+ <StackPanel Margin="0,0,16,0">
+
+ <!-- Description -->
+ <Border
+ Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
+ CornerRadius="8"
+ Margin="0,0,0,12"
+ Padding="16">
<ui:TextBlock
FontTypography="Body"
+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"
Text="{Binding Optimization.ShortDescription}"
- TextTrimming="WordEllipsis"
TextWrapping="Wrap" />
+ </Border>
- <Separator Margin="0,3,0,3" />
-
- <StackPanel Margin="0,0,0,4" Orientation="Horizontal">
- <ui:TextBlock
- FontTypography="BodyStrong"
- Text="{ext:Loc OptimizationDetailsDialog.Tags}"
- TextTrimming="WordEllipsis"
- TextWrapping="Wrap" />
- <ui:SymbolIcon
- Foreground="{DynamicResource TextFillColorSecondaryBrush}"
- Margin="5,0,0,0"
- Symbol="QuestionCircle24"
- ToolTip="{ext:Loc Optimizer.UI.Tags.Help}"
- ToolTipService.InitialShowDelay="150"
- ToolTipService.Placement="Top"
- VerticalAlignment="Center" />
- </StackPanel>
- <ui:VirtualizingItemsControl ItemsSource="{Binding Optimization.TagDisplays}" Margin="0,2,0,2">
- <ui:VirtualizingItemsControl.ItemsPanel>
- <ItemsPanelTemplate>
- <WrapPanel HorizontalAlignment="Left" VerticalAlignment="Top" />
- </ItemsPanelTemplate>
- </ui:VirtualizingItemsControl.ItemsPanel>
- <ui:VirtualizingItemsControl.ItemContainerStyle>
- <Style TargetType="ContentPresenter">
- <Setter Property="Margin" Value="0,0,2,2" />
- <Setter Property="HorizontalAlignment" Value="Left" />
- </Style>
- </ui:VirtualizingItemsControl.ItemContainerStyle>
- <ui:VirtualizingItemsControl.ItemTemplate>
- <DataTemplate>
- <Border
- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
- CornerRadius="5"
- HorizontalAlignment="Left"
- Padding="4,2">
- <StackPanel Orientation="Horizontal">
- <ui:SymbolIcon
- Foreground="{DynamicResource TextFillColorSecondaryBrush}"
- Margin="0,0,5,0"
- Symbol="{Binding Icon}" />
-
- <ui:TextBlock
- Appearance="Secondary"
- FontTypography="Caption"
- Foreground="{DynamicResource TextFillColorInverseBrush}"
- HorizontalAlignment="Center"
- Text="{Binding Display}"
- TextWrapping="Wrap"
- VerticalAlignment="Center" />
- </StackPanel>
- </Border>
- </DataTemplate>
- </ui:VirtualizingItemsControl.ItemTemplate>
- </ui:VirtualizingItemsControl>
+ <!-- Status & Risk -->
+ <Border
+ Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
+ CornerRadius="8"
+ Margin="0,0,0,12"
+ Padding="16">
+ <Grid>
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="*" />
+ <ColumnDefinition Width="*" />
+ </Grid.ColumnDefinitions>
+ <StackPanel Grid.Column="0">
+ <StackPanel Margin="0,0,0,8" Orientation="Horizontal">
+ <ui:TextBlock
+ FontTypography="BodyStrong"
+ Text="{ext:Loc OptimizationDetailsDialog.Risk}"
+ TextTrimming="WordEllipsis"
+ TextWrapping="Wrap" />
+ <ui:SymbolIcon
+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"
+ Margin="6,0,0,0"
+ Symbol="QuestionCircle24"
+ ToolTip="{ext:Loc Optimizer.UI.Risk.Help}"
+ ToolTipService.InitialShowDelay="150"
+ ToolTipService.Placement="Top"
+ VerticalAlignment="Center" />
+ </StackPanel>
+ <Border
+ CornerRadius="5"
+ HorizontalAlignment="Left"
+ Padding="6,4">
+ <Border.Style>
+ <Style TargetType="Border">
+ <Setter Property="Background" Value="{DynamicResource SystemFillColorSuccessBrush}" />
+ <Style.Triggers>
+ <DataTrigger Binding="{Binding Optimization.Risk}" Value="Moderate">
+ <Setter Property="Background" Value="{DynamicResource SystemFillColorCautionBrush}" />
+ </DataTrigger>
+ <DataTrigger Binding="{Binding Optimization.Risk}" Value="Risky">
+ <Setter Property="Background" Value="{DynamicResource SystemFillColorCriticalBrush}" />
+ </DataTrigger>
+ </Style.Triggers>
+ </Style>
+ </Border.Style>
+ <StackPanel Orientation="Horizontal">
+ <ui:SymbolIcon
+ Foreground="{DynamicResource TextFillColorInverseBrush}"
+ Margin="0,0,6,0"
+ Symbol="{Binding Optimization.RiskVisual.Icon}" />
+ <ui:TextBlock
+ FontTypography="Caption"
+ Foreground="{DynamicResource TextFillColorInverseBrush}"
+ HorizontalAlignment="Center"
+ Text="{Binding Optimization.RiskVisual.Display}"
+ TextWrapping="Wrap"
+ VerticalAlignment="Center" />
+ </StackPanel>
+ </Border>
+ </StackPanel>
- <StackPanel Margin="0,5,0,4" Orientation="Horizontal">
- <ui:TextBlock
- FontTypography="BodyStrong"
- Text="{ext:Loc OptimizationDetailsDialog.Risk}"
- TextTrimming="WordEllipsis"
- TextWrapping="Wrap" />
- <ui:SymbolIcon
- Foreground="{DynamicResource TextFillColorSecondaryBrush}"
- Margin="5,0,0,0"
- Symbol="QuestionCircle24"
- ToolTip="{ext:Loc Optimizer.UI.Risk.Help}"
- ToolTipService.InitialShowDelay="150"
- ToolTipService.Placement="Top"
- VerticalAlignment="Center" />
- </StackPanel>
- <Border
- CornerRadius="5"
- HorizontalAlignment="Left"
- Padding="4,2">
- <Border.Style>
- <Style TargetType="Border">
- <Setter Property="Background" Value="{DynamicResource SystemFillColorSuccessBrush}" />
- <Style.Triggers>
- <DataTrigger Binding="{Binding Optimization.Risk}" Value="Moderate">
- <Setter Property="Background" Value="{DynamicResource SystemFillColorCautionBrush}" />
- </DataTrigger>
- <DataTrigger Binding="{Binding Optimization.Risk}" Value="Risky">
- <Setter Property="Background" Value="{DynamicResource SystemFillColorCriticalBrush}" />
- </DataTrigger>
- </Style.Triggers>
- </Style>
- </Border.Style>
- <StackPanel Orientation="Horizontal">
- <ui:SymbolIcon
- Foreground="{DynamicResource TextFillColorInverseBrush}"
- Margin="0,0,5,0"
- Symbol="{Binding Optimization.RiskVisual.Icon}" />
+ <StackPanel Grid.Column="1" Visibility="{Binding Optimization.State.AppliedAt, Converter={StaticResource NullToVisibilityConverter}}">
+ <ui:TextBlock
+ FontTypography="BodyStrong"
+ Margin="0,0,0,8"
+ Text="{ext:Loc Common.Status.Applied}"
+ TextTrimming="WordEllipsis"
+ TextWrapping="Wrap" />
+ <Border
+ Background="{DynamicResource CardBackgroundDisabled}"
+ CornerRadius="5"
+ HorizontalAlignment="Left"
+ Padding="6,4"
+ ToolTip="{Binding Optimization.State.AppliedAt}"
+ ToolTipService.InitialShowDelay="150"
+ ToolTipService.Placement="Top">
+ <ui:TextBlock
+ FontTypography="Caption"
+ HorizontalAlignment="Center"
+ Text="{Binding Optimization.State.RelativeTime}"
+ TextWrapping="Wrap"
+ VerticalAlignment="Center" />
+ </Border>
+ </StackPanel>
+ </Grid>
+ </Border>
+ <!-- Tags -->
+ <Border
+ Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
+ CornerRadius="8"
+ Margin="0,0,0,12"
+ Padding="16">
+ <StackPanel>
+ <StackPanel Margin="0,0,0,12" Orientation="Horizontal">
<ui:TextBlock
- FontTypography="Caption"
- Foreground="{DynamicResource TextFillColorInverseBrush}"
- HorizontalAlignment="Center"
- Text="{Binding Optimization.RiskVisual.Display}"
- TextWrapping="Wrap"
+ FontTypography="BodyStrong"
+ Text="{ext:Loc OptimizationDetailsDialog.Tags}"
+ TextTrimming="WordEllipsis"
+ TextWrapping="Wrap" />
+ <ui:SymbolIcon
+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"
+ Margin="6,0,0,0"
+ Symbol="QuestionCircle24"
+ ToolTip="{ext:Loc Optimizer.UI.Tags.Help}"
+ ToolTipService.InitialShowDelay="150"
+ ToolTipService.Placement="Top"
VerticalAlignment="Center" />
</StackPanel>
- </Border>
+ <ui:VirtualizingItemsControl ItemsSource="{Binding Optimization.TagDisplays}">
+ <ui:VirtualizingItemsControl.ItemsPanel>
+ <ItemsPanelTemplate>
+ <WrapPanel HorizontalAlignment="Left" VerticalAlignment="Top" />
+ </ItemsPanelTemplate>
+ </ui:VirtualizingItemsControl.ItemsPanel>
+ <ui:VirtualizingItemsControl.ItemContainerStyle>
+ <Style TargetType="ContentPresenter">
+ <Setter Property="Margin" Value="0,0,6,6" />
+ <Setter Property="HorizontalAlignment" Value="Left" />
+ </Style>
+ </ui:VirtualizingItemsControl.ItemContainerStyle>
+ <ui:VirtualizingItemsControl.ItemTemplate>
+ <DataTemplate>
+ <Border
+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
+ CornerRadius="5"
+ HorizontalAlignment="Left"
+ Padding="6,4">
+ <StackPanel Orientation="Horizontal">
+ <ui:SymbolIcon
+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"
+ Margin="0,0,6,0"
+ Symbol="{Binding Icon}" />
- <ui:TextBlock
- FontTypography="BodyStrong"
- Margin="0,5,0,0"
- Text="{ext:Loc OptimizationDetailsDialog.Other}"
- TextTrimming="WordEllipsis"
- TextWrapping="Wrap" />
- <ui:CardAction
- Command="{Binding OpenRevertFileCommand}"
- Icon="{ui:SymbolIcon FolderOpen24}"
- Visibility="{Binding Optimization.State.AppliedAt, Converter={StaticResource NullToVisibilityConverter}}">
+ <ui:TextBlock
+ Appearance="Secondary"
+ FontTypography="Caption"
+ Foreground="{DynamicResource TextFillColorInverseBrush}"
+ HorizontalAlignment="Center"
+ Text="{Binding Display}"
+ TextWrapping="Wrap"
+ VerticalAlignment="Center" />
+ </StackPanel>
+ </Border>
+ </DataTemplate>
+ </ui:VirtualizingItemsControl.ItemTemplate>
+ </ui:VirtualizingItemsControl>
+ </StackPanel>
+ </Border>
- <StackPanel>
+ <!-- Technical Details Section -->
+ <ui:TextBlock
+ FontTypography="BodyStrong"
+ Margin="0,12,0,8"
+ Text="{ext:Loc OptimizationDetailsDialog.TechnicalDetails}"
+ TextWrapping="Wrap" />
+
+ <Border
+ Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
+ CornerRadius="8"
+ Margin="0,0,0,12"
+ Padding="0">
+ <StackPanel>
+ <Grid Margin="16">
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="150" />
+ <ColumnDefinition Width="*" />
+ </Grid.ColumnDefinitions>
<ui:TextBlock
- FontTypography="BodyStrong"
- Text="{ext:Loc OptimizationDetailsDialog.Other.OpenRevertFile.Title}"
- TextWrapping="Wrap" />
+ Appearance="Secondary"
+ Grid.Column="0"
+ Text="{ext:Loc OptimizationDetailsDialog.Id}"
+ VerticalAlignment="Center" />
+ <ui:TextBlock
+ FontFamily="Consolas"
+ Grid.Column="1"
+ Text="{Binding Optimization.Id}"
+ TextWrapping="Wrap"
+ VerticalAlignment="Center" />
+ </Grid>
+ <Separator Margin="16,0,16,0" />
+ <Grid Margin="16">
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="150" />
+ <ColumnDefinition Width="*" />
+ </Grid.ColumnDefinitions>
<ui:TextBlock
Appearance="Secondary"
- FontTypography="Body"
- Text="{ext:Loc OptimizationDetailsDialog.Other.OpenRevertFile.Description}"
- TextWrapping="Wrap" />
- </StackPanel>
- </ui:CardAction>
- <Border
- Background="{DynamicResource CardBackgroundDisabled}"
- CornerRadius="5"
- HorizontalAlignment="Left"
- Margin="0,5,0,0"
- Padding="4,2"
- ToolTip="{Binding Optimization.State.AppliedAt}"
- ToolTipService.InitialShowDelay="150"
- ToolTipService.Placement="Top"
- Visibility="{Binding Optimization.State.AppliedAt, Converter={StaticResource NullToVisibilityConverter}}">
+ Grid.Column="0"
+ Text="{ext:Loc OptimizationDetailsDialog.Class}"
+ VerticalAlignment="Center" />
+ <ui:TextBlock
+ FontFamily="Consolas"
+ Grid.Column="1"
+ Text="{Binding Optimization.OptimizationKey}"
+ TextWrapping="Wrap"
+ VerticalAlignment="Center" />
+ </Grid>
+ </StackPanel>
+ </Border>
+
+ <!-- Actions -->
+ <ui:TextBlock
+ FontTypography="BodyStrong"
+ Margin="0,12,0,8"
+ Text="{ext:Loc OptimizationDetailsDialog.Other}"
+ TextTrimming="WordEllipsis"
+ TextWrapping="Wrap" />
+
+ <ui:CardAction
+ Command="{Binding ViewSourceOnGitHubCommand}"
+ Icon="{ui:SymbolIcon Code24}"
+ Margin="0,0,0,8">
+ <StackPanel>
<ui:TextBlock
- FontTypography="Caption"
- HorizontalAlignment="Center"
- Text="{Binding Optimization.State.RelativeTime}"
- TextWrapping="Wrap"
- VerticalAlignment="Center" />
- </Border>
- </StackPanel>
- </ScrollViewer>
+ FontTypography="BodyStrong"
+ Text="{ext:Loc OptimizationDetailsDialog.Other.ViewSource.Title}"
+ TextWrapping="Wrap" />
+ <ui:TextBlock
+ Appearance="Secondary"
+ FontTypography="Body"
+ Text="{ext:Loc OptimizationDetailsDialog.Other.ViewSource.Description}"
+ TextWrapping="Wrap" />
+ </StackPanel>
+ </ui:CardAction>
+
+ <ui:CardAction
+ Command="{Binding OpenRevertFileCommand}"
+ Icon="{ui:SymbolIcon FolderOpen24}"
+ Margin="0,0,0,4"
+ Visibility="{Binding Optimization.State.AppliedAt, Converter={StaticResource NullToVisibilityConverter}}">
+ <StackPanel>
+ <ui:TextBlock
+ FontTypography="BodyStrong"
+ Text="{ext:Loc OptimizationDetailsDialog.Other.OpenRevertFile.Title}"
+ TextWrapping="Wrap" />
+ <ui:TextBlock
+ Appearance="Secondary"
+ FontTypography="Body"
+ Text="{ext:Loc OptimizationDetailsDialog.Other.OpenRevertFile.Description}"
+ TextWrapping="Wrap" />
+ </StackPanel>
+ </ui:CardAction>
+
+ </StackPanel>
</UserControl>
\ No newline at end of file
diff --git a/optimizerDuck/UI/Views/Pages/BloatwarePage.xaml b/optimizerDuck/UI/Views/Pages/BloatwarePage.xaml
index cf3d43d..6b65d39 100644
--- a/optimizerDuck/UI/Views/Pages/BloatwarePage.xaml
+++ b/optimizerDuck/UI/Views/Pages/BloatwarePage.xaml
@@ -87,15 +87,22 @@
<Border Grid.Row="1" Visibility="{Binding ViewModel.IsLoading, Converter={StaticResource BooleanToVisibilityConverter}}">
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
<ui:ProgressRing
+ Height="48"
HorizontalAlignment="Center"
IsIndeterminate="True"
- Margin="0,0,0,5"
- VerticalAlignment="Center" />
+ Margin="0,0,0,16"
+ VerticalAlignment="Center"
+ Width="48" />
<ui:TextBlock
FontTypography="BodyStrong"
HorizontalAlignment="Center"
- Text="{ext:Loc Bloatware.Loading}"
- VerticalAlignment="Center" />
+ Text="{ext:Loc Bloatware.Loading}" />
+ <ui:TextBlock
+ Appearance="Secondary"
+ FontTypography="Caption"
+ HorizontalAlignment="Center"
+ Margin="0,4,0,0"
+ Text="{ext:Loc Bloatware.Loading.Hint}" />
</StackPanel>
</Border>
@@ -169,10 +176,24 @@
ToolTipService.BetweenShowDelay="160"
ToolTipService.Placement="Top"
VerticalAlignment="Center">
- <ComboBoxItem Content="{ext:Loc Common.SortBy.Default}" />
- <ComboBoxItem Content="{ext:Loc Common.SortBy.Name}" />
- <ComboBoxItem Content="{ext:Loc Common.SortBy.Publisher}" />
- <ComboBoxItem Content="{ext:Loc Common.SortBy.Risk}" />
+ <ComboBoxItem HorizontalContentAlignment="Left">
+ <Grid ColumnDefinitions="Auto Auto" HorizontalAlignment="Left">
+ <ui:SymbolIcon HorizontalAlignment="Left" Margin="0,0,6,0" Symbol="TextSortAscending24" />
+ <TextBlock Grid.Column="1" HorizontalAlignment="Left" Text="{ext:Loc Common.SortBy.Name}" />
+ </Grid>
+ </ComboBoxItem>
+ <ComboBoxItem HorizontalContentAlignment="Left">
+ <Grid ColumnDefinitions="Auto Auto" HorizontalAlignment="Left">
+ <ui:SymbolIcon HorizontalAlignment="Left" Margin="0,0,6,0" Symbol="Certificate24" />
+ <TextBlock Grid.Column="1" HorizontalAlignment="Left" Text="{ext:Loc Common.SortBy.Publisher}" />
+ </Grid>
+ </ComboBoxItem>
+ <ComboBoxItem HorizontalContentAlignment="Left">
+ <Grid ColumnDefinitions="Auto Auto" HorizontalAlignment="Left">
+ <ui:SymbolIcon HorizontalAlignment="Left" Margin="0,0,6,0" Symbol="Shield24" />
+ <TextBlock Grid.Column="1" HorizontalAlignment="Left" Text="{ext:Loc Common.SortBy.Risk}" />
+ </Grid>
+ </ComboBoxItem>
</ComboBox>
</WrapPanel>
diff --git a/optimizerDuck/UI/Views/Pages/DiskCleanupPage.xaml b/optimizerDuck/UI/Views/Pages/DiskCleanupPage.xaml
index 750c00b..9da6c04 100644
--- a/optimizerDuck/UI/Views/Pages/DiskCleanupPage.xaml
+++ b/optimizerDuck/UI/Views/Pages/DiskCleanupPage.xaml
@@ -46,18 +46,12 @@
HorizontalAlignment="Center"
Orientation="Vertical"
VerticalAlignment="Center">
- <ui:SymbolIcon
- FontSize="48"
- Foreground="{DynamicResource TextFillColorSecondaryBrush}"
- HorizontalAlignment="Center"
- Margin="0,0,0,16"
- Symbol="HardDrive20" />
<ui:ProgressRing
- Height="36"
+ Height="48"
HorizontalAlignment="Center"
IsIndeterminate="True"
Margin="0,0,0,12"
- Width="36" />
+ Width="48" />
<ui:TextBlock
FontTypography="BodyStrong"
HorizontalAlignment="Center"
@@ -145,10 +139,42 @@
ToolTipService.BetweenShowDelay="160"
ToolTipService.Placement="Top"
VerticalAlignment="Center">
- <ComboBoxItem Content="{ext:Loc Common.SortBy.Default}" />
- <ComboBoxItem Content="{ext:Loc Common.SortBy.Size}" />
- <ComboBoxItem Content="{ext:Loc Common.SortBy.Name}" />
- <ComboBoxItem Content="{ext:Loc Common.SortBy.Path}" />
+ <ComboBoxItem HorizontalContentAlignment="Left">
+ <Grid ColumnDefinitions="Auto Auto" HorizontalAlignment="Left">
+ <ui:SymbolIcon
+ HorizontalAlignment="Left"
+ Margin="0,0,6,0"
+ Symbol="Storage24" />
+ <TextBlock
+ Grid.Column="1"
+ HorizontalAlignment="Left"
+ Text="{ext:Loc Common.SortBy.Size}" />
+ </Grid>
+ </ComboBoxItem>
+ <ComboBoxItem HorizontalContentAlignment="Left">
+ <Grid ColumnDefinitions="Auto Auto" HorizontalAlignment="Left">
+ <ui:SymbolIcon
+ HorizontalAlignment="Left"
+ Margin="0,0,6,0"
+ Symbol="TextSortAscending24" />
+ <TextBlock
+ Grid.Column="1"
+ HorizontalAlignment="Left"
+ Text="{ext:Loc Common.SortBy.Name}" />
+ </Grid>
+ </ComboBoxItem>
+ <ComboBoxItem HorizontalContentAlignment="Left">
+ <Grid ColumnDefinitions="Auto Auto" HorizontalAlignment="Left">
+ <ui:SymbolIcon
+ HorizontalAlignment="Left"
+ Margin="0,0,6,0"
+ Symbol="Folder24" />
+ <TextBlock
+ Grid.Column="1"
+ HorizontalAlignment="Left"
+ Text="{ext:Loc Common.SortBy.Path}" />
+ </Grid>
+ </ComboBoxItem>
</ComboBox>
</WrapPanel>
diff --git a/optimizerDuck/UI/Views/Pages/Optimizations/OptimizationPage.xaml b/optimizerDuck/UI/Views/Pages/Optimizations/OptimizationPage.xaml
index d6f3dbf..61446e6 100644
--- a/optimizerDuck/UI/Views/Pages/Optimizations/OptimizationPage.xaml
+++ b/optimizerDuck/UI/Views/Pages/Optimizations/OptimizationPage.xaml
@@ -105,9 +105,29 @@
ToolTipService.BetweenShowDelay="160"
ToolTipService.Placement="Top"
VerticalAlignment="Center">
- <ComboBoxItem Content="{ext:Loc Common.SortBy.Default}" />
- <ComboBoxItem Content="{ext:Loc Common.SortBy.Name}" />
- <ComboBoxItem Content="{ext:Loc Common.SortBy.Risk}" />
+
+ <ComboBoxItem HorizontalContentAlignment="Left">
+ <Grid ColumnDefinitions="Auto Auto" HorizontalAlignment="Left">
+ <ui:SymbolIcon HorizontalAlignment="Left" Margin="0,0,6,0" Symbol="Filter24" />
+ <TextBlock Grid.Column="1" HorizontalAlignment="Left">
+ <Run Text="{ext:Loc Common.SortBy.Risk}" />
+ <Run Text=" &amp; " />
+ <Run Text="{ext:Loc Common.SortBy.Status}" />
+ </TextBlock>
+ </Grid>
+ </ComboBoxItem>
+ <ComboBoxItem HorizontalContentAlignment="Left">
+ <Grid ColumnDefinitions="Auto Auto" HorizontalAlignment="Left">
+ <ui:SymbolIcon HorizontalAlignment="Left" Margin="0,0,6,0" Symbol="TextSortAscending24" />
+ <TextBlock Grid.Column="1" HorizontalAlignment="Left" Text="{ext:Loc Common.SortBy.Name}" />
+ </Grid>
+ </ComboBoxItem>
+ <ComboBoxItem HorizontalContentAlignment="Left">
+ <Grid ColumnDefinitions="Auto Auto" HorizontalAlignment="Left">
+ <ui:SymbolIcon HorizontalAlignment="Left" Margin="0,0,6,0" Symbol="Shield24" />
+ <TextBlock Grid.Column="1" HorizontalAlignment="Left" Text="{ext:Loc Common.SortBy.Risk}" />
+ </Grid>
+ </ComboBoxItem>
</ComboBox>
<!-- Hide Applied toggle -->
diff --git a/optimizerDuck/UI/Views/Pages/StartupManagerPage.xaml b/optimizerDuck/UI/Views/Pages/StartupManagerPage.xaml
index ba2fb90..9c5e3f9 100644
--- a/optimizerDuck/UI/Views/Pages/StartupManagerPage.xaml
+++ b/optimizerDuck/UI/Views/Pages/StartupManagerPage.xaml
@@ -108,26 +108,69 @@
<Border Grid.Row="1" Visibility="{Binding ViewModel.HasData, Converter={StaticResource BooleanToVisibilityConverter}}">
<Grid RowDefinitions="Auto,*">
<!-- Toolbar -->
- <WrapPanel
+ <Grid
Grid.Row="0"
- Margin="0,0,0,12"
- Orientation="Horizontal">
- <!-- Search -->
- <ui:TextBox
- Icon="{ui:SymbolIcon Search24}"
- Margin="0,0,8,0"
- MinWidth="220"
- PlaceholderText="{ext:Loc Common.Search.Placeholder}"
- Text="{Binding ViewModel.SearchText, UpdateSourceTrigger=PropertyChanged}"
- VerticalAlignment="Center" />
+ Margin="0,0,16,12">
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="*" />
+ <ColumnDefinition Width="Auto" />
+ </Grid.ColumnDefinitions>
+
+ <WrapPanel Grid.Column="0" Orientation="Horizontal">
+ <!-- Search -->
+ <ui:TextBox
+ Icon="{ui:SymbolIcon Search24}"
+ Margin="0,0,8,0"
+ MinWidth="220"
+ PlaceholderText="{ext:Loc Common.Search.Placeholder}"
+ Text="{Binding ViewModel.SearchText, UpdateSourceTrigger=PropertyChanged}"
+ VerticalAlignment="Center" />
+
+ <!-- Sort By -->
+ <ComboBox
+ Margin="0,0,8,0"
+ SelectedIndex="{Binding ViewModel.SelectedSortByIndex}"
+ ToolTip="{ext:Loc Common.SortBy}"
+ ToolTipService.BetweenShowDelay="160"
+ ToolTipService.Placement="Top"
+ VerticalAlignment="Center">
+ <ComboBoxItem HorizontalContentAlignment="Left">
+ <Grid ColumnDefinitions="Auto Auto" HorizontalAlignment="Left">
+ <ui:SymbolIcon HorizontalAlignment="Left" Margin="0,0,6,0" Symbol="TextSortAscending24" />
+ <TextBlock Grid.Column="1" HorizontalAlignment="Left" Text="{ext:Loc Common.SortBy.Name}" />
+ </Grid>
+ </ComboBoxItem>
+ <ComboBoxItem HorizontalContentAlignment="Left">
+ <Grid ColumnDefinitions="Auto Auto" HorizontalAlignment="Left">
+ <ui:SymbolIcon HorizontalAlignment="Left" Margin="0,0,6,0" Symbol="ToggleRight24" />
+ <TextBlock Grid.Column="1" HorizontalAlignment="Left" Text="{ext:Loc Common.SortBy.Status}" />
+ </Grid>
+ </ComboBoxItem>
+ <ComboBoxItem HorizontalContentAlignment="Left">
+ <Grid ColumnDefinitions="Auto Auto" HorizontalAlignment="Left">
+ <ui:SymbolIcon HorizontalAlignment="Left" Margin="0,0,6,0" Symbol="Folder24" />
+ <TextBlock Grid.Column="1" HorizontalAlignment="Left" Text="{ext:Loc Common.SortBy.Path}" />
+ </Grid>
+ </ComboBoxItem>
+ </ComboBox>
+
+ <ui:Button
+ Appearance="Primary"
+ Command="{Binding ViewModel.RefreshCommand}"
+ Content="{ext:Loc StartupManager.Menu.Refresh}"
+ Icon="{ui:SymbolIcon ArrowClockwise24,
+ FontSize=18}" />
+ </WrapPanel>
<ui:Button
- Appearance="Primary"
- Command="{Binding ViewModel.RefreshCommand}"
- Content="{ext:Loc StartupManager.Menu.Refresh}"
- Icon="{ui:SymbolIcon ArrowClockwise24,
- FontSize=18}" />
- </WrapPanel>
+ Grid.Column="2"
+ Appearance="Secondary"
+ Command="{Binding ViewModel.OpenStartupSettingsCommand}"
+ Content="{ext:Loc StartupManager.Menu.OpenSettings}"
+ Icon="{ui:SymbolIcon Settings24, FontSize=18}"
+ VerticalAlignment="Center" />
+ </Grid>
<!-- Scrollable content -->
<ScrollViewer Grid.Row="1" Margin="0,0,16,0">