Free, open-source Windows optimization tool for performance, privacy, and simplicity.
C# csharpdebloatdotnetgamingopen-sourceoptimizationoptimizeroptimizerduckperformanceprivacytweakertweakswindowswinui
fix: improve async handling and resource cleanup
fatDuckedf19c549da2
diff --git a/.editorconfig b/.editorconfigindex 7aa7585..ce65901 100644--- a/.editorconfig+++ b/.editorconfig@@ -4,3 +4,24 @@# bro ts solve so many warnings!!# CA1416: Validate platform compatibilitydotnet_diagnostic.CA1416.severity = silent+++# https://csharpier.com/docs/Configuration+[*.{cs,csx}]+# Non-configurable behaviors+charset = utf-8+insert_final_newline = true+trim_trailing_whitespace = true+dotnet_sort_system_directives_first = true+dotnet_separate_import_directive_groups = false++# conifguiawudiable+end_of_line = lf+indent_style = space+indent_size = 4+max_line_length = 100++[*.{config,csproj,props,slnx,targets,xml}]+indent_style = space+indent_size = 4+max_line_length = 100\ No newline at end of filediff --git a/.github/workflows/release.yml b/.github/workflows/release.ymlnew file mode 100644index 0000000..a7952f3--- /dev/null+++ b/.github/workflows/release.yml@@ -0,0 +1,60 @@+name: Release++on:+ release:+ types: [created]++env:+ FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true++jobs:+ build:+ runs-on: windows-latest++ steps:+ - name: Checkout+ uses: actions/checkout@v6++ - name: Setup .NET+ uses: actions/setup-dotnet@v5+ with:+ dotnet-version: 10.0.x+ cache: true+ cache-dependency-path: |+ optimizerDuck/optimizerDuck.csproj+ optimizerDuck.Test/optimizerDuck.Test.csproj++ - name: Restore+ run: dotnet restore optimizerDuck.slnx++ - name: Build+ run: dotnet build optimizerDuck.slnx --configuration Release --no-restore++ - name: Test+ run: dotnet test optimizerDuck.Test/optimizerDuck.Test.csproj --configuration Release --no-build++ - name: Publish Single+ run: dotnet publish optimizerDuck/optimizerDuck.csproj -c Release --nologo /p:PublishProfile=Single++ - name: Get version from tag+ id: get_version+ run: |+ $tag = "${{ github.ref_name }}"+ $version = $tag -replace '^v', ''+ echo "version=$version" >> $env:GITHUB_OUTPUT+ shell: pwsh++ - name: Rename output file+ run: |+ $version = "${{ steps.get_version.outputs.version }}"+ $source = "optimizerDuck/bin/Release/Single/net10.0/publish/win-x64/optimizerDuck.exe"+ $dest = "optimizerDuck-Windows-x64-$version.exe"+ Move-Item -Path $source -Destination $dest+ shell: pwsh++ - name: Upload Release Asset+ uses: softprops/action-gh-release@v3+ with:+ files: ./optimizerDuck-Windows-x64-${{ steps.get_version.outputs.version }}.exe+ env:+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}diff --git a/.windsurf/workflows/generatechangelog.md b/.windsurf/workflows/generatechangelog.mdnew file mode 100644index 0000000..292a0a5--- /dev/null+++ b/.windsurf/workflows/generatechangelog.md@@ -0,0 +1,52 @@+You are a professional software release writer.++Your task is to generate a clean, concise, and engaging changelog based on the provided working changes (git diff, file changes, or summaries).++Step 1 — Understand the product:++- Infer what the project does based on the provided changes+- Identify the likely target users (e.g., developers, gamers, general users, etc.)+- Understand the purpose of the changes and their impact++Step 2 — Write the changelog:++Start with a short summary (1–2 sentences):++- Describe the overall direction of this update+- Focus on user value and experience, not technical details+- Make it feel like a real product update, not a raw log++Then organize details into sections:++## New++- New features or capabilities that users can notice or use++## Fixes++- Bug fixes, crashes, incorrect behaviors resolved++## Improvements++- Enhancements, optimizations, UI/UX refinements, performance upgrades++Rules:++- Be concise but meaningful+- Focus on user-facing impact (what changed for the user and why it matters)+- Do NOT mention file names unless absolutely necessary+- Do NOT include raw technical details (variables, code, diffs, logs)+- Merge related changes into clear, high-level bullet points+- Avoid generic wording like "minor fixes" unless nothing else is known+- Use natural, polished English (like real release notes from a product)++Style guidelines:++- Make the changelog feel intentional and purposeful+- Avoid robotic or repetitive phrasing+- Slightly emphasize improvements in usability, performance, or stability when relevant+- If the changes are small, still make them sound meaningful without exaggerating++Section rules:++- Omit any section that has no relevant itemsdiff --git a/.windsurfrules b/.windsurfrulesnew file mode 100644index 0000000..8491f5a--- /dev/null+++ b/.windsurfrules@@ -0,0 +1,32 @@+# RTK - Rust Token Killer (Windsurf)++**Usage**: Token-optimized CLI proxy for shell commands.++## Rule++Always prefix shell commands with `rtk` to minimize token consumption.++Examples:++```bash+rtk git status+rtk cargo test+rtk ls src/+rtk grep "pattern" src/+rtk find "*.rs" .+rtk docker ps+rtk gh pr list+```++## Meta Commands++```bash+rtk gain # Show token savings+rtk gain --history # Command history with savings+rtk discover # Find missed RTK opportunities+rtk proxy <cmd> # Run raw (no filtering, for debugging)+```++## Why++RTK filters and compresses command output before it reaches the LLM context, saving 60-90% tokens on common operations. Always use `rtk <cmd>` instead of raw commands.diff --git a/LICENSE b/LICENSEindex baa32ab..ed5ab97 100644--- a/LICENSE+++ b/LICENSE@@ -1,9 +1,7 @@-optimizerDuck – A free and open-source Windows optimization tool-Copyright (C) 2025–2026 fatDuck (itsfatduck)---GNU GENERAL PUBLIC LICENSE+ GNU GENERAL PUBLIC LICENSEVersion 3, 29 June 2007+ optimizerDuck – A free and open-source Windows optimization tool+ Copyright (C) 2025–2026 fatDuck (itsfatduck)Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>Everyone is permitted to copy and distribute verbatim copiesdiff --git a/README.md b/README.mdindex 612b091..5ddea47 100644--- a/README.md+++ b/README.md@@ -138,7 +138,7 @@ Step-by-step instructions, explanations of each optimization, and best practices> [!TIP]> Join our growing community on Discord! Get support, share your experience, and connect with other users and contributors.->+>> <a href="https://discord.gg/tDUBDCYw9Q"><img src="https://discord.com/api/guilds/1091675679994675240/widget.png?style=banner2" alt="Discord Banner 2"/></a>If optimizerDuck helped your PC:diff --git a/README.vi.md b/README.vi.mdindex bf7217c..4c7e610 100644--- a/README.vi.md+++ b/README.vi.md@@ -4,7 +4,7 @@# [optimizerDuck](https://optimizerduck.vercel.app/)-**optimizerDuck là một công cụ tối ưu hóa Windows miễn phí, mã nguồn mở được xây dựng nhằm mục đích hiệu suất, quyền riêng tư và sự đơn giản.**+**optimizerDuck là một công cụ tối ưu hóa Windows miễn phí, mã nguồn mở được xây dựng nhằm mục đích tối ưu hiệu suất, bảo mật và sự đơn giản.**[](https://github.com/itsfatduck/optimizerDuck/releases/latest)[](https://github.com/itsfatduck/optimizerDuck/releases)@@ -21,11 +21,13 @@<details><summary>⭐ Lịch sử Star</summary>-Nếu optimizerDuck giúp ích cho PC của bạn, hãy cân nhắc tặng repo một ⭐ và chia sẻ nó với người khác.+🇻🇳++Nếu optimizerDuck giúp ích cho PC của bạn, hãy tặng repo một ⭐ và chia sẻ nó với người khác.Mỗi ngôi sao giúp tạo động lực cho những cải tiến trong tương lai.<a href="https://www.star-history.com/#itsfatduck/optimizerDuck&type=timeline&legend=top-left">- <picture>+<picture><source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/svg?repos=itsfatduck/optimizerDuck&type=timeline&theme=dark&legend=top-left" /><source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/svg?repos=itsfatduck/optimizerDuck&type=timeline&legend=top-left" /><img alt="Star History Chart" src="https://api.star-history.com/svg?repos=itsfatduck/optimizerDuck&type=timeline&legend=top-left" />@@ -58,21 +60,21 @@ Mỗi ngôi sao giúp tạo động lực cho những cải tiến trong tươngHơn 35 tối ưu hóa trong 6 danh mục, cùng với các công cụ tích hợp để quản lý hệ thống của bạn. Tất cả đều có chỉ báo rủi ro rõ ràng và hoàn tác chỉ với một cú nhấp chuột.-| | Tính năng | Công dụng |-| :-- | :---------------------- | :------------------------------------------------------------------------ |-| 🚀 | **Hiệu suất & Nguồn điện** | Tăng tốc hệ thống, vô hiệu hóa các dịch vụ rác, tinh chỉnh cài đặt nguồn điện. |-| 🛡️ | **Bảo vệ quyền riêng tư** | Tắt đo lường từ xa, Cortana, Copilot, quảng cáo và theo dõi. Lấy lại dữ liệu của bạn. |-| 🎮 | **Tinh chỉnh GPU** | Các tinh chỉnh dành riêng cho nhà sản xuất. AMD, NVIDIA hoặc Intel. |-| 🧩 | **Bật/Tắt tính năng** | Dễ dàng bật hoặc tắt các tính năng khác nhau của Windows. |-| 🧹 | **Dọn dẹp ổ đĩa** | Xóa các tệp tạm thời, bộ nhớ cache, bản cài đặt Windows cũ. Lấy lại dung lượng ổ đĩa. |-| 🗑️ | **Gỡ bỏ Bloatware** | Loại bỏ các ứng dụng Windows được cài đặt sẵn. Chỉ báo rủi ro giúp bạn quyết định. |-| ⚡ | **Quản lý khởi động** | Kiểm soát các ứng dụng chạy khi khởi động. Giữ lại những gì bạn cần, tắt phần còn lại. |-| 📋 | **Tác vụ đã lên lịch** | Xem, chạy, dừng hoặc xóa các tác vụ đã lên lịch của Windows. Kiểm soát hoàn toàn. |-| 💻 | **Bảng điều khiển hệ thống** | Xem thông tin CPU, RAM, GPU, Lưu trữ và Hệ điều hành của bạn một cách nhanh chóng. |-| 🔄 | **Hoàn tác thay đổi** | Bạn đã nhầm lẫn? Một cú nhấp chuột để hoàn tác bất kỳ thay đổi nào. |-| 🎨 | **Giao diện sạch sẽ** | Chủ đề Tối, Sáng hoặc Độ tương phản cao. Thiết kế Fluent hiện đại. |-| 🌐 | **Đa ngôn ngữ** | Tiếng Anh, tiếng Việt, tiếng Trung phồn thể. |-| 🔒 | **Chạy ngoại tuyến** | Không đo lường từ xa, không quảng cáo, không thu thập dữ liệu. Mọi thứ chạy cục bộ. |+| | Tính năng | Công dụng |+| :-- | :--------------------------- | :------------------------------------------------------------------------------------- |+| 🚀 | **Hiệu suất & Nguồn điện** | Tăng tốc hệ thống, vô hiệu hóa các dịch vụ rác, tinh chỉnh cài đặt nguồn điện. |+| 🛡️ | **Bảo vệ quyền riêng tư** | Tắt đo lường từ xa, Cortana, Copilot, quảng cáo và theo dõi. Lấy lại dữ liệu của bạn. |+| 🎮 | **Tinh chỉnh GPU** | Các tinh chỉnh dành riêng cho nhà sản xuất. AMD, NVIDIA hoặc Intel. |+| 🧩 | **Bật/Tắt tính năng** | Dễ dàng bật hoặc tắt các tính năng khác nhau của Windows. |+| 🧹 | **Dọn dẹp ổ đĩa** | Xóa các tệp tạm thời, bộ nhớ cache, bản cài đặt Windows cũ. Lấy lại dung lượng ổ đĩa. |+| 🗑️ | **Gỡ bỏ Bloatware** | Loại bỏ các ứng dụng Windows được cài đặt sẵn. Chỉ báo rủi ro giúp bạn quyết định. |+| ⚡ | **Quản lý khởi động** | Kiểm soát các ứng dụng chạy khi khởi động. Giữ lại những gì bạn cần, tắt phần còn lại. |+| 📋 | **Tác vụ đã lên lịch** | Xem, chạy, dừng hoặc xóa các tác vụ đã lên lịch của Windows. Kiểm soát hoàn toàn. |+| 💻 | **Bảng điều khiển hệ thống** | Xem thông tin CPU, RAM, GPU, Lưu trữ và Hệ điều hành của bạn một cách nhanh chóng. |+| 🔄 | **Hoàn tác thay đổi** | Bạn đã nhầm lẫn? Một cú nhấp chuột để hoàn tác bất kỳ thay đổi nào. |+| 🎨 | **Giao diện sạch sẽ** | Chủ đề Tối, Sáng hoặc Độ tương phản cao. Thiết kế Fluent hiện đại. |+| 🌐 | **Đa ngôn ngữ** | Tiếng Anh, tiếng Việt, tiếng Trung phồn thể. |+| 🔒 | **Chạy ngoại tuyến** | Không đo lường từ xa, không quảng cáo, không thu thập dữ liệu. Mọi thứ chạy cục bộ. |---@@ -138,7 +140,7 @@ Hướng dẫn từng bước, giải thích về từng tối ưu hóa và các> [!TIP]> Tham gia cộng đồng đang phát triển của chúng tôi trên Discord! Nhận hỗ trợ, chia sẻ kinh nghiệm và kết nối với những người dùng và cộng tác viên khác.->+>> <a href="https://discord.gg/tDUBDCYw9Q"><img src="https://discord.com/api/guilds/1091675679994675240/widget.png?style=banner2" alt="Discord Banner 2"/></a>Nếu optimizerDuck đã giúp ích cho PC của bạn:@@ -192,4 +194,4 @@ Luôn tạo một **điểm khôi phục** trước khi áp dụng các thay đ[](https://github.com/itsfatduck/optimizerDuck/graphs/contributors)-</div>\ No newline at end of file+</div>diff --git a/README.zh-TW.md b/README.zh-TW.mdindex fcf6593..4190ec8 100644--- a/README.zh-TW.md+++ b/README.zh-TW.md@@ -58,21 +58,21 @@超過 35 種優化,分為 6 個類別,並內建工具來管理您的系統。所有功能都帶有清晰的風險指示和一鍵還原。-| | 功能 | 作用 |-| :-- | :---------------------- | :------------------------------------------------------------------------ |-| 🚀 | **性能與電源** | 加速系統、禁用臃腫服務、調整電源設置。 |-| 🛡️ | **隱私保護** | 關閉遙測、Cortana、Copilot、廣告和追踪。取回您的數據。 |-| 🎮 | **GPU 調整** | 廠商特定的調整。AMD、NVIDIA 或 Intel。 |-| 🧩 | **功能切換** | 輕鬆啟用或禁用各種 Windows 功能。 |-| 🧹 | **磁碟清理** | 清理臨時文件、快取、舊的 Windows 安裝。回收磁碟空間。 |-| 🗑️ | **臃腫軟體卸載** | 刪除預裝的 Windows 應用。風險指示助您決定。 |-| ⚡ | **啟動管理** | 控制啟動時執行的應用。保留您需要的,禁用其餘的。 |-| 📋 | **排程工作** | 查看、執行、停止或刪除 Windows 排程工作。完全控制。 |-| 💻 | **系統儀表板** | 一目了然查看您的 CPU、RAM、GPU、儲存和作業系統資訊。 |-| 🔄 | **還原更改** | 犯了錯誤?一鍵撤銷任何更改。 |-| 🎨 | **簡潔介面** | 深色、淺色或高對比主題。現代 Fluent 設計。 |-| 🌐 | **多語言** | 英文、越南文、繁體中文。 |-| 🔒 | **離線執行** | 無遙測、無廣告、無數據收集。一切都在本地執行。 |+| | 功能 | 作用 |+| :-- | :--------------- | :----------------------------------------------------- |+| 🚀 | **性能與電源** | 加速系統、禁用臃腫服務、調整電源設置。 |+| 🛡️ | **隱私保護** | 關閉遙測、Cortana、Copilot、廣告和追踪。取回您的數據。 |+| 🎮 | **GPU 調整** | 廠商特定的調整。AMD、NVIDIA 或 Intel。 |+| 🧩 | **功能切換** | 輕鬆啟用或禁用各種 Windows 功能。 |+| 🧹 | **磁碟清理** | 清理臨時文件、快取、舊的 Windows 安裝。回收磁碟空間。 |+| 🗑️ | **臃腫軟體卸載** | 刪除預裝的 Windows 應用。風險指示助您決定。 |+| ⚡ | **啟動管理** | 控制啟動時執行的應用。保留您需要的,禁用其餘的。 |+| 📋 | **排程工作** | 查看、執行、停止或刪除 Windows 排程工作。完全控制。 |+| 💻 | **系統儀表板** | 一目了然查看您的 CPU、RAM、GPU、儲存和作業系統資訊。 |+| 🔄 | **還原更改** | 犯了錯誤?一鍵撤銷任何更改。 |+| 🎨 | **簡潔介面** | 深色、淺色或高對比主題。現代 Fluent 設計。 |+| 🌐 | **多語言** | 英文、越南文、繁體中文。 |+| 🔒 | **離線執行** | 無遙測、無廣告、無數據收集。一切都在本地執行。 |---@@ -138,7 +138,7 @@ optimizerDuck 在設計時充分考慮了安全性。我們深知修改系統設> [!TIP]> 加入我們不斷壯大的 Discord 社群!獲取支援、分享您的經驗,並與其他使用者和貢獻者建立聯繫。->+>> <a href="https://discord.gg/tDUBDCYw9Q"><img src="https://discord.com/api/guilds/1091675679994675240/widget.png?style=banner2" alt="Discord Banner 2"/></a>如果 optimizerDuck 幫助了您的電腦:@@ -192,4 +192,4 @@ optimizerDuck 按 **"原樣"** 提供,不提供任何形式的保證。[](https://github.com/itsfatduck/optimizerDuck/graphs/contributors)-</div>\ No newline at end of file+</div>diff --git a/optimizerDuck.Test/optimizerDuck.Test.csproj b/optimizerDuck.Test/optimizerDuck.Test.csprojindex e34c258..9821ec1 100644--- a/optimizerDuck.Test/optimizerDuck.Test.csproj+++ b/optimizerDuck.Test/optimizerDuck.Test.csproj@@ -1,32 +1,32 @@<Project Sdk="Microsoft.NET.Sdk">- <PropertyGroup>- <TargetFramework>net10.0-windows10.0.17763.0</TargetFramework>- <ImplicitUsings>enable</ImplicitUsings>- <Nullable>enable</Nullable>- <IsPackable>false</IsPackable>- <OutputType>Exe</OutputType>- </PropertyGroup>+ <PropertyGroup>+ <TargetFramework>net10.0-windows</TargetFramework>+ <ImplicitUsings>enable</ImplicitUsings>+ <Nullable>enable</Nullable>+ <IsPackable>false</IsPackable>+ <OutputType>Exe</OutputType>+ </PropertyGroup>- <ItemGroup>- <PackageReference Include="coverlet.collector" Version="8.0.0">- <PrivateAssets>all</PrivateAssets>- <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>- </PackageReference>- <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.5" />- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />- <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />- <PackageReference Include="xunit.v3" Version="3.2.2" />- <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">- <PrivateAssets>all</PrivateAssets>- <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>- </PackageReference>- </ItemGroup>+ <ItemGroup>+ <PackageReference Include="coverlet.collector" Version="10.0.0">+ <PrivateAssets>all</PrivateAssets>+ <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>+ </PackageReference>+ <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.7" />+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.5.1" />+ <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />+ <PackageReference Include="xunit.v3" Version="3.2.2" />+ <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">+ <PrivateAssets>all</PrivateAssets>+ <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>+ </PackageReference>+ </ItemGroup>- <ItemGroup>- <Using Include="Xunit" />- </ItemGroup>+ <ItemGroup>+ <Using Include="Xunit" />+ </ItemGroup>- <ItemGroup>- <ProjectReference Include="..\optimizerDuck\optimizerDuck.csproj" />- </ItemGroup>+ <ItemGroup>+ <ProjectReference Include="..\optimizerDuck\optimizerDuck.csproj" />+ </ItemGroup></Project>diff --git a/optimizerDuck.slnx b/optimizerDuck.slnxindex bd06313..a990a7c 100644--- a/optimizerDuck.slnx+++ b/optimizerDuck.slnx@@ -1,4 +1,4 @@<Solution>- <Project Path="optimizerDuck.Test/optimizerDuck.Test.csproj" />- <Project Path="optimizerDuck/optimizerDuck.csproj" />+ <Project Path="optimizerDuck.Test/optimizerDuck.Test.csproj" />+ <Project Path="optimizerDuck/optimizerDuck.csproj" /></Solution>diff --git a/optimizerDuck/App.xaml b/optimizerDuck/App.xamlindex d9c27b9..822d88c 100644--- a/optimizerDuck/App.xaml+++ b/optimizerDuck/App.xaml@@ -1,21 +1,21 @@<Application- x:Class="optimizerDuck.App"- xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"- xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"- xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"+ x:Class="optimizerDuck.App"+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"+ xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">- <Application.Resources>- <ResourceDictionary>- <ResourceDictionary.MergedDictionaries>- <ui:ThemesDictionary Theme="Dark" />- <ui:ControlsDictionary />- </ResourceDictionary.MergedDictionaries>+ <Application.Resources>+ <ResourceDictionary>+ <ResourceDictionary.MergedDictionaries>+ <ui:ThemesDictionary Theme="Dark" />+ <ui:ControlsDictionary />+ </ResourceDictionary.MergedDictionaries>- <Style TargetType="Image">- <Setter Property="RenderOptions.BitmapScalingMode" Value="HighQuality" />- <Setter Property="SnapsToDevicePixels" Value="True" />- <Setter Property="UseLayoutRounding" Value="True" />- </Style>- </ResourceDictionary>- </Application.Resources>+ <Style TargetType="Image">+ <Setter Property="RenderOptions.BitmapScalingMode" Value="HighQuality" />+ <Setter Property="SnapsToDevicePixels" Value="True" />+ <Setter Property="UseLayoutRounding" Value="True" />+ </Style>+ </ResourceDictionary>+ </Application.Resources></Application>diff --git a/optimizerDuck/App.xaml.cs b/optimizerDuck/App.xaml.csindex a16783b..762b028 100644--- a/optimizerDuck/App.xaml.cs+++ b/optimizerDuck/App.xaml.cs@@ -117,128 +117,153 @@ public partial class App : Applicationtry{- // Create the required directories if they don't exist- Directory.CreateDirectory(Shared.ResourcesDirectory);- Directory.CreateDirectory(Shared.RootDirectory);- Directory.CreateDirectory(Shared.RevertDirectory);-- var logPath = Path.Combine(Shared.RootDirectory, "optimizerDuck.log");- Log.Logger = new LoggerConfiguration()- .MinimumLevel.Verbose()- .MinimumLevel.Override("Microsoft", LogEventLevel.Warning)- .Enrich.FromLogContext()- .WriteTo.File(- new ScopeBlockTextFormatter(),- logPath,- rollingInterval: RollingInterval.Infinite- )- .CreateLogger();-- _host = Host.CreateDefaultBuilder()- .UseSerilog()- .ConfigureAppConfiguration(c =>- {- ConfigManager.ValidateConfig();- c.AddJsonFile(- Path.Combine(Shared.RootDirectory, "appsettings.json"),- false,- true- );- })- .ConfigureServices(- (context, services) =>- {- services.Configure<AppSettings>(context.Configuration);-- // WPF UI shi- services.AddNavigationViewPageProvider();- services.AddSingleton<INavigationService, NavigationService>();- services.AddSingleton<IContentDialogService, ContentDialogService>();- services.AddSingleton<ISnackbarService, SnackbarService>();-- // Windows- services.AddSingleton<MainWindow>();- services.AddSingleton<MainWindowViewModel>();-- // Pages- services.AddSingleton<DashboardViewModel>();- services.AddSingleton<DashboardPage>();-- services.AddSingleton<OptimizeViewModel>();- services.AddSingleton<OptimizePage>();-- services.AddSingleton<SettingsViewModel>();- services.AddSingleton<SettingsPage>();-- services.AddSingleton<BloatwareViewModel>();- services.AddSingleton<BloatwarePage>();-- services.AddSingleton<DiskCleanupViewModel>();- services.AddSingleton<DiskCleanupPage>();-- services.AddSingleton<StartupManagerViewModel>();- services.AddSingleton<StartupManagerPage>();-- services.AddSingleton<ScheduledTasksViewModel>();- services.AddSingleton<ScheduledTasksPage>();-- // Toggle Features- services.AddSingleton<FeaturesViewModel>();- services.AddSingleton<FeaturesPage>();-- services.AddAllFeaturesCategoryPages();-- // Optimizations- services.AddAllOptimizationPages();-- // Managers- services.AddSingleton<ConfigManager>();- services.AddSingleton<RevertManager>();-- // Services- services.AddSingleton<OptimizationRegistry>();- services.AddSingleton<FeatureRegistry>();- services.AddSingleton<OptimizationService>();- services.AddSingleton<BloatwareService>();- services.AddSingleton<DiskCleanupService>();- services.AddSingleton<StartupManagerService>();- services.AddSingleton<SystemInfoService>();- services.AddSingleton<StreamService>();- services.AddSingleton<UpdaterService>();- }- )- .Build();-- await _host.StartAsync();-- var config = _host.Services.GetRequiredService<ConfigManager>();- await config.InitializeAsync();- await config.EnsureDefaultsAsync();-- var appOptionsMonitor = _host.Services.GetRequiredService<- IOptionsMonitor<AppSettings>- >();-- // init shell service with config- ShellService.Init(appOptionsMonitor);-- var appSettings = appOptionsMonitor.CurrentValue;-- Loc.Instance.ChangeCulture(new CultureInfo(appSettings.App.Language));-- _logger = _host.Services.GetRequiredService<ILogger<App>>();- _logger.LogInformation(- "\n{Logo}\nVersion: {Version}\n\n",- Shared.RawLogo,- Shared.FileVersion+ await OnStartupAsync(e);+ }+ catch (Exception ex)+ {+ try+ {+ Log.Logger?.Fatal(ex, "Fatal error during startup");+ await Log.CloseAndFlushAsync();+ }+ catch+ {+ // ignore logging failures during fatal startup handling+ }++ MessageBox.Show(+ $"Failed to start optimizerDuck.{Environment.NewLine}{Environment.NewLine}{ex.Message}",+ "optimizerDuck",+ MessageBoxButton.OK,+ MessageBoxImage.Error);- _logger.LogInformation("Loaded language: {Language}", appSettings.App.Language);+ Shutdown(-1);+ }+ }++ private async Task OnStartupAsync(StartupEventArgs e)+ {+ // Create the required directories if they don't exist+ Directory.CreateDirectory(Shared.ResourcesDirectory);+ Directory.CreateDirectory(Shared.RootDirectory);+ Directory.CreateDirectory(Shared.RevertDirectory);++ var logPath = Path.Combine(Shared.RootDirectory, "optimizerDuck.log");+ Log.Logger = new LoggerConfiguration()+ .MinimumLevel.Verbose()+ .MinimumLevel.Override("Microsoft", LogEventLevel.Warning)+ .Enrich.FromLogContext()+ .WriteTo.File(+ new ScopeBlockTextFormatter(),+ logPath,+ rollingInterval: RollingInterval.Infinite+ )+ .CreateLogger();++ _host = Host.CreateDefaultBuilder()+ .UseSerilog()+ .ConfigureAppConfiguration(c =>+ {+ ConfigManager.ValidateConfig();+ c.AddJsonFile(Path.Combine(Shared.RootDirectory, "appsettings.json"), false, true);+ })+ .ConfigureServices(+ (context, services) =>+ {+ services.Configure<AppSettings>(context.Configuration);++ // WPF UI shi+ services.AddNavigationViewPageProvider();+ services.AddSingleton<INavigationService, NavigationService>();+ services.AddSingleton<IContentDialogService, ContentDialogService>();+ services.AddSingleton<ISnackbarService, SnackbarService>();++ // Windows+ services.AddSingleton<MainWindow>();+ services.AddSingleton<MainWindowViewModel>();++ // Pages+ services.AddSingleton<DashboardViewModel>();+ services.AddSingleton<DashboardPage>();++ services.AddSingleton<OptimizeViewModel>();+ services.AddSingleton<OptimizePage>();++ services.AddSingleton<SettingsViewModel>();+ services.AddSingleton<SettingsPage>();++ services.AddSingleton<BloatwareViewModel>();+ services.AddSingleton<BloatwarePage>();++ services.AddSingleton<DiskCleanupViewModel>();+ services.AddSingleton<DiskCleanupPage>();++ services.AddSingleton<StartupManagerViewModel>();+ services.AddSingleton<StartupManagerPage>();++ services.AddSingleton<ScheduledTasksViewModel>();+ services.AddSingleton<ScheduledTasksPage>();++ // Toggle Features+ services.AddSingleton<FeaturesViewModel>();+ services.AddSingleton<FeaturesPage>();++ services.AddAllFeaturesCategoryPages();- var optimizationRegistry = _host.Services.GetRequiredService<OptimizationRegistry>();- _logger.LogInformation("Preloading optimizations...");- await optimizationRegistry.PreloadOptimizations();+ // Optimizations+ services.AddAllOptimizationPages();- // Apply custom accent colors+ // Managers+ services.AddSingleton<ConfigManager>();+ services.AddSingleton<RevertManager>();++ // Services+ services.AddSingleton<OptimizationRegistry>();+ services.AddSingleton<FeatureRegistry>();+ services.AddSingleton<OptimizationService>();+ services.AddSingleton<BloatwareService>();+ services.AddSingleton<DiskCleanupService>();+ services.AddSingleton<StartupManagerService>();+ services.AddSingleton<SystemInfoService>();+ services.AddSingleton<StreamService>();+ services.AddSingleton<UpdaterService>();+ }+ )+ .Build();++ await _host.StartAsync().ConfigureAwait(false);++ var config = _host.Services.GetRequiredService<ConfigManager>();+ await config.InitializeAsync().ConfigureAwait(false);+ await config.EnsureDefaultsAsync().ConfigureAwait(false);++ var appOptionsMonitor = _host.Services.GetRequiredService<IOptionsMonitor<AppSettings>>();++ // init shell service with config+ ShellService.Init(appOptionsMonitor);++ // init WMI helper for cleanup on abnormal termination+ WmiHelper.Initialize();++ var appSettings = appOptionsMonitor.CurrentValue;++ Loc.Instance.ChangeCulture(new CultureInfo(appSettings.App.Language));++ _logger = _host.Services.GetRequiredService<ILogger<App>>();+ _logger.LogInformation(+ "\n{Logo}\nVersion: {Version}\n\n",+ Shared.RawLogo,+ Shared.FileVersion+ );+ _logger.LogInformation("Loaded language: {Language}", appSettings.App.Language);++ var optimizationRegistry = _host.Services.GetRequiredService<OptimizationRegistry>();+ _logger.LogInformation("Preloading optimizations...");+ await optimizationRegistry.PreloadOptimizations().ConfigureAwait(false);++ // Apply custom accent colors and theme on UI thread+ await Dispatcher.InvokeAsync(() =>+ {ApplicationAccentColorManager.Apply(Color.FromRgb(254, 209, 20),Color.FromRgb(242, 124, 20),@@ -258,39 +283,29 @@ public partial class App : Applicationvar mainWindow = _host.Services.GetRequiredService<MainWindow>();mainWindow.Show();- }- catch (Exception ex)+ });+ }++ protected override void OnExit(ExitEventArgs e)+ {+ try{- try- {- Log.Logger?.Fatal(ex, "Fatal error during startup");- await Log.CloseAndFlushAsync();- }- catch+ if (_host != null){- // ignore logging failures during fatal startup handling+ _host.StopAsync().GetAwaiter().GetResult();+ _host.Dispose();}- MessageBox.Show(- $"Failed to start optimizerDuck.{Environment.NewLine}{Environment.NewLine}{ex.Message}",- "optimizerDuck",- MessageBoxButton.OK,- MessageBoxImage.Error- );- Shutdown(-1);- }- }+ // Dispose WMI scopes to prevent resource leaks+ WmiHelper.DisposeScopes();- protected override async void OnExit(ExitEventArgs e)- {- if (_host != null)+ Log.CloseAndFlush();+ }+ catch{- await _host.StopAsync();- _host.Dispose();+ // Silently ignore exit errors to prevent blocking shutdown}- await Log.CloseAndFlushAsync();-base.OnExit(e);}}diff --git a/optimizerDuck/Domain/Optimizations/Models/Cleanup/CleanupItem.cs b/optimizerDuck/Domain/Optimizations/Models/Cleanup/CleanupItem.csindex bf3efba..1f14c1c 100644--- a/optimizerDuck/Domain/Optimizations/Models/Cleanup/CleanupItem.cs+++ b/optimizerDuck/Domain/Optimizations/Models/Cleanup/CleanupItem.cs@@ -74,6 +74,11 @@ public partial class CleanupItem : ObservableObject/// </summary>public bool IsCommand { get; init; }+ /// <summary>+ /// Whether the folder exists and can be opened.+ /// </summary>+ public bool CanOpenFolder => !IsCommand && System.IO.Directory.Exists(Path);+/// <summary>/// Gets the human-readable size string (e.g., "1.5 GB")./// </summary>diff --git a/optimizerDuck/Services/Configuration/ConfigManager.cs b/optimizerDuck/Services/Configuration/ConfigManager.csindex 3e8deaa..a201f23 100644--- a/optimizerDuck/Services/Configuration/ConfigManager.cs+++ b/optimizerDuck/Services/Configuration/ConfigManager.cs@@ -34,7 +34,7 @@ public class ConfigManager(IConfiguration configuration, ILogger<ConfigManager>/// </summary>public async Task InitializeAsync(){- _cache = await LoadConfigAsync();+ _cache = await LoadConfigAsync().ConfigureAwait(false);}/// <summary>@@ -96,7 +96,7 @@ public class ConfigManager(IConfiguration configuration, ILogger<ConfigManager>{// Clean up any duplicate flat keys that may have been added previouslyCleanupDuplicateKeys(_cache);- await SaveConfigAsync();+ await SaveConfigAsync().ConfigureAwait(false);logger.LogInformation("Added {Count} missing config keys: {Keys}",addedKeys.Count,@@ -224,7 +224,7 @@ public class ConfigManager(IConfiguration configuration, ILogger<ConfigManager>current = GetOrCreateObjectIgnoreCase(current, parts[i]);SetValueIgnoreCase(current, parts[^1], value);- await SaveConfigAsync();+ await SaveConfigAsync().ConfigureAwait(false);}finally{@@ -253,7 +253,7 @@ public class ConfigManager(IConfiguration configuration, ILogger<ConfigManager>}RemoveIgnoreCase(current, parts[^1]);- await SaveConfigAsync();+ await SaveConfigAsync().ConfigureAwait(false);}finally{@@ -261,15 +261,6 @@ public class ConfigManager(IConfiguration configuration, ILogger<ConfigManager>}}- /// <summary>- /// Removes a configuration value by key (synchronous wrapper).- /// </summary>- /// <param name="key">The configuration key to remove.</param>- public void Remove(string key)- {- _ = RemoveAsync(key);- }-/// <summary>/// Loads configuration from disk./// </summary>@@ -278,12 +269,14 @@ public class ConfigManager(IConfiguration configuration, ILogger<ConfigManager>{try{- Directory.CreateDirectory(Path.GetDirectoryName(_configPath)!);+ var configDir = Path.GetDirectoryName(_configPath);+ if (!string.IsNullOrEmpty(configDir))+ Directory.CreateDirectory(configDir);if (!File.Exists(_configPath))return new JObject();- var content = await File.ReadAllTextAsync(_configPath);+ var content = await File.ReadAllTextAsync(_configPath).ConfigureAwait(false);return string.IsNullOrWhiteSpace(content)? new JObject()@@ -301,7 +294,8 @@ public class ConfigManager(IConfiguration configuration, ILogger<ConfigManager>/// </summary>private async Task SaveConfigAsync(){- await File.WriteAllTextAsync(_configPath, _cache.ToString(Formatting.Indented));+ await File.WriteAllTextAsync(_configPath, _cache.ToString(Formatting.Indented))+ .ConfigureAwait(false);(configuration as IConfigurationRoot)?.Reload();}diff --git a/optimizerDuck/Services/Features/Bloatware/BloatwareService.cs b/optimizerDuck/Services/Features/Bloatware/BloatwareService.csindex 7d7f379..eb07ff7 100644--- a/optimizerDuck/Services/Features/Bloatware/BloatwareService.cs+++ b/optimizerDuck/Services/Features/Bloatware/BloatwareService.cs@@ -47,33 +47,35 @@ public class BloatwareService(var safePattern = string.Join("|", Shared.SafeApps.Select(Regex.Escape));var cautionPattern = string.Join("|", Shared.CautionApps.Select(Regex.Escape));- var result = await ShellService.PowerShellAsync(- $$"""- $safeRegex = '{{safePattern}}'- $cautionRegex = '{{cautionPattern}}'-- Get-AppxPackage |- Where-Object {- $_.NonRemovable -eq $false -and- $_.IsFramework -eq $false- } |- ForEach-Object {- $risk = "Unknown"-- if ($_.Name -match $safeRegex) { $risk = "Safe" }- elseif ($_.Name -match $cautionRegex) { $risk = "Caution" }-- [PSCustomObject]@{- Name = $_.Name- PackageFullName = $_.PackageFullName- Publisher = $_.Publisher- Version = $_.Version.ToString()- InstallLocation = if ($_.InstallLocation) { $_.InstallLocation } else { "" }- Risk = $risk- }- } | ConvertTo-Json -Depth 2- """- );+ var result = await ShellService+ .PowerShellAsync(+ $$"""+ $safeRegex = '{{safePattern}}'+ $cautionRegex = '{{cautionPattern}}'++ Get-AppxPackage |+ Where-Object {+ $_.NonRemovable -eq $false -and+ $_.IsFramework -eq $false+ } |+ ForEach-Object {+ $risk = "Unknown"++ if ($_.Name -match $safeRegex) { $risk = "Safe" }+ elseif ($_.Name -match $cautionRegex) { $risk = "Caution" }++ [PSCustomObject]@{+ Name = $_.Name+ PackageFullName = $_.PackageFullName+ Publisher = $_.Publisher+ Version = $_.Version.ToString()+ InstallLocation = if ($_.InstallLocation) { $_.InstallLocation } else { "" }+ Risk = $risk+ }+ } | ConvertTo-Json -Depth 2+ """+ )+ .ConfigureAwait(false);var options = new JsonSerializerOptions{@@ -188,7 +190,7 @@ public class BloatwareService(Write-Output "Skipping provisioned package removal (disabled by user)"""";- var result = await ShellService.PowerShellAsync(script);+ var result = await ShellService.PowerShellAsync(script).ConfigureAwait(false);if (!string.IsNullOrWhiteSpace(result.Stderr))logger.LogWarning("Remove AppX stderr: {Error}", result.Stderr);diff --git a/optimizerDuck/Services/Optimization/OptimizationService.cs b/optimizerDuck/Services/Optimization/OptimizationService.csindex 7e21053..7730e16 100644--- a/optimizerDuck/Services/Optimization/OptimizationService.cs+++ b/optimizerDuck/Services/Optimization/OptimizationService.cs@@ -56,9 +56,11 @@ public class OptimizationService(using var scope = ExecutionScope.BeginForLogging(_logger);- var result = await ShellService.PowerShellAsync(- $"Checkpoint-Computer -Description \"{Shared.RestorePointName}\" -RestorePointType MODIFY_SETTINGS"- );+ var result = await ShellService+ .PowerShellAsync(+ $"Checkpoint-Computer -Description \"{Shared.RestorePointName}\" -RestorePointType MODIFY_SETTINGS"+ )+ .ConfigureAwait(false);if (result.Stderr.Contains(@@ -95,9 +97,9 @@ public class OptimizationService(});- var enableResult = await ShellService.PowerShellAsync(- "Enable-ComputerRestore -Drive \"$env:SystemDrive\""- );+ var enableResult = await ShellService+ .PowerShellAsync("Enable-ComputerRestore -Drive \"$env:SystemDrive\"")+ .ConfigureAwait(false);if (enableResult.ExitCode != 0){_logger.LogError(@@ -115,9 +117,11 @@ public class OptimizationService(});- result = await ShellService.PowerShellAsync(- $"Checkpoint-Computer -Description \"{Shared.RestorePointName}\" -RestorePointType MODIFY_SETTINGS"- );+ result = await ShellService+ .PowerShellAsync(+ $"Checkpoint-Computer -Description \"{Shared.RestorePointName}\" -RestorePointType MODIFY_SETTINGS"+ )+ .ConfigureAwait(false);if (result.Stderr.Contains(@@ -131,7 +135,7 @@ public class OptimizationService(}finally{- dialog.Hide();+ dialog?.Hide();}}@@ -154,16 +158,19 @@ public class OptimizationService(try{var applyResult = await Task.Run(async () =>- await optimization.ApplyAsync(- progress,- new OptimizationContext- {- Logger = optLogger,- Snapshot = systemInfoService.Snapshot,- StreamService = streamService,- }+ await optimization+ .ApplyAsync(+ progress,+ new OptimizationContext+ {+ Logger = optLogger,+ Snapshot = systemInfoService.Snapshot,+ StreamService = streamService,+ }+ )+ .ConfigureAwait(false))- );+ .ConfigureAwait(false);if (!string.IsNullOrWhiteSpace(applyResult.Message))return new OptimizationResult@@ -184,7 +191,7 @@ public class OptimizationService();var result = scope.ToResult();- await TrySaveRevertDataAsync(scope, optimization);+ await TrySaveRevertDataAsync(scope, optimization).ConfigureAwait(false);return result;}@@ -206,7 +213,7 @@ public class OptimizationService(FailedSteps = failedSteps,};- await TrySaveRevertDataAsync(scope, optimization);+ await TrySaveRevertDataAsync(scope, optimization).ConfigureAwait(false);return result;}@@ -224,7 +231,7 @@ public class OptimizationService(IsIndeterminate = true,});- var result = await revertManager.RevertAsync(optimization, progress);+ var result = await revertManager.RevertAsync(optimization, progress).ConfigureAwait(false);progress?.Report(new ProcessingProgress{@@ -245,13 +252,14 @@ public class OptimizationService(public static async Task UpdateOptimizationStateAsync(params IOptimization[] optimizations){await Task.WhenAll(- optimizations.Select(async opt =>- {- var data = await RevertManager.GetRevertDataAsync(opt.Id);- opt.State.IsApplied = data != null;- opt.State.AppliedAt = data?.AppliedAt;- })- );+ optimizations.Select(async opt =>+ {+ var data = await RevertManager.GetRevertDataAsync(opt.Id).ConfigureAwait(false);+ opt.State.IsApplied = data != null;+ opt.State.AppliedAt = data?.AppliedAt;+ })+ )+ .ConfigureAwait(false);}public static Task UpdateOptimizationStateAsync(IEnumerable<IOptimization> optimizations)@@ -326,7 +334,7 @@ public class OptimizationService(try{using var retryScope = ExecutionScope.BeginForCapture(logger);- success = await step.RetryAction();+ success = await step.RetryAction().ConfigureAwait(false);if (success){@@ -372,7 +380,7 @@ public class OptimizationService(try{- await revertManager.SaveRevertDataAsync(scope);+ await revertManager.SaveRevertDataAsync(scope).ConfigureAwait(false);}catch (Exception ex){diff --git a/optimizerDuck/Services/Optimization/Providers/ShellService.cs b/optimizerDuck/Services/Optimization/Providers/ShellService.csindex 1297f7f..b736fee 100644--- a/optimizerDuck/Services/Optimization/Providers/ShellService.cs+++ b/optimizerDuck/Services/Optimization/Providers/ShellService.cs@@ -49,6 +49,9 @@ public sealed class ShellPolicypublic static class ShellService{+ private const int DefaultShellTimeoutMs = 120000; // 2 minutes+ private const int ProcessGraceDrainMs = 2000; // 2 seconds+private static IOptionsMonitor<AppSettings>? _options;public static void Init(IOptionsMonitor<AppSettings> options)@@ -140,8 +143,8 @@ public static class ShellServiceprocess.BeginErrorReadLine();var exited = process.WaitForExit(- _options?.CurrentValue.Optimize.ShellTimeoutMs ?? 120000- ); // fallback to 2 minutes+ _options?.CurrentValue.Optimize.ShellTimeoutMs ?? DefaultShellTimeoutMs+ );var timedOut = !exited;if (timedOut)@@ -150,12 +153,36 @@ public static class ShellService{process.Kill(true);}- catch+ catch (Exception ex){- ExecutionScope.LogError(null, "Failed to kill process for timeout");+ ExecutionScope.LogError(ex, "Failed to kill process for timeout");}- process.WaitForExit(2000); // grace drain+ try+ {+ process.WaitForExit(ProcessGraceDrainMs);+ }+ catch (Exception ex)+ {+ ExecutionScope.LogError(ex, "Failed to wait for process exit after kill");+ }++ // Force kill if still running after grace period+ if (!process.HasExited)+ {+ try+ {+ process.Kill(true);+ if (!process.HasExited)+ {+ process.WaitForExit(5000); // Wait up to 5 seconds for force kill+ }+ }+ catch (Exception ex)+ {+ ExecutionScope.LogError(ex, "Failed to force kill process after timeout");+ }+ }}sw.Stop();@@ -307,7 +334,7 @@ public static class ShellServiceprocess.BeginOutputReadLine();process.BeginErrorReadLine();- var timeout = _options?.CurrentValue.Optimize.ShellTimeoutMs ?? 120000;+ var timeout = _options?.CurrentValue.Optimize.ShellTimeoutMs ?? DefaultShellTimeoutMs;using var timeoutCts = new CancellationTokenSource(timeout);using var linkedCts = CancellationTokenSource.CreateLinkedTokenSource(@@ -325,14 +352,49 @@ public static class ShellService{process.Kill(true);}- catch { }+ catch (Exception ex)+ {+ ExecutionScope.LogError(ex, "Failed to kill process for timeout (async)");+ }}sw.Stop();var timedOut = !process.HasExited;if (!process.HasExited)- process.WaitForExit(2000);+ {+ try+ {+ process.WaitForExit(ProcessGraceDrainMs);+ }+ catch (Exception ex)+ {+ ExecutionScope.LogError(+ ex,+ "Failed to wait for process exit after kill (async)"+ );+ }++ // Force kill if still running after grace period+ if (!process.HasExited)+ {+ try+ {+ process.Kill(true);+ if (!process.HasExited)+ {+ process.WaitForExit(5000); // Wait up to 5 seconds for force kill+ }+ }+ catch (Exception ex)+ {+ ExecutionScope.LogError(+ ex,+ "Failed to force kill process after timeout (async)"+ );+ }+ }+ }var stdout = stdoutBuilder.ToString().Trim();var stderr = stderrBuilder.ToString().ParseCliXml().Trim();diff --git a/optimizerDuck/Services/Revert/RevertManager.cs b/optimizerDuck/Services/Revert/RevertManager.csindex a58920a..a191028 100644--- a/optimizerDuck/Services/Revert/RevertManager.cs+++ b/optimizerDuck/Services/Revert/RevertManager.cs@@ -49,15 +49,16 @@ public class RevertManager(ILogger<RevertManager> logger, ILoggerFactory loggerFreturn;await WriteJsonAsync(- GetFilePath(scope.OptimizationId!.Value),- new RevertData- {- OptimizationId = scope.OptimizationId!.Value,- OptimizationName = scope.OptimizationKey!,- AppliedAt = DateTime.Now,- Steps = steps,- }- );+ GetFilePath(scope.OptimizationId!.Value),+ new RevertData+ {+ OptimizationId = scope.OptimizationId!.Value,+ OptimizationName = scope.OptimizationKey!,+ AppliedAt = DateTime.Now,+ Steps = steps,+ }+ )+ .ConfigureAwait(false);}public async Task<RevertResult> RevertAsync(@@ -72,7 +73,7 @@ public class RevertManager(ILogger<RevertManager> logger, ILoggerFactory loggerFoperationLogger);- var steps = await LoadStepsAsync(optimization.Id);+ var steps = await LoadStepsAsync(optimization.Id).ConfigureAwait(false);if (steps.Count == 0)return new RevertResult{@@ -102,7 +103,7 @@ public class RevertManager(ILogger<RevertManager> logger, ILoggerFactory loggerFtry{- if (!await step.ExecuteAsync())+ if (!await step.ExecuteAsync().ConfigureAwait(false))throw new Exception(Translations.Revert_Error_StepFailed);}catch (Exception ex)@@ -159,7 +160,7 @@ public class RevertManager(ILogger<RevertManager> logger, ILoggerFactory loggerFtry{var data =- await LoadAsync(filePath)+ await LoadAsync(filePath).ConfigureAwait(false)?? new RevertData{OptimizationId = id,@@ -175,7 +176,7 @@ public class RevertManager(ILogger<RevertManager> logger, ILoggerFactory loggerFType = step.Type,Data = step.ToData(),};- await WriteJsonAsync(filePath, data);+ await WriteJsonAsync(filePath, data).ConfigureAwait(false);}finally{@@ -190,7 +191,7 @@ public class RevertManager(ILogger<RevertManager> logger, ILoggerFactory loggerFpublic static async Task<RevertData?> GetRevertDataAsync(Guid id){- return await LoadAsync(GetFilePath(id));+ return await LoadAsync(GetFilePath(id)).ConfigureAwait(false);}public static void ClearAllRevertData(ILogger logger)@@ -221,7 +222,9 @@ public class RevertManager(ILogger<RevertManager> logger, ILoggerFactory loggerFreturn null;try{- return JsonConvert.DeserializeObject<RevertData>(await File.ReadAllTextAsync(path));+ return JsonConvert.DeserializeObject<RevertData>(+ await File.ReadAllTextAsync(path).ConfigureAwait(false)+ );}catch{@@ -237,12 +240,13 @@ public class RevertManager(ILogger<RevertManager> logger, ILoggerFactory loggerFprivate static async Task WriteJsonAsync(string path, RevertData data){Directory.CreateDirectory(Path.GetDirectoryName(path)!);- await File.WriteAllTextAsync(path, JsonConvert.SerializeObject(data, Formatting.Indented));+ await File.WriteAllTextAsync(path, JsonConvert.SerializeObject(data, Formatting.Indented))+ .ConfigureAwait(false);}private async Task<List<(int Index, IRevertStep Step)>> LoadStepsAsync(Guid id){- var data = await LoadAsync(GetFilePath(id));+ var data = await LoadAsync(GetFilePath(id)).ConfigureAwait(false);if (data == null || data.Steps.Count == 0)return [];diff --git a/optimizerDuck/Services/System/SystemInfoService.cs b/optimizerDuck/Services/System/SystemInfoService.csindex 83c0b18..3e90959 100644--- a/optimizerDuck/Services/System/SystemInfoService.cs+++ b/optimizerDuck/Services/System/SystemInfoService.cs@@ -499,6 +499,29 @@ internal static class WmiHelper);private static readonly Lock ScopeLock = new();+ /// <summary>+ /// Initializes the WMI helper by registering the process exit handler.+ /// Call this during application startup to enable cleanup on abnormal termination.+ /// </summary>+ public static void Initialize()+ {+ // Register process exit handler as a fallback for crash/force-kill scenarios+ AppDomain.CurrentDomain.ProcessExit += OnProcessExit;+ }++ private static void OnProcessExit(object? sender, EventArgs e)+ {+ // Best-effort cleanup during process exit+ try+ {+ DisposeScopes();+ }+ catch+ {+ // Ignore errors during process exit+ }+ }+/// <summary>/// Gets or creates a cached ManagementScope for the given namespace./// </summary>@@ -516,6 +539,18 @@ internal static class WmiHelper}}+ /// <summary>+ /// Clears all cached ManagementScope objects.+ /// Note: ManagementScope does not implement IDisposable, so we only clear the cache.+ /// </summary>+ public static void DisposeScopes()+ {+ lock (ScopeLock)+ {+ ScopeCache.Clear();+ }+ }+public static IEnumerable<ManagementObject> Query(string query,string namespacePath = @"root\cimv2"diff --git a/optimizerDuck/UI/Dialogs/BloatwareConfirmationDialog.xaml b/optimizerDuck/UI/Dialogs/BloatwareConfirmationDialog.xamlindex 093841e..1897f50 100644--- a/optimizerDuck/UI/Dialogs/BloatwareConfirmationDialog.xaml+++ b/optimizerDuck/UI/Dialogs/BloatwareConfirmationDialog.xaml@@ -1,191 +1,197 @@<UserControl- x:Class="optimizerDuck.UI.Dialogs.BloatwareConfirmationDialog"- xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"- xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"- xmlns:converters="clr-namespace:optimizerDuck.Common.Converters"- xmlns:d="http://schemas.microsoft.com/expression/blend/2008"- xmlns:dialogVm="clr-namespace:optimizerDuck.UI.ViewModels.Dialogs"- xmlns:ext="clr-namespace:optimizerDuck.Common.Extensions"- xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"- xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"- d:DesignHeight="520"- d:DesignWidth="900"- mc:Ignorable="d"+ x:Class="optimizerDuck.UI.Dialogs.BloatwareConfirmationDialog"+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"+ xmlns:converters="clr-namespace:optimizerDuck.Common.Converters"+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"+ xmlns:dialogVm="clr-namespace:optimizerDuck.UI.ViewModels.Dialogs"+ xmlns:ext="clr-namespace:optimizerDuck.Common.Extensions"+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"+ xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"+ d:DesignHeight="520"+ d:DesignWidth="900"+ mc:Ignorable="d">- <UserControl.Resources>- <converters:GreaterThanZeroToVisibilityConverter x:Key="GreaterThanZeroToVisibilityConverter" />- <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />- </UserControl.Resources>+ <UserControl.Resources>+ <converters:GreaterThanZeroToVisibilityConverter x:Key="GreaterThanZeroToVisibilityConverter" />+ <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />+ </UserControl.Resources>- <Grid>- <Grid.RowDefinitions>- <RowDefinition Height="Auto" />- <RowDefinition Height="Auto" />- <RowDefinition Height="*" />- </Grid.RowDefinitions>+ <Grid>+ <Grid.RowDefinitions>+ <RowDefinition Height="Auto" />+ <RowDefinition Height="Auto" />+ <RowDefinition Height="*" />+ </Grid.RowDefinitions>- <ui:InfoBar- Grid.Row="0"- Margin="0,0,0,12"- IsClosable="False"- IsOpen="True"- Message="{ext:Loc BloatwareDialog.Confirmation.Description}"- Severity="Warning"- />+ <ui:InfoBar+ Grid.Row="0"+ Margin="0,0,0,12"+ IsClosable="False"+ IsOpen="True"+ Message="{ext:Loc BloatwareDialog.Confirmation.Description}"+ Severity="Warning"+ />- <ui:TextBlock- Grid.Row="1"- Margin="0,0,0,6"- Appearance="Primary"- FontTypography="BodyStrong"- Text="{ext:Loc BloatwareDialog.Confirmation.SelectedList}"- TextWrapping="Wrap"- />- <ScrollViewer Grid.Row="2" MaxHeight="420" VerticalScrollBarVisibility="Auto">- <ItemsControl- ItemsSource="{Binding Items}"- Visibility="{Binding Items.Count, Converter={StaticResource GreaterThanZeroToVisibilityConverter}}"- >- <ItemsControl.ItemsPanel>- <ItemsPanelTemplate>- <VirtualizingStackPanel />- </ItemsPanelTemplate>- </ItemsControl.ItemsPanel>-- <ItemsControl.ItemTemplate>- <DataTemplate DataType="{x:Type dialogVm:BloatwareConfirmationItemViewModel}">- <Border- Margin="0,0,0,6"- Padding="12"- Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"- CornerRadius="6"+ <ui:TextBlock+ Grid.Row="1"+ Margin="0,0,0,6"+ Foreground="{DynamicResource TextFillColorPrimaryBrush}"+ FontTypography="BodyStrong"+ Text="{ext:Loc BloatwareDialog.Confirmation.SelectedList}"+ TextWrapping="Wrap"+ />+ <ScrollViewer Grid.Row="2" MaxHeight="420" VerticalScrollBarVisibility="Auto">+ <ItemsControl+ ItemsSource="{Binding Items}"+ Visibility="{Binding Items.Count, Converter={StaticResource GreaterThanZeroToVisibilityConverter}}">- <Grid>- <Grid.ColumnDefinitions>- <ColumnDefinition Width="Auto" />- <ColumnDefinition Width="Auto" />- <ColumnDefinition Width="*" />- </Grid.ColumnDefinitions>+ <ItemsControl.ItemsPanel>+ <ItemsPanelTemplate>+ <VirtualizingStackPanel />+ </ItemsPanelTemplate>+ </ItemsControl.ItemsPanel>++ <ItemsControl.ItemTemplate>+ <DataTemplate DataType="{x:Type dialogVm:BloatwareConfirmationItemViewModel}">+ <Border+ Margin="0,0,0,6"+ Padding="12"+ Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"+ CornerRadius="6"+ >+ <Grid>+ <Grid.ColumnDefinitions>+ <ColumnDefinition Width="Auto" />+ <ColumnDefinition Width="Auto" />+ <ColumnDefinition Width="*" />+ </Grid.ColumnDefinitions>- <Border- Grid.Column="0"- MinWidth="34"- Margin="0,0,12,0"- Padding="6,2"- VerticalAlignment="Top"- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"- CornerRadius="5"- >- <ui:TextBlock- HorizontalAlignment="Center"- VerticalAlignment="Center"- Appearance="Secondary"- FontTypography="Caption"- Text="{Binding Index, StringFormat=#{0}}"- />- </Border>+ <Border+ Grid.Column="0"+ MinWidth="34"+ Margin="0,0,12,0"+ Padding="6,2"+ VerticalAlignment="Top"+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"+ CornerRadius="5"+ >+ <ui:TextBlock+ HorizontalAlignment="Center"+ VerticalAlignment="Center"+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ FontTypography="Caption"+ Text="{Binding Index, StringFormat=#{0}}"+ />+ </Border>- <Image- Grid.Column="1"- Width="36"- Height="36"- Margin="0,0,12,0"- VerticalAlignment="Top"- Source="{Binding Package.LogoImage}"- Stretch="UniformToFill"- />+ <Image+ Grid.Column="1"+ Width="36"+ Height="36"+ Margin="0,0,12,0"+ VerticalAlignment="Top"+ Source="{Binding Package.LogoImage}"+ Stretch="UniformToFill"+ />- <StackPanel Grid.Column="2">- <DockPanel LastChildFill="False">- <ui:TextBlock FontTypography="BodyStrong" Text="{Binding Package.Name}" />+ <StackPanel Grid.Column="2">+ <DockPanel LastChildFill="False">+ <ui:TextBlock+ FontTypography="BodyStrong"+ Text="{Binding Package.Name}"+ />- <Border- Margin="5,0,0,0"- Padding="4,1"- HorizontalAlignment="Left"- VerticalAlignment="Center"- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"- CornerRadius="5"- >- <ui:TextBlock- VerticalAlignment="Center"- Appearance="Tertiary"- FontTypography="Body"- Text="{Binding Package.Version}"- />- </Border>+ <Border+ Margin="5,0,0,0"+ Padding="4,1"+ HorizontalAlignment="Left"+ VerticalAlignment="Center"+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"+ CornerRadius="5"+ >+ <ui:TextBlock+ VerticalAlignment="Center"+ Appearance="Tertiary"+ FontTypography="Body"+ Text="{Binding Package.Version}"+ />+ </Border>- <Border- Margin="5,0,0,0"- Padding="4,2"- HorizontalAlignment="Left"- CornerRadius="5"- Visibility="{Binding Package.ShouldVisibleRisk, Converter={StaticResource BooleanToVisibilityConverter}}"- >- <Border.Style>- <Style TargetType="Border">- <Setter- Property="Background"- Value="{DynamicResource SystemFillColorSuccessBrush}"- />- <Style.Triggers>- <DataTrigger Binding="{Binding Package.Risk}" Value="Caution">- <Setter- Property="Background"- Value="{DynamicResource SystemFillColorCautionBrush}"- />- </DataTrigger>- </Style.Triggers>- </Style>- </Border.Style>- <StackPanel Orientation="Horizontal">- <ui:SymbolIcon- Margin="0,0,5,0"- Foreground="{DynamicResource TextFillColorInverseBrush}"- Symbol="{Binding Package.RiskVisual.Icon}"- />+ <Border+ Margin="5,0,0,0"+ Padding="4,2"+ HorizontalAlignment="Left"+ CornerRadius="5"+ Visibility="{Binding Package.ShouldVisibleRisk, Converter={StaticResource BooleanToVisibilityConverter}}"+ >+ <Border.Style>+ <Style TargetType="Border">+ <Setter+ Property="Background"+ Value="{DynamicResource SystemFillColorSuccessBrush}"+ />+ <Style.Triggers>+ <DataTrigger+ Binding="{Binding Package.Risk}"+ Value="Caution"+ >+ <Setter+ Property="Background"+ Value="{DynamicResource SystemFillColorCautionBrush}"+ />+ </DataTrigger>+ </Style.Triggers>+ </Style>+ </Border.Style>+ <StackPanel Orientation="Horizontal">+ <ui:SymbolIcon+ Margin="0,0,5,0"+ Foreground="{DynamicResource TextFillColorInverseBrush}"+ Symbol="{Binding Package.RiskVisual.Icon}"+ />- <ui:TextBlock- HorizontalAlignment="Center"- VerticalAlignment="Center"- FontTypography="Caption"- Foreground="{DynamicResource TextFillColorInverseBrush}"- Text="{Binding Package.RiskVisual.Display}"- TextWrapping="Wrap"- />- </StackPanel>- </Border>- </DockPanel>+ <ui:TextBlock+ HorizontalAlignment="Center"+ VerticalAlignment="Center"+ FontTypography="Caption"+ Foreground="{DynamicResource TextFillColorInverseBrush}"+ Text="{Binding Package.RiskVisual.Display}"+ TextWrapping="Wrap"+ />+ </StackPanel>+ </Border>+ </DockPanel>- <ui:TextBlock- Margin="0,2,0,0"- Appearance="Disabled"- FontTypography="Body"- Text="{Binding Package.Publisher}"- TextTrimming="CharacterEllipsis"- />+ <ui:TextBlock+ Margin="0,2,0,0"+ Foreground="{DynamicResource TextFillColorDisabledBrush}"+ FontTypography="Body"+ Text="{Binding Package.Publisher}"+ TextTrimming="CharacterEllipsis"+ />- <ui:TextBlock- Margin="0,2,0,0"- Appearance="Disabled"- FontTypography="Body"- Text="{Binding Package.InstallLocation}"- TextTrimming="CharacterEllipsis"- />+ <ui:TextBlock+ Margin="0,2,0,0"+ Foreground="{DynamicResource TextFillColorDisabledBrush}"+ FontTypography="Body"+ Text="{Binding Package.InstallLocation}"+ TextTrimming="CharacterEllipsis"+ />- <ui:TextBlock- Margin="0,4,0,0"- Appearance="Secondary"- FontTypography="Caption"- Text="{Binding Package.PackageFullName}"- TextTrimming="CharacterEllipsis"- />- </StackPanel>- </Grid>- </Border>- </DataTemplate>- </ItemsControl.ItemTemplate>- </ItemsControl>- </ScrollViewer>- </Grid>+ <ui:TextBlock+ Margin="0,4,0,0"+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ FontTypography="Caption"+ Text="{Binding Package.PackageFullName}"+ TextTrimming="CharacterEllipsis"+ />+ </StackPanel>+ </Grid>+ </Border>+ </DataTemplate>+ </ItemsControl.ItemTemplate>+ </ItemsControl>+ </ScrollViewer>+ </Grid></UserControl>diff --git a/optimizerDuck/UI/Dialogs/LegalDialog.xaml b/optimizerDuck/UI/Dialogs/LegalDialog.xamlindex 9be96ba..e9c5855 100644--- a/optimizerDuck/UI/Dialogs/LegalDialog.xaml+++ b/optimizerDuck/UI/Dialogs/LegalDialog.xaml@@ -1,71 +1,71 @@<UserControl- x:Class="optimizerDuck.UI.Dialogs.LegalDialog"- xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"- xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"- xmlns:d="http://schemas.microsoft.com/expression/blend/2008"- xmlns:ext="clr-namespace:optimizerDuck.Common.Extensions"- xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"- xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"- d:DesignHeight="420"- d:DesignWidth="520"- mc:Ignorable="d"+ x:Class="optimizerDuck.UI.Dialogs.LegalDialog"+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"+ xmlns:ext="clr-namespace:optimizerDuck.Common.Extensions"+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"+ xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"+ d:DesignHeight="420"+ d:DesignWidth="520"+ mc:Ignorable="d">- <Grid>- <Grid.RowDefinitions>- <RowDefinition Height="Auto" />- <RowDefinition Height="*" />- <RowDefinition Height="Auto" />- </Grid.RowDefinitions>+ <Grid>+ <Grid.RowDefinitions>+ <RowDefinition Height="Auto" />+ <RowDefinition Height="*" />+ <RowDefinition Height="Auto" />+ </Grid.RowDefinitions>- <StackPanel>- <ui:TextBlock- FontTypography="BodyStrong"- Text="{ext:Loc LegalDialog.Intro.ThankYou}"- TextWrapping="Wrap"- />- <ui:TextBlock- Margin="0,3,0,0"- FontTypography="Body"- Text="{ext:Loc LegalDialog.Intro.Safety}"- TextWrapping="Wrap"- />- <ui:TextBlock- Margin="0,1,0,0"- FontTypography="Body"- Text="{ext:Loc LegalDialog.Intro.Review}"- TextWrapping="Wrap"- />- </StackPanel>+ <StackPanel>+ <ui:TextBlock+ FontTypography="BodyStrong"+ Text="{ext:Loc LegalDialog.Intro.ThankYou}"+ TextWrapping="Wrap"+ />+ <ui:TextBlock+ Margin="0,3,0,0"+ FontTypography="Body"+ Text="{ext:Loc LegalDialog.Intro.Safety}"+ TextWrapping="Wrap"+ />+ <ui:TextBlock+ Margin="0,1,0,0"+ FontTypography="Body"+ Text="{ext:Loc LegalDialog.Intro.Review}"+ TextWrapping="Wrap"+ />+ </StackPanel>- <StackPanel Grid.Row="1" Margin="0,6,0,6">- <ui:HyperlinkButton- Content="{ext:Loc Key=LegalDialog.Link.TermsOfService}"- Icon="{ui:SymbolIcon DocumentText24}"- NavigateUri="https://github.com/itsfatduck/optimizerDuck/blob/master/TERMS.md"- />+ <StackPanel Grid.Row="1" Margin="0,6,0,6">+ <ui:HyperlinkButton+ Content="{ext:Loc Key=LegalDialog.Link.TermsOfService}"+ Icon="{ui:SymbolIcon DocumentText24}"+ NavigateUri="https://github.com/itsfatduck/optimizerDuck/blob/master/TERMS.md"+ />- <ui:HyperlinkButton- Margin="0,4,0,0"- Content="{ext:Loc Key=LegalDialog.Link.PrivacyPolicy}"- Icon="{ui:SymbolIcon ShieldLock24}"- NavigateUri="https://github.com/itsfatduck/optimizerDuck/blob/master/PRIVACY.md"- />+ <ui:HyperlinkButton+ Margin="0,4,0,0"+ Content="{ext:Loc Key=LegalDialog.Link.PrivacyPolicy}"+ Icon="{ui:SymbolIcon ShieldLock24}"+ NavigateUri="https://github.com/itsfatduck/optimizerDuck/blob/master/PRIVACY.md"+ />- <ui:HyperlinkButton- Margin="0,4,0,0"- Content="{ext:Loc Key=LegalDialog.Link.Disclaimer}"- Icon="{ui:SymbolIcon Warning24}"- NavigateUri="https://github.com/itsfatduck/optimizerDuck/blob/master/DISCLAIMER.md"- />- </StackPanel>+ <ui:HyperlinkButton+ Margin="0,4,0,0"+ Content="{ext:Loc Key=LegalDialog.Link.Disclaimer}"+ Icon="{ui:SymbolIcon Warning24}"+ NavigateUri="https://github.com/itsfatduck/optimizerDuck/blob/master/DISCLAIMER.md"+ />+ </StackPanel>- <ui:InfoBar- Title="{ext:Loc Key=LegalDialog.Warning.Title}"- Grid.Row="2"- IsClosable="False"- IsOpen="True"- Message="{ext:Loc Key=LegalDialog.Warning.Message}"- Severity="Warning"- />- </Grid>+ <ui:InfoBar+ Title="{ext:Loc Key=LegalDialog.Warning.Title}"+ Grid.Row="2"+ IsClosable="False"+ IsOpen="True"+ Message="{ext:Loc Key=LegalDialog.Warning.Message}"+ Severity="Warning"+ />+ </Grid></UserControl>diff --git a/optimizerDuck/UI/Dialogs/OptimizationDetailsDialog.xaml b/optimizerDuck/UI/Dialogs/OptimizationDetailsDialog.xamlindex 0d4fcdb..4f94727 100644--- a/optimizerDuck/UI/Dialogs/OptimizationDetailsDialog.xaml+++ b/optimizerDuck/UI/Dialogs/OptimizationDetailsDialog.xaml@@ -1,263 +1,269 @@<UserControl- x:Class="optimizerDuck.UI.Dialogs.OptimizationDetailsDialog"- xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"- xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"- xmlns:d="http://schemas.microsoft.com/expression/blend/2008"- xmlns:ext="clr-namespace:optimizerDuck.Common.Extensions"- xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"- xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"- d:DesignHeight="760"- d:DesignWidth="760"- ScrollViewer.CanContentScroll="False"- mc:Ignorable="d"+ x:Class="optimizerDuck.UI.Dialogs.OptimizationDetailsDialog"+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"+ xmlns:ext="clr-namespace:optimizerDuck.Common.Extensions"+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"+ xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"+ d:DesignHeight="760"+ d:DesignWidth="760"+ ScrollViewer.CanContentScroll="False"+ mc:Ignorable="d">- <StackPanel>- <Border- Margin="0,0,0,12"- Padding="16"- Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"- BorderBrush="{DynamicResource CardBorderBrush}"- BorderThickness="1"- CornerRadius="8"- >- <Grid RowDefinitions="Auto,Auto,Auto,Auto">- <ui:TextBlock- Appearance="Disabled"- FontTypography="Caption"- Text="{Binding Optimization.Id}"- />+ <StackPanel>+ <Border+ Margin="0,0,0,12"+ Padding="16"+ Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"+ BorderBrush="{DynamicResource CardBorderBrush}"+ BorderThickness="1"+ CornerRadius="8"+ >+ <Grid RowDefinitions="Auto,Auto,Auto,Auto">+ <ui:TextBlock+ Appearance="Disabled"+ FontTypography="Caption"+ Text="{Binding Optimization.Id}"+ />- <ui:TextBlock- Grid.Row="1"- Margin="0,2,0,0"- FontTypography="Subtitle"- Text="{Binding Optimization.Name}"- TextWrapping="Wrap"- />+ <ui:TextBlock+ Grid.Row="1"+ Margin="0,2,0,0"+ FontTypography="Subtitle"+ Text="{Binding Optimization.Name}"+ TextWrapping="Wrap"+ />++ <ui:VirtualizingItemsControl+ Grid.Row="2"+ Margin="0,8,0,0"+ 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" />+ </Style>+ </ui:VirtualizingItemsControl.ItemContainerStyle>+ <ui:VirtualizingItemsControl.ItemTemplate>+ <DataTemplate>+ <Border+ Padding="6,3"+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"+ CornerRadius="5"+ >+ <StackPanel Orientation="Horizontal">+ <ui:SymbolIcon+ Margin="0,0,6,0"+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ Symbol="{Binding Icon}"+ />+ <ui:TextBlock+ VerticalAlignment="Center"+ Appearance="Secondary"+ FontTypography="Caption"+ Text="{Binding Display}"+ />+ </StackPanel>+ </Border>+ </DataTemplate>+ </ui:VirtualizingItemsControl.ItemTemplate>+ </ui:VirtualizingItemsControl>- <ui:VirtualizingItemsControl- Grid.Row="2"- Margin="0,8,0,0"- ItemsSource="{Binding Optimization.TagDisplays}"+ <Grid Grid.Row="3" Margin="0,4,0,0" ColumnDefinitions="Auto,Auto,*">+ <Border Padding="6,4" HorizontalAlignment="Left" CornerRadius="5">+ <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+ Margin="0,0,6,0"+ Foreground="{DynamicResource TextFillColorInverseBrush}"+ Symbol="{Binding Optimization.RiskVisual.Icon}"+ />+ <ui:TextBlock+ VerticalAlignment="Center"+ FontTypography="Caption"+ Foreground="{DynamicResource TextFillColorInverseBrush}"+ Text="{Binding Optimization.RiskVisual.Display}"+ />+ </StackPanel>+ </Border>++ <Border+ Grid.Column="1"+ Margin="8,0,0,0"+ Padding="6,4"+ HorizontalAlignment="Left"+ Background="{DynamicResource CardBackgroundDisabled}"+ CornerRadius="5"+ ToolTip="{Binding Optimization.State.AppliedAt}"+ ToolTipService.InitialShowDelay="150"+ ToolTipService.Placement="Top"+ Visibility="{Binding Optimization.State.AppliedAt, Converter={StaticResource NullToVisibilityConverter}}"+ >+ <StackPanel Orientation="Horizontal">+ <ui:SymbolIcon Margin="0,0,6,0" Symbol="CheckmarkCircle24" />+ <ui:TextBlock+ VerticalAlignment="Center"+ FontTypography="Caption"+ Text="{Binding Optimization.State.RelativeTime}"+ />+ </StackPanel>+ </Border>+ </Grid>+ </Grid>+ </Border>++ <Border+ Margin="0,0,0,12"+ Padding="16"+ Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"+ BorderBrush="{DynamicResource CardBorderBrush}"+ BorderThickness="1"+ CornerRadius="8">- <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" />- </Style>- </ui:VirtualizingItemsControl.ItemContainerStyle>- <ui:VirtualizingItemsControl.ItemTemplate>- <DataTemplate>- <Border- Padding="6,3"- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"- CornerRadius="5"- >- <StackPanel Orientation="Horizontal">- <ui:SymbolIcon- Margin="0,0,6,0"- Foreground="{DynamicResource TextFillColorSecondaryBrush}"- Symbol="{Binding Icon}"- />- <ui:TextBlock- VerticalAlignment="Center"+ <StackPanel>+ <ui:TextBlock+ Margin="0,0,0,8"+ FontTypography="BodyStrong"+ Text="{ext:Loc OptimizationDetailsDialog.DetailedDescription}"+ />+ <ui:TextBlockAppearance="Secondary"- FontTypography="Caption"- Text="{Binding Display}"- />- </StackPanel>- </Border>- </DataTemplate>- </ui:VirtualizingItemsControl.ItemTemplate>- </ui:VirtualizingItemsControl>-- <Grid Grid.Row="3" Margin="0,4,0,0" ColumnDefinitions="Auto,Auto,*">- <Border Padding="6,4" HorizontalAlignment="Left" CornerRadius="5">- <Border.Style>- <Style TargetType="Border">- <Setter- Property="Background"- Value="{DynamicResource SystemFillColorSuccessBrush}"+ FontTypography="Body"+ Text="{Binding Optimization.ShortDescription}"+ TextWrapping="Wrap"/>- <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- Margin="0,0,6,0"- Foreground="{DynamicResource TextFillColorInverseBrush}"- Symbol="{Binding Optimization.RiskVisual.Icon}"- />- <ui:TextBlock- VerticalAlignment="Center"- FontTypography="Caption"- Foreground="{DynamicResource TextFillColorInverseBrush}"- Text="{Binding Optimization.RiskVisual.Display}"- /></StackPanel>- </Border>+ </Border>- <Border- Grid.Column="1"- Margin="8,0,0,0"- Padding="6,4"- HorizontalAlignment="Left"- Background="{DynamicResource CardBackgroundDisabled}"- CornerRadius="5"- ToolTip="{Binding Optimization.State.AppliedAt}"- ToolTipService.InitialShowDelay="150"- ToolTipService.Placement="Top"- Visibility="{Binding Optimization.State.AppliedAt, Converter={StaticResource NullToVisibilityConverter}}"- >- <StackPanel Orientation="Horizontal">- <ui:SymbolIcon Margin="0,0,6,0" Symbol="CheckmarkCircle24" />- <ui:TextBlock- VerticalAlignment="Center"- FontTypography="Caption"- Text="{Binding Optimization.State.RelativeTime}"- />+ <Border+ Margin="0,0,0,12"+ Padding="0"+ Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"+ BorderBrush="{DynamicResource CardBorderBrush}"+ BorderThickness="1"+ CornerRadius="8"+ >+ <StackPanel>+ <Grid Margin="16">+ <Grid.ColumnDefinitions>+ <ColumnDefinition Width="150" />+ <ColumnDefinition Width="*" />+ </Grid.ColumnDefinitions>+ <ui:TextBlock+ Grid.Column="0"+ VerticalAlignment="Center"+ Appearance="Secondary"+ Text="{ext:Loc OptimizationDetailsDialog.Id}"+ />+ <ui:TextBlock+ Grid.Column="1"+ VerticalAlignment="Center"+ FontFamily="Consolas"+ Text="{Binding Optimization.Id}"+ TextWrapping="Wrap"+ />+ </Grid>+ <Separator Margin="16,0" />+ <Grid Margin="16">+ <Grid.ColumnDefinitions>+ <ColumnDefinition Width="150" />+ <ColumnDefinition Width="*" />+ </Grid.ColumnDefinitions>+ <ui:TextBlock+ Grid.Column="0"+ VerticalAlignment="Center"+ Appearance="Secondary"+ Text="{ext:Loc OptimizationDetailsDialog.Class}"+ />+ <ui:TextBlock+ Grid.Column="1"+ VerticalAlignment="Center"+ FontFamily="Consolas"+ Text="{Binding Optimization.OptimizationKey}"+ TextWrapping="Wrap"+ />+ </Grid></StackPanel>- </Border>- </Grid>- </Grid>- </Border>+ </Border>- <Border- Margin="0,0,0,12"- Padding="16"- Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"- BorderBrush="{DynamicResource CardBorderBrush}"- BorderThickness="1"- CornerRadius="8"- >- <StackPanel><ui:TextBlock- Margin="0,0,0,8"- FontTypography="BodyStrong"- Text="{ext:Loc OptimizationDetailsDialog.DetailedDescription}"+ Margin="0,0,0,8"+ FontTypography="BodyStrong"+ Text="{ext:Loc OptimizationDetailsDialog.Other}"/>- <ui:TextBlock- Appearance="Secondary"- FontTypography="Body"- Text="{Binding Optimization.ShortDescription}"- TextWrapping="Wrap"- />- </StackPanel>- </Border>-- <Border- Margin="0,0,0,12"- Padding="0"- Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"- BorderBrush="{DynamicResource CardBorderBrush}"- BorderThickness="1"- CornerRadius="8"- >- <StackPanel>- <Grid Margin="16">- <Grid.ColumnDefinitions>- <ColumnDefinition Width="150" />- <ColumnDefinition Width="*" />- </Grid.ColumnDefinitions>- <ui:TextBlock- Grid.Column="0"- VerticalAlignment="Center"- Appearance="Secondary"- Text="{ext:Loc OptimizationDetailsDialog.Id}"- />- <ui:TextBlock- Grid.Column="1"- VerticalAlignment="Center"- FontFamily="Consolas"- Text="{Binding Optimization.Id}"- TextWrapping="Wrap"- />- </Grid>- <Separator Margin="16,0" />- <Grid Margin="16">- <Grid.ColumnDefinitions>- <ColumnDefinition Width="150" />- <ColumnDefinition Width="*" />- </Grid.ColumnDefinitions>- <ui:TextBlock- Grid.Column="0"- VerticalAlignment="Center"- Appearance="Secondary"- Text="{ext:Loc OptimizationDetailsDialog.Class}"- />- <ui:TextBlock- Grid.Column="1"- VerticalAlignment="Center"- FontFamily="Consolas"- Text="{Binding Optimization.OptimizationKey}"- TextWrapping="Wrap"- />- </Grid>- </StackPanel>- </Border>-- <ui:TextBlock- Margin="0,0,0,8"- FontTypography="BodyStrong"- Text="{ext:Loc OptimizationDetailsDialog.Other}"- />- <ui:CardAction- Margin="0,0,0,8"- Command="{Binding ViewSourceOnGitHubCommand}"- Icon="{ui:SymbolIcon Code24}"- >- <StackPanel>- <ui:TextBlock- 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+ Margin="0,0,0,8"+ Command="{Binding ViewSourceOnGitHubCommand}"+ Icon="{ui:SymbolIcon Code24}"+ >+ <StackPanel>+ <ui:TextBlock+ 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- Margin="0,0,0,4"- Command="{Binding OpenRevertFileCommand}"- Icon="{ui:SymbolIcon FolderOpen24}"- 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>+ <ui:CardAction+ Margin="0,0,0,4"+ Command="{Binding OpenRevertFileCommand}"+ Icon="{ui:SymbolIcon FolderOpen24}"+ 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>diff --git a/optimizerDuck/UI/Dialogs/OptimizationResultDialog.xaml b/optimizerDuck/UI/Dialogs/OptimizationResultDialog.xamlindex 742f301..8482be4 100644--- a/optimizerDuck/UI/Dialogs/OptimizationResultDialog.xaml+++ b/optimizerDuck/UI/Dialogs/OptimizationResultDialog.xaml@@ -1,136 +1,136 @@<UserControl- d:DesignHeight="450"- d:DesignWidth="800"- mc:Ignorable="d"- x:Class="optimizerDuck.UI.Dialogs.OptimizationResultDialog"- xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"- xmlns:converters="clr-namespace:optimizerDuck.Common.Converters"- xmlns:d="http://schemas.microsoft.com/expression/blend/2008"- xmlns:ext="clr-namespace:optimizerDuck.Common.Extensions"- 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"+ d:DesignHeight="450"+ d:DesignWidth="800"+ mc:Ignorable="d"+ x:Class="optimizerDuck.UI.Dialogs.OptimizationResultDialog"+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"+ xmlns:converters="clr-namespace:optimizerDuck.Common.Converters"+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"+ xmlns:ext="clr-namespace:optimizerDuck.Common.Extensions"+ 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">- <UserControl.Resources>- <converters:NullToVisibilityConverter- False="Visible"- True="Collapsed"- x:Key="NullToVisibilityConverter"- />- </UserControl.Resources>- <StackPanel>- <!-- Header with failed count summary -->- <StackPanel Orientation="Horizontal" Margin="0,0,0,4">- <ui:SymbolIcon- Filled="True"- Foreground="{DynamicResource SystemFillColorCriticalBrush}"- Margin="0,0,8,0"- Symbol="ErrorCircle24"- VerticalAlignment="Center"- />+ <UserControl.Resources>+ <converters:NullToVisibilityConverter+ False="Visible"+ True="Collapsed"+ x:Key="NullToVisibilityConverter"+ />+ </UserControl.Resources>+ <StackPanel>+ <!-- Header with failed count summary -->+ <StackPanel Orientation="Horizontal" Margin="0,0,0,4">+ <ui:SymbolIcon+ Filled="True"+ Foreground="{DynamicResource SystemFillColorCriticalBrush}"+ Margin="0,0,8,0"+ Symbol="ErrorCircle24"+ VerticalAlignment="Center"+ />- <ui:TextBlock- FontTypography="Subtitle"- Text="{ext:Loc OptimizationResultDialog.Header,+ <ui:TextBlock+ FontTypography="Subtitle"+ Text="{ext:Loc OptimizationResultDialog.Header,{Binding FailedCount}}"- TextTrimming="WordEllipsis"- TextWrapping="Wrap"- />- </StackPanel>+ TextTrimming="WordEllipsis"+ TextWrapping="Wrap"+ />+ </StackPanel>- <ui:TextBlock- Appearance="Secondary"- FontTypography="Body"- Margin="0,2,0,12"- Text="{ext:Loc OptimizationResultDialog.Description}"- TextWrapping="Wrap"- />+ <ui:TextBlock+ Appearance="Secondary"+ FontTypography="Body"+ Margin="0,2,0,12"+ Text="{ext:Loc OptimizationResultDialog.Description}"+ TextWrapping="Wrap"+ />- <ScrollViewer MaxHeight="350" VerticalScrollBarVisibility="Auto">- <ItemsControl ItemsSource="{Binding FailedSteps}">- <ItemsControl.ItemTemplate>- <DataTemplate>- <ui:CardControl Margin="0,0,0,8">- <ui:CardControl.Header>- <StackPanel>- <!-- Top row: index + service type badge + step name -->- <StackPanel Orientation="Horizontal" Margin="0,0,0,6">- <!-- Step index badge -->- <Border- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"- CornerRadius="4"- HorizontalAlignment="Left"- Margin="0,0,8,0"- Padding="6,2"- VerticalAlignment="Center"- >- <ui:TextBlock- Appearance="Disabled"- FontTypography="Caption"- Text="{Binding Index, StringFormat=# {0}}"- VerticalAlignment="Center"- />- </Border>+ <ScrollViewer MaxHeight="350" VerticalScrollBarVisibility="Auto">+ <ItemsControl ItemsSource="{Binding FailedSteps}">+ <ItemsControl.ItemTemplate>+ <DataTemplate>+ <ui:CardControl Margin="0,0,0,8">+ <ui:CardControl.Header>+ <StackPanel>+ <!-- Top row: index + service type badge + step name -->+ <StackPanel Orientation="Horizontal" Margin="0,0,0,6">+ <!-- Step index badge -->+ <Border+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"+ CornerRadius="4"+ HorizontalAlignment="Left"+ Margin="0,0,8,0"+ Padding="6,2"+ VerticalAlignment="Center"+ >+ <ui:TextBlock+ Appearance="Disabled"+ FontTypography="Caption"+ Text="{Binding Index, StringFormat=# {0}}"+ VerticalAlignment="Center"+ />+ </Border>- <!-- Service type badge -->- <Border- Background="{DynamicResource SystemFillColorAttentionBackgroundBrush}"- CornerRadius="4"- HorizontalAlignment="Left"- Margin="0,0,8,0"- Padding="6,2"- VerticalAlignment="Center"- >- <ui:TextBlock- FontTypography="Caption"- Foreground="{DynamicResource SystemFillColorAttentionBrush}"- Text="{Binding Name}"- VerticalAlignment="Center"- />- </Border>- </StackPanel>+ <!-- Service type badge -->+ <Border+ Background="{DynamicResource SystemFillColorAttentionBackgroundBrush}"+ CornerRadius="4"+ HorizontalAlignment="Left"+ Margin="0,0,8,0"+ Padding="6,2"+ VerticalAlignment="Center"+ >+ <ui:TextBlock+ FontTypography="Caption"+ Foreground="{DynamicResource SystemFillColorAttentionBrush}"+ Text="{Binding Name}"+ VerticalAlignment="Center"+ />+ </Border>+ </StackPanel>- <!-- Step description -->- <ui:TextBlock- FontTypography="BodyStrong"- Margin="0,0,0,4"- Text="{Binding Description}"- TextWrapping="Wrap"- />+ <!-- Step description -->+ <ui:TextBlock+ FontTypography="BodyStrong"+ Margin="0,0,0,4"+ Text="{Binding Description}"+ TextWrapping="Wrap"+ />- <!-- Error message -->- <Border- BorderBrush="{DynamicResource SystemFillColorCriticalBrush}"- BorderThickness="1"- CornerRadius="6"- HorizontalAlignment="Left"- Margin="0,4,0,0"- Padding="8,6"- Visibility="{Binding Error, Converter={StaticResource NullToVisibilityConverter}}"- >- <StackPanel Orientation="Horizontal">- <ui:SymbolIcon- Filled="True"- Foreground="{DynamicResource SystemFillColorCriticalBrush}"- Margin="0,0,6,0"- Symbol="Warning24"- VerticalAlignment="Center"- />- <ui:TextBlock- FontTypography="Caption"- Foreground="{DynamicResource SystemFillColorCriticalBrush}"- HorizontalAlignment="Stretch"- Text="{Binding Error}"- TextWrapping="Wrap"- />- </StackPanel>- </Border>- </StackPanel>- </ui:CardControl.Header>- </ui:CardControl>- </DataTemplate>- </ItemsControl.ItemTemplate>- </ItemsControl>- </ScrollViewer>- </StackPanel>+ <!-- Error message -->+ <Border+ BorderBrush="{DynamicResource SystemFillColorCriticalBrush}"+ BorderThickness="1"+ CornerRadius="6"+ HorizontalAlignment="Left"+ Margin="0,4,0,0"+ Padding="8,6"+ Visibility="{Binding Error, Converter={StaticResource NullToVisibilityConverter}}"+ >+ <StackPanel Orientation="Horizontal">+ <ui:SymbolIcon+ Filled="True"+ Foreground="{DynamicResource SystemFillColorCriticalBrush}"+ Margin="0,0,6,0"+ Symbol="Warning24"+ VerticalAlignment="Center"+ />+ <ui:TextBlock+ FontTypography="Caption"+ Foreground="{DynamicResource SystemFillColorCriticalBrush}"+ HorizontalAlignment="Stretch"+ Text="{Binding Error}"+ TextWrapping="Wrap"+ />+ </StackPanel>+ </Border>+ </StackPanel>+ </ui:CardControl.Header>+ </ui:CardControl>+ </DataTemplate>+ </ItemsControl.ItemTemplate>+ </ItemsControl>+ </ScrollViewer>+ </StackPanel></UserControl>diff --git a/optimizerDuck/UI/Dialogs/ProcessingDialog.xaml b/optimizerDuck/UI/Dialogs/ProcessingDialog.xamlindex b54f747..3dc240f 100644--- a/optimizerDuck/UI/Dialogs/ProcessingDialog.xaml+++ b/optimizerDuck/UI/Dialogs/ProcessingDialog.xaml@@ -1,31 +1,31 @@<UserControl- d:DesignHeight="450"- d:DesignWidth="800"- mc:Ignorable="d"- x:Class="optimizerDuck.UI.Dialogs.ProcessingDialog"- xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"- xmlns:d="http://schemas.microsoft.com/expression/blend/2008"- xmlns:extensions="clr-namespace:optimizerDuck.Common.Extensions"- 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"+ d:DesignHeight="450"+ d:DesignWidth="800"+ mc:Ignorable="d"+ x:Class="optimizerDuck.UI.Dialogs.ProcessingDialog"+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"+ xmlns:extensions="clr-namespace:optimizerDuck.Common.Extensions"+ 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">- <StackPanel>- <TextBlock HorizontalAlignment="Center" Margin="0,0,0,5" Text="{Binding Message}" />+ <StackPanel>+ <TextBlock HorizontalAlignment="Center" Margin="0,0,0,5" Text="{Binding Message}" />- <ProgressBar- IsIndeterminate="{Binding IsIndeterminate}"- Maximum="{Binding Total}"- Minimum="0"- Value="{Binding Value}"- />+ <ProgressBar+ IsIndeterminate="{Binding IsIndeterminate}"+ Maximum="{Binding Total}"+ Minimum="0"+ Value="{Binding Value}"+ />- <ui:TextBlock- FontTypography="Body"- Foreground="{DynamicResource SystemFillColorCriticalBrush}"- HorizontalAlignment="Center"- Margin="0,25,0,0"- Text="{extensions:Loc ProcessingOptimizationDialog.Warning.DontCloseAppOrRestart}"- />- </StackPanel>+ <ui:TextBlock+ FontTypography="Body"+ Foreground="{DynamicResource SystemFillColorCriticalBrush}"+ HorizontalAlignment="Center"+ Margin="0,25,0,0"+ Text="{extensions:Loc ProcessingOptimizationDialog.Warning.DontCloseAppOrRestart}"+ />+ </StackPanel></UserControl>diff --git a/optimizerDuck/UI/Dialogs/RestorePointDialog.xaml b/optimizerDuck/UI/Dialogs/RestorePointDialog.xamlindex e69f48a..70fa4c9 100644--- a/optimizerDuck/UI/Dialogs/RestorePointDialog.xaml+++ b/optimizerDuck/UI/Dialogs/RestorePointDialog.xaml@@ -1,33 +1,33 @@<UserControl- d:DesignHeight="300"- d:DesignWidth="300"- mc:Ignorable="d"- x:Class="optimizerDuck.UI.Dialogs.RestorePointDialog"- xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"- xmlns:d="http://schemas.microsoft.com/expression/blend/2008"- xmlns:ext="clr-namespace:optimizerDuck.Common.Extensions"- 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"+ d:DesignHeight="300"+ d:DesignWidth="300"+ mc:Ignorable="d"+ x:Class="optimizerDuck.UI.Dialogs.RestorePointDialog"+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"+ xmlns:ext="clr-namespace:optimizerDuck.Common.Extensions"+ 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">- <Grid>- <StackPanel>- <ui:SymbolIcon FontSize="48" Symbol="DatabaseLightning20" />- <ui:TextBlock- FontTypography="Body"- HorizontalAlignment="Center"- Text="{ext:Loc RestorePointDialog.Description}"- TextAlignment="Center"- TextWrapping="Wrap"- />+ <Grid>+ <StackPanel>+ <ui:SymbolIcon FontSize="48" Symbol="DatabaseLightning20" />+ <ui:TextBlock+ FontTypography="Body"+ HorizontalAlignment="Center"+ Text="{ext:Loc RestorePointDialog.Description}"+ TextAlignment="Center"+ TextWrapping="Wrap"+ />- <ui:InfoBar- IsClosable="False"- IsOpen="True"- Margin="0,15,0,0"- Message="{ext:Loc RestorePointDialog.Help}"- Severity="Success"- />- </StackPanel>- </Grid>+ <ui:InfoBar+ IsClosable="False"+ IsOpen="True"+ Margin="0,15,0,0"+ Message="{ext:Loc RestorePointDialog.Help}"+ Severity="Success"+ />+ </StackPanel>+ </Grid></UserControl>diff --git a/optimizerDuck/UI/Dialogs/ScheduledTaskCreateDialog.xaml b/optimizerDuck/UI/Dialogs/ScheduledTaskCreateDialog.xamlindex 92986e9..4ec61d3 100644--- a/optimizerDuck/UI/Dialogs/ScheduledTaskCreateDialog.xaml+++ b/optimizerDuck/UI/Dialogs/ScheduledTaskCreateDialog.xaml@@ -1,162 +1,165 @@<UserControl- d:DesignHeight="400"- d:DesignWidth="500"- mc:Ignorable="d"- x:Class="optimizerDuck.UI.Dialogs.ScheduledTaskCreateDialog"- xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"- xmlns:d="http://schemas.microsoft.com/expression/blend/2008"- xmlns:ext="clr-namespace:optimizerDuck.Common.Extensions"- 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"+ d:DesignHeight="400"+ d:DesignWidth="500"+ mc:Ignorable="d"+ x:Class="optimizerDuck.UI.Dialogs.ScheduledTaskCreateDialog"+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"+ xmlns:ext="clr-namespace:optimizerDuck.Common.Extensions"+ 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">- <Grid MinWidth="480">- <Grid.RowDefinitions>- <RowDefinition Height="Auto" />- <RowDefinition Height="Auto" />- </Grid.RowDefinitions>+ <Grid MinWidth="480">+ <Grid.RowDefinitions>+ <RowDefinition Height="Auto" />+ <RowDefinition Height="Auto" />+ </Grid.RowDefinitions>- <Grid Grid.Row="1">- <Grid.ColumnDefinitions>- <ColumnDefinition Width="*" />- <ColumnDefinition Width="24" />- <ColumnDefinition Width="*" />- </Grid.ColumnDefinitions>+ <Grid Grid.Row="1">+ <Grid.ColumnDefinitions>+ <ColumnDefinition Width="*" />+ <ColumnDefinition Width="24" />+ <ColumnDefinition Width="*" />+ </Grid.ColumnDefinitions>- <!-- Left Column: General & Action Info -->- <StackPanel Grid.Column="0">- <ui:TextBlock- FontTypography="Caption"- Margin="0,0,0,4"- Text="{ext:Loc ScheduledTasks.Dialog.TaskName}"- />- <ui:TextBox- Margin="0,0,0,12"- PlaceholderText="{ext:Loc ScheduledTasks.Dialog.TaskNameHint}"- x:Name="TaskNameBox"- />+ <!-- Left Column: General & Action Info -->+ <StackPanel Grid.Column="0">+ <ui:TextBlock+ FontTypography="Caption"+ Margin="0,0,0,4"+ Text="{ext:Loc ScheduledTasks.Dialog.TaskName}"+ />+ <ui:TextBox+ Margin="0,0,0,12"+ PlaceholderText="{ext:Loc ScheduledTasks.Dialog.TaskNameHint}"+ x:Name="TaskNameBox"+ />- <ui:TextBlock- FontTypography="Caption"- Margin="0,0,0,4"- Text="{ext:Loc ScheduledTasks.Dialog.Description}"- />- <ui:TextBox- AcceptsReturn="True"- Margin="0,0,0,12"- MinHeight="60"- PlaceholderText="{ext:Loc ScheduledTasks.Dialog.DescriptionHint}"- TextWrapping="Wrap"- x:Name="DescriptionBox"- />+ <ui:TextBlock+ FontTypography="Caption"+ Margin="0,0,0,4"+ Text="{ext:Loc ScheduledTasks.Dialog.Description}"+ />+ <ui:TextBox+ AcceptsReturn="True"+ Margin="0,0,0,12"+ MinHeight="60"+ PlaceholderText="{ext:Loc ScheduledTasks.Dialog.DescriptionHint}"+ TextWrapping="Wrap"+ x:Name="DescriptionBox"+ />- <ui:TextBlock- FontTypography="Caption"- Margin="0,0,0,4"- Text="{ext:Loc ScheduledTasks.Dialog.FolderPath}"- />- <ui:TextBox Margin="0,0,0,12" PlaceholderText="\" x:Name="FolderPathBox" />+ <ui:TextBlock+ FontTypography="Caption"+ Margin="0,0,0,4"+ Text="{ext:Loc ScheduledTasks.Dialog.FolderPath}"+ />+ <ui:TextBox Margin="0,0,0,12" PlaceholderText="\" x:Name="FolderPathBox" />- <ui:TextBlock- FontTypography="Caption"- Margin="0,0,0,4"- Text="{ext:Loc ScheduledTasks.Dialog.Executable}"- />- <ui:TextBox- Margin="0,0,0,12"- PlaceholderText="{ext:Loc ScheduledTasks.Dialog.ExecutableHint}"- x:Name="ExecutableBox"- />+ <ui:TextBlock+ FontTypography="Caption"+ Margin="0,0,0,4"+ Text="{ext:Loc ScheduledTasks.Dialog.Executable}"+ />+ <ui:TextBox+ Margin="0,0,0,12"+ PlaceholderText="{ext:Loc ScheduledTasks.Dialog.ExecutableHint}"+ x:Name="ExecutableBox"+ />- <ui:TextBlock- FontTypography="Caption"- Margin="0,0,0,4"- Text="{ext:Loc ScheduledTasks.Dialog.Arguments}"- />- <ui:TextBox- Margin="0,0,0,12"- PlaceholderText="{ext:Loc ScheduledTasks.Dialog.ArgumentsHint}"- x:Name="ArgumentsBox"- />- </StackPanel>+ <ui:TextBlock+ FontTypography="Caption"+ Margin="0,0,0,4"+ Text="{ext:Loc ScheduledTasks.Dialog.Arguments}"+ />+ <ui:TextBox+ Margin="0,0,0,12"+ PlaceholderText="{ext:Loc ScheduledTasks.Dialog.ArgumentsHint}"+ x:Name="ArgumentsBox"+ />+ </StackPanel>- <!-- Right Column: Triggers & Settings -->- <StackPanel Grid.Column="2">- <ui:TextBlock- FontTypography="Caption"- Margin="0,0,0,4"- Text="{ext:Loc ScheduledTasks.Dialog.Trigger}"- />- <Border- Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"- CornerRadius="4"- Margin="0,0,0,12"- Padding="12"- >- <StackPanel>- <CheckBox- Content="{ext:Loc ScheduledTasks.Dialog.TriggerLogon}"- IsChecked="True"- Margin="0,0,0,8"- x:Name="LogonTriggerCheck"- />- <CheckBox- Content="{ext:Loc ScheduledTasks.Dialog.TriggerBoot}"- Margin="0,0,0,8"- x:Name="BootTriggerCheck"- />- <CheckBox- Content="{ext:Loc ScheduledTasks.Dialog.TriggerIdle}"- Margin="0,0,0,8"- x:Name="IdleTriggerCheck"- />- <CheckBox- Content="{ext:Loc ScheduledTasks.Dialog.TriggerRegistration}"- Margin="0,0,0,8"- x:Name="RegistrationTriggerCheck"- />+ <!-- Right Column: Triggers & Settings -->+ <StackPanel Grid.Column="2">+ <ui:TextBlock+ FontTypography="Caption"+ Margin="0,0,0,4"+ Text="{ext:Loc ScheduledTasks.Dialog.Trigger}"+ />+ <Border+ Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"+ CornerRadius="4"+ Margin="0,0,0,12"+ Padding="12"+ >+ <StackPanel>+ <CheckBox+ Content="{ext:Loc ScheduledTasks.Dialog.TriggerLogon}"+ IsChecked="True"+ Margin="0,0,0,8"+ x:Name="LogonTriggerCheck"+ />+ <CheckBox+ Content="{ext:Loc ScheduledTasks.Dialog.TriggerBoot}"+ Margin="0,0,0,8"+ x:Name="BootTriggerCheck"+ />+ <CheckBox+ Content="{ext:Loc ScheduledTasks.Dialog.TriggerIdle}"+ Margin="0,0,0,8"+ x:Name="IdleTriggerCheck"+ />+ <CheckBox+ Content="{ext:Loc ScheduledTasks.Dialog.TriggerRegistration}"+ Margin="0,0,0,8"+ x:Name="RegistrationTriggerCheck"+ />- <StackPanel Margin="0,0,0,0" Orientation="Horizontal">- <CheckBox- Content="{ext:Loc ScheduledTasks.Dialog.TriggerDaily}"- Margin="0,0,12,0"- VerticalAlignment="Center"- x:Name="DailyTriggerCheck"- />- <ui:TextBox- IsEnabled="{Binding ElementName=DailyTriggerCheck, Path=IsChecked}"- PlaceholderText="12:00"- ToolTip="{ext:Loc ScheduledTasks.Dialog.Time}"- Width="80"- x:Name="DailyTimeBox"- />- </StackPanel>- </StackPanel>- </Border>+ <StackPanel Margin="0,0,0,0" Orientation="Horizontal">+ <CheckBox+ Content="{ext:Loc ScheduledTasks.Dialog.TriggerDaily}"+ Margin="0,0,12,0"+ VerticalAlignment="Center"+ x:Name="DailyTriggerCheck"+ />+ <ui:TextBox+ IsEnabled="{Binding ElementName=DailyTriggerCheck, Path=IsChecked}"+ PlaceholderText="12:00"+ ToolTip="{ext:Loc ScheduledTasks.Dialog.Time}"+ Width="80"+ x:Name="DailyTimeBox"+ />+ </StackPanel>+ </StackPanel>+ </Border>- <ui:TextBlock FontTypography="Caption" Margin="0,0,0,4" Text="Settings" />- <Border- Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"- CornerRadius="4"- Margin="0,0,0,12"- Padding="12"- >- <StackPanel>- <CheckBox- Content="{ext:Loc ScheduledTasks.Dialog.Enabled}"- IsChecked="True"- Margin="0,0,0,8"- x:Name="EnabledCheck"- />- <CheckBox- Content="{ext:Loc ScheduledTasks.Dialog.HighestPrivileges}"- Margin="0,0,0,8"- x:Name="HighestPrivilegesCheck"- />- <CheckBox Content="{ext:Loc ScheduledTasks.Dialog.Hidden}" x:Name="HiddenCheck" />- </StackPanel>- </Border>- </StackPanel>+ <ui:TextBlock FontTypography="Caption" Margin="0,0,0,4" Text="Settings" />+ <Border+ Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"+ CornerRadius="4"+ Margin="0,0,0,12"+ Padding="12"+ >+ <StackPanel>+ <CheckBox+ Content="{ext:Loc ScheduledTasks.Dialog.Enabled}"+ IsChecked="True"+ Margin="0,0,0,8"+ x:Name="EnabledCheck"+ />+ <CheckBox+ Content="{ext:Loc ScheduledTasks.Dialog.HighestPrivileges}"+ Margin="0,0,0,8"+ x:Name="HighestPrivilegesCheck"+ />+ <CheckBox+ Content="{ext:Loc ScheduledTasks.Dialog.Hidden}"+ x:Name="HiddenCheck"+ />+ </StackPanel>+ </Border>+ </StackPanel>+ </Grid></Grid>- </Grid></UserControl>diff --git a/optimizerDuck/UI/Dialogs/ScheduledTaskDetailsDialog.xaml b/optimizerDuck/UI/Dialogs/ScheduledTaskDetailsDialog.xamlindex 365f6aa..04e5618 100644--- a/optimizerDuck/UI/Dialogs/ScheduledTaskDetailsDialog.xaml+++ b/optimizerDuck/UI/Dialogs/ScheduledTaskDetailsDialog.xaml@@ -1,308 +1,323 @@<UserControl- d:DesignHeight="700"- d:DesignWidth="760"- mc:Ignorable="d"- x:Class="optimizerDuck.UI.Dialogs.ScheduledTaskDetailsDialog"- xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"- xmlns:d="http://schemas.microsoft.com/expression/blend/2008"- xmlns:ext="clr-namespace:optimizerDuck.Common.Extensions"- 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"+ d:DesignHeight="700"+ d:DesignWidth="760"+ mc:Ignorable="d"+ x:Class="optimizerDuck.UI.Dialogs.ScheduledTaskDetailsDialog"+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"+ xmlns:ext="clr-namespace:optimizerDuck.Common.Extensions"+ 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 MinWidth="620" x:Name="RootPanel">- <Border- Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"- BorderBrush="{DynamicResource CardBorderBrush}"- BorderThickness="1"- CornerRadius="8"- Margin="0,0,0,12"- Padding="16,12"- >- <Grid>- <Grid.ColumnDefinitions>- <ColumnDefinition Width="Auto" />- <ColumnDefinition Width="*" />- </Grid.ColumnDefinitions>+ <ScrollViewer VerticalScrollBarVisibility="Auto">+ <StackPanel MinWidth="620" x:Name="RootPanel">+ <Border+ Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"+ BorderBrush="{DynamicResource CardBorderBrush}"+ BorderThickness="1"+ CornerRadius="8"+ Margin="0,0,0,12"+ Padding="16,12"+ >+ <Grid>+ <Grid.ColumnDefinitions>+ <ColumnDefinition Width="Auto" />+ <ColumnDefinition Width="*" />+ </Grid.ColumnDefinitions>- <Image- Grid.Column="0"- Height="40"- Margin="0,0,12,0"- Stretch="UniformToFill"- VerticalAlignment="Center"- Width="40"- x:Name="TaskLogoImage"- />+ <Image+ Grid.Column="0"+ Height="40"+ Margin="0,0,12,0"+ Stretch="UniformToFill"+ VerticalAlignment="Center"+ Width="40"+ x:Name="TaskLogoImage"+ />- <StackPanel Grid.Column="1" VerticalAlignment="Center">- <DockPanel LastChildFill="False">- <ui:TextBlock- FontTypography="BodyStrong"- Text=""- TextWrapping="Wrap"- x:Name="TaskNameText"- />- <Border- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"- CornerRadius="4"- Margin="8,0,0,0"- Padding="6,1"- VerticalAlignment="Center"- >- <ui:TextBlock- Appearance="Tertiary"- FontTypography="Caption"- Text="{ext:Loc ScheduledTasks.Header.Title}"- VerticalAlignment="Center"- />- </Border>- <Border- CornerRadius="4"- Margin="8,0,0,0"- Padding="6,1"- VerticalAlignment="Center"- x:Name="StateBorder"- >- <StackPanel Orientation="Horizontal">- <ui:SymbolIcon- FontSize="10"- Margin="0,0,4,0"- Symbol="Circle24"- x:Name="StateIcon"- />- <ui:TextBlock- FontTypography="Caption"- Foreground="{Binding ElementName=StateIcon, Path=Foreground}"- Text=""- VerticalAlignment="Center"- x:Name="StateText"- />- </StackPanel>- </Border>- </DockPanel>+ <StackPanel Grid.Column="1" VerticalAlignment="Center">+ <DockPanel LastChildFill="False">+ <ui:TextBlock+ FontTypography="BodyStrong"+ Text=""+ TextWrapping="Wrap"+ x:Name="TaskNameText"+ />+ <Border+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"+ CornerRadius="4"+ Margin="8,0,0,0"+ Padding="6,1"+ VerticalAlignment="Center"+ >+ <ui:TextBlock+ Appearance="Tertiary"+ FontTypography="Caption"+ Text="{ext:Loc ScheduledTasks.Header.Title}"+ VerticalAlignment="Center"+ />+ </Border>+ <Border+ CornerRadius="4"+ Margin="8,0,0,0"+ Padding="6,1"+ VerticalAlignment="Center"+ x:Name="StateBorder"+ >+ <StackPanel Orientation="Horizontal">+ <ui:SymbolIcon+ FontSize="10"+ Margin="0,0,4,0"+ Symbol="Circle24"+ x:Name="StateIcon"+ />+ <ui:TextBlock+ FontTypography="Caption"+ Foreground="{Binding ElementName=StateIcon, Path=Foreground}"+ Text=""+ VerticalAlignment="Center"+ x:Name="StateText"+ />+ </StackPanel>+ </Border>+ </DockPanel>- <ui:TextBlock- Appearance="Secondary"- FontTypography="Caption"- Margin="0,4,0,0"- Text=""- TextWrapping="Wrap"- x:Name="DescriptionText"- />- <ui:TextBlock- Appearance="Disabled"- FontTypography="Caption"- Margin="0,2,0,0"- Text=""- TextTrimming="CharacterEllipsis"- x:Name="PathText"- />+ <ui:TextBlock+ Appearance="Secondary"+ FontTypography="Caption"+ Margin="0,4,0,0"+ Text=""+ TextWrapping="Wrap"+ x:Name="DescriptionText"+ />+ <ui:TextBlock+ Appearance="Disabled"+ FontTypography="Caption"+ Margin="0,2,0,0"+ Text=""+ TextTrimming="CharacterEllipsis"+ x:Name="PathText"+ />- <ItemsControl Margin="0,6,0,0" x:Name="TriggerBadgesItems">- <ItemsControl.ItemsPanel>- <ItemsPanelTemplate>- <WrapPanel Orientation="Horizontal" />- </ItemsPanelTemplate>- </ItemsControl.ItemsPanel>- <ItemsControl.ItemTemplate>- <DataTemplate>- <Border- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"- CornerRadius="4"- Margin="0,0,4,2"- Padding="6,2"- >- <StackPanel Orientation="Horizontal">- <ui:SymbolIcon- Foreground="{DynamicResource TextFillColorSecondaryBrush}"- Margin="0,0,4,0"- Symbol="Timer24"- />- <ui:TextBlock- FontTypography="Caption"- Foreground="{DynamicResource TextFillColorSecondaryBrush}"- Text="{Binding}"- VerticalAlignment="Center"- />+ <ItemsControl Margin="0,6,0,0" x:Name="TriggerBadgesItems">+ <ItemsControl.ItemsPanel>+ <ItemsPanelTemplate>+ <WrapPanel Orientation="Horizontal" />+ </ItemsPanelTemplate>+ </ItemsControl.ItemsPanel>+ <ItemsControl.ItemTemplate>+ <DataTemplate>+ <Border+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"+ CornerRadius="4"+ Margin="0,0,4,2"+ Padding="6,2"+ >+ <StackPanel Orientation="Horizontal">+ <ui:SymbolIcon+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ Margin="0,0,4,0"+ Symbol="Timer24"+ />+ <ui:TextBlock+ FontTypography="Caption"+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ Text="{Binding}"+ VerticalAlignment="Center"+ />+ </StackPanel>+ </Border>+ </DataTemplate>+ </ItemsControl.ItemTemplate>+ </ItemsControl></StackPanel>- </Border>- </DataTemplate>- </ItemsControl.ItemTemplate>- </ItemsControl>- </StackPanel>- </Grid>- </Border>+ </Grid>+ </Border>- <Border- Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"- BorderBrush="{DynamicResource CardBorderBrush}"- BorderThickness="1"- CornerRadius="8"- Margin="0,0,0,12"- Padding="0"- >- <StackPanel>- <Grid Margin="14,12">- <Grid.ColumnDefinitions>- <ColumnDefinition Width="Auto" />- <ColumnDefinition Width="*" />- </Grid.ColumnDefinitions>- <ui:SymbolIcon- FontSize="14"- Foreground="{DynamicResource TextFillColorSecondaryBrush}"- Margin="0,0,10,0"- Symbol="Person24"- VerticalAlignment="Top"- />- <StackPanel Grid.Column="1">- <ui:TextBlock- Appearance="Secondary"- FontTypography="Caption"- Text="{ext:Loc ScheduledTasks.Details.Author}"- />- <ui:TextBlock FontTypography="Body" Margin="0,2,0,0" Text="" x:Name="AuthorText" />- </StackPanel>- </Grid>- <Separator Margin="14,0" />+ <Border+ Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"+ BorderBrush="{DynamicResource CardBorderBrush}"+ BorderThickness="1"+ CornerRadius="8"+ Margin="0,0,0,12"+ Padding="0"+ >+ <StackPanel>+ <Grid Margin="14,12">+ <Grid.ColumnDefinitions>+ <ColumnDefinition Width="Auto" />+ <ColumnDefinition Width="*" />+ </Grid.ColumnDefinitions>+ <ui:SymbolIcon+ FontSize="14"+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ Margin="0,0,10,0"+ Symbol="Person24"+ VerticalAlignment="Top"+ />+ <StackPanel Grid.Column="1">+ <ui:TextBlock+ Appearance="Secondary"+ FontTypography="Caption"+ Text="{ext:Loc ScheduledTasks.Details.Author}"+ />+ <ui:TextBlock+ FontTypography="Body"+ Margin="0,2,0,0"+ Text=""+ x:Name="AuthorText"+ />+ </StackPanel>+ </Grid>+ <Separator Margin="14,0" />- <Grid Margin="14,12">- <Grid.ColumnDefinitions>- <ColumnDefinition Width="Auto" />- <ColumnDefinition Width="*" />- </Grid.ColumnDefinitions>- <ui:SymbolIcon- FontSize="14"- Foreground="{DynamicResource TextFillColorSecondaryBrush}"- Margin="0,0,10,0"- Symbol="Timer24"- VerticalAlignment="Top"- />- <StackPanel Grid.Column="1">- <ui:TextBlock- Appearance="Secondary"- FontTypography="Caption"- Text="{ext:Loc ScheduledTasks.Details.Triggers}"- />- <ui:TextBlock- FontTypography="Body"- Margin="0,2,0,0"- Text=""- TextWrapping="Wrap"- x:Name="TriggersText"- />- </StackPanel>- </Grid>- <Separator Margin="14,0" />+ <Grid Margin="14,12">+ <Grid.ColumnDefinitions>+ <ColumnDefinition Width="Auto" />+ <ColumnDefinition Width="*" />+ </Grid.ColumnDefinitions>+ <ui:SymbolIcon+ FontSize="14"+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ Margin="0,0,10,0"+ Symbol="Timer24"+ VerticalAlignment="Top"+ />+ <StackPanel Grid.Column="1">+ <ui:TextBlock+ Appearance="Secondary"+ FontTypography="Caption"+ Text="{ext:Loc ScheduledTasks.Details.Triggers}"+ />+ <ui:TextBlock+ FontTypography="Body"+ Margin="0,2,0,0"+ Text=""+ TextWrapping="Wrap"+ x:Name="TriggersText"+ />+ </StackPanel>+ </Grid>+ <Separator Margin="14,0" />- <Grid Margin="14,12">- <Grid.ColumnDefinitions>- <ColumnDefinition Width="Auto" />- <ColumnDefinition Width="*" />- </Grid.ColumnDefinitions>- <ui:SymbolIcon- FontSize="14"- Foreground="{DynamicResource TextFillColorSecondaryBrush}"- Margin="0,0,10,0"- Symbol="Play24"- VerticalAlignment="Top"- />- <StackPanel Grid.Column="1">- <ui:TextBlock- Appearance="Secondary"- FontTypography="Caption"- Text="{ext:Loc ScheduledTasks.Details.Action}"- />- <ui:TextBlock- FontFamily="Consolas"- FontTypography="Body"- Margin="0,2,0,0"- Text=""- TextWrapping="Wrap"- x:Name="ActionText"- />- </StackPanel>- </Grid>- </StackPanel>- </Border>+ <Grid Margin="14,12">+ <Grid.ColumnDefinitions>+ <ColumnDefinition Width="Auto" />+ <ColumnDefinition Width="*" />+ </Grid.ColumnDefinitions>+ <ui:SymbolIcon+ FontSize="14"+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ Margin="0,0,10,0"+ Symbol="Play24"+ VerticalAlignment="Top"+ />+ <StackPanel Grid.Column="1">+ <ui:TextBlock+ Appearance="Secondary"+ FontTypography="Caption"+ Text="{ext:Loc ScheduledTasks.Details.Action}"+ />+ <ui:TextBlock+ FontFamily="Consolas"+ FontTypography="Body"+ Margin="0,2,0,0"+ Text=""+ TextWrapping="Wrap"+ x:Name="ActionText"+ />+ </StackPanel>+ </Grid>+ </StackPanel>+ </Border>- <Border- Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"- BorderBrush="{DynamicResource CardBorderBrush}"- BorderThickness="1"- CornerRadius="8"- Padding="0"- >- <StackPanel>- <Grid Margin="14,12">- <Grid.ColumnDefinitions>- <ColumnDefinition Width="Auto" />- <ColumnDefinition Width="*" />- <ColumnDefinition Width="Auto" />- <ColumnDefinition Width="*" />- </Grid.ColumnDefinitions>- <ui:SymbolIcon- FontSize="14"- Foreground="{DynamicResource TextFillColorSecondaryBrush}"- Margin="0,0,10,0"- Symbol="History24"- VerticalAlignment="Top"- />- <StackPanel Grid.Column="1" Margin="0,0,16,0">- <ui:TextBlock- Appearance="Secondary"- FontTypography="Caption"- Text="{ext:Loc ScheduledTasks.Details.LastRun}"- />- <ui:TextBlock FontTypography="Body" Margin="0,2,0,0" Text="" x:Name="LastRunText" />- </StackPanel>- <ui:SymbolIcon- FontSize="14"- Foreground="{DynamicResource TextFillColorSecondaryBrush}"- Grid.Column="2"- Margin="0,0,10,0"- Symbol="CalendarArrowRight24"- VerticalAlignment="Top"- />- <StackPanel Grid.Column="3">- <ui:TextBlock- Appearance="Secondary"- FontTypography="Caption"- Text="{ext:Loc ScheduledTasks.Details.NextRun}"- />- <ui:TextBlock FontTypography="Body" Margin="0,2,0,0" Text="" x:Name="NextRunText" />- </StackPanel>- </Grid>- <Separator Margin="14,0" />- <Grid Margin="14,12">- <Grid.ColumnDefinitions>- <ColumnDefinition Width="Auto" />- <ColumnDefinition Width="*" />- </Grid.ColumnDefinitions>- <ui:SymbolIcon- FontSize="14"- Foreground="{DynamicResource TextFillColorSecondaryBrush}"- Margin="0,0,10,0"- Symbol="CheckmarkCircle24"- VerticalAlignment="Top"- />- <StackPanel Grid.Column="1">- <ui:TextBlock- Appearance="Secondary"- FontTypography="Caption"- Text="{ext:Loc ScheduledTasks.Details.LastResult}"- />- <ui:TextBlock- FontTypography="Body"- Margin="0,2,0,0"- Text=""- x:Name="LastResultText"- />- </StackPanel>- </Grid>+ <Border+ Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"+ BorderBrush="{DynamicResource CardBorderBrush}"+ BorderThickness="1"+ CornerRadius="8"+ Padding="0"+ >+ <StackPanel>+ <Grid Margin="14,12">+ <Grid.ColumnDefinitions>+ <ColumnDefinition Width="Auto" />+ <ColumnDefinition Width="*" />+ <ColumnDefinition Width="Auto" />+ <ColumnDefinition Width="*" />+ </Grid.ColumnDefinitions>+ <ui:SymbolIcon+ FontSize="14"+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ Margin="0,0,10,0"+ Symbol="History24"+ VerticalAlignment="Top"+ />+ <StackPanel Grid.Column="1" Margin="0,0,16,0">+ <ui:TextBlock+ Appearance="Secondary"+ FontTypography="Caption"+ Text="{ext:Loc ScheduledTasks.Details.LastRun}"+ />+ <ui:TextBlock+ FontTypography="Body"+ Margin="0,2,0,0"+ Text=""+ x:Name="LastRunText"+ />+ </StackPanel>+ <ui:SymbolIcon+ FontSize="14"+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ Grid.Column="2"+ Margin="0,0,10,0"+ Symbol="CalendarArrowRight24"+ VerticalAlignment="Top"+ />+ <StackPanel Grid.Column="3">+ <ui:TextBlock+ Appearance="Secondary"+ FontTypography="Caption"+ Text="{ext:Loc ScheduledTasks.Details.NextRun}"+ />+ <ui:TextBlock+ FontTypography="Body"+ Margin="0,2,0,0"+ Text=""+ x:Name="NextRunText"+ />+ </StackPanel>+ </Grid>+ <Separator Margin="14,0" />+ <Grid Margin="14,12">+ <Grid.ColumnDefinitions>+ <ColumnDefinition Width="Auto" />+ <ColumnDefinition Width="*" />+ </Grid.ColumnDefinitions>+ <ui:SymbolIcon+ FontSize="14"+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ Margin="0,0,10,0"+ Symbol="CheckmarkCircle24"+ VerticalAlignment="Top"+ />+ <StackPanel Grid.Column="1">+ <ui:TextBlock+ Appearance="Secondary"+ FontTypography="Caption"+ Text="{ext:Loc ScheduledTasks.Details.LastResult}"+ />+ <ui:TextBlock+ FontTypography="Body"+ Margin="0,2,0,0"+ Text=""+ x:Name="LastResultText"+ />+ </StackPanel>+ </Grid>+ </StackPanel>+ </Border></StackPanel>- </Border>- </StackPanel>- </ScrollViewer>+ </ScrollViewer></UserControl>diff --git a/optimizerDuck/UI/Dialogs/StartupTaskDetailsPanel.xaml b/optimizerDuck/UI/Dialogs/StartupTaskDetailsPanel.xamlindex 366be62..ec6a876 100644--- a/optimizerDuck/UI/Dialogs/StartupTaskDetailsPanel.xaml+++ b/optimizerDuck/UI/Dialogs/StartupTaskDetailsPanel.xaml@@ -1,288 +1,288 @@<UserControl- d:DesignHeight="520"- d:DesignWidth="620"- mc:Ignorable="d"- x:Class="optimizerDuck.UI.Dialogs.StartupTaskDetailsPanel"- xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"- xmlns:d="http://schemas.microsoft.com/expression/blend/2008"- xmlns:ext="clr-namespace:optimizerDuck.Common.Extensions"- 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"+ d:DesignHeight="520"+ d:DesignWidth="620"+ mc:Ignorable="d"+ x:Class="optimizerDuck.UI.Dialogs.StartupTaskDetailsPanel"+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"+ xmlns:ext="clr-namespace:optimizerDuck.Common.Extensions"+ 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 MinWidth="540">- <Border- Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"- BorderBrush="{DynamicResource CardBorderBrush}"- BorderThickness="1"- CornerRadius="8"- Margin="0,0,0,12"- Padding="16,12"- >- <Grid>- <Grid.ColumnDefinitions>- <ColumnDefinition Width="Auto" />- <ColumnDefinition Width="*" />- </Grid.ColumnDefinitions>+ <ScrollViewer VerticalScrollBarVisibility="Auto">+ <StackPanel MinWidth="540">+ <Border+ Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"+ BorderBrush="{DynamicResource CardBorderBrush}"+ BorderThickness="1"+ CornerRadius="8"+ Margin="0,0,0,12"+ Padding="16,12"+ >+ <Grid>+ <Grid.ColumnDefinitions>+ <ColumnDefinition Width="Auto" />+ <ColumnDefinition Width="*" />+ </Grid.ColumnDefinitions>- <Image- Grid.Column="0"- Height="40"- Margin="0,0,12,0"- Source="{x:Null}"- Stretch="UniformToFill"- VerticalAlignment="Center"- Width="40"- x:Name="LogoImageControl"- />+ <Image+ Grid.Column="0"+ Height="40"+ Margin="0,0,12,0"+ Source="{x:Null}"+ Stretch="UniformToFill"+ VerticalAlignment="Center"+ Width="40"+ x:Name="LogoImageControl"+ />- <StackPanel Grid.Column="1" VerticalAlignment="Center">- <DockPanel LastChildFill="False">- <ui:TextBlock- FontTypography="BodyStrong"- Text="{Binding Text, ElementName=NameText}"- TextWrapping="Wrap"- />- <Border- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"- CornerRadius="4"- Margin="8,0,0,0"- Padding="6,1"- VerticalAlignment="Center"- x:Name="TaskKindBadge"- >- <ui:TextBlock- Appearance="Tertiary"- FontTypography="Caption"- Text="{ext:Loc ScheduledTasks.Header.Title}"- VerticalAlignment="Center"- />- </Border>- <Border- CornerRadius="4"- Margin="8,0,0,0"- Padding="6,1"- VerticalAlignment="Center"- x:Name="TaskStateBadge"- >- <ui:TextBlock- FontTypography="Caption"- Foreground="{DynamicResource TextFillColorInverseBrush}"- Text=""- VerticalAlignment="Center"- x:Name="TaskStateText"- />- </Border>- </DockPanel>+ <StackPanel Grid.Column="1" VerticalAlignment="Center">+ <DockPanel LastChildFill="False">+ <ui:TextBlock+ FontTypography="BodyStrong"+ Text="{Binding Text, ElementName=NameText}"+ TextWrapping="Wrap"+ />+ <Border+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"+ CornerRadius="4"+ Margin="8,0,0,0"+ Padding="6,1"+ VerticalAlignment="Center"+ x:Name="TaskKindBadge"+ >+ <ui:TextBlock+ Appearance="Tertiary"+ FontTypography="Caption"+ Text="{ext:Loc ScheduledTasks.Header.Title}"+ VerticalAlignment="Center"+ />+ </Border>+ <Border+ CornerRadius="4"+ Margin="8,0,0,0"+ Padding="6,1"+ VerticalAlignment="Center"+ x:Name="TaskStateBadge"+ >+ <ui:TextBlock+ FontTypography="Caption"+ Foreground="{DynamicResource TextFillColorInverseBrush}"+ Text=""+ VerticalAlignment="Center"+ x:Name="TaskStateText"+ />+ </Border>+ </DockPanel>- <ui:TextBlock- Appearance="Secondary"- FontTypography="Caption"- Margin="0,4,0,0"- Text="{Binding Text, ElementName=DescriptionText}"- TextTrimming="CharacterEllipsis"- TextWrapping="Wrap"- />- <ui:TextBlock- Appearance="Disabled"- FontTypography="Caption"- Margin="0,2,0,0"- Text="{Binding Text, ElementName=PathText}"- TextTrimming="CharacterEllipsis"- />+ <ui:TextBlock+ Appearance="Secondary"+ FontTypography="Caption"+ Margin="0,4,0,0"+ Text="{Binding Text, ElementName=DescriptionText}"+ TextTrimming="CharacterEllipsis"+ TextWrapping="Wrap"+ />+ <ui:TextBlock+ Appearance="Disabled"+ FontTypography="Caption"+ Margin="0,2,0,0"+ Text="{Binding Text, ElementName=PathText}"+ TextTrimming="CharacterEllipsis"+ />- <ItemsControl Margin="0,6,0,0" x:Name="TriggerBadgesItems">- <ItemsControl.ItemsPanel>- <ItemsPanelTemplate>- <WrapPanel Orientation="Horizontal" />- </ItemsPanelTemplate>- </ItemsControl.ItemsPanel>- <ItemsControl.ItemTemplate>- <DataTemplate>- <Border- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"- CornerRadius="4"- Margin="0,0,4,2"- Padding="6,2"- >- <StackPanel Orientation="Horizontal">- <ui:SymbolIcon- FontSize="14"- Foreground="{DynamicResource TextFillColorSecondaryBrush}"- Margin="0,0,4,0"- Symbol="Timer24"- />- <ui:TextBlock- FontTypography="Caption"- Foreground="{DynamicResource TextFillColorSecondaryBrush}"- Text="{Binding}"- VerticalAlignment="Center"- />+ <ItemsControl Margin="0,6,0,0" x:Name="TriggerBadgesItems">+ <ItemsControl.ItemsPanel>+ <ItemsPanelTemplate>+ <WrapPanel Orientation="Horizontal" />+ </ItemsPanelTemplate>+ </ItemsControl.ItemsPanel>+ <ItemsControl.ItemTemplate>+ <DataTemplate>+ <Border+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"+ CornerRadius="4"+ Margin="0,0,4,2"+ Padding="6,2"+ >+ <StackPanel Orientation="Horizontal">+ <ui:SymbolIcon+ FontSize="14"+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ Margin="0,0,4,0"+ Symbol="Timer24"+ />+ <ui:TextBlock+ FontTypography="Caption"+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ Text="{Binding}"+ VerticalAlignment="Center"+ />+ </StackPanel>+ </Border>+ </DataTemplate>+ </ItemsControl.ItemTemplate>+ </ItemsControl></StackPanel>- </Border>- </DataTemplate>- </ItemsControl.ItemTemplate>- </ItemsControl>- </StackPanel>- </Grid>- </Border>+ </Grid>+ </Border>- <Border- Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"- BorderBrush="{DynamicResource CardBorderBrush}"- BorderThickness="1"- CornerRadius="8"- Padding="0"- >- <StackPanel>- <Grid Margin="14,12">- <Grid.ColumnDefinitions>- <ColumnDefinition Width="Auto" />- <ColumnDefinition Width="*" />- </Grid.ColumnDefinitions>- <ui:SymbolIcon- FontSize="14"- Foreground="{DynamicResource TextFillColorSecondaryBrush}"- Margin="0,0,10,0"- Symbol="AppGeneric24"- VerticalAlignment="Top"- />- <StackPanel Grid.Column="1">- <ui:TextBlock- Appearance="Secondary"- FontTypography="Caption"- Text="{ext:Loc ScheduledTasks.Details.Name}"- />- <ui:TextBlock- FontTypography="Body"- Margin="0,2,0,0"- Text=""- TextWrapping="Wrap"- x:Name="NameText"- />- </StackPanel>- </Grid>- <Separator Margin="14,0" />+ <Border+ Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"+ BorderBrush="{DynamicResource CardBorderBrush}"+ BorderThickness="1"+ CornerRadius="8"+ Padding="0"+ >+ <StackPanel>+ <Grid Margin="14,12">+ <Grid.ColumnDefinitions>+ <ColumnDefinition Width="Auto" />+ <ColumnDefinition Width="*" />+ </Grid.ColumnDefinitions>+ <ui:SymbolIcon+ FontSize="14"+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ Margin="0,0,10,0"+ Symbol="AppGeneric24"+ VerticalAlignment="Top"+ />+ <StackPanel Grid.Column="1">+ <ui:TextBlock+ Appearance="Secondary"+ FontTypography="Caption"+ Text="{ext:Loc ScheduledTasks.Details.Name}"+ />+ <ui:TextBlock+ FontTypography="Body"+ Margin="0,2,0,0"+ Text=""+ TextWrapping="Wrap"+ x:Name="NameText"+ />+ </StackPanel>+ </Grid>+ <Separator Margin="14,0" />- <Grid Margin="14,12">- <Grid.ColumnDefinitions>- <ColumnDefinition Width="Auto" />- <ColumnDefinition Width="*" />- </Grid.ColumnDefinitions>- <ui:SymbolIcon- FontSize="14"- Foreground="{DynamicResource TextFillColorSecondaryBrush}"- Margin="0,0,10,0"- Symbol="TextDescription24"- VerticalAlignment="Top"- />- <StackPanel Grid.Column="1">- <ui:TextBlock- Appearance="Secondary"- FontTypography="Caption"- Text="{ext:Loc ScheduledTasks.Details.Description}"- />- <ui:TextBlock- FontTypography="Body"- Margin="0,2,0,0"- Text=""- TextWrapping="Wrap"- x:Name="DescriptionText"- />- </StackPanel>- </Grid>- <Separator Margin="14,0" />+ <Grid Margin="14,12">+ <Grid.ColumnDefinitions>+ <ColumnDefinition Width="Auto" />+ <ColumnDefinition Width="*" />+ </Grid.ColumnDefinitions>+ <ui:SymbolIcon+ FontSize="14"+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ Margin="0,0,10,0"+ Symbol="TextDescription24"+ VerticalAlignment="Top"+ />+ <StackPanel Grid.Column="1">+ <ui:TextBlock+ Appearance="Secondary"+ FontTypography="Caption"+ Text="{ext:Loc ScheduledTasks.Details.Description}"+ />+ <ui:TextBlock+ FontTypography="Body"+ Margin="0,2,0,0"+ Text=""+ TextWrapping="Wrap"+ x:Name="DescriptionText"+ />+ </StackPanel>+ </Grid>+ <Separator Margin="14,0" />- <Grid Margin="14,12">- <Grid.ColumnDefinitions>- <ColumnDefinition Width="Auto" />- <ColumnDefinition Width="*" />- </Grid.ColumnDefinitions>- <ui:SymbolIcon- FontSize="14"- Foreground="{DynamicResource TextFillColorSecondaryBrush}"- Margin="0,0,10,0"- Symbol="Folder24"- VerticalAlignment="Top"- />- <StackPanel Grid.Column="1">- <ui:TextBlock- Appearance="Secondary"- FontTypography="Caption"- Text="{ext:Loc ScheduledTasks.Details.Path}"- />- <ui:TextBlock- FontFamily="Consolas"- FontTypography="Body"- Margin="0,2,0,0"- Text=""- TextWrapping="Wrap"- x:Name="PathText"- />- </StackPanel>- </Grid>- <Separator Margin="14,0" />+ <Grid Margin="14,12">+ <Grid.ColumnDefinitions>+ <ColumnDefinition Width="Auto" />+ <ColumnDefinition Width="*" />+ </Grid.ColumnDefinitions>+ <ui:SymbolIcon+ FontSize="14"+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ Margin="0,0,10,0"+ Symbol="Folder24"+ VerticalAlignment="Top"+ />+ <StackPanel Grid.Column="1">+ <ui:TextBlock+ Appearance="Secondary"+ FontTypography="Caption"+ Text="{ext:Loc ScheduledTasks.Details.Path}"+ />+ <ui:TextBlock+ FontFamily="Consolas"+ FontTypography="Body"+ Margin="0,2,0,0"+ Text=""+ TextWrapping="Wrap"+ x:Name="PathText"+ />+ </StackPanel>+ </Grid>+ <Separator Margin="14,0" />- <Grid Margin="14,12">- <Grid.ColumnDefinitions>- <ColumnDefinition Width="Auto" />- <ColumnDefinition Width="*" />- </Grid.ColumnDefinitions>- <ui:SymbolIcon- FontSize="14"- Foreground="{DynamicResource TextFillColorSecondaryBrush}"- Margin="0,0,10,0"- Symbol="Timer24"- VerticalAlignment="Top"- />- <StackPanel Grid.Column="1">- <ui:TextBlock- Appearance="Secondary"- FontTypography="Caption"- Text="{ext:Loc ScheduledTasks.Details.Triggers}"- />- <ui:TextBlock- FontTypography="Body"- Margin="0,2,0,0"- Text=""- TextWrapping="Wrap"- x:Name="TriggersText"- />- </StackPanel>- </Grid>- <Separator Margin="14,0" />+ <Grid Margin="14,12">+ <Grid.ColumnDefinitions>+ <ColumnDefinition Width="Auto" />+ <ColumnDefinition Width="*" />+ </Grid.ColumnDefinitions>+ <ui:SymbolIcon+ FontSize="14"+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ Margin="0,0,10,0"+ Symbol="Timer24"+ VerticalAlignment="Top"+ />+ <StackPanel Grid.Column="1">+ <ui:TextBlock+ Appearance="Secondary"+ FontTypography="Caption"+ Text="{ext:Loc ScheduledTasks.Details.Triggers}"+ />+ <ui:TextBlock+ FontTypography="Body"+ Margin="0,2,0,0"+ Text=""+ TextWrapping="Wrap"+ x:Name="TriggersText"+ />+ </StackPanel>+ </Grid>+ <Separator Margin="14,0" />- <Grid Margin="14,12">- <Grid.ColumnDefinitions>- <ColumnDefinition Width="Auto" />- <ColumnDefinition Width="*" />- </Grid.ColumnDefinitions>- <ui:SymbolIcon- FontSize="14"- Foreground="{DynamicResource TextFillColorSecondaryBrush}"- Margin="0,0,10,0"- Symbol="Play24"- VerticalAlignment="Top"- />- <StackPanel Grid.Column="1">- <ui:TextBlock- Appearance="Secondary"- FontTypography="Caption"- Text="{ext:Loc ScheduledTasks.Details.Action}"- />- <ui:TextBlock- FontFamily="Consolas"- FontTypography="Body"- Margin="0,2,0,0"- Text=""- TextWrapping="Wrap"- x:Name="ActionText"- />- </StackPanel>- </Grid>+ <Grid Margin="14,12">+ <Grid.ColumnDefinitions>+ <ColumnDefinition Width="Auto" />+ <ColumnDefinition Width="*" />+ </Grid.ColumnDefinitions>+ <ui:SymbolIcon+ FontSize="14"+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ Margin="0,0,10,0"+ Symbol="Play24"+ VerticalAlignment="Top"+ />+ <StackPanel Grid.Column="1">+ <ui:TextBlock+ Appearance="Secondary"+ FontTypography="Caption"+ Text="{ext:Loc ScheduledTasks.Details.Action}"+ />+ <ui:TextBlock+ FontFamily="Consolas"+ FontTypography="Body"+ Margin="0,2,0,0"+ Text=""+ TextWrapping="Wrap"+ x:Name="ActionText"+ />+ </StackPanel>+ </Grid>+ </StackPanel>+ </Border></StackPanel>- </Border>- </StackPanel>- </ScrollViewer>+ </ScrollViewer></UserControl>diff --git a/optimizerDuck/UI/Pages/BloatwarePage.xaml b/optimizerDuck/UI/Pages/BloatwarePage.xamlindex 42384bd..2db661b 100644--- a/optimizerDuck/UI/Pages/BloatwarePage.xaml+++ b/optimizerDuck/UI/Pages/BloatwarePage.xaml@@ -1,461 +1,500 @@<Page- x:Class="optimizerDuck.UI.Pages.BloatwarePage"- xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"- xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"- xmlns:bloatware1="clr-namespace:optimizerDuck.Domain.Optimizations.Models.Bloatware"- xmlns:converters="clr-namespace:optimizerDuck.Common.Converters"- xmlns:d="http://schemas.microsoft.com/expression/blend/2008"- xmlns:ext="clr-namespace:optimizerDuck.Common.Extensions"- xmlns:local="clr-namespace:optimizerDuck.UI.Pages"- xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"- xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"- Title="BloatwarePage"- Margin="0,32,0,0"- d:DataContext="{d:DesignInstance local:BloatwarePage}"- d:DesignHeight="1200"- d:DesignWidth="800"- ui:Design.Background="Black"- ui:Design.Foreground="White"- Foreground="{DynamicResource TextFillColorPrimaryBrush}"- ScrollViewer.CanContentScroll="False"- mc:Ignorable="d"+ x:Class="optimizerDuck.UI.Pages.BloatwarePage"+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"+ xmlns:bloatware1="clr-namespace:optimizerDuck.Domain.Optimizations.Models.Bloatware"+ xmlns:converters="clr-namespace:optimizerDuck.Common.Converters"+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"+ xmlns:ext="clr-namespace:optimizerDuck.Common.Extensions"+ xmlns:local="clr-namespace:optimizerDuck.UI.Pages"+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"+ xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"+ Title="BloatwarePage"+ Margin="0,32,0,0"+ d:DataContext="{d:DesignInstance local:BloatwarePage}"+ d:DesignHeight="1200"+ d:DesignWidth="800"+ ui:Design.Background="Black"+ ui:Design.Foreground="White"+ Foreground="{DynamicResource TextFillColorPrimaryBrush}"+ ScrollViewer.CanContentScroll="False"+ mc:Ignorable="d">- <Page.Resources>- <converters:GreaterThanZeroToVisibilityConverter x:Key="GreaterThanZeroToVisibilityConverter" />- <converters:ZeroToVisibilityConverter x:Key="ZeroToVisibilityConverter" />- <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />- </Page.Resources>+ <Page.Resources>+ <converters:GreaterThanZeroToVisibilityConverter x:Key="GreaterThanZeroToVisibilityConverter" />+ <converters:ZeroToVisibilityConverter x:Key="ZeroToVisibilityConverter" />+ <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />+ </Page.Resources>- <Grid RowDefinitions="Auto *">- <StackPanel Margin="0,0,0,20">- <ui:TextBlock- FontTypography="Title"- Text="{ext:Loc Bloatware.Header.Title}"- TextWrapping="Wrap"- />- <ui:TextBlock- Margin="0,4,0,0"- Appearance="Secondary"- FontTypography="Body"- Text="{ext:Loc Bloatware.Header.Description}"- TextWrapping="Wrap"- />- </StackPanel>-- <!-- Empty (truly no packages installed) -->- <Border Grid.Row="1">- <Border.Style>- <Style TargetType="Border">- <Setter Property="Visibility" Value="Collapsed" />- <Style.Triggers>- <MultiDataTrigger>- <MultiDataTrigger.Conditions>- <Condition Binding="{Binding ViewModel.HasData}" Value="False" />- <Condition Binding="{Binding ViewModel.IsLoading}" Value="False" />- </MultiDataTrigger.Conditions>- <Setter Property="Visibility" Value="Visible" />- </MultiDataTrigger>- </Style.Triggers>- </Style>- </Border.Style>-- <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">- <ui:SymbolIcon- Margin="0,0,0,15"- HorizontalAlignment="Center"- FontSize="46"- Foreground="{DynamicResource SystemFillColorCriticalBrush}"- Symbol="DeleteOff24"- />- <ui:TextBlock- HorizontalAlignment="Center"- FontTypography="Subtitle"- Text="{ext:Loc Bloatware.Empty.Title}"- />- <ui:TextBlock- Margin="0,0,0,10"- HorizontalAlignment="Center"- Appearance="Secondary"- FontTypography="Body"- Text="{ext:Loc Bloatware.Empty.Description}"- />- <ui:Button- HorizontalAlignment="Center"- Appearance="Primary"- Command="{Binding ViewModel.RefreshCommand}"- Content="{ext:Loc Bloatware.Menu.Refresh}"- Icon="{ui:SymbolIcon ArrowClockwise24,- FontSize=18}"- />- </StackPanel>- </Border>-- <!-- Loading -->- <Border- Grid.Row="1"- Visibility="{Binding ViewModel.IsLoading, Converter={StaticResource BooleanToVisibilityConverter}}"- >- <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">- <ui:ProgressRing- Width="48"- Height="48"- Margin="0,0,0,16"- HorizontalAlignment="Center"- VerticalAlignment="Center"- IsIndeterminate="True"- />- <ui:TextBlock- HorizontalAlignment="Center"- FontTypography="BodyStrong"- Text="{ext:Loc Bloatware.Loading}"- />- <ui:TextBlock- Margin="0,4,0,0"- HorizontalAlignment="Center"- Appearance="Secondary"- FontTypography="Caption"- Text="{ext:Loc Bloatware.Loading.Hint}"- />- </StackPanel>- </Border>+ <Grid RowDefinitions="Auto *">+ <StackPanel Margin="0,0,0,20">+ <ui:TextBlock+ FontTypography="Title"+ Text="{ext:Loc Bloatware.Header.Title}"+ TextWrapping="Wrap"+ />+ <ui:TextBlock+ Margin="0,4,0,0"+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ FontTypography="Body"+ Text="{ext:Loc Bloatware.Header.Description}"+ TextWrapping="Wrap"+ />+ </StackPanel>- <Border- Grid.Row="1"- CornerRadius="6"- Visibility="{Binding ViewModel.HasData, Converter={StaticResource BooleanToVisibilityConverter}}"- >- <Grid RowDefinitions="Auto,Auto,*">- <!-- Search / Filter / Sort toolbar -->- <WrapPanel Grid.Row="0" Margin="0,0,0,5" Orientation="Horizontal">- <!-- Search -->- <ui:TextBox- MinWidth="200"- Margin="0,0,8,0"- VerticalAlignment="Center"- Icon="{ui:SymbolIcon Search24}"- PlaceholderText="{ext:Loc Common.Search.Placeholder}"- Text="{Binding ViewModel.SearchText, UpdateSourceTrigger=PropertyChanged}"- />+ <!-- Empty (truly no packages installed) -->+ <Border Grid.Row="1">+ <Border.Style>+ <Style TargetType="Border">+ <Setter Property="Visibility" Value="Collapsed" />+ <Style.Triggers>+ <MultiDataTrigger>+ <MultiDataTrigger.Conditions>+ <Condition Binding="{Binding ViewModel.HasData}" Value="False" />+ <Condition Binding="{Binding ViewModel.IsLoading}" Value="False" />+ </MultiDataTrigger.Conditions>+ <Setter Property="Visibility" Value="Visible" />+ </MultiDataTrigger>+ </Style.Triggers>+ </Style>+ </Border.Style>- <!-- Filter by Risk -->- <ComboBox- Margin="0,0,8,0"- VerticalAlignment="Center"- SelectedIndex="{Binding ViewModel.SelectedRiskFilterIndex}"- ToolTip="{ext:Loc Common.Filter}"- ToolTipService.BetweenShowDelay="160"- ToolTipService.Placement="Top"- >- <ComboBoxItem HorizontalContentAlignment="Left">- <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">- <ui:SymbolIcon Margin="0,0,6,0" HorizontalAlignment="Left" Symbol="Filter24" />- <TextBlock- Grid.Column="1"- HorizontalAlignment="Left"- Text="{ext:Loc Common.Filter.All}"- />- </Grid>- </ComboBoxItem>- <ComboBoxItem HorizontalContentAlignment="Left">- <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">+ <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center"><ui:SymbolIcon- Margin="0,0,6,0"- HorizontalAlignment="Left"- Foreground="{DynamicResource SystemFillColorSuccessBrush}"- Symbol="ShieldCheckmark24"+ Margin="0,0,0,15"+ HorizontalAlignment="Center"+ FontSize="46"+ Foreground="{DynamicResource SystemFillColorCriticalBrush}"+ Symbol="DeleteOff24"/>- <TextBlock Grid.Column="1" Text="{ext:Loc Optimizer.UI.Risk.Safe}" />- </Grid>- </ComboBoxItem>- <ComboBoxItem HorizontalContentAlignment="Left">- <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">- <ui:SymbolIcon- Margin="0,0,6,0"- HorizontalAlignment="Left"- Foreground="{DynamicResource SystemFillColorCautionBrush}"- Symbol="Warning24"+ <ui:TextBlock+ HorizontalAlignment="Center"+ FontTypography="Subtitle"+ Text="{ext:Loc Bloatware.Empty.Title}"/>- <TextBlock Grid.Column="1" Text="{ext:Loc Optimizer.UI.Risk.Moderate}" />- </Grid>- </ComboBoxItem>- </ComboBox>- <!-- Sort By -->- <ComboBox- Margin="0,0,8,0"- VerticalAlignment="Center"- SelectedIndex="{Binding ViewModel.SelectedSortByIndex}"- ToolTip="{ext:Loc Common.SortBy}"- ToolTipService.BetweenShowDelay="160"- ToolTipService.Placement="Top"- >- <ComboBoxItem HorizontalContentAlignment="Left">- <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">- <ui:SymbolIcon- Margin="0,0,6,0"- HorizontalAlignment="Left"- Symbol="TextSortAscending24"+ <ui:TextBlock+ Margin="0,0,0,10"+ HorizontalAlignment="Center"+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ FontTypography="Body"+ Text="{ext:Loc Bloatware.Empty.Description}"+ />+ <ui:Button+ HorizontalAlignment="Center"+ Appearance="Primary"+ Command="{Binding ViewModel.RefreshCommand}"+ Content="{ext:Loc Bloatware.Menu.Refresh}"+ Icon="{ui:SymbolIcon ArrowClockwise24,+ FontSize=18}"/>- <TextBlock- Grid.Column="1"- HorizontalAlignment="Left"- Text="{ext:Loc Common.SortBy.Name}"+ </StackPanel>+ </Border>++ <!-- Loading -->+ <Border+ Grid.Row="1"+ Visibility="{Binding ViewModel.IsLoading, Converter={StaticResource BooleanToVisibilityConverter}}"+ >+ <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">+ <ui:ProgressRing+ Width="48"+ Height="48"+ Margin="0,0,0,16"+ HorizontalAlignment="Center"+ VerticalAlignment="Center"+ IsIndeterminate="True"/>- </Grid>- </ComboBoxItem>- <ComboBoxItem HorizontalContentAlignment="Left">- <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">- <ui:SymbolIcon Margin="0,0,6,0" HorizontalAlignment="Left" Symbol="Certificate24" />- <TextBlock- Grid.Column="1"- HorizontalAlignment="Left"- Text="{ext:Loc Common.SortBy.Publisher}"+ <ui:TextBlock+ HorizontalAlignment="Center"+ FontTypography="BodyStrong"+ Text="{ext:Loc Bloatware.Loading}"/>- </Grid>- </ComboBoxItem>- <ComboBoxItem HorizontalContentAlignment="Left">- <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">- <ui:SymbolIcon Margin="0,0,6,0" HorizontalAlignment="Left" Symbol="Shield24" />- <TextBlock- Grid.Column="1"- HorizontalAlignment="Left"- Text="{ext:Loc Common.SortBy.Risk}"+ <ui:TextBlock+ Margin="0,4,0,0"+ HorizontalAlignment="Center"+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ FontTypography="Caption"+ Text="{ext:Loc Bloatware.Loading.Hint}"/>- </Grid>- </ComboBoxItem>- </ComboBox>- </WrapPanel>+ </StackPanel>+ </Border>++ <Border+ Grid.Row="1"+ CornerRadius="6"+ Visibility="{Binding ViewModel.HasData, Converter={StaticResource BooleanToVisibilityConverter}}"+ >+ <Grid RowDefinitions="Auto,Auto,*">+ <!-- Search / Filter / Sort toolbar -->+ <WrapPanel Grid.Row="0" Margin="0,0,0,5" Orientation="Horizontal">+ <!-- Search -->+ <ui:TextBox+ MinWidth="200"+ Margin="0,0,8,0"+ VerticalAlignment="Center"+ Icon="{ui:SymbolIcon Search24}"+ PlaceholderText="{ext:Loc Common.Search.Placeholder}"+ Text="{Binding ViewModel.SearchText, UpdateSourceTrigger=PropertyChanged}"+ />++ <!-- Filter by Risk -->+ <ComboBox+ Margin="0,0,8,0"+ VerticalAlignment="Center"+ SelectedIndex="{Binding ViewModel.SelectedRiskFilterIndex}"+ ToolTip="{ext:Loc Common.Filter}"+ ToolTipService.BetweenShowDelay="160"+ ToolTipService.Placement="Top"+ >+ <ComboBoxItem HorizontalContentAlignment="Left">+ <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">+ <ui:SymbolIcon+ Margin="0,0,6,0"+ HorizontalAlignment="Left"+ Symbol="Filter24"+ />+ <TextBlock+ Grid.Column="1"+ HorizontalAlignment="Left"+ Text="{ext:Loc Common.Filter.All}"+ />+ </Grid>+ </ComboBoxItem>+ <ComboBoxItem HorizontalContentAlignment="Left">+ <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">+ <ui:SymbolIcon+ Margin="0,0,6,0"+ HorizontalAlignment="Left"+ Foreground="{DynamicResource SystemFillColorSuccessBrush}"+ Symbol="ShieldCheckmark24"+ />+ <TextBlock+ Grid.Column="1"+ Text="{ext:Loc Optimizer.UI.Risk.Safe}"+ />+ </Grid>+ </ComboBoxItem>+ <ComboBoxItem HorizontalContentAlignment="Left">+ <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">+ <ui:SymbolIcon+ Margin="0,0,6,0"+ HorizontalAlignment="Left"+ Foreground="{DynamicResource SystemFillColorCautionBrush}"+ Symbol="Warning24"+ />+ <TextBlock+ Grid.Column="1"+ Text="{ext:Loc Optimizer.UI.Risk.Moderate}"+ />+ </Grid>+ </ComboBoxItem>+ </ComboBox>+ <!-- Sort By -->+ <ComboBox+ Margin="0,0,8,0"+ VerticalAlignment="Center"+ SelectedIndex="{Binding ViewModel.SelectedSortByIndex}"+ ToolTip="{ext:Loc Common.SortBy}"+ ToolTipService.BetweenShowDelay="160"+ ToolTipService.Placement="Top"+ >+ <ComboBoxItem HorizontalContentAlignment="Left">+ <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">+ <ui:SymbolIcon+ Margin="0,0,6,0"+ HorizontalAlignment="Left"+ Symbol="TextSortAscending24"+ />+ <TextBlock+ Grid.Column="1"+ HorizontalAlignment="Left"+ Text="{ext:Loc Common.SortBy.Name}"+ />+ </Grid>+ </ComboBoxItem>+ <ComboBoxItem HorizontalContentAlignment="Left">+ <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">+ <ui:SymbolIcon+ Margin="0,0,6,0"+ HorizontalAlignment="Left"+ Symbol="Certificate24"+ />+ <TextBlock+ Grid.Column="1"+ HorizontalAlignment="Left"+ Text="{ext:Loc Common.SortBy.Publisher}"+ />+ </Grid>+ </ComboBoxItem>+ <ComboBoxItem HorizontalContentAlignment="Left">+ <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">+ <ui:SymbolIcon+ Margin="0,0,6,0"+ HorizontalAlignment="Left"+ Symbol="Shield24"+ />+ <TextBlock+ Grid.Column="1"+ HorizontalAlignment="Left"+ Text="{ext:Loc Common.SortBy.Risk}"+ />+ </Grid>+ </ComboBoxItem>+ </ComboBox>+ </WrapPanel>- <!-- Action buttons -->- <StackPanel Grid.Row="1" Margin="0,0,0,8" Orientation="Horizontal">- <ui:Button- Appearance="Danger"- Command="{Binding ViewModel.RemoveSelectedCommand}"- Content="{ext:Loc Bloatware.Menu.Remove,+ <!-- Action buttons -->+ <StackPanel Grid.Row="1" Margin="0,0,0,8" Orientation="Horizontal">+ <ui:Button+ Appearance="Danger"+ Command="{Binding ViewModel.RemoveSelectedCommand}"+ Content="{ext:Loc Bloatware.Menu.Remove,{Binding ViewModel.SelectedCount}}"- Icon="{ui:SymbolIcon Delete24,+ Icon="{ui:SymbolIcon Delete24,FontSize=18}"- />+ />- <Separator- Margin="3,0,3,0"- Visibility="{Binding ViewModel.HasSafePackages, Converter={StaticResource BooleanToVisibilityConverter}}"- />+ <Separator+ Margin="3,0,3,0"+ Visibility="{Binding ViewModel.HasSafePackages, Converter={StaticResource BooleanToVisibilityConverter}}"+ />- <ui:Button- Command="{Binding ViewModel.SelectAllSafeCommand}"- Visibility="{Binding ViewModel.HasSafePackages, Converter={StaticResource BooleanToVisibilityConverter}}"- >- <ui:Button.Style>- <Style BasedOn="{StaticResource {x:Type ui:Button}}" TargetType="ui:Button">- <Setter Property="Appearance" Value="Success" />- <Setter Property="Content" Value="{ext:Loc Bloatware.Menu.SelectAllSafe}" />- <Setter Property="Icon">- <Setter.Value>- <ui:SymbolIcon FontSize="18" Symbol="ShieldCheckmark24" />- </Setter.Value>- </Setter>- <Style.Triggers>- <DataTrigger Binding="{Binding ViewModel.IsAllSafeSelected}" Value="True">- <Setter Property="Appearance" Value="Danger" />- <Setter Property="Content" Value="{ext:Loc Bloatware.Menu.DeselectAllSafe}" />- <Setter Property="Icon">- <Setter.Value>- <ui:SymbolIcon FontSize="18" Symbol="CheckboxUnchecked24" />- </Setter.Value>- </Setter>- </DataTrigger>- </Style.Triggers>- </Style>- </ui:Button.Style>- </ui:Button>+ <ui:Button+ Command="{Binding ViewModel.SelectAllSafeCommand}"+ Visibility="{Binding ViewModel.HasSafePackages, Converter={StaticResource BooleanToVisibilityConverter}}"+ >+ <ui:Button.Style>+ <Style+ BasedOn="{StaticResource {x:Type ui:Button}}"+ TargetType="ui:Button"+ >+ <Setter Property="Appearance" Value="Success" />+ <Setter+ Property="Content"+ Value="{ext:Loc Bloatware.Menu.SelectAllSafe}"+ />+ <Setter Property="Icon">+ <Setter.Value>+ <ui:SymbolIcon FontSize="18" Symbol="ShieldCheckmark24" />+ </Setter.Value>+ </Setter>+ <Style.Triggers>+ <DataTrigger+ Binding="{Binding ViewModel.IsAllSafeSelected}"+ Value="True"+ >+ <Setter Property="Appearance" Value="Danger" />+ <Setter+ Property="Content"+ Value="{ext:Loc Bloatware.Menu.DeselectAllSafe}"+ />+ <Setter Property="Icon">+ <Setter.Value>+ <ui:SymbolIcon+ FontSize="18"+ Symbol="CheckboxUnchecked24"+ />+ </Setter.Value>+ </Setter>+ </DataTrigger>+ </Style.Triggers>+ </Style>+ </ui:Button.Style>+ </ui:Button>- <Separator Margin="3,0,3,0" />+ <Separator Margin="3,0,3,0" />- <ui:Button- Appearance="Primary"- Command="{Binding ViewModel.RefreshCommand}"- Content="{ext:Loc Bloatware.Menu.Refresh}"- Icon="{ui:SymbolIcon ArrowClockwise24,+ <ui:Button+ Appearance="Primary"+ Command="{Binding ViewModel.RefreshCommand}"+ Content="{ext:Loc Bloatware.Menu.Refresh}"+ Icon="{ui:SymbolIcon ArrowClockwise24,FontSize=18}"- />- </StackPanel>+ />+ </StackPanel>- <!-- No search results -->- <StackPanel- Grid.Row="2"- HorizontalAlignment="Center"- VerticalAlignment="Center"- Visibility="{Binding ViewModel.AppxPackages.Count, Converter={StaticResource ZeroToVisibilityConverter}}"- >- <ui:SymbolIcon- Margin="0,0,0,10"- HorizontalAlignment="Center"- FontSize="36"- Foreground="{DynamicResource SystemFillColorCriticalBrush}"- Symbol="SearchInfo24"- />- <ui:TextBlock- HorizontalAlignment="Center"- Appearance="Secondary"- FontTypography="Body"- Text="{ext:Loc Bloatware.Search.NoResults}"- />- </StackPanel>+ <!-- No search results -->+ <StackPanel+ Grid.Row="2"+ HorizontalAlignment="Center"+ VerticalAlignment="Center"+ Visibility="{Binding ViewModel.AppxPackages.Count, Converter={StaticResource ZeroToVisibilityConverter}}"+ >+ <ui:SymbolIcon+ Margin="0,0,0,10"+ HorizontalAlignment="Center"+ FontSize="36"+ Foreground="{DynamicResource SystemFillColorCriticalBrush}"+ Symbol="SearchInfo24"+ />+ <ui:TextBlock+ HorizontalAlignment="Center"+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ FontTypography="Body"+ Text="{ext:Loc Bloatware.Search.NoResults}"+ />+ </StackPanel>- <ItemsControl- Grid.Row="2"- ItemsSource="{Binding ViewModel.AppxPackages}"- Visibility="{Binding ViewModel.AppxPackages.Count, Converter={StaticResource GreaterThanZeroToVisibilityConverter}}"- >- <ItemsControl.Template>- <ControlTemplate TargetType="ItemsControl">- <ScrollViewer HorizontalScrollBarVisibility="Disabled">- <ItemsPresenter />- </ScrollViewer>- </ControlTemplate>- </ItemsControl.Template>- <!-- Layout panel -->- <ItemsControl.ItemsPanel>- <ItemsPanelTemplate>- <VirtualizingStackPanel />- </ItemsPanelTemplate>- </ItemsControl.ItemsPanel>+ <ItemsControl+ Grid.Row="2"+ ItemsSource="{Binding ViewModel.AppxPackages}"+ Visibility="{Binding ViewModel.AppxPackages.Count, Converter={StaticResource GreaterThanZeroToVisibilityConverter}}"+ >+ <ItemsControl.Template>+ <ControlTemplate TargetType="ItemsControl">+ <ScrollViewer HorizontalScrollBarVisibility="Disabled">+ <ItemsPresenter />+ </ScrollViewer>+ </ControlTemplate>+ </ItemsControl.Template>+ <!-- Layout panel -->+ <ItemsControl.ItemsPanel>+ <ItemsPanelTemplate>+ <VirtualizingStackPanel />+ </ItemsPanelTemplate>+ </ItemsControl.ItemsPanel>- <!-- Item template -->- <ItemsControl.ItemTemplate>- <DataTemplate DataType="{x:Type bloatware1:AppXPackage}">- <Border- Margin="0,0,16,4"- Padding="12"- Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"- CornerRadius="6"- >- <Grid>- <Grid.ColumnDefinitions>- <ColumnDefinition Width="Auto" />- <ColumnDefinition Width="Auto" />- <ColumnDefinition Width="*" />- <ColumnDefinition Width="Auto" />- </Grid.ColumnDefinitions>+ <!-- Item template -->+ <ItemsControl.ItemTemplate>+ <DataTemplate DataType="{x:Type bloatware1:AppXPackage}">+ <Border+ Margin="0,0,16,4"+ Padding="12"+ Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"+ CornerRadius="6"+ >+ <Grid>+ <Grid.ColumnDefinitions>+ <ColumnDefinition Width="Auto" />+ <ColumnDefinition Width="Auto" />+ <ColumnDefinition Width="*" />+ <ColumnDefinition Width="Auto" />+ </Grid.ColumnDefinitions>- <!-- Checkbox -->- <CheckBox- Grid.Column="0"- Margin="0,4,12,0"- VerticalAlignment="Top"- IsChecked="{Binding IsSelected, Mode=TwoWay}"- />+ <!-- Checkbox -->+ <CheckBox+ Grid.Column="0"+ Margin="0,4,12,0"+ VerticalAlignment="Top"+ IsChecked="{Binding IsSelected, Mode=TwoWay}"+ />- <!-- Logo Image -->- <Image- Grid.Column="1"- Width="36"- Height="36"- Margin="0,0,12,0"- VerticalAlignment="Top"- Source="{Binding LogoImage}"- Stretch="UniformToFill"- />+ <!-- Logo Image -->+ <Image+ Grid.Column="1"+ Width="36"+ Height="36"+ Margin="0,0,12,0"+ VerticalAlignment="Top"+ Source="{Binding LogoImage}"+ Stretch="UniformToFill"+ />- <!-- Content -->- <StackPanel Grid.Column="2">- <!-- Top row -->- <DockPanel LastChildFill="False">- <!-- App Name -->- <ui:TextBlock FontTypography="BodyStrong" Text="{Binding Name}" />+ <!-- Content -->+ <StackPanel Grid.Column="2">+ <!-- Top row -->+ <DockPanel LastChildFill="False">+ <!-- App Name -->+ <ui:TextBlock+ FontTypography="BodyStrong"+ Text="{Binding Name}"+ />- <Border- Margin="5,0,0,0"- Padding="4,1"- HorizontalAlignment="Left"- VerticalAlignment="Center"- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"- CornerRadius="5"- >- <!-- Version -->- <ui:TextBlock- VerticalAlignment="Center"- Appearance="Tertiary"- FontTypography="Body"- Text="{Binding Version}"- />- </Border>+ <Border+ Margin="5,0,0,0"+ Padding="4,1"+ HorizontalAlignment="Left"+ VerticalAlignment="Center"+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"+ CornerRadius="5"+ >+ <!-- Version -->+ <ui:TextBlock+ VerticalAlignment="Center"+ Appearance="Tertiary"+ FontTypography="Body"+ Text="{Binding Version}"+ />+ </Border>- <Border- Margin="5,0,0,0"- Padding="4,2"- HorizontalAlignment="Left"- CornerRadius="5"- Visibility="{Binding ShouldVisibleRisk, Converter={StaticResource BooleanToVisibilityConverter}}"- >- <Border.Style>- <Style TargetType="Border">- <Setter- Property="Background"- Value="{DynamicResource SystemFillColorSuccessBrush}"- />- <Style.Triggers>- <DataTrigger Binding="{Binding Risk}" Value="Caution">- <Setter- Property="Background"- Value="{DynamicResource SystemFillColorCautionBrush}"- />- </DataTrigger>- </Style.Triggers>- </Style>- </Border.Style>- <StackPanel Orientation="Horizontal">- <ui:SymbolIcon- Margin="0,0,5,0"- Foreground="{DynamicResource TextFillColorInverseBrush}"- Symbol="{Binding RiskVisual.Icon}"- />+ <Border+ Margin="5,0,0,0"+ Padding="4,2"+ HorizontalAlignment="Left"+ CornerRadius="5"+ Visibility="{Binding ShouldVisibleRisk, Converter={StaticResource BooleanToVisibilityConverter}}"+ >+ <Border.Style>+ <Style TargetType="Border">+ <Setter+ Property="Background"+ Value="{DynamicResource SystemFillColorSuccessBrush}"+ />+ <Style.Triggers>+ <DataTrigger+ Binding="{Binding Risk}"+ Value="Caution"+ >+ <Setter+ Property="Background"+ Value="{DynamicResource SystemFillColorCautionBrush}"+ />+ </DataTrigger>+ </Style.Triggers>+ </Style>+ </Border.Style>+ <StackPanel Orientation="Horizontal">+ <ui:SymbolIcon+ Margin="0,0,5,0"+ Foreground="{DynamicResource TextFillColorInverseBrush}"+ Symbol="{Binding RiskVisual.Icon}"+ />- <ui:TextBlock- HorizontalAlignment="Center"- VerticalAlignment="Center"- FontTypography="Caption"- Foreground="{DynamicResource TextFillColorInverseBrush}"- Text="{Binding RiskVisual.Display}"- TextWrapping="Wrap"- />- </StackPanel>- </Border>- </DockPanel>+ <ui:TextBlock+ HorizontalAlignment="Center"+ VerticalAlignment="Center"+ FontTypography="Caption"+ Foreground="{DynamicResource TextFillColorInverseBrush}"+ Text="{Binding RiskVisual.Display}"+ TextWrapping="Wrap"+ />+ </StackPanel>+ </Border>+ </DockPanel>- <!-- Publisher -->- <ui:TextBlock- Margin="0,2,0,0"- Appearance="Disabled"- FontTypography="Body"- Text="{Binding Publisher}"- TextTrimming="CharacterEllipsis"- />+ <!-- Publisher -->+ <ui:TextBlock+ Margin="0,2,0,0"+ Foreground="{DynamicResource TextFillColorDisabledBrush}"+ FontTypography="Body"+ Text="{Binding Publisher}"+ TextTrimming="CharacterEllipsis"+ />- <!-- Install location -->- <ui:TextBlock- Margin="0,2,0,0"- Appearance="Disabled"- FontTypography="Body"- Text="{Binding InstallLocation}"- TextTrimming="CharacterEllipsis"- />+ <!-- Install location -->+ <ui:TextBlock+ Margin="0,2,0,0"+ Foreground="{DynamicResource TextFillColorDisabledBrush}"+ FontTypography="Body"+ Text="{Binding InstallLocation}"+ TextTrimming="CharacterEllipsis"+ />- <!-- Package full name -->- <ui:TextBlock- Margin="0,4,0,0"- Appearance="Secondary"- FontTypography="Caption"- Text="{Binding PackageFullName}"- TextTrimming="CharacterEllipsis"- />- </StackPanel>- </Grid>- </Border>- </DataTemplate>- </ItemsControl.ItemTemplate>- </ItemsControl>- </Grid>- </Border>- </Grid>+ <!-- Package full name -->+ <ui:TextBlock+ Margin="0,4,0,0"+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ FontTypography="Caption"+ Text="{Binding PackageFullName}"+ TextTrimming="CharacterEllipsis"+ />+ </StackPanel>+ </Grid>+ </Border>+ </DataTemplate>+ </ItemsControl.ItemTemplate>+ </ItemsControl>+ </Grid>+ </Border>+ </Grid></Page>diff --git a/optimizerDuck/UI/Pages/DashboardPage.xaml b/optimizerDuck/UI/Pages/DashboardPage.xamlindex 78d3463..0ae3e3e 100644--- a/optimizerDuck/UI/Pages/DashboardPage.xaml+++ b/optimizerDuck/UI/Pages/DashboardPage.xaml@@ -1,585 +1,617 @@<Page- Foreground="{DynamicResource TextFillColorPrimaryBrush}"- Margin="0,32,0,0"- ScrollViewer.CanContentScroll="False"- Title="Dashboard"- d:DataContext="{d:DesignInstance pages:DashboardPage}"- d:DesignHeight="650"- d:DesignWidth="800"- mc:Ignorable="d"- ui:Design.Background="Black"- ui:Design.Foreground="White"- x:Class="optimizerDuck.UI.Pages.DashboardPage"- xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"- xmlns:converters="clr-namespace:optimizerDuck.Common.Converters"- xmlns:d="http://schemas.microsoft.com/expression/blend/2008"- xmlns:ext="clr-namespace:optimizerDuck.Common.Extensions"- xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"- xmlns:pages="clr-namespace:optimizerDuck.UI.Pages"- xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"- xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"+ Foreground="{DynamicResource TextFillColorPrimaryBrush}"+ Margin="0,32,0,0"+ ScrollViewer.CanContentScroll="False"+ Title="Dashboard"+ d:DataContext="{d:DesignInstance pages:DashboardPage}"+ d:DesignHeight="650"+ d:DesignWidth="800"+ mc:Ignorable="d"+ ui:Design.Background="Black"+ ui:Design.Foreground="White"+ x:Class="optimizerDuck.UI.Pages.DashboardPage"+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"+ xmlns:converters="clr-namespace:optimizerDuck.Common.Converters"+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"+ xmlns:ext="clr-namespace:optimizerDuck.Common.Extensions"+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"+ xmlns:pages="clr-namespace:optimizerDuck.UI.Pages"+ xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">- <Page.Resources>- <converters:BooleanToVisibilityConverter x:Key="BoolToVisibilityConverter" />- <converters:MBToGBConverter x:Key="MBToGBConverter" />- <converters:GreaterThanNumberToVisibilityConverter- Threshold="1"- x:Key="GreaterThanOneToVisibilityConverter"- />- <converters:MinusNumberConverter NumberToMinus="1" x:Key="MinusOneConverter" />- <converters:ThemeToGitHubIconConverter x:Key="ThemeToGitHubIconConverter" />- </Page.Resources>-- <Grid RowDefinitions="Auto,Auto,*">- <!-- Loading Overlay -->- <Grid- Grid.RowSpan="3"- Panel.ZIndex="1000"- Visibility="{Binding ViewModel.IsLoading, Converter={StaticResource BoolToVisibilityConverter}}"- >- <Border Background="{DynamicResource ApplicationBackgroundBrush}" Opacity="0.8" />- <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">- <ui:ProgressRing Height="60" IsIndeterminate="True" Width="60" />- <ui:TextBlock- FontTypography="Subtitle"- HorizontalAlignment="Center"- Margin="0,16,0,0"- Text="{ext:Loc Dashboard.SystemInfo.Loading}"- TextWrapping="Wrap"+ <Page.Resources>+ <converters:BooleanToVisibilityConverter x:Key="BoolToVisibilityConverter" />+ <converters:MBToGBConverter x:Key="MBToGBConverter" />+ <converters:GreaterThanNumberToVisibilityConverter+ Threshold="1"+ x:Key="GreaterThanOneToVisibilityConverter"/>- </StackPanel>- </Grid>+ <converters:MinusNumberConverter NumberToMinus="1" x:Key="MinusOneConverter" />+ <converters:ThemeToGitHubIconConverter x:Key="ThemeToGitHubIconConverter" />+ </Page.Resources>- <!-- Header -->- <StackPanel Margin="0,0,0,20">- <ui:InfoBar- IsOpen="{Binding ViewModel.IsUpdateInfoOpen, Mode=TwoWay}"- Margin="0,0,0,10"- Message="{ext:Loc Dashboard.UpdateInfoBar.Message,- {Binding ViewModel.LatestVersion}}"- Severity="Warning"- />- <Grid ColumnDefinitions="*,Auto">- <ui:TextBlock- FontTypography="Title"- Text="{ext:Loc Dashboard.Header.Title}"- TextWrapping="Wrap"- />+ <Grid RowDefinitions="Auto,Auto,*">+ <!-- Loading Overlay -->+ <Grid+ Grid.RowSpan="3"+ Panel.ZIndex="1000"+ Visibility="{Binding ViewModel.IsLoading, Converter={StaticResource BoolToVisibilityConverter}}"+ >+ <Border Background="{DynamicResource ApplicationBackgroundBrush}" Opacity="0.8" />+ <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">+ <ui:ProgressRing Height="60" IsIndeterminate="True" Width="60" />+ <ui:TextBlock+ FontTypography="Subtitle"+ HorizontalAlignment="Center"+ Margin="0,16,0,0"+ Text="{ext:Loc Dashboard.SystemInfo.Loading}"+ TextWrapping="Wrap"+ />+ </StackPanel>+ </Grid>- <Menu Grid.Column="1">- <ui:MenuItem Header="{ext:Loc Dashboard.Header.Menu.Header.Options}">- <ui:MenuItem- Header="{ext:Loc Dashboard.Header.Menu.Header.Run}"- Icon="{ui:SymbolIcon Apps24}"- >- <ui:MenuItem- Command="{Binding ViewModel.RunCommand}"- CommandParameter="Settings"- Header="{ext:Loc Dashboard.Header.Menu.RunSettings}"- />- <ui:MenuItem- Command="{Binding ViewModel.RunCommand}"- CommandParameter="TaskManager"- Header="{ext:Loc Dashboard.Header.Menu.RunTaskManager}"- />- <ui:MenuItem- Command="{Binding ViewModel.RunCommand}"- CommandParameter="ControlPanel"- Header="{ext:Loc Dashboard.Header.Menu.RunControlPanel}"- />- </ui:MenuItem>- <Separator />- <ui:MenuItem- Command="{Binding ViewModel.RefreshCommand}"- Header="{ext:Loc Dashboard.Header.Menu.Refresh}"- Icon="{ui:SymbolIcon ArrowClockwise24}"+ <!-- Header -->+ <StackPanel Margin="0,0,0,20">+ <ui:InfoBar+ IsOpen="{Binding ViewModel.IsUpdateInfoOpen, Mode=TwoWay}"+ Margin="0,0,0,10"+ Message="{ext:Loc Dashboard.UpdateInfoBar.Message,+ {Binding ViewModel.LatestVersion}}"+ Severity="Warning"/>- </ui:MenuItem>- </Menu>- </Grid>- </StackPanel>-- <!-- Action Cards -->- <UniformGrid Columns="3" Grid.Row="1" Margin="0,0,0,20">- <ui:CardAction- Command="{Binding ViewModel.OpenActionCommand}"- CommandParameter="Discord"- Margin="0,0,5,0"- VerticalAlignment="Stretch"- >- <ui:CardAction.Icon>- <ui:ImageIcon- Height="25"- Source="pack://application:,,,/Resources/Images/DiscordLogo.png"- />- </ui:CardAction.Icon>- <StackPanel>- <ui:TextBlock- FontTypography="BodyStrong"- Text="{ext:Loc Dashboard.Actions.Discord.Title}"- />- <ui:TextBlock- Appearance="Secondary"- FontTypography="Caption"- Text="{ext:Loc Dashboard.Actions.Discord.Description}"- TextWrapping="Wrap"- />- </StackPanel>- </ui:CardAction>-- <ui:CardAction- Command="{Binding ViewModel.OpenActionCommand}"- CommandParameter="GitHub"- Margin="5,0,5,0"- VerticalAlignment="Stretch"- >- <ui:CardAction.Icon>- <ui:ImageIcon- Height="40"- Source="{Binding ViewModel.CurrentApplicationTheme, Converter={StaticResource ThemeToGitHubIconConverter}}"- />- </ui:CardAction.Icon>- <StackPanel>- <ui:TextBlock- FontTypography="BodyStrong"- Text="{ext:Loc Dashboard.Actions.GitHub.Title}"- />- <ui:TextBlock- Appearance="Secondary"- FontTypography="Caption"- Text="{ext:Loc Dashboard.Actions.GitHub.Description}"- TextWrapping="Wrap"- />- </StackPanel>- </ui:CardAction>-- <ui:CardAction- BorderThickness="1"- Command="{Binding ViewModel.OpenActionCommand}"- CommandParameter="Contribute"- Margin="5,0,0,0"- VerticalAlignment="Stretch"- >- <ui:CardAction.Icon>- <ui:SymbolIcon- Filled="True"- Foreground="{DynamicResource SystemFillColorCautionBrush}"- Symbol="Star24"- />- </ui:CardAction.Icon>+ <Grid ColumnDefinitions="*,Auto">+ <ui:TextBlock+ FontTypography="Title"+ Text="{ext:Loc Dashboard.Header.Title}"+ TextWrapping="Wrap"+ />- <StackPanel>- <ui:TextBlock- FontTypography="BodyStrong"- Text="{ext:Loc Dashboard.Actions.SupportMe.Title}"- />- <ui:TextBlock- Appearance="Secondary"- FontTypography="Caption"- Text="{ext:Loc Dashboard.Actions.SupportMe.Description}"- TextWrapping="Wrap"- />+ <Menu Grid.Column="1">+ <ui:MenuItem Header="{ext:Loc Dashboard.Header.Menu.Header.Options}">+ <ui:MenuItem+ Header="{ext:Loc Dashboard.Header.Menu.Header.Run}"+ Icon="{ui:SymbolIcon Apps24}"+ >+ <ui:MenuItem+ Command="{Binding ViewModel.RunCommand}"+ CommandParameter="Settings"+ Header="{ext:Loc Dashboard.Header.Menu.RunSettings}"+ />+ <ui:MenuItem+ Command="{Binding ViewModel.RunCommand}"+ CommandParameter="TaskManager"+ Header="{ext:Loc Dashboard.Header.Menu.RunTaskManager}"+ />+ <ui:MenuItem+ Command="{Binding ViewModel.RunCommand}"+ CommandParameter="ControlPanel"+ Header="{ext:Loc Dashboard.Header.Menu.RunControlPanel}"+ />+ </ui:MenuItem>+ <Separator />+ <ui:MenuItem+ Command="{Binding ViewModel.RefreshCommand}"+ Header="{ext:Loc Dashboard.Header.Menu.Refresh}"+ Icon="{ui:SymbolIcon ArrowClockwise24}"+ />+ </ui:MenuItem>+ </Menu>+ </Grid></StackPanel>- </ui:CardAction>- </UniformGrid>- <ScrollViewer- Grid.Row="2"- HorizontalScrollBarVisibility="Disabled"- Padding="20,0"- VerticalScrollBarVisibility="Auto"- >- <StackPanel>- <!-- System Info Cards -->- <UniformGrid Columns="2" Rows="2">- <!-- Operating System -->- <ui:CardControl Icon="{ui:SymbolIcon Tv24}" Margin="0,0,5,5" VerticalAlignment="Stretch">- <ui:CardControl.Header>- <Grid>- <Grid.RowDefinitions>- <RowDefinition Height="Auto" />- <RowDefinition Height="*" />- </Grid.RowDefinitions>-- <StackPanel Grid.Row="0">- <ui:TextBlock- FontTypography="BodyStrong"- Text="{Binding ViewModel.SystemInfo.Os.Name}"- />- <ui:TextBlock Appearance="Secondary" FontTypography="Caption">- <Run Text="{Binding ViewModel.SystemInfo.Os.Edition}" />- <Run Text="·" />- <Run Text="{Binding ViewModel.SystemInfo.Os.Architecture}" />- </ui:TextBlock>+ <!-- Action Cards -->+ <UniformGrid Columns="3" Grid.Row="1" Margin="0,0,0,20">+ <ui:CardAction+ Command="{Binding ViewModel.OpenActionCommand}"+ CommandParameter="Discord"+ Margin="0,0,5,0"+ VerticalAlignment="Stretch"+ >+ <ui:CardAction.Icon>+ <ui:ImageIcon+ Height="25"+ Source="pack://application:,,,/Resources/Images/DiscordLogo.png"+ />+ </ui:CardAction.Icon>+ <StackPanel>+ <ui:TextBlock+ FontTypography="BodyStrong"+ Text="{ext:Loc Dashboard.Actions.Discord.Title}"+ />+ <ui:TextBlock+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ FontTypography="Caption"+ Text="{ext:Loc Dashboard.Actions.Discord.Description}"+ TextWrapping="Wrap"+ /></StackPanel>+ </ui:CardAction>- <WrapPanel Grid.Row="1" Margin="0,8,0,0" Orientation="Horizontal">- <Border- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"- CornerRadius="4"- Margin="0,0,4,4"- Padding="6,3"- >- <ui:TextBlock- FontTypography="Caption"- Text="{ext:Loc Dashboard.SystemInfo.Os.Build, {Binding ViewModel.SystemInfo.Os.BuildNumber}}"+ <ui:CardAction+ Command="{Binding ViewModel.OpenActionCommand}"+ CommandParameter="GitHub"+ Margin="5,0,5,0"+ VerticalAlignment="Stretch"+ >+ <ui:CardAction.Icon>+ <ui:ImageIcon+ Height="40"+ Source="{Binding ViewModel.CurrentApplicationTheme, Converter={StaticResource ThemeToGitHubIconConverter}}"/>- </Border>- <Border- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"- CornerRadius="4"- Margin="0,0,4,4"- Padding="6,3"- >+ </ui:CardAction.Icon>+ <StackPanel><ui:TextBlock- FontTypography="Caption"- Text="{Binding ViewModel.SystemInfo.Os.DeviceType}"+ FontTypography="BodyStrong"+ Text="{ext:Loc Dashboard.Actions.GitHub.Title}"/>- </Border>- <Border- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"- CornerRadius="4"- Margin="0,0,4,4"- Padding="6,3"- ><ui:TextBlock- FontTypography="Caption"- Text="{Binding ViewModel.SystemInfo.Os.InstallDate}"+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ FontTypography="Caption"+ Text="{ext:Loc Dashboard.Actions.GitHub.Description}"+ TextWrapping="Wrap"/>- </Border>- </WrapPanel>- </Grid>- </ui:CardControl.Header>- </ui:CardControl>+ </StackPanel>+ </ui:CardAction>- <!-- CPU -->- <ui:CardControl- Icon="{ui:SymbolIcon DeveloperBoard24}"- Margin="5,0,0,5"- VerticalAlignment="Stretch"- >- <ui:CardControl.Header>- <Grid>- <Grid.RowDefinitions>- <RowDefinition Height="Auto" />- <RowDefinition Height="*" />- </Grid.RowDefinitions>+ <ui:CardAction+ BorderThickness="1"+ Command="{Binding ViewModel.OpenActionCommand}"+ CommandParameter="Contribute"+ Margin="5,0,0,0"+ VerticalAlignment="Stretch"+ >+ <ui:CardAction.Icon>+ <ui:SymbolIcon+ Filled="True"+ Foreground="{DynamicResource SystemFillColorCautionBrush}"+ Symbol="Star24"+ />+ </ui:CardAction.Icon>- <StackPanel Grid.Row="0">- <ui:TextBlock- FontTypography="BodyStrong"- Text="{Binding ViewModel.SystemInfo.Cpu.Name}"- TextTrimming="CharacterEllipsis"- />- <ui:TextBlock Appearance="Secondary" FontTypography="Caption">- <Run Text="{Binding ViewModel.SystemInfo.Cpu.Vendor}" />- <Run Text="·" />- <Run Text="{ext:Loc Dashboard.SystemInfo.Cpu.Cores, {Binding ViewModel.SystemInfo.Cpu.Cores}}" />- <Run Text="/" />- <Run Text="{ext:Loc Dashboard.SystemInfo.Cpu.Threads, {Binding ViewModel.SystemInfo.Cpu.Threads}}" />- </ui:TextBlock>+ <StackPanel>+ <ui:TextBlock+ FontTypography="BodyStrong"+ Text="{ext:Loc Dashboard.Actions.SupportMe.Title}"+ />+ <ui:TextBlock+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ FontTypography="Caption"+ Text="{ext:Loc Dashboard.Actions.SupportMe.Description}"+ TextWrapping="Wrap"+ /></StackPanel>+ </ui:CardAction>+ </UniformGrid>- <WrapPanel Grid.Row="1" Margin="0,8,0,0" Orientation="Horizontal">- <Border- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"- CornerRadius="4"- Margin="0,0,4,4"- Padding="6,3"- >- <ui:TextBlock FontTypography="Caption">- <Run Text="{Binding ViewModel.SystemInfo.Cpu.CurrentClockMHz}" />- <Run Text="MHz" />- </ui:TextBlock>- </Border>- <Border- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"- CornerRadius="4"- Margin="0,0,4,4"- Padding="6,3"- >- <ui:TextBlock FontTypography="Caption">- <Run Text="L2:" />- <Run Text="{Binding ViewModel.SystemInfo.Cpu.L2CacheKB}" />- <Run Text="KB" />- </ui:TextBlock>- </Border>- <Border- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"- CornerRadius="4"- Margin="0,0,4,4"- Padding="6,3"- >- <ui:TextBlock FontTypography="Caption">- <Run Text="L3:" />- <Run Text="{Binding ViewModel.SystemInfo.Cpu.L3CacheKB}" />- <Run Text="KB" />- </ui:TextBlock>- </Border>- </WrapPanel>- </Grid>- </ui:CardControl.Header>- </ui:CardControl>+ <ScrollViewer+ Grid.Row="2"+ HorizontalScrollBarVisibility="Disabled"+ Padding="20,0"+ VerticalScrollBarVisibility="Auto"+ >+ <StackPanel>+ <!-- System Info Cards -->+ <UniformGrid Columns="2" Rows="2">+ <!-- Operating System -->+ <ui:CardControl+ Icon="{ui:SymbolIcon Tv24}"+ Margin="0,0,5,5"+ VerticalAlignment="Stretch"+ >+ <ui:CardControl.Header>+ <Grid>+ <Grid.RowDefinitions>+ <RowDefinition Height="Auto" />+ <RowDefinition Height="*" />+ </Grid.RowDefinitions>- <!-- RAM -->- <ui:CardControl- Icon="{ui:SymbolIcon Memory16}"- Margin="0,5,5,0"- VerticalAlignment="Stretch"- >- <ui:CardControl.Header>- <Grid>- <Grid.RowDefinitions>- <RowDefinition Height="Auto" />- <RowDefinition Height="Auto" />- <RowDefinition Height="Auto" />- </Grid.RowDefinitions>+ <StackPanel Grid.Row="0">+ <ui:TextBlock+ FontTypography="BodyStrong"+ Text="{Binding ViewModel.SystemInfo.Os.Name}"+ />+ <ui:TextBlock+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ FontTypography="Caption"+ >+ <Run Text="{Binding ViewModel.SystemInfo.Os.Edition}" />+ <Run Text="·" />+ <Run Text="{Binding ViewModel.SystemInfo.Os.Architecture}" />+ </ui:TextBlock>+ </StackPanel>- <StackPanel Grid.Row="0">- <ui:TextBlock FontTypography="BodyStrong">- <Run Text="{Binding ViewModel.RuntimeRam.TotalGB, StringFormat='{}{0:F1}'}" />- <Run Text="GB RAM" />- </ui:TextBlock>- <ui:TextBlock Appearance="Secondary" FontTypography="Caption">- <Run Text="{ext:Loc Dashboard.SystemInfo.Ram.Used, {Binding ViewModel.RuntimeRam.UsedGB, StringFormat='{}{0:F1}'}}" />- <Run Text="·" />- <Run Text="{ext:Loc Dashboard.SystemInfo.Ram.Available, {Binding ViewModel.RuntimeRam.AvailableGB, StringFormat='{}{0:F1}'}}" />- </ui:TextBlock>- </StackPanel>+ <WrapPanel Grid.Row="1" Margin="0,8,0,0" Orientation="Horizontal">+ <Border+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"+ CornerRadius="4"+ Margin="0,0,4,4"+ Padding="6,3"+ >+ <ui:TextBlock+ FontTypography="Caption"+ Text="{ext:Loc Dashboard.SystemInfo.Os.Build, {Binding ViewModel.SystemInfo.Os.BuildNumber}}"+ />+ </Border>+ <Border+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"+ CornerRadius="4"+ Margin="0,0,4,4"+ Padding="6,3"+ >+ <ui:TextBlock+ FontTypography="Caption"+ Text="{Binding ViewModel.SystemInfo.Os.DeviceType}"+ />+ </Border>+ <Border+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"+ CornerRadius="4"+ Margin="0,0,4,4"+ Padding="6,3"+ >+ <ui:TextBlock+ FontTypography="Caption"+ Text="{Binding ViewModel.SystemInfo.Os.InstallDate}"+ />+ </Border>+ </WrapPanel>+ </Grid>+ </ui:CardControl.Header>+ </ui:CardControl>- <ProgressBar- Grid.Row="1"- Height="6"- Margin="0,8,0,0"- Maximum="100"- Value="{Binding ViewModel.RuntimeRam.UsedPercent}"- />+ <!-- CPU -->+ <ui:CardControl+ Icon="{ui:SymbolIcon DeveloperBoard24}"+ Margin="5,0,0,5"+ VerticalAlignment="Stretch"+ >+ <ui:CardControl.Header>+ <Grid>+ <Grid.RowDefinitions>+ <RowDefinition Height="Auto" />+ <RowDefinition Height="*" />+ </Grid.RowDefinitions>- <WrapPanel Grid.Row="2" Margin="0,8,0,0" Orientation="Horizontal">- <Border- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"- CornerRadius="4"- Padding="6,3"- >- <ui:TextBlock FontTypography="Caption">- <Run Text="{ext:Loc Dashboard.SystemInfo.Ram.Modules, {Binding ViewModel.RuntimeRam.Modules.Count, Mode=OneWay}}" />- </ui:TextBlock>- </Border>- </WrapPanel>- </Grid>- </ui:CardControl.Header>- </ui:CardControl>+ <StackPanel Grid.Row="0">+ <ui:TextBlock+ FontTypography="BodyStrong"+ Text="{Binding ViewModel.SystemInfo.Cpu.Name}"+ TextTrimming="CharacterEllipsis"+ />+ <ui:TextBlock+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ FontTypography="Caption"+ >+ <Run Text="{Binding ViewModel.SystemInfo.Cpu.Vendor}" />+ <Run Text="·" />+ <Run Text="{ext:Loc Dashboard.SystemInfo.Cpu.Cores, {Binding ViewModel.SystemInfo.Cpu.Cores}}" />+ <Run Text="/" />+ <Run Text="{ext:Loc Dashboard.SystemInfo.Cpu.Threads, {Binding ViewModel.SystemInfo.Cpu.Threads}}" />+ </ui:TextBlock>+ </StackPanel>- <!-- GPU -->- <ui:CardControl- Icon="{ui:SymbolIcon NetworkAdapter16}"- Margin="5,5,0,0"- VerticalAlignment="Stretch"- >- <ui:CardControl.Header>- <Grid>- <Grid.RowDefinitions>- <RowDefinition Height="Auto" />- <RowDefinition Height="*" />- </Grid.RowDefinitions>+ <WrapPanel Grid.Row="1" Margin="0,8,0,0" Orientation="Horizontal">+ <Border+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"+ CornerRadius="4"+ Margin="0,0,4,4"+ Padding="6,3"+ >+ <ui:TextBlock FontTypography="Caption">+ <Run Text="{Binding ViewModel.SystemInfo.Cpu.CurrentClockMHz}" />+ <Run Text="MHz" />+ </ui:TextBlock>+ </Border>+ <Border+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"+ CornerRadius="4"+ Margin="0,0,4,4"+ Padding="6,3"+ >+ <ui:TextBlock FontTypography="Caption">+ <Run Text="L2:" />+ <Run Text="{Binding ViewModel.SystemInfo.Cpu.L2CacheKB}" />+ <Run Text="KB" />+ </ui:TextBlock>+ </Border>+ <Border+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"+ CornerRadius="4"+ Margin="0,0,4,4"+ Padding="6,3"+ >+ <ui:TextBlock FontTypography="Caption">+ <Run Text="L3:" />+ <Run Text="{Binding ViewModel.SystemInfo.Cpu.L3CacheKB}" />+ <Run Text="KB" />+ </ui:TextBlock>+ </Border>+ </WrapPanel>+ </Grid>+ </ui:CardControl.Header>+ </ui:CardControl>- <StackPanel Grid.Row="0">- <ui:TextBlock- FontTypography="BodyStrong"- Text="{Binding ViewModel.SystemInfo.PrimaryGpu.Name}"- TextTrimming="CharacterEllipsis"- />- <ui:TextBlock- Appearance="Secondary"- FontTypography="Caption"- Text="{Binding ViewModel.SystemInfo.PrimaryGpu.Vendor}"- />- </StackPanel>+ <!-- RAM -->+ <ui:CardControl+ Icon="{ui:SymbolIcon Memory16}"+ Margin="0,5,5,0"+ VerticalAlignment="Stretch"+ >+ <ui:CardControl.Header>+ <Grid>+ <Grid.RowDefinitions>+ <RowDefinition Height="Auto" />+ <RowDefinition Height="Auto" />+ <RowDefinition Height="Auto" />+ </Grid.RowDefinitions>- <WrapPanel Grid.Row="1" Margin="0,8,0,0" Orientation="Horizontal">- <Border- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"- CornerRadius="4"- Margin="0,0,4,4"- Padding="6,3"- >- <ui:TextBlock FontTypography="Caption">- <Run Text="{Binding ViewModel.SystemInfo.PrimaryGpu.MemoryMB, Converter={StaticResource MBToGBConverter}}" />- <Run Text="GB" />- </ui:TextBlock>- </Border>- <Border- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"- CornerRadius="4"- Margin="0,0,4,4"- Padding="6,3"- >- <ui:TextBlock- FontTypography="Caption"- Text="{Binding ViewModel.SystemInfo.PrimaryGpu.DriverVersion}"- TextTrimming="CharacterEllipsis"- />- </Border>- <Border- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"- CornerRadius="4"- Margin="0,0,4,4"- Padding="6,3"- Visibility="{Binding ViewModel.SystemInfo.Gpus.Count, Converter={StaticResource GreaterThanOneToVisibilityConverter}}"- >- <ui:TextBlock FontTypography="Caption">- <Run Text="{ext:Loc Dashboard.SystemInfo.Gpu.More, {Binding ViewModel.SystemInfo.Gpus.Count, Mode=OneWay, Converter={StaticResource MinusOneConverter}}}" />- </ui:TextBlock>- </Border>- </WrapPanel>- </Grid>- </ui:CardControl.Header>- </ui:CardControl>- </UniformGrid>+ <StackPanel Grid.Row="0">+ <ui:TextBlock FontTypography="BodyStrong">+ <Run Text="{Binding ViewModel.RuntimeRam.TotalGB, StringFormat='{}{0:F1}'}" />+ <Run Text="GB RAM" />+ </ui:TextBlock>+ <ui:TextBlock+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ FontTypography="Caption"+ >+ <Run Text="{ext:Loc Dashboard.SystemInfo.Ram.Used, {Binding ViewModel.RuntimeRam.UsedGB, StringFormat='{}{0:F1}'}}" />+ <Run Text="·" />+ <Run Text="{ext:Loc Dashboard.SystemInfo.Ram.Available, {Binding ViewModel.RuntimeRam.AvailableGB, StringFormat='{}{0:F1}'}}" />+ </ui:TextBlock>+ </StackPanel>- <!-- Storage Section -->- <ui:TextBlock- FontTypography="BodyStrong"- Margin="0,20,0,8"- Text="{ext:Loc Dashboard.SystemInfo.Storage.Header}"- />+ <ProgressBar+ Grid.Row="1"+ Height="6"+ Margin="0,8,0,0"+ Maximum="100"+ Value="{Binding ViewModel.RuntimeRam.UsedPercent}"+ />- <ItemsControl ItemsSource="{Binding ViewModel.RuntimeDisk.Volumes}">- <ItemsControl.ItemTemplate>- <DataTemplate>- <ui:CardControl Margin="0,0,0,8">- <ui:CardControl.Icon>- <ui:SymbolIcon Filled="True" Symbol="HardDrive20">- <ui:SymbolIcon.Style>- <Style TargetType="ui:SymbolIcon">- <Style.Triggers>- <DataTrigger Binding="{Binding IsSystemDrive}" Value="True">- <Setter- Property="Foreground"- Value="{DynamicResource SystemFillColorAttentionBrush}"- />- </DataTrigger>- </Style.Triggers>- </Style>- </ui:SymbolIcon.Style>- </ui:SymbolIcon>- </ui:CardControl.Icon>- <ui:CardControl.Header>- <Grid>- <Grid.RowDefinitions>- <RowDefinition Height="Auto" />- <RowDefinition Height="Auto" />- <RowDefinition Height="Auto" />- <RowDefinition Height="Auto" />- </Grid.RowDefinitions>+ <WrapPanel Grid.Row="2" Margin="0,8,0,0" Orientation="Horizontal">+ <Border+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"+ CornerRadius="4"+ Padding="6,3"+ >+ <ui:TextBlock FontTypography="Caption">+ <Run Text="{ext:Loc Dashboard.SystemInfo.Ram.Modules, {Binding ViewModel.RuntimeRam.Modules.Count, Mode=OneWay}}" />+ </ui:TextBlock>+ </Border>+ </WrapPanel>+ </Grid>+ </ui:CardControl.Header>+ </ui:CardControl>- <!-- Drive Letter and Label -->- <StackPanel Grid.Row="0" Orientation="Horizontal">- <ui:TextBlock- FontTypography="BodyStrong"- Margin="0,0,5,0"- Text="{Binding DriveLetter, StringFormat='({0})'}"- />+ <!-- GPU -->+ <ui:CardControl+ Icon="{ui:SymbolIcon NetworkAdapter16}"+ Margin="5,5,0,0"+ VerticalAlignment="Stretch"+ >+ <ui:CardControl.Header>+ <Grid>+ <Grid.RowDefinitions>+ <RowDefinition Height="Auto" />+ <RowDefinition Height="*" />+ </Grid.RowDefinitions>- <ui:TextBlock- FontTypography="Caption"- Margin="0,0,5,0"- Text="{Binding VolumeLabel}"- VerticalAlignment="Center"- />+ <StackPanel Grid.Row="0">+ <ui:TextBlock+ FontTypography="BodyStrong"+ Text="{Binding ViewModel.SystemInfo.PrimaryGpu.Name}"+ TextTrimming="CharacterEllipsis"+ />+ <ui:TextBlock+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ FontTypography="Caption"+ Text="{Binding ViewModel.SystemInfo.PrimaryGpu.Vendor}"+ />+ </StackPanel>- <Border- Background="{DynamicResource SystemFillColorAttentionBrush}"- CornerRadius="4"- Margin="0,0,4,0"- Padding="5,2"- VerticalAlignment="Center"- Visibility="{Binding IsSystemDrive, Converter={StaticResource BoolToVisibilityConverter}}"- >- <ui:TextBlock- FontTypography="Caption"- Foreground="Black"- Text="{ext:Loc Dashboard.SystemInfo.Storage.System}"- />- </Border>+ <WrapPanel Grid.Row="1" Margin="0,8,0,0" Orientation="Horizontal">+ <Border+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"+ CornerRadius="4"+ Margin="0,0,4,4"+ Padding="6,3"+ >+ <ui:TextBlock FontTypography="Caption">+ <Run Text="{Binding ViewModel.SystemInfo.PrimaryGpu.MemoryMB, Converter={StaticResource MBToGBConverter}}" />+ <Run Text="GB" />+ </ui:TextBlock>+ </Border>+ <Border+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"+ CornerRadius="4"+ Margin="0,0,4,4"+ Padding="6,3"+ >+ <ui:TextBlock+ FontTypography="Caption"+ Text="{Binding ViewModel.SystemInfo.PrimaryGpu.DriverVersion}"+ TextTrimming="CharacterEllipsis"+ />+ </Border>+ <Border+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"+ CornerRadius="4"+ Margin="0,0,4,4"+ Padding="6,3"+ Visibility="{Binding ViewModel.SystemInfo.Gpus.Count, Converter={StaticResource GreaterThanOneToVisibilityConverter}}"+ >+ <ui:TextBlock FontTypography="Caption">+ <Run Text="{ext:Loc Dashboard.SystemInfo.Gpu.More, {Binding ViewModel.SystemInfo.Gpus.Count, Mode=OneWay, Converter={StaticResource MinusOneConverter}}}" />+ </ui:TextBlock>+ </Border>+ </WrapPanel>+ </Grid>+ </ui:CardControl.Header>+ </ui:CardControl>+ </UniformGrid>- <Border- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"- CornerRadius="4"- Margin="0,0,4,0"- Padding="5,2"- VerticalAlignment="Center"- >- <ui:TextBlock FontTypography="Caption" Text="{Binding MediaType}">- <ui:TextBlock.Style>- <Style TargetType="ui:TextBlock">- <Style.Triggers>- <DataTrigger Binding="{Binding MediaType}" Value="SSD">- <Setter- Property="Foreground"- Value="{DynamicResource SystemFillColorSuccessBrush}"- />- </DataTrigger>- <DataTrigger Binding="{Binding MediaType}" Value="HDD">- <Setter- Property="Foreground"- Value="{DynamicResource SystemFillColorCautionBrush}"- />- </DataTrigger>- </Style.Triggers>- </Style>- </ui:TextBlock.Style>- </ui:TextBlock>- </Border>+ <!-- Storage Section -->+ <ui:TextBlock+ FontTypography="BodyStrong"+ Margin="0,20,0,8"+ Text="{ext:Loc Dashboard.SystemInfo.Storage.Header}"+ />- <Border- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"- CornerRadius="4"- Padding="5,2"- VerticalAlignment="Center"- >- <ui:TextBlock FontTypography="Caption" Text="{Binding DriveFormat}" />- </Border>- </StackPanel>+ <ItemsControl ItemsSource="{Binding ViewModel.RuntimeDisk.Volumes}">+ <ItemsControl.ItemTemplate>+ <DataTemplate>+ <ui:CardControl Margin="0,0,0,8">+ <ui:CardControl.Icon>+ <ui:SymbolIcon Filled="True" Symbol="HardDrive20">+ <ui:SymbolIcon.Style>+ <Style TargetType="ui:SymbolIcon">+ <Style.Triggers>+ <DataTrigger+ Binding="{Binding IsSystemDrive}"+ Value="True"+ >+ <Setter+ Property="Foreground"+ Value="{DynamicResource SystemFillColorAttentionBrush}"+ />+ </DataTrigger>+ </Style.Triggers>+ </Style>+ </ui:SymbolIcon.Style>+ </ui:SymbolIcon>+ </ui:CardControl.Icon>+ <ui:CardControl.Header>+ <Grid>+ <Grid.RowDefinitions>+ <RowDefinition Height="Auto" />+ <RowDefinition Height="Auto" />+ <RowDefinition Height="Auto" />+ <RowDefinition Height="Auto" />+ </Grid.RowDefinitions>- <!-- Model Information -->- <ui:TextBlock- Appearance="Secondary"- FontTypography="Caption"- Grid.Row="1"- Margin="0,4,0,0"- Text="{Binding Model}"- TextTrimming="CharacterEllipsis"- Visibility="{Binding Model, Converter={StaticResource NullToVisibilityConverter}}"- />+ <!-- Drive Letter and Label -->+ <StackPanel Grid.Row="0" Orientation="Horizontal">+ <ui:TextBlock+ FontTypography="BodyStrong"+ Margin="0,0,5,0"+ Text="{Binding DriveLetter, StringFormat='({0})'}"+ />- <!-- Storage Stats -->- <StackPanel Grid.Row="2" Margin="0,4,0,0" Orientation="Horizontal">- <ui:TextBlock- Appearance="Secondary"- FontTypography="Caption"- Text="{ext:Loc Dashboard.SystemInfo.Storage.DiskInfo,+ <ui:TextBlock+ FontTypography="Caption"+ Margin="0,0,5,0"+ Text="{Binding VolumeLabel}"+ VerticalAlignment="Center"+ />++ <Border+ Background="{DynamicResource SystemFillColorAttentionBrush}"+ CornerRadius="4"+ Margin="0,0,4,0"+ Padding="5,2"+ VerticalAlignment="Center"+ Visibility="{Binding IsSystemDrive, Converter={StaticResource BoolToVisibilityConverter}}"+ >+ <ui:TextBlock+ FontTypography="Caption"+ Foreground="Black"+ Text="{ext:Loc Dashboard.SystemInfo.Storage.System}"+ />+ </Border>++ <Border+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"+ CornerRadius="4"+ Margin="0,0,4,0"+ Padding="5,2"+ VerticalAlignment="Center"+ >+ <ui:TextBlock+ FontTypography="Caption"+ Text="{Binding MediaType}"+ >+ <ui:TextBlock.Style>+ <Style TargetType="ui:TextBlock">+ <Style.Triggers>+ <DataTrigger+ Binding="{Binding MediaType}"+ Value="SSD"+ >+ <Setter+ Property="Foreground"+ Value="{DynamicResource SystemFillColorSuccessBrush}"+ />+ </DataTrigger>+ <DataTrigger+ Binding="{Binding MediaType}"+ Value="HDD"+ >+ <Setter+ Property="Foreground"+ Value="{DynamicResource SystemFillColorCautionBrush}"+ />+ </DataTrigger>+ </Style.Triggers>+ </Style>+ </ui:TextBlock.Style>+ </ui:TextBlock>+ </Border>++ <Border+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"+ CornerRadius="4"+ Padding="5,2"+ VerticalAlignment="Center"+ >+ <ui:TextBlock+ FontTypography="Caption"+ Text="{Binding DriveFormat}"+ />+ </Border>+ </StackPanel>++ <!-- Model Information -->+ <ui:TextBlock+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ FontTypography="Caption"+ Grid.Row="1"+ Margin="0,4,0,0"+ Text="{Binding Model}"+ TextTrimming="CharacterEllipsis"+ Visibility="{Binding Model, Converter={StaticResource NullToVisibilityConverter}}"+ />++ <!-- Storage Stats -->+ <StackPanel+ Grid.Row="2"+ Margin="0,4,0,0"+ Orientation="Horizontal"+ >+ <ui:TextBlock+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ FontTypography="Caption"+ Text="{ext:Loc Dashboard.SystemInfo.Storage.DiskInfo,{Binding UsedSizeGB, StringFormat='{}{0:F1}'},{Binding TotalSizeGB, StringFormat='{}{0:F1}'},{Binding AvailableSizeGB, StringFormat='{}{0:F1}'}}"- />- </StackPanel>+ />+ </StackPanel>- <!-- Progress Bar -->- <ProgressBar- Grid.Row="3"- Height="6"- Margin="0,8,0,0"- Maximum="100"- Value="{Binding UsedPercent}"- />- </Grid>- </ui:CardControl.Header>- </ui:CardControl>- </DataTemplate>- </ItemsControl.ItemTemplate>- </ItemsControl>- </StackPanel>- </ScrollViewer>- </Grid>+ <!-- Progress Bar -->+ <ProgressBar+ Grid.Row="3"+ Height="6"+ Margin="0,8,0,0"+ Maximum="100"+ Value="{Binding UsedPercent}"+ />+ </Grid>+ </ui:CardControl.Header>+ </ui:CardControl>+ </DataTemplate>+ </ItemsControl.ItemTemplate>+ </ItemsControl>+ </StackPanel>+ </ScrollViewer>+ </Grid></Page>diff --git a/optimizerDuck/UI/Pages/DiskCleanupPage.xaml b/optimizerDuck/UI/Pages/DiskCleanupPage.xamlindex 8328c47..8c0d37d 100644--- a/optimizerDuck/UI/Pages/DiskCleanupPage.xaml+++ b/optimizerDuck/UI/Pages/DiskCleanupPage.xaml@@ -1,431 +1,374 @@<Page- x:Class="optimizerDuck.UI.Pages.DiskCleanupPage"- xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"- xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"- xmlns:cleanup1="clr-namespace:optimizerDuck.Domain.Optimizations.Models.Cleanup"- xmlns:converters="clr-namespace:optimizerDuck.Common.Converters"- xmlns:d="http://schemas.microsoft.com/expression/blend/2008"- xmlns:ext="clr-namespace:optimizerDuck.Common.Extensions"- xmlns:local="clr-namespace:optimizerDuck.UI.Pages"- xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"- xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"- Title="DiskCleanupPage"- Margin="0,32,0,0"- d:DataContext="{d:DesignInstance local:DiskCleanupPage}"- d:DesignHeight="1200"- d:DesignWidth="800"- ui:Design.Background="Black"- ui:Design.Foreground="White"- Foreground="{DynamicResource TextFillColorPrimaryBrush}"- ScrollViewer.CanContentScroll="False"- mc:Ignorable="d"->- <Page.Resources>- <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />- <converters:BooleanToVisibilityConverter- x:Key="InverseBooleanToVisibilityConverter"- False="Visible"- True="Collapsed"- />- <converters:SizeToBrushConverter x:Key="SizeToBrushConverter" />- </Page.Resources>+ x:Class="optimizerDuck.UI.Pages.DiskCleanupPage"+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"+ xmlns:cleanup1="clr-namespace:optimizerDuck.Domain.Optimizations.Models.Cleanup"+ xmlns:converters="clr-namespace:optimizerDuck.Common.Converters"+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"+ xmlns:ext="clr-namespace:optimizerDuck.Common.Extensions"+ xmlns:local="clr-namespace:optimizerDuck.UI.Pages"+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"+ xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"+ Title="DiskCleanupPage"+ Margin="0,32,0,0"+ d:DataContext="{d:DesignInstance local:DiskCleanupPage}"+ d:DesignHeight="1200"+ d:DesignWidth="800"+ ui:Design.Background="Black"+ ui:Design.Foreground="White"+ Foreground="{DynamicResource TextFillColorPrimaryBrush}"+ ScrollViewer.CanContentScroll="False"+ mc:Ignorable="d">+ <Page.Resources>+ <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />+ <converters:BooleanToVisibilityConverter+ x:Key="InverseBooleanToVisibilityConverter"+ False="Visible"+ True="Collapsed" />+ <converters:SizeToBrushConverter x:Key="SizeToBrushConverter" />- <Grid RowDefinitions="Auto,*">- <!-- Header -->- <StackPanel Margin="0,0,0,20">- <ui:TextBlock- FontTypography="Title"- Text="{ext:Loc DiskCleanup.Header.Title}"- TextWrapping="Wrap"- />- <ui:TextBlock- Margin="0,4,0,0"- Appearance="Secondary"- FontTypography="Body"- Text="{ext:Loc DiskCleanup.Header.Description}"- TextWrapping="Wrap"- />- </StackPanel>+ <!-- Modern Card Style -->+ <Style x:Key="CleanupItemCardStyle" TargetType="Border">+ <Setter Property="Background" Value="{DynamicResource CardBackgroundFillColorDefaultBrush}" />+ <Setter Property="CornerRadius" Value="8" />+ <Setter Property="Padding" Value="16,12" />+ <Setter Property="Margin" Value="0,0,0,6" />+ <Setter Property="BorderBrush" Value="{DynamicResource CardStrokeColorDefaultBrush}" />+ <Setter Property="BorderThickness" Value="1" />+ </Style>- <!-- Loading state (initial scan) -->- <Border- Grid.Row="1"- Visibility="{Binding ViewModel.IsLoading, Converter={StaticResource BooleanToVisibilityConverter}}"- >- <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Orientation="Vertical">- <ui:ProgressRing- Width="48"- Height="48"- Margin="0,0,0,12"- HorizontalAlignment="Center"- IsIndeterminate="True"- />- <ui:TextBlock- HorizontalAlignment="Center"- FontTypography="BodyStrong"- Text="{ext:Loc DiskCleanup.Loading}"- />- <ui:TextBlock- Margin="0,4,0,0"- HorizontalAlignment="Center"- Appearance="Secondary"- FontTypography="Caption"- Text="{ext:Loc DiskCleanup.Header.Description}"- />- </StackPanel>- </Border>+ <!-- Clickable Name Style -->+ <Style+ x:Key="ClickableNameStyle"+ BasedOn="{StaticResource DefaultUiHyperlinkButtonStyle}"+ TargetType="ui:HyperlinkButton">+ <Setter Property="Foreground" Value="{DynamicResource TextFillColorPrimaryBrush}" />+ <Setter Property="FontSize" Value="14" />+ <Setter Property="Padding" Value="0" />+ <Setter Property="VerticalAlignment" Value="Center" />+ <Setter Property="HorizontalAlignment" Value="Left" />- <!-- Main content -->- <Border- Grid.Row="1"- CornerRadius="6"- Visibility="{Binding ViewModel.HasData, Converter={StaticResource BooleanToVisibilityConverter}}"- >- <Grid RowDefinitions="Auto,Auto,Auto,*">- <!-- Summary card with Scan button / Indicator -->- <Border- Margin="0,0,0,12"- Padding="16"- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"- CornerRadius="8"- >- <Grid ColumnDefinitions="Auto,*,Auto">- <!-- Icon -->- <Border- Width="44"- Height="44"- Margin="0,0,16,0"- VerticalAlignment="Center"- CornerRadius="22"- >- <ui:SymbolIcon- HorizontalAlignment="Center"- VerticalAlignment="Center"- FontSize="22"- Symbol="HardDrive20"- />- </Border>+ <Style.Triggers>+ <DataTrigger Binding="{Binding CanOpenFolder}" Value="False">+ <Setter Property="Opacity" Value="0.5" />+ </DataTrigger>- <!-- Info -->- <StackPanel Grid.Column="1" VerticalAlignment="Center">- <ui:TextBlock FontTypography="BodyStrong" Text="{ext:Loc DiskCleanup.TotalSpace}" />- <ui:TextBlock- Margin="0,2,0,0"- Appearance="Secondary"- FontTypography="Body"- Text="{ext:Loc DiskCleanup.ItemsAndFilesSelected,- {Binding ViewModel.TotalSelectedSizeFormatted},- {Binding ViewModel.SelectedCount},- {Binding ViewModel.TotalSelectedFileCount}}"- />- </StackPanel>+ <DataTrigger Binding="{Binding CanOpenFolder}" Value="True">+ <Setter Property="Opacity" Value="1" />+ </DataTrigger>+ </Style.Triggers>+ </Style>+ </Page.Resources>- <!-- Scan button -->- <ui:Button- Grid.Column="2"- VerticalAlignment="Center"- Appearance="Primary"- Command="{Binding ViewModel.ScanCommand}"- Content="{ext:Loc DiskCleanup.Button.Scan}"- Icon="{ui:SymbolIcon Search24,- FontSize=18}"- Visibility="{Binding ViewModel.IsScanning, Converter={StaticResource InverseBooleanToVisibilityConverter}}"- />+ <Grid RowDefinitions="Auto,*">+ <!-- Header -->+ <StackPanel Margin="0,0,0,20">+ <ui:TextBlock+ FontTypography="Title"+ Text="{ext:Loc DiskCleanup.Header.Title}"+ TextWrapping="Wrap" />+ <ui:TextBlock+ Margin="0,4,0,0"+ FontTypography="Body"+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ Text="{ext:Loc DiskCleanup.Header.Description}"+ TextWrapping="Wrap" />+ </StackPanel>- <!-- Scanning indicator -->- <StackPanel- Grid.Column="2"- VerticalAlignment="Center"- Orientation="Horizontal"- Visibility="{Binding ViewModel.IsScanning, Converter={StaticResource BooleanToVisibilityConverter}}"- >- <ui:ProgressRing Width="16" Height="16" Margin="0,0,8,0" IsIndeterminate="True" />- <ui:TextBlock- VerticalAlignment="Center"- Appearance="Secondary"- FontTypography="Caption"- Text="{ext:Loc DiskCleanup.Scanning}"- />+ <!-- Loading State -->+ <Border Grid.Row="1" Visibility="{Binding ViewModel.IsLoading, Converter={StaticResource BooleanToVisibilityConverter}}">+ <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">+ <ui:ProgressRing+ Width="48"+ Height="48"+ Margin="0,0,0,16"+ IsIndeterminate="True" />+ <ui:TextBlock+ HorizontalAlignment="Center"+ FontTypography="BodyStrong"+ Text="{ext:Loc DiskCleanup.Loading}" />+ <ui:TextBlock+ Margin="0,4,0,0"+ HorizontalAlignment="Center"+ FontTypography="Caption"+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ Text="{ext:Loc DiskCleanup.Header.Description}" /></StackPanel>- </Grid></Border>- <!-- Sort toolbar -->- <WrapPanel Grid.Row="1" Margin="0,0,0,8" Orientation="Horizontal">- <!-- Sort By -->- <ComboBox- Margin="0,0,8,0"- VerticalAlignment="Center"- SelectedIndex="{Binding ViewModel.SelectedSortByIndex}"- ToolTip="{ext:Loc Common.SortBy}"- ToolTipService.BetweenShowDelay="160"- ToolTipService.Placement="Top"- >- <ComboBoxItem HorizontalContentAlignment="Left">- <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">- <ui:SymbolIcon Margin="0,0,6,0" HorizontalAlignment="Left" Symbol="Storage24" />- <TextBlock- Grid.Column="1"- HorizontalAlignment="Left"- Text="{ext:Loc Common.SortBy.Size}"- />- </Grid>- </ComboBoxItem>- <ComboBoxItem HorizontalContentAlignment="Left">- <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">- <ui:SymbolIcon- Margin="0,0,6,0"- HorizontalAlignment="Left"- Symbol="TextSortAscending24"- />- <TextBlock- Grid.Column="1"- HorizontalAlignment="Left"- Text="{ext:Loc Common.SortBy.Name}"- />- </Grid>- </ComboBoxItem>- <ComboBoxItem HorizontalContentAlignment="Left">- <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">- <ui:SymbolIcon Margin="0,0,6,0" HorizontalAlignment="Left" Symbol="Folder24" />- <TextBlock- Grid.Column="1"- HorizontalAlignment="Left"- Text="{ext:Loc Common.SortBy.Path}"- />- </Grid>- </ComboBoxItem>- </ComboBox>- </WrapPanel>+ <!-- Main Content -->+ <Grid+ Grid.Row="1"+ RowDefinitions="Auto,*"+ Visibility="{Binding ViewModel.HasData, Converter={StaticResource BooleanToVisibilityConverter}}">+ <!-- Toolbar Card -->+ <Border+ Margin="0,0,0,12"+ Padding="16"+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"+ CornerRadius="8">+ <Grid ColumnDefinitions="Auto,*,Auto">+ <!-- Summary Info -->+ <StackPanel Grid.Column="0" VerticalAlignment="Center">+ <ui:TextBlock FontTypography="BodyStrong" Text="{ext:Loc DiskCleanup.TotalSpace}" />+ <ui:TextBlock+ Margin="0,2,0,0"+ FontTypography="Caption"+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ Text="{ext:Loc DiskCleanup.ItemsAndFilesSelected,+ {Binding ViewModel.TotalSelectedSizeFormatted},+ {Binding ViewModel.SelectedCount},+ {Binding ViewModel.TotalSelectedFileCount}}" />+ </StackPanel>- <!-- Action buttons -->- <StackPanel Grid.Row="2" Margin="0,0,0,12" Orientation="Horizontal">- <!-- Clean button -->- <ui:Button- Appearance="Danger"- Command="{Binding ViewModel.CleanSelectedCommand}"- IsEnabled="{Binding ViewModel.CanClean}"- >- <ui:Button.Content>- <StackPanel Orientation="Horizontal">- <ui:SymbolIcon Margin="0,0,6,0" FontSize="18" Symbol="Delete24" />- <TextBlock Text="{ext:Loc DiskCleanup.Button.CleanSelected, {Binding ViewModel.TotalSelectedSizeFormatted}}" />- </StackPanel>- </ui:Button.Content>- </ui:Button>+ <!-- Actions -->+ <WrapPanel+ Grid.Column="2"+ VerticalAlignment="Center"+ Orientation="Horizontal">+ <!-- Sort Dropdown -->+ <ComboBox+ Margin="0,0,8,0"+ VerticalAlignment="Center"+ SelectedIndex="{Binding ViewModel.SelectedSortByIndex}"+ ToolTip="{ext:Loc Common.SortBy}">+ <ComboBoxItem HorizontalContentAlignment="Left">+ <StackPanel HorizontalAlignment="Left" Orientation="Horizontal">+ <ui:SymbolIcon Margin="0,0,6,0" Symbol="Storage24" />+ <TextBlock Text="{ext:Loc Common.SortBy.Size}" />+ </StackPanel>+ </ComboBoxItem>+ <ComboBoxItem HorizontalContentAlignment="Left">+ <StackPanel HorizontalAlignment="Left" Orientation="Horizontal">+ <ui:SymbolIcon Margin="0,0,6,0" Symbol="TextSortAscending24" />+ <TextBlock Text="{ext:Loc Common.SortBy.Name}" />+ </StackPanel>+ </ComboBoxItem>+ <ComboBoxItem HorizontalContentAlignment="Left">+ <StackPanel HorizontalAlignment="Left" Orientation="Horizontal">+ <ui:SymbolIcon Margin="0,0,6,0" Symbol="Folder24" />+ <TextBlock Text="{ext:Loc Common.SortBy.Path}" />+ </StackPanel>+ </ComboBoxItem>+ </ComboBox>- <Separator Margin="4,0,4,0" />+ <!-- Clean Button -->+ <ui:Button+ Appearance="Danger"+ Command="{Binding ViewModel.CleanSelectedCommand}"+ IsEnabled="{Binding ViewModel.CanClean}">+ <StackPanel Orientation="Horizontal">+ <ui:SymbolIcon+ Margin="0,0,6,0"+ FontSize="16"+ Symbol="Delete24" />+ <TextBlock Text="{ext:Loc DiskCleanup.Button.CleanSelected, {Binding ViewModel.TotalSelectedSizeFormatted}}" />+ </StackPanel>+ </ui:Button>- <!-- Select/Deselect All -->- <ui:Button Command="{Binding ViewModel.SelectAllCommand}">- <ui:Button.Style>- <Style BasedOn="{StaticResource {x:Type ui:Button}}" TargetType="ui:Button">- <Setter Property="Appearance" Value="Success" />- <Setter Property="Content" Value="{ext:Loc DiskCleanup.Button.SelectAll}" />- <Setter Property="Icon">- <Setter.Value>- <ui:SymbolIcon FontSize="18" Symbol="CheckboxChecked24" />- </Setter.Value>- </Setter>- <Style.Triggers>- <DataTrigger Binding="{Binding ViewModel.IsAllSelected}" Value="True">- <Setter Property="Appearance" Value="Danger" />- <Setter Property="Content" Value="{ext:Loc DiskCleanup.Button.DeselectAll}" />- <Setter Property="Icon">- <Setter.Value>- <ui:SymbolIcon FontSize="18" Symbol="CheckboxUnchecked24" />- </Setter.Value>- </Setter>- </DataTrigger>- </Style.Triggers>- </Style>- </ui:Button.Style>- </ui:Button>- </StackPanel>+ <Separator Margin="8,0,8,0" />- <!-- Items list (virtualized) -->- <ItemsControl Grid.Row="3" ItemsSource="{Binding ViewModel.CleanupItems}">- <ItemsControl.Template>- <ControlTemplate TargetType="ItemsControl">- <ScrollViewer HorizontalScrollBarVisibility="Disabled">- <ItemsPresenter Margin="0,0,16,0" />- </ScrollViewer>- </ControlTemplate>- </ItemsControl.Template>+ <!-- Scan Button -->+ <Grid>+ <ui:Button+ Appearance="Primary"+ Command="{Binding ViewModel.ScanCommand}"+ Content="{ext:Loc DiskCleanup.Button.Scan}"+ Icon="{ui:SymbolIcon Search24,+ FontSize=16}"+ Visibility="{Binding ViewModel.IsScanning, Converter={StaticResource InverseBooleanToVisibilityConverter}}" />+ <ui:ProgressRing+ Width="20"+ Height="20"+ Margin="8"+ IsIndeterminate="True"+ Visibility="{Binding ViewModel.IsScanning, Converter={StaticResource BooleanToVisibilityConverter}}" />+ </Grid>+ </WrapPanel>+ </Grid>+ </Border>- <ItemsControl.ItemsPanel>- <ItemsPanelTemplate>- <VirtualizingStackPanel />- </ItemsPanelTemplate>- </ItemsControl.ItemsPanel>+ <!-- Items List -->+ <ItemsControl Grid.Row="1" ItemsSource="{Binding ViewModel.CleanupItems}">+ <ItemsControl.Template>+ <ControlTemplate TargetType="ItemsControl">+ <ScrollViewer HorizontalScrollBarVisibility="Disabled">+ <ItemsPresenter Margin="0,0,12,0" />+ </ScrollViewer>+ </ControlTemplate>+ </ItemsControl.Template>- <ItemsControl.ItemTemplate>- <DataTemplate DataType="{x:Type cleanup1:CleanupItem}">- <Border- Margin="0,0,0,4"- Padding="14,10"- Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"- CornerRadius="6"- >- <Grid>- <Grid.ColumnDefinitions>- <ColumnDefinition Width="Auto" />- <ColumnDefinition Width="Auto" />- <ColumnDefinition Width="*" />- <ColumnDefinition Width="Auto" />- </Grid.ColumnDefinitions>+ <ItemsControl.ItemsPanel>+ <ItemsPanelTemplate>+ <VirtualizingStackPanel />+ </ItemsPanelTemplate>+ </ItemsControl.ItemsPanel>- <!-- Checkbox -->- <CheckBox- Grid.Column="0"- Margin="0,0,12,0"- VerticalAlignment="Center"- IsChecked="{Binding IsSelected, Mode=TwoWay}"- />+ <ItemsControl.ItemTemplate>+ <DataTemplate DataType="{x:Type cleanup1:CleanupItem}">+ <Border Style="{StaticResource CleanupItemCardStyle}">+ <Grid>+ <Grid.ColumnDefinitions>+ <ColumnDefinition Width="Auto" />+ <ColumnDefinition Width="Auto" />+ <ColumnDefinition Width="*" />+ <ColumnDefinition Width="Auto" />+ </Grid.ColumnDefinitions>- <!-- Icon with circle background -->- <Border- Grid.Column="1"- Width="38"- Height="38"- Margin="0,0,14,0"- VerticalAlignment="Center"- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"- CornerRadius="19"- >- <ui:SymbolIcon- HorizontalAlignment="Center"- VerticalAlignment="Center"- FontSize="20"- Foreground="{DynamicResource TextFillColorSecondaryBrush}"- Symbol="{Binding Icon}"- />- </Border>+ <!-- Checkbox -->+ <CheckBox+ Grid.Column="0"+ Margin="0,0,12,0"+ VerticalAlignment="Center"+ IsChecked="{Binding IsSelected, Mode=TwoWay}" />- <!-- Info -->- <StackPanel Grid.Column="2" VerticalAlignment="Center">- <ui:TextBlock FontTypography="BodyStrong" Text="{Binding Name}" />- <ui:TextBlock- Margin="0,2,0,0"- Appearance="Disabled"- FontTypography="Body"- Text="{Binding Description}"- TextWrapping="Wrap"- />- <ui:TextBlock- Margin="0,2,0,0"- Appearance="Secondary"- FontTypography="Caption"- Text="{Binding Path}"- TextTrimming="CharacterEllipsis"- />+ <!-- Icon -->+ <Border+ Grid.Column="1"+ Width="40"+ Height="40"+ Margin="0,0,14,0"+ VerticalAlignment="Center"+ Background="{DynamicResource ControlFillColorSecondaryBrush}"+ CornerRadius="20">+ <ui:SymbolIcon+ HorizontalAlignment="Center"+ VerticalAlignment="Center"+ FontSize="20"+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ Symbol="{Binding Icon}" />+ </Border>- <Border Margin="0,6,0,0" HorizontalAlignment="Left" CornerRadius="8">- <Border.Style>- <Style TargetType="Border">- <Setter- Property="Visibility"- Value="{Binding IsScanned, Converter={StaticResource BooleanToVisibilityConverter}}"- />- <Setter Property="Padding" Value="8,3" />- <Setter- Property="Background"- Value="{Binding SizeBytes, Converter={StaticResource SizeToBrushConverter}}"- />- <Style.Triggers>- <DataTrigger Binding="{Binding IsScanning}" Value="True">- <Setter Property="Visibility" Value="Collapsed" />- </DataTrigger>- <DataTrigger Binding="{Binding IsCleaning}" Value="True">- <Setter Property="Visibility" Value="Collapsed" />- </DataTrigger>- <DataTrigger Binding="{Binding FormattedSize}" Value="0 B">- <Setter Property="Background" Value="Transparent" />- <Setter Property="Padding" Value="0,3" />- </DataTrigger>- </Style.Triggers>- </Style>- </Border.Style>- <Grid>- <Border>- <Border.Style>- <Style TargetType="Border">- <Setter Property="Visibility" Value="Visible" />- <Style.Triggers>- <DataTrigger Binding="{Binding FormattedSize}" Value="0 B">- <Setter Property="Visibility" Value="Collapsed" />- </DataTrigger>- </Style.Triggers>- </Style>- </Border.Style>- <StackPanel VerticalAlignment="Center" Orientation="Horizontal">- <ui:TextBlock- FontTypography="Caption"- Foreground="{DynamicResource TextFillColorInverseBrush}"- Text="{Binding FormattedSize}"- />- <ui:TextBlock- Margin="6,0,6,0"- FontTypography="Caption"- Foreground="{DynamicResource TextFillColorInverseBrush}"- Opacity="0.8"- Text="•"- />- <ui:TextBlock- FontTypography="Caption"- Foreground="{DynamicResource TextFillColorInverseBrush}"- Text="{ext:Loc DiskCleanup.FilesCount,- {Binding FileCount}}"- />- </StackPanel>- </Border>- <Border>- <Border.Style>- <Style TargetType="Border">- <Setter Property="Visibility" Value="Collapsed" />- <Style.Triggers>- <DataTrigger Binding="{Binding FormattedSize}" Value="0 B">- <Setter Property="Visibility" Value="Visible" />- </DataTrigger>- </Style.Triggers>- </Style>- </Border.Style>- <ui:TextBlock- FontTypography="Caption"- Foreground="{DynamicResource TextFillColorSecondaryBrush}"- Text="{ext:Loc DiskCleanup.EmptySize}"- />- </Border>- </Grid>- </Border>- </StackPanel>+ <!-- Info Section -->+ <StackPanel Grid.Column="2" VerticalAlignment="Center">+ <!-- Clickable Name -->+ <ui:HyperlinkButton+ Command="{Binding DataContext.ViewModel.OpenFolderCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}"+ CommandParameter="{Binding}"+ IsEnabled="{Binding CanOpenFolder}"+ Style="{StaticResource ClickableNameStyle}">- <!-- Scanning / Cleaning spinners -->- <StackPanel- Grid.Column="3"- Margin="14,0,0,0"- HorizontalAlignment="Right"- VerticalAlignment="Center"- >- <ui:ProgressRing- Width="22"- Height="22"- IsIndeterminate="True"- Visibility="{Binding IsScanning, Converter={StaticResource BooleanToVisibilityConverter}}"- />- <ui:ProgressRing- Width="22"- Height="22"- IsIndeterminate="True"- Visibility="{Binding IsCleaning, Converter={StaticResource BooleanToVisibilityConverter}}"- />- </StackPanel>- </Grid>- </Border>- </DataTemplate>- </ItemsControl.ItemTemplate>- </ItemsControl>- </Grid>- </Border>- </Grid>++ <StackPanel Orientation="Horizontal">+ <TextBlock+ Margin="0,0,5,0"+ VerticalAlignment="Center"+ Text="{Binding Name}" />+ <ui:SymbolIcon+ VerticalAlignment="Center"+ Symbol="Open24"+ Visibility="{Binding CanOpenFolder, Converter={StaticResource BooleanToVisibilityConverter}}" />+ </StackPanel>+++ </ui:HyperlinkButton>++ <!-- Description -->+ <ui:TextBlock+ Margin="0,2,0,0"+ FontTypography="Caption"+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ Text="{Binding Description}"+ TextWrapping="Wrap" />++ <!-- Path (truncated) -->+ <ui:TextBlock+ Margin="0,2,0,0"+ FontTypography="Caption"+ Foreground="{DynamicResource TextFillColorDisabledBrush}"+ Text="{Binding Path}"+ TextTrimming="CharacterEllipsis"+ ToolTip="{Binding Path}" />++ <!-- Size Badge -->+ <Border+ Margin="0,6,0,0"+ HorizontalAlignment="Left"+ CornerRadius="6">+ <Border.Style>+ <Style TargetType="Border">+ <Setter Property="Padding" Value="8,3" />+ <Setter Property="Background" Value="{Binding SizeBytes, Converter={StaticResource SizeToBrushConverter}}" />+ <Setter Property="Visibility" Value="Collapsed" />+ <Style.Triggers>+ <DataTrigger Binding="{Binding IsScanned}" Value="True">+ <Setter Property="Visibility" Value="Visible" />+ </DataTrigger>+ </Style.Triggers>+ </Style>+ </Border.Style>+ <Grid>+ <!-- Normal size display -->+ <StackPanel Orientation="Horizontal">+ <StackPanel.Style>+ <Style TargetType="StackPanel">+ <Setter Property="Visibility" Value="Visible" />+ <Style.Triggers>+ <DataTrigger Binding="{Binding FormattedSize}" Value="0 B">+ <Setter Property="Visibility" Value="Collapsed" />+ </DataTrigger>+ </Style.Triggers>+ </Style>+ </StackPanel.Style>+ <ui:TextBlock+ FontTypography="Caption"+ FontWeight="SemiBold"+ Foreground="{DynamicResource TextFillColorInverseBrush}"+ Text="{Binding FormattedSize}" />+ <ui:TextBlock+ Margin="6,0"+ FontTypography="Caption"+ Foreground="{DynamicResource TextFillColorInverseBrush}"+ Opacity="0.7"+ Text="•" />+ <ui:TextBlock+ FontTypography="Caption"+ Foreground="{DynamicResource TextFillColorInverseBrush}"+ Text="{ext:Loc DiskCleanup.FilesCount,+ {Binding FileCount}}" />+ </StackPanel>+ <!-- Empty state -->+ <ui:TextBlock+ FontTypography="Caption"+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ Text="{ext:Loc DiskCleanup.EmptySize}">+ <ui:TextBlock.Style>+ <Style TargetType="ui:TextBlock">+ <Setter Property="Visibility" Value="Collapsed" />+ <Style.Triggers>+ <DataTrigger Binding="{Binding FormattedSize}" Value="0 B">+ <Setter Property="Visibility" Value="Visible" />+ </DataTrigger>+ </Style.Triggers>+ </Style>+ </ui:TextBlock.Style>+ </ui:TextBlock>+ </Grid>+ </Border>+ </StackPanel>++ <!-- Status Icons -->+ <StackPanel+ Grid.Column="3"+ Margin="12,0,0,0"+ VerticalAlignment="Center">+ <ui:ProgressRing+ Width="20"+ Height="20"+ IsIndeterminate="True"+ Visibility="{Binding IsScanning, Converter={StaticResource BooleanToVisibilityConverter}}" />+ <ui:ProgressRing+ Width="20"+ Height="20"+ Foreground="{DynamicResource SystemFillColorSuccessBrush}"+ IsIndeterminate="True"+ Visibility="{Binding IsCleaning, Converter={StaticResource BooleanToVisibilityConverter}}" />+ </StackPanel>+ </Grid>+ </Border>+ </DataTemplate>+ </ItemsControl.ItemTemplate>+ </ItemsControl>+ </Grid>+ </Grid></Page>diff --git a/optimizerDuck/UI/Pages/Features/Categories/FeatureCategoryPage.xaml b/optimizerDuck/UI/Pages/Features/Categories/FeatureCategoryPage.xamlindex 53b00d5..9ea972e 100644--- a/optimizerDuck/UI/Pages/Features/Categories/FeatureCategoryPage.xaml+++ b/optimizerDuck/UI/Pages/Features/Categories/FeatureCategoryPage.xaml@@ -1,175 +1,183 @@<Page- x:Class="optimizerDuck.UI.Pages.Features.FeatureCategoryPage"- xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"- xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"- xmlns:converters="clr-namespace:optimizerDuck.Common.Converters"- xmlns:d="http://schemas.microsoft.com/expression/blend/2008"- xmlns:ext="clr-namespace:optimizerDuck.Common.Extensions"- xmlns:features="clr-namespace:optimizerDuck.UI.Pages.Features"- xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"- xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"- Title="{Binding ViewModel.CategoryName}"- Margin="0,32,0,0"- d:DataContext="{d:DesignInstance features:FeatureCategoryPage}"- d:DesignHeight="650"- d:DesignWidth="800"- ui:Design.Background="Black"- ui:Design.Foreground="White"- Foreground="{DynamicResource TextFillColorPrimaryBrush}"- ScrollViewer.CanContentScroll="False"- mc:Ignorable="d"+ x:Class="optimizerDuck.UI.Pages.Features.FeatureCategoryPage"+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"+ xmlns:converters="clr-namespace:optimizerDuck.Common.Converters"+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"+ xmlns:ext="clr-namespace:optimizerDuck.Common.Extensions"+ xmlns:features="clr-namespace:optimizerDuck.UI.Pages.Features"+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"+ xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"+ Title="{Binding ViewModel.CategoryName}"+ Margin="0,32,0,0"+ d:DataContext="{d:DesignInstance features:FeatureCategoryPage}"+ d:DesignHeight="650"+ d:DesignWidth="800"+ ui:Design.Background="Black"+ ui:Design.Foreground="White"+ Foreground="{DynamicResource TextFillColorPrimaryBrush}"+ ScrollViewer.CanContentScroll="False"+ mc:Ignorable="d">- <Page.Resources>- <converters:BooleanToVisibilityConverter x:Key="BoolToVisibilityConverter" />- </Page.Resources>+ <Page.Resources>+ <converters:BooleanToVisibilityConverter x:Key="BoolToVisibilityConverter" />+ </Page.Resources>- <Grid>- <Grid.RowDefinitions>- <RowDefinition Height="Auto" />- <RowDefinition Height="Auto" />- <RowDefinition Height="*" />- </Grid.RowDefinitions>+ <Grid>+ <Grid.RowDefinitions>+ <RowDefinition Height="Auto" />+ <RowDefinition Height="Auto" />+ <RowDefinition Height="*" />+ </Grid.RowDefinitions>- <StackPanel Grid.Row="0" Margin="0,0,0,16">- <StackPanel Margin="0,0,0,8" Orientation="Horizontal">- <ui:SymbolIcon- Margin="0,0,12,0"- VerticalAlignment="Center"- FontSize="24"- Symbol="{Binding ViewModel.CategoryIcon}"- />- <ui:TextBlock- VerticalAlignment="Center"- FontTypography="Title"- Text="{Binding ViewModel.CategoryName}"- />- </StackPanel>- <ui:TextBlock- Appearance="Secondary"- Text="{Binding ViewModel.CategoryDescription}"- TextWrapping="Wrap"- />- </StackPanel>-- <WrapPanel Grid.Row="1" Margin="0,0,0,16" Orientation="Horizontal">- <ui:TextBox- MinWidth="200"- Margin="0,0,8,0"- HorizontalAlignment="Left"- VerticalAlignment="Center"- Icon="{ui:SymbolIcon Search24}"- PlaceholderText="{ext:Loc Common.Search.Placeholder}"- Text="{Binding ViewModel.SearchText, UpdateSourceTrigger=PropertyChanged}"- />-- <ComboBox- Margin="0,0,8,0"- VerticalAlignment="Center"- SelectedIndex="{Binding ViewModel.SelectedSortByIndex}"- ToolTip="{ext:Loc Common.SortBy}"- ToolTipService.BetweenShowDelay="160"- ToolTipService.Placement="Top"- >- <ComboBoxItem HorizontalContentAlignment="Left">- <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">- <ui:SymbolIcon- Margin="0,0,6,0"- HorizontalAlignment="Left"- Symbol="TextSortAscending24"- />- <TextBlock- Grid.Column="1"- HorizontalAlignment="Left"- Text="{ext:Loc Common.SortBy.Name}"+ <StackPanel Grid.Row="0" Margin="0,0,0,16">+ <StackPanel Margin="0,0,0,8" Orientation="Horizontal">+ <ui:SymbolIcon+ Margin="0,0,12,0"+ VerticalAlignment="Center"+ FontSize="24"+ Symbol="{Binding ViewModel.CategoryIcon}"+ />+ <ui:TextBlock+ VerticalAlignment="Center"+ FontTypography="Title"+ Text="{Binding ViewModel.CategoryName}"+ />+ </StackPanel>+ <ui:TextBlock+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ Text="{Binding ViewModel.CategoryDescription}"+ TextWrapping="Wrap"/>- </Grid>- </ComboBoxItem>- <ComboBoxItem HorizontalContentAlignment="Left">- <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">- <ui:SymbolIcon Margin="0,0,6,0" HorizontalAlignment="Left" Symbol="ToggleRight24" />- <TextBlock- Grid.Column="1"- HorizontalAlignment="Left"- Text="{ext:Loc Common.SortBy.Status}"+ </StackPanel>++ <WrapPanel Grid.Row="1" Margin="0,0,0,16" Orientation="Horizontal">+ <ui:TextBox+ MinWidth="200"+ Margin="0,0,8,0"+ HorizontalAlignment="Left"+ VerticalAlignment="Center"+ Icon="{ui:SymbolIcon Search24}"+ PlaceholderText="{ext:Loc Common.Search.Placeholder}"+ Text="{Binding ViewModel.SearchText, UpdateSourceTrigger=PropertyChanged}"/>- </Grid>- </ComboBoxItem>- </ComboBox>- </WrapPanel>- <ScrollViewer- Grid.Row="2"- HorizontalScrollBarVisibility="Disabled"- VerticalScrollBarVisibility="Auto"- >- <!-- Sections -->- <ItemsControl Margin="0,0,16,0" ItemsSource="{Binding ViewModel.Sections}">- <ItemsControl.ItemTemplate>- <DataTemplate>- <StackPanel Margin="0,0,0,10">- <ui:TextBlock Margin="0,0,0,6" FontTypography="BodyStrong" Text="{Binding Name}" />- <ItemsControl ItemsSource="{Binding Features}">+ <ComboBox+ Margin="0,0,8,0"+ VerticalAlignment="Center"+ SelectedIndex="{Binding ViewModel.SelectedSortByIndex}"+ ToolTip="{ext:Loc Common.SortBy}"+ ToolTipService.BetweenShowDelay="160"+ ToolTipService.Placement="Top"+ >+ <ComboBoxItem HorizontalContentAlignment="Left">+ <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">+ <ui:SymbolIcon+ Margin="0,0,6,0"+ HorizontalAlignment="Left"+ Symbol="TextSortAscending24"+ />+ <TextBlock+ Grid.Column="1"+ HorizontalAlignment="Left"+ Text="{ext:Loc Common.SortBy.Name}"+ />+ </Grid>+ </ComboBoxItem>+ <ComboBoxItem HorizontalContentAlignment="Left">+ <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">+ <ui:SymbolIcon+ Margin="0,0,6,0"+ HorizontalAlignment="Left"+ Symbol="ToggleRight24"+ />+ <TextBlock+ Grid.Column="1"+ HorizontalAlignment="Left"+ Text="{ext:Loc Common.SortBy.Status}"+ />+ </Grid>+ </ComboBoxItem>+ </ComboBox>+ </WrapPanel>++ <ScrollViewer+ Grid.Row="2"+ HorizontalScrollBarVisibility="Disabled"+ VerticalScrollBarVisibility="Auto"+ >+ <!-- Sections -->+ <ItemsControl Margin="0,0,16,0" ItemsSource="{Binding ViewModel.Sections}"><ItemsControl.ItemTemplate>- <DataTemplate>- <ui:CardControl Margin="0,0,0,4">- <ui:CardControl.Icon>- <ui:SymbolIcon Symbol="{Binding Icon}" />- </ui:CardControl.Icon>- <ui:CardControl.Header>- <StackPanel VerticalAlignment="Center">- <ui:TextBlock- FontTypography="Body"- Text="{Binding Name}"- TextWrapping="Wrap"- />- <ui:TextBlock- Margin="0,4,0,0"- Appearance="Secondary"- FontTypography="Caption"- Text="{Binding Description}"- TextTrimming="WordEllipsis"- TextWrapping="Wrap"- />+ <DataTemplate>+ <StackPanel Margin="0,0,0,10">+ <ui:TextBlock+ Margin="0,0,0,6"+ FontTypography="BodyStrong"+ Text="{Binding Name}"+ />+ <ItemsControl ItemsSource="{Binding Features}">+ <ItemsControl.ItemTemplate>+ <DataTemplate>+ <ui:CardControl Margin="0,0,0,4">+ <ui:CardControl.Icon>+ <ui:SymbolIcon Symbol="{Binding Icon}" />+ </ui:CardControl.Icon>+ <ui:CardControl.Header>+ <StackPanel VerticalAlignment="Center">+ <ui:TextBlock+ FontTypography="Body"+ Text="{Binding Name}"+ TextWrapping="Wrap"+ />+ <ui:TextBlock+ Margin="0,4,0,0"+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ FontTypography="Caption"+ Text="{Binding Description}"+ TextTrimming="WordEllipsis"+ TextWrapping="Wrap"+ />+ </StackPanel>+ </ui:CardControl.Header>+ <ui:ToggleSwitch+ HorizontalAlignment="Right"+ VerticalAlignment="Center"+ Command="{Binding ToggleCommand}"+ Cursor="Hand"+ IsChecked="{Binding IsEnabled, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"+ OffContent="{ext:Loc Common.Toggle.Off}"+ OnContent="{ext:Loc Common.Toggle.On}"+ />+ </ui:CardControl>+ </DataTemplate>+ </ItemsControl.ItemTemplate>+ </ItemsControl></StackPanel>- </ui:CardControl.Header>- <ui:ToggleSwitch- HorizontalAlignment="Right"- VerticalAlignment="Center"- Command="{Binding ToggleCommand}"- Cursor="Hand"- IsChecked="{Binding IsEnabled, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"- OffContent="{ext:Loc Common.Toggle.Off}"- OnContent="{ext:Loc Common.Toggle.On}"- />- </ui:CardControl>- </DataTemplate>+ </DataTemplate></ItemsControl.ItemTemplate>- </ItemsControl>- </StackPanel>- </DataTemplate>- </ItemsControl.ItemTemplate>- </ItemsControl>- </ScrollViewer>+ </ItemsControl>+ </ScrollViewer>- <Border- Grid.Row="2"- Visibility="{Binding ViewModel.IsLoading, Converter={StaticResource BoolToVisibilityConverter}}"- >- <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">- <ui:ProgressRing- Width="48"- Height="48"- Margin="0,0,0,16"- HorizontalAlignment="Center"- VerticalAlignment="Center"- IsIndeterminate="True"- />- <ui:TextBlock- HorizontalAlignment="Center"- FontTypography="BodyStrong"- Text="{ext:Loc Features.Loading}"- />- </StackPanel>- </Border>- </Grid>+ <Border+ Grid.Row="2"+ Visibility="{Binding ViewModel.IsLoading, Converter={StaticResource BoolToVisibilityConverter}}"+ >+ <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">+ <ui:ProgressRing+ Width="48"+ Height="48"+ Margin="0,0,0,16"+ HorizontalAlignment="Center"+ VerticalAlignment="Center"+ IsIndeterminate="True"+ />+ <ui:TextBlock+ HorizontalAlignment="Center"+ FontTypography="BodyStrong"+ Text="{ext:Loc Features.Loading}"+ />+ </StackPanel>+ </Border>+ </Grid></Page>diff --git a/optimizerDuck/UI/Pages/Features/FeaturesPage.xaml b/optimizerDuck/UI/Pages/Features/FeaturesPage.xamlindex 577d4a4..5646601 100644--- a/optimizerDuck/UI/Pages/Features/FeaturesPage.xaml+++ b/optimizerDuck/UI/Pages/Features/FeaturesPage.xaml@@ -1,131 +1,134 @@<Page- Foreground="{DynamicResource TextFillColorPrimaryBrush}"- Margin="0,32,0,0"- ScrollViewer.CanContentScroll="False"- Title="Features"- d:DataContext="{d:DesignInstance pages:FeaturesPage}"- d:DesignHeight="650"- d:DesignWidth="800"- mc:Ignorable="d"- ui:Design.Background="Black"- ui:Design.Foreground="White"- x:Class="optimizerDuck.UI.Pages.FeaturesPage"- xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"- xmlns:converters="clr-namespace:optimizerDuck.Common.Converters"- xmlns:d="http://schemas.microsoft.com/expression/blend/2008"- xmlns:ext="clr-namespace:optimizerDuck.Common.Extensions"- xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"- xmlns:pages="clr-namespace:optimizerDuck.UI.Pages"- xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"- xmlns:vm="clr-namespace:optimizerDuck.UI.ViewModels.Pages"- xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"+ Foreground="{DynamicResource TextFillColorPrimaryBrush}"+ Margin="0,32,0,0"+ ScrollViewer.CanContentScroll="False"+ Title="Features"+ d:DataContext="{d:DesignInstance pages:FeaturesPage}"+ d:DesignHeight="650"+ d:DesignWidth="800"+ mc:Ignorable="d"+ ui:Design.Background="Black"+ ui:Design.Foreground="White"+ x:Class="optimizerDuck.UI.Pages.FeaturesPage"+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"+ xmlns:converters="clr-namespace:optimizerDuck.Common.Converters"+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"+ xmlns:ext="clr-namespace:optimizerDuck.Common.Extensions"+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"+ xmlns:pages="clr-namespace:optimizerDuck.UI.Pages"+ xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"+ xmlns:vm="clr-namespace:optimizerDuck.UI.ViewModels.Pages"+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">- <Page.Resources>- <converters:BooleanToVisibilityConverter x:Key="BoolToVisibilityConverter" />- <converters:WidthToColumnConverter x:Key="WidthToColumnConverter" />- </Page.Resources>+ <Page.Resources>+ <converters:BooleanToVisibilityConverter x:Key="BoolToVisibilityConverter" />+ <converters:WidthToColumnConverter x:Key="WidthToColumnConverter" />+ </Page.Resources>- <Grid>- <Grid.RowDefinitions>- <RowDefinition Height="Auto" />- <RowDefinition Height="*" />- </Grid.RowDefinitions>+ <Grid>+ <Grid.RowDefinitions>+ <RowDefinition Height="Auto" />+ <RowDefinition Height="*" />+ </Grid.RowDefinitions>- <StackPanel Grid.Row="0" Margin="42,0,42,16">- <ui:TextBlock FontTypography="Title" Margin="0,0,0,8" Text="{ext:Loc Features.Title}" />- <ui:TextBlock- Appearance="Secondary"- Text="{ext:Loc Features.Description}"- TextWrapping="Wrap"- />- </StackPanel>+ <StackPanel Grid.Row="0" Margin="42,0,42,16">+ <ui:TextBlock FontTypography="Title" Margin="0,0,0,8" Text="{ext:Loc Features.Title}" />+ <ui:TextBlock+ Appearance="Secondary"+ Text="{ext:Loc Features.Description}"+ TextWrapping="Wrap"+ />+ </StackPanel>- <ui:VirtualizingItemsControl- Grid.Row="1"- ItemsSource="{Binding ViewModel.Categories}"- Margin="42,0,42,0"- >- <ui:VirtualizingItemsControl.Template>- <ControlTemplate TargetType="ItemsControl">- <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">- <ItemsPresenter />- </ScrollViewer>- </ControlTemplate>- </ui:VirtualizingItemsControl.Template>+ <ui:VirtualizingItemsControl+ Grid.Row="1"+ ItemsSource="{Binding ViewModel.Categories}"+ Margin="42,0,42,0"+ >+ <ui:VirtualizingItemsControl.Template>+ <ControlTemplate TargetType="ItemsControl">+ <ScrollViewer+ HorizontalScrollBarVisibility="Disabled"+ VerticalScrollBarVisibility="Auto"+ >+ <ItemsPresenter />+ </ScrollViewer>+ </ControlTemplate>+ </ui:VirtualizingItemsControl.Template>- <ui:VirtualizingItemsControl.ItemsPanel>- <ItemsPanelTemplate>- <UniformGrid- Columns="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=ScrollViewer}, Converter={StaticResource WidthToColumnConverter}}"- VerticalAlignment="Top"- />- </ItemsPanelTemplate>- </ui:VirtualizingItemsControl.ItemsPanel>+ <ui:VirtualizingItemsControl.ItemsPanel>+ <ItemsPanelTemplate>+ <UniformGrid+ Columns="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=ScrollViewer}, Converter={StaticResource WidthToColumnConverter}}"+ VerticalAlignment="Top"+ />+ </ItemsPanelTemplate>+ </ui:VirtualizingItemsControl.ItemsPanel>- <ui:VirtualizingItemsControl.ItemContainerStyle>- <Style TargetType="ContentPresenter">- <Setter Property="Margin" Value="5" />- <Setter Property="HorizontalAlignment" Value="Stretch" />- </Style>- </ui:VirtualizingItemsControl.ItemContainerStyle>+ <ui:VirtualizingItemsControl.ItemContainerStyle>+ <Style TargetType="ContentPresenter">+ <Setter Property="Margin" Value="5" />+ <Setter Property="HorizontalAlignment" Value="Stretch" />+ </Style>+ </ui:VirtualizingItemsControl.ItemContainerStyle>- <ui:VirtualizingItemsControl.ItemTemplate>- <DataTemplate DataType="{x:Type vm:FeatureCategoryItemViewModel}">- <ui:CardAction- Command="{Binding DataContext.ViewModel.NavigateToCategoryCommand, RelativeSource={RelativeSource AncestorType=Page}}"- CommandParameter="{Binding}"- IsChevronVisible="False"- Padding="20,16"- >- <Grid RowDefinitions="Auto,Auto,Auto">- <ui:SymbolIcon- FontSize="32"- Grid.Row="0"- HorizontalAlignment="Left"- Margin="0,0,0,12"- Symbol="{Binding Icon}"- />+ <ui:VirtualizingItemsControl.ItemTemplate>+ <DataTemplate DataType="{x:Type vm:FeatureCategoryItemViewModel}">+ <ui:CardAction+ Command="{Binding DataContext.ViewModel.NavigateToCategoryCommand, RelativeSource={RelativeSource AncestorType=Page}}"+ CommandParameter="{Binding}"+ IsChevronVisible="False"+ Padding="20,16"+ >+ <Grid RowDefinitions="Auto,Auto,Auto">+ <ui:SymbolIcon+ FontSize="32"+ Grid.Row="0"+ HorizontalAlignment="Left"+ Margin="0,0,0,12"+ Symbol="{Binding Icon}"+ />- <ui:TextBlock- FontTypography="Subtitle"- Grid.Row="1"- Margin="0,0,0,6"- Text="{Binding Name}"- TextWrapping="Wrap"- />+ <ui:TextBlock+ FontTypography="Subtitle"+ Grid.Row="1"+ Margin="0,0,0,6"+ Text="{Binding Name}"+ TextWrapping="Wrap"+ />- <ui:TextBlock- Appearance="Secondary"- FontTypography="Body"- Grid.Row="2"- Text="{Binding Description}"- TextWrapping="Wrap"- />- </Grid>- </ui:CardAction>- </DataTemplate>- </ui:VirtualizingItemsControl.ItemTemplate>- </ui:VirtualizingItemsControl>+ <ui:TextBlock+ Appearance="Secondary"+ FontTypography="Body"+ Grid.Row="2"+ Text="{Binding Description}"+ TextWrapping="Wrap"+ />+ </Grid>+ </ui:CardAction>+ </DataTemplate>+ </ui:VirtualizingItemsControl.ItemTemplate>+ </ui:VirtualizingItemsControl>- <Border- Grid.Row="1"- Visibility="{Binding ViewModel.IsLoading, Converter={StaticResource BoolToVisibilityConverter}}"- >- <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">- <ui:ProgressRing- Height="48"- HorizontalAlignment="Center"- IsIndeterminate="True"- Margin="0,0,0,16"- VerticalAlignment="Center"- Width="48"- />- <ui:TextBlock- FontTypography="BodyStrong"- HorizontalAlignment="Center"- Text="{ext:Loc ToggleFeatures.Loading}"- />- </StackPanel>- </Border>- </Grid>+ <Border+ Grid.Row="1"+ Visibility="{Binding ViewModel.IsLoading, Converter={StaticResource BoolToVisibilityConverter}}"+ >+ <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">+ <ui:ProgressRing+ Height="48"+ HorizontalAlignment="Center"+ IsIndeterminate="True"+ Margin="0,0,0,16"+ VerticalAlignment="Center"+ Width="48"+ />+ <ui:TextBlock+ FontTypography="BodyStrong"+ HorizontalAlignment="Center"+ Text="{ext:Loc ToggleFeatures.Loading}"+ />+ </StackPanel>+ </Border>+ </Grid></Page>diff --git a/optimizerDuck/UI/Pages/Optimize/Categories/OptimizationPage.xaml b/optimizerDuck/UI/Pages/Optimize/Categories/OptimizationPage.xamlindex 234eecc..3105f71 100644--- a/optimizerDuck/UI/Pages/Optimize/Categories/OptimizationPage.xaml+++ b/optimizerDuck/UI/Pages/Optimize/Categories/OptimizationPage.xaml@@ -1,451 +1,490 @@<Page- x:Class="optimizerDuck.UI.Pages.Optimizations.OptimizationPage"- xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"- xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"- xmlns:converters="clr-namespace:optimizerDuck.Common.Converters"- xmlns:d="http://schemas.microsoft.com/expression/blend/2008"- xmlns:ext="clr-namespace:optimizerDuck.Common.Extensions"- xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"- xmlns:optimization="clr-namespace:optimizerDuck.Domain.Optimizations.Models"- xmlns:optimizations="clr-namespace:optimizerDuck.UI.Pages.Optimizations"- xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"- Title="OptimizationPage"- Margin="0,32,0,0"- d:DataContext="{d:DesignInstance optimizations:OptimizationPage}"- d:DesignHeight="650"- d:DesignWidth="800"- ui:Design.Background="Black"- ui:Design.Foreground="White"- Foreground="{DynamicResource TextFillColorPrimaryBrush}"- ScrollViewer.CanContentScroll="False"- mc:Ignorable="d"+ x:Class="optimizerDuck.UI.Pages.Optimizations.OptimizationPage"+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"+ xmlns:converters="clr-namespace:optimizerDuck.Common.Converters"+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"+ xmlns:ext="clr-namespace:optimizerDuck.Common.Extensions"+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"+ xmlns:optimization="clr-namespace:optimizerDuck.Domain.Optimizations.Models"+ xmlns:optimizations="clr-namespace:optimizerDuck.UI.Pages.Optimizations"+ xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"+ Title="OptimizationPage"+ Margin="0,32,0,0"+ d:DataContext="{d:DesignInstance optimizations:OptimizationPage}"+ d:DesignHeight="650"+ d:DesignWidth="800"+ ui:Design.Background="Black"+ ui:Design.Foreground="White"+ Foreground="{DynamicResource TextFillColorPrimaryBrush}"+ ScrollViewer.CanContentScroll="False"+ mc:Ignorable="d">- <Page.Resources>- <converters:WidthToColumnConverter x:Key="WidthToColumnConverter" />- <converters:ZeroToVisibilityConverter x:Key="ZeroToVisibilityConverter" />- <converters:GreaterThanZeroToVisibilityConverter x:Key="GreaterThanZeroToVisibilityConverter" />- <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />- <converters:BooleanToVisibilityConverter- x:Key="InverseBooleanToVisibilityConverter"- False="Visible"- True="Collapsed"- />- <converters:NullToVisibilityConverter- x:Key="NullToVisibilityConverter"- False="Visible"- True="Collapsed"- />- </Page.Resources>-- <Grid>- <!-- Main Content -->- <Grid- RowDefinitions="Auto,*"- Visibility="{Binding ViewModel.IsLoading, Converter={StaticResource InverseBooleanToVisibilityConverter}}"- >- <!-- Toolbar -->- <WrapPanel Grid.Row="0" Margin="5,0,5,10" VerticalAlignment="Center" Orientation="Horizontal">- <!-- Search -->- <ui:TextBox- MinWidth="200"- Margin="0,0,8,0"- VerticalAlignment="Center"- Icon="{ui:SymbolIcon Search24}"- PlaceholderText="{ext:Loc Common.Search.Placeholder}"- Text="{Binding ViewModel.SearchText, UpdateSourceTrigger=PropertyChanged}"+ <Page.Resources>+ <converters:WidthToColumnConverter x:Key="WidthToColumnConverter" />+ <converters:ZeroToVisibilityConverter x:Key="ZeroToVisibilityConverter" />+ <converters:GreaterThanZeroToVisibilityConverter x:Key="GreaterThanZeroToVisibilityConverter" />+ <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />+ <converters:BooleanToVisibilityConverter+ x:Key="InverseBooleanToVisibilityConverter"+ False="Visible"+ True="Collapsed"/>+ <converters:NullToVisibilityConverter+ x:Key="NullToVisibilityConverter"+ False="Visible"+ True="Collapsed"+ />+ </Page.Resources>- <!-- Filter by Risk -->- <ComboBox- Margin="0,0,8,0"- VerticalAlignment="Center"- SelectedIndex="{Binding ViewModel.SelectedRiskFilterIndex}"- ToolTip="{ext:Loc Common.Filter}"- ToolTipService.BetweenShowDelay="160"- ToolTipService.Placement="Top"- >- <ComboBoxItem HorizontalContentAlignment="Left">- <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">- <ui:SymbolIcon Margin="0,0,6,0" HorizontalAlignment="Left" Symbol="Filter24" />- <TextBlock- Grid.Column="1"- HorizontalAlignment="Left"- Text="{ext:Loc Common.Filter.All}"- />- </Grid>- </ComboBoxItem>- <ComboBoxItem HorizontalContentAlignment="Left">- <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">- <ui:SymbolIcon- Margin="0,0,6,0"- Foreground="{DynamicResource SystemFillColorSuccessBrush}"- Symbol="ShieldCheckmark24"- />- <TextBlock Grid.Column="1" Text="{ext:Loc Optimizer.UI.Risk.Safe}" />- </Grid>- </ComboBoxItem>- <ComboBoxItem HorizontalContentAlignment="Left">- <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">- <ui:SymbolIcon- Margin="0,0,6,0"- Foreground="{DynamicResource SystemFillColorCautionBrush}"- Symbol="Warning24"- />- <TextBlock Grid.Column="1" Text="{ext:Loc Optimizer.UI.Risk.Moderate}" />- </Grid>- </ComboBoxItem>- <ComboBoxItem HorizontalContentAlignment="Left">- <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">- <ui:SymbolIcon- Margin="0,0,6,0"- Foreground="{DynamicResource SystemFillColorCriticalBrush}"- Symbol="ShieldError24"- />- <TextBlock Grid.Column="1" Text="{ext:Loc Optimizer.UI.Risk.Risky}" />- </Grid>- </ComboBoxItem>- </ComboBox>-- <!-- Sort By -->- <ComboBox- Margin="0,0,8,0"- VerticalAlignment="Center"- SelectedIndex="{Binding ViewModel.SelectedSortByIndex}"- ToolTip="{ext:Loc Common.SortBy}"- ToolTipService.BetweenShowDelay="160"- ToolTipService.Placement="Top"+ <Grid>+ <!-- Main Content -->+ <Grid+ RowDefinitions="Auto,*"+ Visibility="{Binding ViewModel.IsLoading, Converter={StaticResource InverseBooleanToVisibilityConverter}}">- <ComboBoxItem HorizontalContentAlignment="Left">- <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">- <ui:SymbolIcon Margin="0,0,6,0" HorizontalAlignment="Left" Symbol="Filter24" />- <TextBlock Grid.Column="1" HorizontalAlignment="Left">- <Run Text="{ext:Loc Common.SortBy.Risk}" />- <Run Text=" & " />- <Run Text="{ext:Loc Common.SortBy.Status}" />- </TextBlock>- </Grid>- </ComboBoxItem>- <ComboBoxItem HorizontalContentAlignment="Left">- <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">- <ui:SymbolIcon- Margin="0,0,6,0"- HorizontalAlignment="Left"- Symbol="TextSortAscending24"- />- <TextBlock- Grid.Column="1"- HorizontalAlignment="Left"- Text="{ext:Loc Common.SortBy.Name}"- />- </Grid>- </ComboBoxItem>- <ComboBoxItem HorizontalContentAlignment="Left">- <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">- <ui:SymbolIcon Margin="0,0,6,0" HorizontalAlignment="Left" Symbol="Shield24" />- <TextBlock- Grid.Column="1"- HorizontalAlignment="Left"- Text="{ext:Loc Common.SortBy.Risk}"- />- </Grid>- </ComboBoxItem>- <ComboBoxItem HorizontalContentAlignment="Left">- <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">- <ui:SymbolIcon Margin="0,0,6,0" HorizontalAlignment="Left" Symbol="ToggleRight24" />- <TextBlock- Grid.Column="1"- HorizontalAlignment="Left"- Text="{ext:Loc Common.SortBy.Status}"- />- </Grid>- </ComboBoxItem>- </ComboBox>+ <!-- Toolbar -->+ <WrapPanel+ Grid.Row="0"+ Margin="5,0,5,10"+ VerticalAlignment="Center"+ Orientation="Horizontal"+ >+ <!-- Search -->+ <ui:TextBox+ MinWidth="200"+ Margin="0,0,8,0"+ VerticalAlignment="Center"+ Icon="{ui:SymbolIcon Search24}"+ PlaceholderText="{ext:Loc Common.Search.Placeholder}"+ Text="{Binding ViewModel.SearchText, UpdateSourceTrigger=PropertyChanged}"+ />- <!-- Hide Applied toggle -->- <ToggleButton- Margin="0,0,0,0"- VerticalAlignment="Stretch"- IsChecked="{Binding ViewModel.HideApplied}"- Visibility="{Binding ViewModel.HasAppliedOptimizations, Converter={StaticResource BooleanToVisibilityConverter}}"- >- <StackPanel Orientation="Horizontal">- <ui:SymbolIcon Margin="0,0,6,0" Symbol="EyeOff24" />- <TextBlock Text="{ext:Loc Optimizer.Menu.HideApplied}" />- </StackPanel>- </ToggleButton>- </WrapPanel>+ <!-- Filter by Risk -->+ <ComboBox+ Margin="0,0,8,0"+ VerticalAlignment="Center"+ SelectedIndex="{Binding ViewModel.SelectedRiskFilterIndex}"+ ToolTip="{ext:Loc Common.Filter}"+ ToolTipService.BetweenShowDelay="160"+ ToolTipService.Placement="Top"+ >+ <ComboBoxItem HorizontalContentAlignment="Left">+ <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">+ <ui:SymbolIcon+ Margin="0,0,6,0"+ HorizontalAlignment="Left"+ Symbol="Filter24"+ />+ <TextBlock+ Grid.Column="1"+ HorizontalAlignment="Left"+ Text="{ext:Loc Common.Filter.All}"+ />+ </Grid>+ </ComboBoxItem>+ <ComboBoxItem HorizontalContentAlignment="Left">+ <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">+ <ui:SymbolIcon+ Margin="0,0,6,0"+ Foreground="{DynamicResource SystemFillColorSuccessBrush}"+ Symbol="ShieldCheckmark24"+ />+ <TextBlock Grid.Column="1" Text="{ext:Loc Optimizer.UI.Risk.Safe}" />+ </Grid>+ </ComboBoxItem>+ <ComboBoxItem HorizontalContentAlignment="Left">+ <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">+ <ui:SymbolIcon+ Margin="0,0,6,0"+ Foreground="{DynamicResource SystemFillColorCautionBrush}"+ Symbol="Warning24"+ />+ <TextBlock+ Grid.Column="1"+ Text="{ext:Loc Optimizer.UI.Risk.Moderate}"+ />+ </Grid>+ </ComboBoxItem>+ <ComboBoxItem HorizontalContentAlignment="Left">+ <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">+ <ui:SymbolIcon+ Margin="0,0,6,0"+ Foreground="{DynamicResource SystemFillColorCriticalBrush}"+ Symbol="ShieldError24"+ />+ <TextBlock Grid.Column="1" Text="{ext:Loc Optimizer.UI.Risk.Risky}" />+ </Grid>+ </ComboBoxItem>+ </ComboBox>- <!-- No search results -->- <StackPanel- Grid.Row="1"- HorizontalAlignment="Center"- VerticalAlignment="Center"- Visibility="{Binding ViewModel.Optimizations.Count, Converter={StaticResource ZeroToVisibilityConverter}}"- >- <ui:SymbolIcon- Margin="0,0,0,10"- HorizontalAlignment="Center"- FontSize="36"- Foreground="{DynamicResource SystemFillColorCriticalBrush}"- Symbol="SearchInfo24"- />- <ui:TextBlock- HorizontalAlignment="Center"- Appearance="Secondary"- FontTypography="Body"- Text="{ext:Loc Bloatware.Search.NoResults}"- />- </StackPanel>+ <!-- Sort By -->+ <ComboBox+ Margin="0,0,8,0"+ VerticalAlignment="Center"+ SelectedIndex="{Binding ViewModel.SelectedSortByIndex}"+ ToolTip="{ext:Loc Common.SortBy}"+ ToolTipService.BetweenShowDelay="160"+ ToolTipService.Placement="Top"+ >+ <ComboBoxItem HorizontalContentAlignment="Left">+ <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">+ <ui:SymbolIcon+ Margin="0,0,6,0"+ HorizontalAlignment="Left"+ Symbol="Filter24"+ />+ <TextBlock Grid.Column="1" HorizontalAlignment="Left">+ <Run Text="{ext:Loc Common.SortBy.Risk}" />+ <Run Text=" & " />+ <Run Text="{ext:Loc Common.SortBy.Status}" />+ </TextBlock>+ </Grid>+ </ComboBoxItem>+ <ComboBoxItem HorizontalContentAlignment="Left">+ <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">+ <ui:SymbolIcon+ Margin="0,0,6,0"+ HorizontalAlignment="Left"+ Symbol="TextSortAscending24"+ />+ <TextBlock+ Grid.Column="1"+ HorizontalAlignment="Left"+ Text="{ext:Loc Common.SortBy.Name}"+ />+ </Grid>+ </ComboBoxItem>+ <ComboBoxItem HorizontalContentAlignment="Left">+ <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">+ <ui:SymbolIcon+ Margin="0,0,6,0"+ HorizontalAlignment="Left"+ Symbol="Shield24"+ />+ <TextBlock+ Grid.Column="1"+ HorizontalAlignment="Left"+ Text="{ext:Loc Common.SortBy.Risk}"+ />+ </Grid>+ </ComboBoxItem>+ <ComboBoxItem HorizontalContentAlignment="Left">+ <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">+ <ui:SymbolIcon+ Margin="0,0,6,0"+ HorizontalAlignment="Left"+ Symbol="ToggleRight24"+ />+ <TextBlock+ Grid.Column="1"+ HorizontalAlignment="Left"+ Text="{ext:Loc Common.SortBy.Status}"+ />+ </Grid>+ </ComboBoxItem>+ </ComboBox>- <!-- Optimization Cards -->- <ui:VirtualizingItemsControl- Grid.Row="1"- ItemsSource="{Binding ViewModel.Optimizations}"- Visibility="{Binding ViewModel.Optimizations.Count, Converter={StaticResource GreaterThanZeroToVisibilityConverter}}"- >- <ui:VirtualizingItemsControl.Template>- <ControlTemplate TargetType="ItemsControl">- <ScrollViewer HorizontalScrollBarVisibility="Disabled">- <ItemsPresenter Margin="0,0,7,0" />- </ScrollViewer>- </ControlTemplate>- </ui:VirtualizingItemsControl.Template>- <ui:VirtualizingItemsControl.ItemsPanel>- <ItemsPanelTemplate>- <UniformGrid- VerticalAlignment="Top"- Columns="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=ScrollViewer}, Converter={StaticResource WidthToColumnConverter}}"- />- </ItemsPanelTemplate>- </ui:VirtualizingItemsControl.ItemsPanel>- <ui:VirtualizingItemsControl.ItemContainerStyle>- <Style TargetType="ContentPresenter">- <Setter Property="Margin" Value="5" />- <Setter Property="HorizontalAlignment" Value="Stretch" />- </Style>- </ui:VirtualizingItemsControl.ItemContainerStyle>+ <!-- Hide Applied toggle -->+ <ToggleButton+ Margin="0,0,0,0"+ VerticalAlignment="Stretch"+ IsChecked="{Binding ViewModel.HideApplied}"+ Visibility="{Binding ViewModel.HasAppliedOptimizations, Converter={StaticResource BooleanToVisibilityConverter}}"+ >+ <StackPanel Orientation="Horizontal">+ <ui:SymbolIcon Margin="0,0,6,0" Symbol="EyeOff24" />+ <TextBlock Text="{ext:Loc Optimizer.Menu.HideApplied}" />+ </StackPanel>+ </ToggleButton>+ </WrapPanel>- <ui:VirtualizingItemsControl.ItemTemplate>- <DataTemplate DataType="{x:Type optimization:BaseOptimization}">- <Border- Padding="20,10"- Background="{DynamicResource CardBackground}"- BorderBrush="{DynamicResource CardBorderBrush}"- BorderThickness="1"- CornerRadius="5"+ <!-- No search results -->+ <StackPanel+ Grid.Row="1"+ HorizontalAlignment="Center"+ VerticalAlignment="Center"+ Visibility="{Binding ViewModel.Optimizations.Count, Converter={StaticResource ZeroToVisibilityConverter}}">- <Grid RowDefinitions="Auto,Auto,Auto,Auto,*">- <ui:TextBlock- Grid.Row="0"- Appearance="Disabled"- FontTypography="Caption"- Text="{Binding Id}"- TextWrapping="Wrap"+ <ui:SymbolIcon+ Margin="0,0,0,10"+ HorizontalAlignment="Center"+ FontSize="36"+ Foreground="{DynamicResource SystemFillColorCriticalBrush}"+ Symbol="SearchInfo24"/><ui:TextBlock- Grid.Row="1"- FontTypography="Subtitle"- Text="{Binding Name}"- TextWrapping="Wrap"+ HorizontalAlignment="Center"+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ FontTypography="Body"+ Text="{ext:Loc Bloatware.Search.NoResults}"/>+ </StackPanel>- <ui:VirtualizingItemsControl- Grid.Row="2"- Margin="0,2,0,2"- ItemsSource="{Binding TagDisplays}"- >- <ui:VirtualizingItemsControl.ItemsPanel>+ <!-- Optimization Cards -->+ <ui:VirtualizingItemsControl+ Grid.Row="1"+ ItemsSource="{Binding ViewModel.Optimizations}"+ Visibility="{Binding ViewModel.Optimizations.Count, Converter={StaticResource GreaterThanZeroToVisibilityConverter}}"+ >+ <ui:VirtualizingItemsControl.Template>+ <ControlTemplate TargetType="ItemsControl">+ <ScrollViewer HorizontalScrollBarVisibility="Disabled">+ <ItemsPresenter Margin="0,0,7,0" />+ </ScrollViewer>+ </ControlTemplate>+ </ui:VirtualizingItemsControl.Template>+ <ui:VirtualizingItemsControl.ItemsPanel><ItemsPanelTemplate>- <WrapPanel HorizontalAlignment="Left" VerticalAlignment="Top" />+ <UniformGrid+ VerticalAlignment="Top"+ Columns="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=ScrollViewer}, Converter={StaticResource WidthToColumnConverter}}"+ /></ItemsPanelTemplate>- </ui:VirtualizingItemsControl.ItemsPanel>- <ui:VirtualizingItemsControl.ItemContainerStyle>+ </ui:VirtualizingItemsControl.ItemsPanel>+ <ui:VirtualizingItemsControl.ItemContainerStyle><Style TargetType="ContentPresenter">- <Setter Property="Margin" Value="0,0,2,2" />- <Setter Property="HorizontalAlignment" Value="Left" />+ <Setter Property="Margin" Value="5" />+ <Setter Property="HorizontalAlignment" Value="Stretch" /></Style>- </ui:VirtualizingItemsControl.ItemContainerStyle>- <ui:VirtualizingItemsControl.ItemTemplate>- <DataTemplate>- <Border- Padding="4,2"- HorizontalAlignment="Left"- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"- CornerRadius="5"- >- <StackPanel Orientation="Horizontal">- <ui:SymbolIcon- Margin="0,0,5,0"- Foreground="{DynamicResource TextFillColorSecondaryBrush}"- Symbol="{Binding Icon}"- />+ </ui:VirtualizingItemsControl.ItemContainerStyle>- <ui:TextBlock- HorizontalAlignment="Center"- VerticalAlignment="Center"- Appearance="Secondary"- FontTypography="Caption"- Foreground="{DynamicResource TextFillColorInverseBrush}"- Text="{Binding Display}"- TextWrapping="Wrap"- />- </StackPanel>- </Border>- </DataTemplate>- </ui:VirtualizingItemsControl.ItemTemplate>- </ui:VirtualizingItemsControl>+ <ui:VirtualizingItemsControl.ItemTemplate>+ <DataTemplate DataType="{x:Type optimization:BaseOptimization}">+ <Border+ Padding="20,10"+ Background="{DynamicResource CardBackground}"+ BorderBrush="{DynamicResource CardBorderBrush}"+ BorderThickness="1"+ CornerRadius="5"+ >+ <Grid RowDefinitions="Auto,Auto,Auto,Auto,*">+ <ui:TextBlock+ Grid.Row="0"+ Foreground="{DynamicResource TextFillColorDisabledBrush}"+ FontTypography="Caption"+ Text="{Binding Id}"+ TextWrapping="Wrap"+ />+ <ui:TextBlock+ Grid.Row="1"+ FontTypography="Subtitle"+ Text="{Binding Name}"+ TextWrapping="Wrap"+ />- <ui:TextBlock- Grid.Row="3"- Margin="0,10,0,0"- FontTypography="Body"- Text="{Binding ShortDescription}"- TextTrimming="WordEllipsis"- TextWrapping="Wrap"- />+ <ui:VirtualizingItemsControl+ Grid.Row="2"+ Margin="0,2,0,2"+ ItemsSource="{Binding 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,2,2" />+ <Setter Property="HorizontalAlignment" Value="Left" />+ </Style>+ </ui:VirtualizingItemsControl.ItemContainerStyle>+ <ui:VirtualizingItemsControl.ItemTemplate>+ <DataTemplate>+ <Border+ Padding="4,2"+ HorizontalAlignment="Left"+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"+ CornerRadius="5"+ >+ <StackPanel Orientation="Horizontal">+ <ui:SymbolIcon+ Margin="0,0,5,0"+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ Symbol="{Binding Icon}"+ />- <Grid- Grid.Row="4"- Margin="0,10,0,0"- VerticalAlignment="Bottom"- ColumnDefinitions="*,Auto"- >- <Grid RowDefinitions="Auto,Auto">- <Border Padding="4,2" HorizontalAlignment="Left" CornerRadius="5">- <Border.Style>- <Style TargetType="Border">- <Setter- Property="Background"- Value="{DynamicResource SystemFillColorSuccessBrush}"- />- <Style.Triggers>- <DataTrigger Binding="{Binding Risk}" Value="Moderate">- <Setter- Property="Background"- Value="{DynamicResource SystemFillColorCautionBrush}"- />- </DataTrigger>- <DataTrigger Binding="{Binding Risk}" Value="Risky">- <Setter- Property="Background"- Value="{DynamicResource SystemFillColorCriticalBrush}"- />- </DataTrigger>- </Style.Triggers>- </Style>- </Border.Style>- <StackPanel Orientation="Horizontal">- <ui:SymbolIcon- Margin="0,0,5,0"- Foreground="{DynamicResource TextFillColorInverseBrush}"- Symbol="{Binding RiskVisual.Icon}"- />+ <ui:TextBlock+ HorizontalAlignment="Center"+ VerticalAlignment="Center"+ FontTypography="Caption"+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ Text="{Binding Display}"+ TextWrapping="Wrap"+ />+ </StackPanel>+ </Border>+ </DataTemplate>+ </ui:VirtualizingItemsControl.ItemTemplate>+ </ui:VirtualizingItemsControl>- <ui:TextBlock- HorizontalAlignment="Center"- VerticalAlignment="Center"- FontTypography="Caption"- Foreground="{DynamicResource TextFillColorInverseBrush}"- Text="{Binding RiskVisual.Display}"- TextWrapping="Wrap"- />- </StackPanel>- </Border>+ <ui:TextBlock+ Grid.Row="3"+ Margin="0,10,0,0"+ FontTypography="Body"+ Text="{Binding ShortDescription}"+ TextTrimming="WordEllipsis"+ TextWrapping="Wrap"+ />- <Border- Grid.Row="1"- Margin="0,5,0,0"- Padding="4,2"- HorizontalAlignment="Left"- Background="{DynamicResource CardBackgroundDisabled}"- CornerRadius="5"- ToolTip="{Binding State.AppliedAt}"- ToolTipService.InitialShowDelay="150"- ToolTipService.Placement="Top"- Visibility="{Binding State.AppliedAt, Converter={StaticResource NullToVisibilityConverter}}"- >- <StackPanel Orientation="Horizontal">- <ui:SymbolIcon Margin="0,0,6,0" Symbol="CheckmarkCircle24" />- <ui:TextBlock- HorizontalAlignment="Center"- VerticalAlignment="Center"- FontTypography="Caption"- Text="{Binding State.RelativeTime}"- TextWrapping="Wrap"- />- </StackPanel>- </Border>- </Grid>+ <Grid+ Grid.Row="4"+ Margin="0,10,0,0"+ VerticalAlignment="Bottom"+ ColumnDefinitions="*,Auto"+ >+ <Grid RowDefinitions="Auto,Auto">+ <Border+ Padding="4,2"+ HorizontalAlignment="Left"+ CornerRadius="5"+ >+ <Border.Style>+ <Style TargetType="Border">+ <Setter+ Property="Background"+ Value="{DynamicResource SystemFillColorSuccessBrush}"+ />+ <Style.Triggers>+ <DataTrigger+ Binding="{Binding Risk}"+ Value="Moderate"+ >+ <Setter+ Property="Background"+ Value="{DynamicResource SystemFillColorCautionBrush}"+ />+ </DataTrigger>+ <DataTrigger+ Binding="{Binding Risk}"+ Value="Risky"+ >+ <Setter+ Property="Background"+ Value="{DynamicResource SystemFillColorCriticalBrush}"+ />+ </DataTrigger>+ </Style.Triggers>+ </Style>+ </Border.Style>+ <StackPanel Orientation="Horizontal">+ <ui:SymbolIcon+ Margin="0,0,5,0"+ Foreground="{DynamicResource TextFillColorInverseBrush}"+ Symbol="{Binding RiskVisual.Icon}"+ />- <StackPanel- Grid.Column="1"- Margin="10,0,0,0"- VerticalAlignment="Bottom"- Orientation="Horizontal"- >- <ui:ToggleSwitch- Margin="0,0,5,0"- HorizontalAlignment="Right"- VerticalAlignment="Center"- Command="{Binding DataContext.ViewModel.ToggleOptimizationCommand, RelativeSource={RelativeSource AncestorType=Page}}"- CommandParameter="{Binding}"- Cursor="Hand"- IsChecked="{Binding State.IsApplied, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"- />- <ui:Button- HorizontalAlignment="Right"- VerticalAlignment="Bottom"- Background="Transparent"- BorderBrush="Transparent"- Command="{Binding DataContext.ViewModel.ViewSourceOnGitHubCommand, RelativeSource={RelativeSource AncestorType=Page}}"- CommandParameter="{Binding}"- Cursor="Hand"- Icon="{ui:SymbolIcon Open24}"- ToolTip="{ext:Loc Optimizer.Menu.ViewSource}"- />- <ui:Button- HorizontalAlignment="Right"- VerticalAlignment="Bottom"- Background="Transparent"- BorderBrush="Transparent"- Command="{Binding DataContext.ViewModel.ShowDetailsCommand, RelativeSource={RelativeSource AncestorType=Page}}"- CommandParameter="{Binding}"- Cursor="Hand"- Icon="{ui:SymbolIcon MoreVertical24}"- />- </StackPanel>- </Grid>- </Grid>- </Border>- </DataTemplate>- </ui:VirtualizingItemsControl.ItemTemplate>- </ui:VirtualizingItemsControl>- </Grid>+ <ui:TextBlock+ HorizontalAlignment="Center"+ VerticalAlignment="Center"+ FontTypography="Caption"+ Foreground="{DynamicResource TextFillColorInverseBrush}"+ Text="{Binding RiskVisual.Display}"+ TextWrapping="Wrap"+ />+ </StackPanel>+ </Border>- <!-- Loading Indicator -->- <Border Visibility="{Binding ViewModel.IsLoading, Converter={StaticResource BooleanToVisibilityConverter}}">- <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">- <ui:ProgressRing- Width="48"- Height="48"- Margin="0,0,0,16"- HorizontalAlignment="Center"- VerticalAlignment="Center"- IsIndeterminate="True"- />- <ui:TextBlock- HorizontalAlignment="Center"- FontTypography="BodyStrong"- Text="{ext:Loc Optimizations.Loading}"- />- <ui:TextBlock- Margin="0,4,0,0"- HorizontalAlignment="Center"- Appearance="Secondary"- FontTypography="Caption"- Text="{ext:Loc Optimizations.Loading.Hint}"- />- </StackPanel>- </Border>- </Grid>+ <Border+ Grid.Row="1"+ Margin="0,5,0,0"+ Padding="4,2"+ HorizontalAlignment="Left"+ Background="{DynamicResource CardBackgroundDisabled}"+ CornerRadius="5"+ ToolTip="{Binding State.AppliedAt}"+ ToolTipService.InitialShowDelay="150"+ ToolTipService.Placement="Top"+ Visibility="{Binding State.AppliedAt, Converter={StaticResource NullToVisibilityConverter}}"+ >+ <StackPanel Orientation="Horizontal">+ <ui:SymbolIcon+ Margin="0,0,6,0"+ Symbol="CheckmarkCircle24"+ />+ <ui:TextBlock+ HorizontalAlignment="Center"+ VerticalAlignment="Center"+ FontTypography="Caption"+ Text="{Binding State.RelativeTime}"+ TextWrapping="Wrap"+ />+ </StackPanel>+ </Border>+ </Grid>++ <StackPanel+ Grid.Column="1"+ Margin="10,0,0,0"+ VerticalAlignment="Bottom"+ Orientation="Horizontal"+ >+ <ui:ToggleSwitch+ Margin="0,0,5,0"+ HorizontalAlignment="Right"+ VerticalAlignment="Center"+ Command="{Binding DataContext.ViewModel.ToggleOptimizationCommand, RelativeSource={RelativeSource AncestorType=Page}}"+ CommandParameter="{Binding}"+ Cursor="Hand"+ IsChecked="{Binding State.IsApplied, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"+ />+ <ui:Button+ HorizontalAlignment="Right"+ VerticalAlignment="Bottom"+ Background="Transparent"+ BorderBrush="Transparent"+ Command="{Binding DataContext.ViewModel.ViewSourceOnGitHubCommand, RelativeSource={RelativeSource AncestorType=Page}}"+ CommandParameter="{Binding}"+ Cursor="Hand"+ Icon="{ui:SymbolIcon Open24}"+ ToolTip="{ext:Loc Optimizer.Menu.ViewSource}"+ />+ <ui:Button+ HorizontalAlignment="Right"+ VerticalAlignment="Bottom"+ Background="Transparent"+ BorderBrush="Transparent"+ Command="{Binding DataContext.ViewModel.ShowDetailsCommand, RelativeSource={RelativeSource AncestorType=Page}}"+ CommandParameter="{Binding}"+ Cursor="Hand"+ Icon="{ui:SymbolIcon MoreVertical24}"+ />+ </StackPanel>+ </Grid>+ </Grid>+ </Border>+ </DataTemplate>+ </ui:VirtualizingItemsControl.ItemTemplate>+ </ui:VirtualizingItemsControl>+ </Grid>++ <!-- Loading Indicator -->+ <Border Visibility="{Binding ViewModel.IsLoading, Converter={StaticResource BooleanToVisibilityConverter}}">+ <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">+ <ui:ProgressRing+ Width="48"+ Height="48"+ Margin="0,0,0,16"+ HorizontalAlignment="Center"+ VerticalAlignment="Center"+ IsIndeterminate="True"+ />+ <ui:TextBlock+ HorizontalAlignment="Center"+ FontTypography="BodyStrong"+ Text="{ext:Loc Optimizations.Loading}"+ />+ <ui:TextBlock+ Margin="0,4,0,0"+ HorizontalAlignment="Center"+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ FontTypography="Caption"+ Text="{ext:Loc Optimizations.Loading.Hint}"+ />+ </StackPanel>+ </Border>+ </Grid></Page>diff --git a/optimizerDuck/UI/Pages/Optimize/OptimizePage.xaml b/optimizerDuck/UI/Pages/Optimize/OptimizePage.xamlindex 4c125cf..ba94ebc 100644--- a/optimizerDuck/UI/Pages/Optimize/OptimizePage.xaml+++ b/optimizerDuck/UI/Pages/Optimize/OptimizePage.xaml@@ -1,34 +1,34 @@<Page- Foreground="{DynamicResource TextFillColorPrimaryBrush}"- Margin="0,32,0,0"- ScrollViewer.CanContentScroll="False"- Title="OptimizerPage"- d:DataContext="{d:DesignInstance pages:OptimizePage}"- d:DesignHeight="650"- d:DesignWidth="800"- mc:Ignorable="d"- ui:Design.Background="Black"- ui:Design.Foreground="White"- x:Class="optimizerDuck.UI.Pages.OptimizePage"- xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"- xmlns:d="http://schemas.microsoft.com/expression/blend/2008"- xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"- xmlns:pages="clr-namespace:optimizerDuck.UI.Pages"- xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"- xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"+ Foreground="{DynamicResource TextFillColorPrimaryBrush}"+ Margin="0,32,0,0"+ ScrollViewer.CanContentScroll="False"+ Title="OptimizerPage"+ d:DataContext="{d:DesignInstance pages:OptimizePage}"+ d:DesignHeight="650"+ d:DesignWidth="800"+ mc:Ignorable="d"+ ui:Design.Background="Black"+ ui:Design.Foreground="White"+ x:Class="optimizerDuck.UI.Pages.OptimizePage"+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"+ xmlns:pages="clr-namespace:optimizerDuck.UI.Pages"+ xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">- <Grid>- <ui:NavigationView- FrameMargin="0"- IsBackButtonVisible="Collapsed"- IsFooterSeparatorVisible="False"- IsPaneToggleVisible="False"- IsTopSeparatorVisible="False"- Margin="0"- MenuItemsSource="{Binding ViewModel.OptimizationCategories}"- Padding="42,0,42,0"- PaneDisplayMode="Top"- x:Name="RootNavigation"- />- </Grid>+ <Grid>+ <ui:NavigationView+ FrameMargin="0"+ IsBackButtonVisible="Collapsed"+ IsFooterSeparatorVisible="False"+ IsPaneToggleVisible="False"+ IsTopSeparatorVisible="False"+ Margin="0"+ MenuItemsSource="{Binding ViewModel.OptimizationCategories}"+ Padding="42,0,42,0"+ PaneDisplayMode="Top"+ x:Name="RootNavigation"+ />+ </Grid></Page>diff --git a/optimizerDuck/UI/Pages/ScheduledTasksPage.xaml b/optimizerDuck/UI/Pages/ScheduledTasksPage.xamlindex 9feaab2..9ce3a04 100644--- a/optimizerDuck/UI/Pages/ScheduledTasksPage.xaml+++ b/optimizerDuck/UI/Pages/ScheduledTasksPage.xaml@@ -1,464 +1,540 @@<Page- x:Class="optimizerDuck.UI.Pages.ScheduledTasksPage"- xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"- xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"- xmlns:converters="clr-namespace:optimizerDuck.Common.Converters"- xmlns:d="http://schemas.microsoft.com/expression/blend/2008"- xmlns:ext="clr-namespace:optimizerDuck.Common.Extensions"- xmlns:local="clr-namespace:optimizerDuck.UI.Pages"- xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"- xmlns:scheduledTask="clr-namespace:optimizerDuck.Domain.Optimizations.Models.ScheduledTask"- xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"- Title="ScheduledTasksPage"- Margin="0,32,0,0"- d:DataContext="{d:DesignInstance local:ScheduledTasksPage}"- d:DesignHeight="1200"- d:DesignWidth="800"- ui:Design.Background="Black"- ui:Design.Foreground="White"- Foreground="{DynamicResource TextFillColorPrimaryBrush}"- ScrollViewer.CanContentScroll="False"- mc:Ignorable="d"+ x:Class="optimizerDuck.UI.Pages.ScheduledTasksPage"+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"+ xmlns:converters="clr-namespace:optimizerDuck.Common.Converters"+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"+ xmlns:ext="clr-namespace:optimizerDuck.Common.Extensions"+ xmlns:local="clr-namespace:optimizerDuck.UI.Pages"+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"+ xmlns:scheduledTask="clr-namespace:optimizerDuck.Domain.Optimizations.Models.ScheduledTask"+ xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"+ Title="ScheduledTasksPage"+ Margin="0,32,0,0"+ d:DataContext="{d:DesignInstance local:ScheduledTasksPage}"+ d:DesignHeight="1200"+ d:DesignWidth="800"+ ui:Design.Background="Black"+ ui:Design.Foreground="White"+ Foreground="{DynamicResource TextFillColorPrimaryBrush}"+ ScrollViewer.CanContentScroll="False"+ mc:Ignorable="d">- <Page.Resources>- <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />- <BooleanToVisibilityConverter x:Key="WpfBoolToVis" />- <converters:ZeroToVisibilityConverter x:Key="ZeroToVisibilityConverter" />- <converters:GreaterThanZeroToVisibilityConverter x:Key="GreaterThanZeroToVisibilityConverter" />- </Page.Resources>+ <Page.Resources>+ <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />+ <BooleanToVisibilityConverter x:Key="WpfBoolToVis" />+ <converters:ZeroToVisibilityConverter x:Key="ZeroToVisibilityConverter" />+ <converters:GreaterThanZeroToVisibilityConverter x:Key="GreaterThanZeroToVisibilityConverter" />+ </Page.Resources>- <Grid RowDefinitions="Auto, *">- <!-- Header -->- <StackPanel Margin="0,0,0,20">- <Grid>- <Grid.ColumnDefinitions>- <ColumnDefinition Width="*" />- <ColumnDefinition Width="Auto" />- </Grid.ColumnDefinitions>- <StackPanel Grid.Column="0">- <ui:TextBlock FontTypography="Title" Text="{ext:Loc ScheduledTasks.Header.Title}" />- <ui:TextBlock- Margin="0,4,0,0"- Appearance="Secondary"- FontTypography="Body"- Text="{ext:Loc ScheduledTasks.Header.Description}"- TextWrapping="Wrap"- />- </StackPanel>- <WrapPanel Grid.Column="1" VerticalAlignment="Center" Orientation="Horizontal">- <ui:Button- Margin="0,0,8,0"- Appearance="Secondary"- Command="{Binding ViewModel.OpenTaskSchedulerCommand}"- Content="{ext:Loc ScheduledTasks.Menu.OpenSettings}"- Icon="{ui:SymbolIcon Settings24,+ <Grid RowDefinitions="Auto, *">+ <!-- Header -->+ <StackPanel Margin="0,0,0,20">+ <Grid>+ <Grid.ColumnDefinitions>+ <ColumnDefinition Width="*" />+ <ColumnDefinition Width="Auto" />+ </Grid.ColumnDefinitions>+ <StackPanel Grid.Column="0">+ <ui:TextBlock+ FontTypography="Title"+ Text="{ext:Loc ScheduledTasks.Header.Title}"+ />+ <ui:TextBlock+ Margin="0,4,0,0"+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ FontTypography="Body"+ Text="{ext:Loc ScheduledTasks.Header.Description}"+ TextWrapping="Wrap"+ />+ </StackPanel>+ <WrapPanel Grid.Column="1" VerticalAlignment="Center" Orientation="Horizontal">+ <ui:Button+ Margin="0,0,8,0"+ Appearance="Secondary"+ Command="{Binding ViewModel.OpenTaskSchedulerCommand}"+ Content="{ext:Loc ScheduledTasks.Menu.OpenSettings}"+ Icon="{ui:SymbolIcon Settings24,FontSize=18}"- />- <ui:Button- Appearance="Primary"- Command="{Binding ViewModel.RefreshCommand}"- Content="{ext:Loc StartupManager.Menu.Refresh}"- Icon="{ui:SymbolIcon ArrowClockwise24,+ />+ <ui:Button+ Appearance="Primary"+ Command="{Binding ViewModel.RefreshCommand}"+ Content="{ext:Loc StartupManager.Menu.Refresh}"+ Icon="{ui:SymbolIcon ArrowClockwise24,FontSize=18}"- />- </WrapPanel>- </Grid>- </StackPanel>-- <!-- Loading Indicator -->- <Border- Grid.Row="1"- Visibility="{Binding ViewModel.IsLoading, Converter={StaticResource BooleanToVisibilityConverter}}"- >- <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">- <ui:ProgressRing- Width="48"- Height="48"- Margin="0,0,0,16"- HorizontalAlignment="Center"- VerticalAlignment="Center"- IsIndeterminate="True"- />- <ui:TextBlock- HorizontalAlignment="Center"- FontTypography="BodyStrong"- Text="{ext:Loc ScheduledTasks.Loading}"- />- <ui:TextBlock- Margin="0,4,0,0"- HorizontalAlignment="Center"- Appearance="Secondary"- FontTypography="Caption"- Text="{ext:Loc ScheduledTasks.Loading.Hint}"- />- </StackPanel>- </Border>-- <!-- Main Content -->- <Grid Grid.Row="1">- <Grid.Style>- <Style TargetType="Grid">- <Setter Property="Visibility" Value="Collapsed" />- <Style.Triggers>- <MultiDataTrigger>- <MultiDataTrigger.Conditions>- <Condition Binding="{Binding ViewModel.IsNotLoading}" Value="True" />- <Condition Binding="{Binding ViewModel.IsLoading}" Value="False" />- </MultiDataTrigger.Conditions>- <Setter Property="Visibility" Value="Visible" />- </MultiDataTrigger>- </Style.Triggers>- </Style>- </Grid.Style>- <Grid.RowDefinitions>- <RowDefinition Height="Auto" />- <RowDefinition Height="*" />- </Grid.RowDefinitions>- <!-- Toolbar -->- <WrapPanel Grid.Row="0" Margin="0,0,16,12" Orientation="Horizontal">- <!-- Search -->- <ui:TextBox- MinWidth="200"- Margin="0,0,8,0"- VerticalAlignment="Center"- Icon="{ui:SymbolIcon Search24}"- PlaceholderText="{ext:Loc Common.Search.Placeholder}"- Text="{Binding ViewModel.SearchText, UpdateSourceTrigger=PropertyChanged}"- />-- <!-- Sort By -->- <ComboBox- Margin="0,0,8,0"- VerticalAlignment="Center"- SelectedIndex="{Binding ViewModel.SortByIndex}"- ToolTip="{ext:Loc Common.SortBy}"- >- <ComboBoxItem HorizontalContentAlignment="Left">- <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">- <ui:SymbolIcon- Margin="0,0,6,0"- HorizontalAlignment="Left"- Symbol="TextSortAscending24"- />- <TextBlock- Grid.Column="1"- HorizontalAlignment="Left"- Text="{ext:Loc Common.SortBy.Name}"- />- </Grid>- </ComboBoxItem>- <ComboBoxItem HorizontalContentAlignment="Left">- <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">- <ui:SymbolIcon Margin="0,0,6,0" HorizontalAlignment="Left" Symbol="ToggleRight24" />- <TextBlock- Grid.Column="1"- HorizontalAlignment="Left"- Text="{ext:Loc Common.SortBy.Status}"- />- </Grid>- </ComboBoxItem>- <ComboBoxItem HorizontalContentAlignment="Left">- <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">- <ui:SymbolIcon Margin="0,0,6,0" HorizontalAlignment="Left" Symbol="Folder24" />- <TextBlock- Grid.Column="1"- HorizontalAlignment="Left"- Text="{ext:Loc Common.SortBy.Path}"- />- </Grid>- </ComboBoxItem>- <ComboBoxItem HorizontalContentAlignment="Left">- <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">- <ui:SymbolIcon Margin="0,0,6,0" HorizontalAlignment="Left" Symbol="Flash24" />- <TextBlock- Grid.Column="1"- HorizontalAlignment="Left"- Text="{ext:Loc Common.SortBy.State}"- />+ Visibility="{Binding ViewModel.ShowRefreshButton, Converter={StaticResource BooleanToVisibilityConverter}}"+ />+ </WrapPanel></Grid>- </ComboBoxItem>- </ComboBox>-- <!-- Hide Microsoft -->- <ui:ToggleSwitch- Margin="0,0,8,0"- VerticalAlignment="Center"- Cursor="Hand"- IsChecked="{Binding ViewModel.HideMicrosoftTasks, Mode=TwoWay}"- OffContent="{ext:Loc ScheduledTasks.HideMicrosoft}"- OnContent="{ext:Loc ScheduledTasks.HideMicrosoft}"- />- </WrapPanel>-- <!-- No search results -->- <StackPanel- Grid.Row="1"- Margin="0,64,0,32"- HorizontalAlignment="Center"- VerticalAlignment="Top"- Visibility="{Binding ViewModel.Tasks.Count, Converter={StaticResource ZeroToVisibilityConverter}}"- >- <ui:SymbolIcon- Margin="0,0,0,10"- HorizontalAlignment="Center"- FontSize="36"- Foreground="{DynamicResource SystemFillColorCriticalBrush}"- Symbol="SearchInfo24"- />- <ui:TextBlock- HorizontalAlignment="Center"- Appearance="Secondary"- FontTypography="Body"- Text="{ext:Loc Bloatware.Search.NoResults}"- />- </StackPanel>+ </StackPanel>- <!-- Task List -->- <ScrollViewer Grid.Row="1" Margin="0,0,0,0">- <ItemsControl- ItemsSource="{Binding ViewModel.Tasks}"- Visibility="{Binding ViewModel.Tasks.Count, Converter={StaticResource GreaterThanZeroToVisibilityConverter}}"+ <!-- Loading Indicator -->+ <Border+ Grid.Row="1"+ Visibility="{Binding ViewModel.IsLoading, Converter={StaticResource BooleanToVisibilityConverter}}">- <ItemsControl.ItemTemplate>- <DataTemplate DataType="{x:Type scheduledTask:ScheduledTaskModel}">- <Border- Margin="0,0,16,6"- Padding="16,12"- Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"- CornerRadius="6"- >- <Grid>- <Grid.ColumnDefinitions>- <ColumnDefinition Width="Auto" />- <ColumnDefinition Width="*" />- <ColumnDefinition Width="Auto" />- </Grid.ColumnDefinitions>+ <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">+ <ui:ProgressRing+ Width="48"+ Height="48"+ Margin="0,0,0,16"+ HorizontalAlignment="Center"+ VerticalAlignment="Center"+ IsIndeterminate="True"+ />+ <ui:TextBlock+ HorizontalAlignment="Center"+ FontTypography="BodyStrong"+ Text="{ext:Loc ScheduledTasks.Loading}"+ />+ <ui:TextBlock+ Margin="0,4,0,0"+ HorizontalAlignment="Center"+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ FontTypography="Caption"+ Text="{ext:Loc ScheduledTasks.Loading.Hint}"+ />+ </StackPanel>+ </Border>- <!-- Task Logo -->- <Image- Grid.Column="0"- Width="36"- Height="36"- Margin="0,0,12,0"+ <!-- Main Content -->+ <Grid Grid.Row="1">+ <Grid.Style>+ <Style TargetType="Grid">+ <Setter Property="Visibility" Value="Collapsed" />+ <Style.Triggers>+ <MultiDataTrigger>+ <MultiDataTrigger.Conditions>+ <Condition+ Binding="{Binding ViewModel.IsNotLoading}"+ Value="True"+ />+ <Condition Binding="{Binding ViewModel.IsLoading}" Value="False" />+ </MultiDataTrigger.Conditions>+ <Setter Property="Visibility" Value="Visible" />+ </MultiDataTrigger>+ </Style.Triggers>+ </Style>+ </Grid.Style>+ <Grid.RowDefinitions>+ <RowDefinition Height="Auto" />+ <RowDefinition Height="*" />+ </Grid.RowDefinitions>+ <!-- Toolbar -->+ <WrapPanel Grid.Row="0" Margin="0,0,16,12" Orientation="Horizontal">+ <!-- Search -->+ <ui:TextBox+ MinWidth="200"+ Margin="0,0,8,0"VerticalAlignment="Center"- Source="{Binding LogoImage}"- Stretch="UniformToFill"- />+ Icon="{ui:SymbolIcon Search24}"+ PlaceholderText="{ext:Loc Common.Search.Placeholder}"+ Text="{Binding ViewModel.SearchText, UpdateSourceTrigger=PropertyChanged}"+ />- <!-- Task info -->- <StackPanel Grid.Column="1" Margin="0,0,12,0" VerticalAlignment="Center">- <!-- Row 1: Name + State badge -->- <DockPanel LastChildFill="False">- <ui:TextBlock FontTypography="BodyStrong" Text="{Binding Name}" />- <Border- Margin="8,0,0,0"- Padding="6,1"- VerticalAlignment="Center"- CornerRadius="4"- >- <Border.Style>- <Style TargetType="Border">- <Setter- Property="Background"- Value="{DynamicResource CardBackgroundFillColorSecondaryBrush}"+ <!-- Sort By -->+ <ComboBox+ Margin="0,0,8,0"+ VerticalAlignment="Center"+ SelectedIndex="{Binding ViewModel.SortByIndex}"+ ToolTip="{ext:Loc Common.SortBy}"+ >+ <ComboBoxItem HorizontalContentAlignment="Left">+ <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">+ <ui:SymbolIcon+ Margin="0,0,6,0"+ HorizontalAlignment="Left"+ Symbol="TextSortAscending24"/>- <Style.Triggers>- <DataTrigger Binding="{Binding IsReady}" Value="True">- <Setter- Property="Background"- Value="{DynamicResource SystemFillColorSuccessBrush}"- />- </DataTrigger>- <DataTrigger Binding="{Binding IsRunning}" Value="True">- <Setter- Property="Background"- Value="{DynamicResource AccentButtonBackground}"- />- </DataTrigger>- <DataTrigger Binding="{Binding IsDisabledState}" Value="True">- <Setter- Property="Background"- Value="{DynamicResource SystemFillColorCriticalBrush}"- />- </DataTrigger>- </Style.Triggers>- </Style>- </Border.Style>- <StackPanel Orientation="Horizontal">- <ui:SymbolIcon x:Name="StateIcon" Margin="0,0,4,0" FontSize="10">- <ui:SymbolIcon.Style>- <Style TargetType="ui:SymbolIcon">- <Setter Property="Symbol" Value="Circle24" />- <Setter- Property="Foreground"- Value="{DynamicResource TextFillColorPrimaryBrush}"- />- <Style.Triggers>- <DataTrigger Binding="{Binding IsReady}" Value="True">- <Setter Property="Symbol" Value="CheckmarkCircle24" />- <Setter- Property="Foreground"- Value="{DynamicResource TextFillColorInverseBrush}"- />- </DataTrigger>- <DataTrigger Binding="{Binding IsRunning}" Value="True">- <Setter- Property="Foreground"- Value="{DynamicResource TextFillColorInverseBrush}"- />- <Setter Property="Symbol" Value="Play24" />- </DataTrigger>- <DataTrigger Binding="{Binding IsDisabledState}" Value="True">- <Setter Property="Symbol" Value="Dismiss24" />- <Setter- Property="Foreground"- Value="{DynamicResource TextFillColorInverseBrush}"+ <TextBlock+ Grid.Column="1"+ HorizontalAlignment="Left"+ Text="{ext:Loc Common.SortBy.Name}"+ />+ </Grid>+ </ComboBoxItem>+ <ComboBoxItem HorizontalContentAlignment="Left">+ <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">+ <ui:SymbolIcon+ Margin="0,0,6,0"+ HorizontalAlignment="Left"+ Symbol="ToggleRight24"+ />+ <TextBlock+ Grid.Column="1"+ HorizontalAlignment="Left"+ Text="{ext:Loc Common.SortBy.Status}"+ />+ </Grid>+ </ComboBoxItem>+ <ComboBoxItem HorizontalContentAlignment="Left">+ <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">+ <ui:SymbolIcon+ Margin="0,0,6,0"+ HorizontalAlignment="Left"+ Symbol="Folder24"+ />+ <TextBlock+ Grid.Column="1"+ HorizontalAlignment="Left"+ Text="{ext:Loc Common.SortBy.Path}"+ />+ </Grid>+ </ComboBoxItem>+ <ComboBoxItem HorizontalContentAlignment="Left">+ <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">+ <ui:SymbolIcon+ Margin="0,0,6,0"+ HorizontalAlignment="Left"+ Symbol="Flash24"+ />+ <TextBlock+ Grid.Column="1"+ HorizontalAlignment="Left"+ Text="{ext:Loc Common.SortBy.State}"+ />+ </Grid>+ </ComboBoxItem>+ </ComboBox>++ <!-- Hide Microsoft -->+ <ui:ToggleSwitch+ Margin="0,0,8,0"+ VerticalAlignment="Center"+ Cursor="Hand"+ IsChecked="{Binding ViewModel.HideMicrosoftTasks, Mode=TwoWay}"+ OffContent="{ext:Loc ScheduledTasks.HideMicrosoft}"+ OnContent="{ext:Loc ScheduledTasks.HideMicrosoft}"+ />+ </WrapPanel>++ <!-- No search results -->+ <StackPanel+ Grid.Row="1"+ Margin="0,64,0,32"+ HorizontalAlignment="Center"+ VerticalAlignment="Top"+ Visibility="{Binding ViewModel.Tasks.Count, Converter={StaticResource ZeroToVisibilityConverter}}"+ >+ <ui:SymbolIcon+ Margin="0,0,0,10"+ HorizontalAlignment="Center"+ FontSize="36"+ Foreground="{DynamicResource SystemFillColorCriticalBrush}"+ Symbol="SearchInfo24"+ />+ <ui:TextBlock+ HorizontalAlignment="Center"+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ FontTypography="Body"+ Text="{ext:Loc Bloatware.Search.NoResults}"+ />+ </StackPanel>++ <!-- Task List -->+ <ScrollViewer Grid.Row="1" Margin="0,0,0,0">+ <ItemsControl+ ItemsSource="{Binding ViewModel.Tasks}"+ Visibility="{Binding ViewModel.Tasks.Count, Converter={StaticResource GreaterThanZeroToVisibilityConverter}}"+ >+ <ItemsControl.ItemTemplate>+ <DataTemplate DataType="{x:Type scheduledTask:ScheduledTaskModel}">+ <Border+ Margin="0,0,16,6"+ Padding="16,12"+ Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"+ CornerRadius="6"+ >+ <Grid>+ <Grid.ColumnDefinitions>+ <ColumnDefinition Width="Auto" />+ <ColumnDefinition Width="*" />+ <ColumnDefinition Width="Auto" />+ </Grid.ColumnDefinitions>++ <!-- Task Logo -->+ <Image+ Grid.Column="0"+ Width="36"+ Height="36"+ Margin="0,0,12,0"+ VerticalAlignment="Center"+ Source="{Binding LogoImage}"+ Stretch="UniformToFill"/>- </DataTrigger>- </Style.Triggers>- </Style>- </ui:SymbolIcon.Style>- </ui:SymbolIcon>- <ui:TextBlock- VerticalAlignment="Center"- FontTypography="Caption"- Foreground="{Binding ElementName=StateIcon, Path=Foreground}"- Text="{Binding State}"- />- </StackPanel>- </Border>- </DockPanel>- <!-- Row 2: Description -->- <ui:TextBlock- Margin="0,4,0,0"- Appearance="Secondary"- FontTypography="Caption"- Text="{Binding Description}"- TextWrapping="Wrap"- />+ <!-- Task info -->+ <StackPanel+ Grid.Column="1"+ Margin="0,0,12,0"+ VerticalAlignment="Center"+ >+ <!-- Row 1: Name + State badge -->+ <DockPanel LastChildFill="False">+ <ui:TextBlock+ FontTypography="BodyStrong"+ Text="{Binding Name}"+ />+ <Border+ Margin="8,0,0,0"+ Padding="6,1"+ VerticalAlignment="Center"+ CornerRadius="4"+ >+ <Border.Style>+ <Style TargetType="Border">+ <Setter+ Property="Background"+ Value="{DynamicResource CardBackgroundFillColorSecondaryBrush}"+ />+ <Style.Triggers>+ <DataTrigger+ Binding="{Binding IsReady}"+ Value="True"+ >+ <Setter+ Property="Background"+ Value="{DynamicResource SystemFillColorSuccessBrush}"+ />+ </DataTrigger>+ <DataTrigger+ Binding="{Binding IsRunning}"+ Value="True"+ >+ <Setter+ Property="Background"+ Value="{DynamicResource AccentButtonBackground}"+ />+ </DataTrigger>+ <DataTrigger+ Binding="{Binding IsDisabledState}"+ Value="True"+ >+ <Setter+ Property="Background"+ Value="{DynamicResource SystemFillColorCriticalBrush}"+ />+ </DataTrigger>+ </Style.Triggers>+ </Style>+ </Border.Style>+ <StackPanel Orientation="Horizontal">+ <ui:SymbolIcon+ x:Name="StateIcon"+ Margin="0,0,4,0"+ FontSize="10"+ >+ <ui:SymbolIcon.Style>+ <Style TargetType="ui:SymbolIcon">+ <Setter+ Property="Symbol"+ Value="Circle24"+ />+ <Setter+ Property="Foreground"+ Value="{DynamicResource TextFillColorPrimaryBrush}"+ />+ <Style.Triggers>+ <DataTrigger+ Binding="{Binding IsReady}"+ Value="True"+ >+ <Setter+ Property="Symbol"+ Value="CheckmarkCircle24"+ />+ <Setter+ Property="Foreground"+ Value="{DynamicResource TextFillColorInverseBrush}"+ />+ </DataTrigger>+ <DataTrigger+ Binding="{Binding IsRunning}"+ Value="True"+ >+ <Setter+ Property="Foreground"+ Value="{DynamicResource TextFillColorInverseBrush}"+ />+ <Setter+ Property="Symbol"+ Value="Play24"+ />+ </DataTrigger>+ <DataTrigger+ Binding="{Binding IsDisabledState}"+ Value="True"+ >+ <Setter+ Property="Symbol"+ Value="Dismiss24"+ />+ <Setter+ Property="Foreground"+ Value="{DynamicResource TextFillColorInverseBrush}"+ />+ </DataTrigger>+ </Style.Triggers>+ </Style>+ </ui:SymbolIcon.Style>+ </ui:SymbolIcon>+ <ui:TextBlock+ VerticalAlignment="Center"+ FontTypography="Caption"+ Foreground="{Binding ElementName=StateIcon, Path=Foreground}"+ Text="{Binding State}"+ />+ </StackPanel>+ </Border>+ </DockPanel>- <!-- Row 3: Path -->- <ui:TextBlock- Margin="0,2,0,0"- Appearance="Disabled"- FontTypography="Caption"- Text="{Binding FullPath}"- />+ <!-- Row 2: Description -->+ <ui:TextBlock+ Margin="0,4,0,0"+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ FontTypography="Caption"+ Text="{Binding Description}"+ TextWrapping="Wrap"+ />- <!-- Row 4: Trigger badges -->- <ItemsControl Margin="0,4,0,0" ItemsSource="{Binding TriggerTypes}">- <ItemsControl.ItemsPanel>- <ItemsPanelTemplate>- <WrapPanel Orientation="Horizontal" />- </ItemsPanelTemplate>- </ItemsControl.ItemsPanel>- <ItemsControl.ItemTemplate>- <DataTemplate>- <Border- Margin="0,0,4,2"- Padding="6,2"- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"- CornerRadius="4"- >- <StackPanel Orientation="Horizontal">- <ui:SymbolIcon- Margin="0,0,4,0"- Foreground="{DynamicResource TextFillColorSecondaryBrush}"- Symbol="Timer24"- />- <ui:TextBlock- VerticalAlignment="Center"- FontTypography="Caption"- Foreground="{DynamicResource TextFillColorSecondaryBrush}"- Text="{Binding}"- />- </StackPanel>- </Border>- </DataTemplate>- </ItemsControl.ItemTemplate>- </ItemsControl>+ <!-- Row 3: Path -->+ <ui:TextBlock+ Margin="0,2,0,0"+ Foreground="{DynamicResource TextFillColorDisabledBrush}"+ FontTypography="Caption"+ Text="{Binding FullPath}"+ />- <!-- Row 5: Action summary -->- <ui:TextBlock- Margin="0,2,0,0"- Appearance="Disabled"- FontTypography="Caption"- Text="{Binding ActionSummary}"- TextTrimming="CharacterEllipsis"- />- </StackPanel>+ <!-- Row 4: Trigger badges -->+ <ItemsControl+ Margin="0,4,0,0"+ ItemsSource="{Binding TriggerTypes}"+ >+ <ItemsControl.ItemsPanel>+ <ItemsPanelTemplate>+ <WrapPanel Orientation="Horizontal" />+ </ItemsPanelTemplate>+ </ItemsControl.ItemsPanel>+ <ItemsControl.ItemTemplate>+ <DataTemplate>+ <Border+ Margin="0,0,4,2"+ Padding="6,2"+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"+ CornerRadius="4"+ >+ <StackPanel Orientation="Horizontal">+ <ui:SymbolIcon+ Margin="0,0,4,0"+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ Symbol="Timer24"+ />+ <ui:TextBlock+ VerticalAlignment="Center"+ FontTypography="Caption"+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ Text="{Binding}"+ />+ </StackPanel>+ </Border>+ </DataTemplate>+ </ItemsControl.ItemTemplate>+ </ItemsControl>- <!-- Actions -->- <StackPanel Grid.Column="2" VerticalAlignment="Center" Orientation="Horizontal">- <ui:Button- Margin="0,0,4,0"- Padding="8"- Appearance="Transparent"- Command="{Binding DataContext.ViewModel.ViewDetailsCommand, RelativeSource={RelativeSource AncestorType=Page}}"- CommandParameter="{Binding}"- Icon="{ui:SymbolIcon Info24,+ <!-- Row 5: Action summary -->+ <ui:TextBlock+ Margin="0,2,0,0"+ Foreground="{DynamicResource TextFillColorDisabledBrush}"+ FontTypography="Caption"+ Text="{Binding ActionSummary}"+ TextTrimming="CharacterEllipsis"+ />+ </StackPanel>++ <!-- Actions -->+ <StackPanel+ Grid.Column="2"+ VerticalAlignment="Center"+ Orientation="Horizontal"+ >+ <ui:Button+ Margin="0,0,4,0"+ Padding="8"+ Appearance="Transparent"+ Command="{Binding DataContext.ViewModel.ViewDetailsCommand, RelativeSource={RelativeSource AncestorType=Page}}"+ CommandParameter="{Binding}"+ Icon="{ui:SymbolIcon Info24,FontSize=16}"- ToolTip="{ext:Loc ScheduledTasks.Action.Details}"- />- <!-- Run: visible only when not running -->- <ui:Button- Margin="0,0,4,0"- Padding="8"- Appearance="Transparent"- Command="{Binding DataContext.ViewModel.RunTaskCommand, RelativeSource={RelativeSource AncestorType=Page}}"- CommandParameter="{Binding}"- Icon="{ui:SymbolIcon Play24,+ ToolTip="{ext:Loc ScheduledTasks.Action.Details}"+ />+ <!-- Run: visible only when not running -->+ <ui:Button+ Margin="0,0,4,0"+ Padding="8"+ Appearance="Transparent"+ Command="{Binding DataContext.ViewModel.RunTaskCommand, RelativeSource={RelativeSource AncestorType=Page}}"+ CommandParameter="{Binding}"+ Icon="{ui:SymbolIcon Play24,FontSize=16}"- ToolTip="{ext:Loc ScheduledTasks.Action.Run}"- >- <ui:Button.Style>- <Style BasedOn="{StaticResource {x:Type ui:Button}}" TargetType="ui:Button">- <Setter Property="Visibility" Value="Visible" />- <Style.Triggers>- <DataTrigger Binding="{Binding IsRunning}" Value="True">- <Setter Property="Visibility" Value="Collapsed" />- </DataTrigger>- </Style.Triggers>- </Style>- </ui:Button.Style>- </ui:Button>- <!-- Stop: visible only when running -->- <ui:Button- Margin="0,0,4,0"- Padding="8"- Appearance="Transparent"- Command="{Binding DataContext.ViewModel.StopTaskCommand, RelativeSource={RelativeSource AncestorType=Page}}"- CommandParameter="{Binding}"- Icon="{ui:SymbolIcon Stop24,+ ToolTip="{ext:Loc ScheduledTasks.Action.Run}"+ >+ <ui:Button.Style>+ <Style+ BasedOn="{StaticResource {x:Type ui:Button}}"+ TargetType="ui:Button"+ >+ <Setter Property="Visibility" Value="Visible" />+ <Style.Triggers>+ <DataTrigger+ Binding="{Binding IsRunning}"+ Value="True"+ >+ <Setter+ Property="Visibility"+ Value="Collapsed"+ />+ </DataTrigger>+ </Style.Triggers>+ </Style>+ </ui:Button.Style>+ </ui:Button>+ <!-- Stop: visible only when running -->+ <ui:Button+ Margin="0,0,4,0"+ Padding="8"+ Appearance="Transparent"+ Command="{Binding DataContext.ViewModel.StopTaskCommand, RelativeSource={RelativeSource AncestorType=Page}}"+ CommandParameter="{Binding}"+ Icon="{ui:SymbolIcon Stop24,FontSize=16}"- ToolTip="{ext:Loc ScheduledTasks.Action.Stop}"- Visibility="{Binding IsRunning, Converter={StaticResource WpfBoolToVis}}"- />- <ui:Button- Margin="0,0,8,0"- Padding="8"- Appearance="Transparent"- Command="{Binding DataContext.ViewModel.DeleteTaskCommand, RelativeSource={RelativeSource AncestorType=Page}}"- CommandParameter="{Binding}"- Icon="{ui:SymbolIcon Delete24,+ ToolTip="{ext:Loc ScheduledTasks.Action.Stop}"+ Visibility="{Binding IsRunning, Converter={StaticResource WpfBoolToVis}}"+ />+ <ui:Button+ Margin="0,0,8,0"+ Padding="8"+ Appearance="Transparent"+ Command="{Binding DataContext.ViewModel.DeleteTaskCommand, RelativeSource={RelativeSource AncestorType=Page}}"+ CommandParameter="{Binding}"+ Icon="{ui:SymbolIcon Delete24,FontSize=16}"- ToolTip="{ext:Loc ScheduledTasks.Action.Delete}"- />- <ui:ToggleSwitch- VerticalAlignment="Center"- Cursor="Hand"- IsChecked="{Binding IsEnabled, Mode=TwoWay}"- OffContent="{ext:Loc Common.Toggle.Off}"- OnContent="{ext:Loc Common.Toggle.On}"- />- </StackPanel>- </Grid>- </Border>- </DataTemplate>- </ItemsControl.ItemTemplate>- </ItemsControl>- </ScrollViewer>+ ToolTip="{ext:Loc ScheduledTasks.Action.Delete}"+ />+ <ui:ToggleSwitch+ VerticalAlignment="Center"+ Cursor="Hand"+ IsChecked="{Binding IsEnabled, Mode=TwoWay}"+ OffContent="{ext:Loc Common.Toggle.Off}"+ OnContent="{ext:Loc Common.Toggle.On}"+ />+ </StackPanel>+ </Grid>+ </Border>+ </DataTemplate>+ </ItemsControl.ItemTemplate>+ </ItemsControl>+ </ScrollViewer>+ </Grid></Grid>- </Grid></Page>diff --git a/optimizerDuck/UI/Pages/SettingsPage.xaml b/optimizerDuck/UI/Pages/SettingsPage.xamlindex 504660f..a068706 100644--- a/optimizerDuck/UI/Pages/SettingsPage.xaml+++ b/optimizerDuck/UI/Pages/SettingsPage.xaml@@ -1,387 +1,386 @@<Page- x:Class="optimizerDuck.UI.Pages.SettingsPage"- xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"- xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"- xmlns:converters="clr-namespace:optimizerDuck.Common.Converters"- xmlns:d="http://schemas.microsoft.com/expression/blend/2008"- xmlns:ext="clr-namespace:optimizerDuck.Common.Extensions"- xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"- xmlns:pages="clr-namespace:optimizerDuck.UI.Pages"- xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"- Title="SettingsPage"- Margin="0,32,0,0"- d:DataContext="{d:DesignInstance pages:SettingsPage}"- d:DesignHeight="1200"- d:DesignWidth="800"- ui:Design.Background="Black"- ui:Design.Foreground="White"- Foreground="{DynamicResource TextFillColorPrimaryBrush}"- mc:Ignorable="d"+ x:Class="optimizerDuck.UI.Pages.SettingsPage"+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"+ xmlns:converters="clr-namespace:optimizerDuck.Common.Converters"+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"+ xmlns:ext="clr-namespace:optimizerDuck.Common.Extensions"+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"+ xmlns:pages="clr-namespace:optimizerDuck.UI.Pages"+ xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"+ Title="SettingsPage"+ Margin="0,32,0,0"+ d:DataContext="{d:DesignInstance pages:SettingsPage}"+ d:DesignHeight="1200"+ d:DesignWidth="800"+ ui:Design.Background="Black"+ ui:Design.Foreground="White"+ Foreground="{DynamicResource TextFillColorPrimaryBrush}"+ mc:Ignorable="d">- <Page.Resources>- <converters:ThemeToIndexConverter x:Key="ThemeToIndexConverter" />- </Page.Resources>+ <Page.Resources>+ <converters:ThemeToIndexConverter x:Key="ThemeToIndexConverter" />+ </Page.Resources>- <StackPanel>- <ui:TextBlock- FontTypography="Title"- Text="{ext:Loc Settings.Header.Title}"- TextWrapping="Wrap"- />-- <StackPanel Margin="0,20,0,0">- <ui:TextBlock- FontTypography="BodyStrong"- Text="{ext:Loc Settings.Appearance.Header}"- TextWrapping="Wrap"- />- <ui:CardControl Icon="{ui:SymbolIcon Globe24}">- <ui:CardControl.Header>- <StackPanel>- <ui:TextBlock- Margin="0"- FontTypography="BodyStrong"- Foreground="{DynamicResource TextFillColorPrimaryBrush}"- Text="{ext:Loc Settings.Appearance.LanguageSelector.Title}"- TextWrapping="Wrap"- />- <ui:TextBlock- Appearance="Secondary"- Foreground="{DynamicResource TextFillColorSecondaryBrush}"- Text="{ext:Loc Settings.Appearance.LanguageSelector.Description}"- TextWrapping="Wrap"- />- </StackPanel>- </ui:CardControl.Header>- <ComboBox- DisplayMemberPath="DisplayName"- ItemsSource="{Binding ViewModel.Languages}"- SelectedValue="{Binding ViewModel.SelectedCultureName, Mode=TwoWay}"- SelectedValuePath="Culture.Name"- />- </ui:CardControl>- <ui:CardControl Icon="{ui:SymbolIcon Color24}">- <ui:CardControl.Header>- <StackPanel>- <ui:TextBlock- Margin="0"- Appearance="Primary"- FontTypography="BodyStrong"- Text="{ext:Loc Settings.Appearance.ThemeSelector.Title}"- TextWrapping="Wrap"- />- <ui:TextBlock- Appearance="Secondary"- Text="{ext:Loc Settings.Appearance.ThemeSelector.Description}"- TextWrapping="Wrap"- />- </StackPanel>- </ui:CardControl.Header>- <ComboBox SelectedIndex="{Binding ViewModel.CurrentApplicationTheme, Converter={StaticResource ThemeToIndexConverter}, Mode=TwoWay}">- <ComboBoxItem Content="{ext:Loc Settings.Appearance.ThemeSelector.Light}" />- <ComboBoxItem Content="{ext:Loc Settings.Appearance.ThemeSelector.Dark}" />- <ComboBoxItem Content="{ext:Loc Settings.Appearance.ThemeSelector.HighContrast}" />- </ComboBox>- </ui:CardControl>-- <StackPanel Margin="0,20,0,0">+ <StackPanel><ui:TextBlock- FontTypography="BodyStrong"- Text="{ext:Loc Settings.Optimize.Header}"- TextWrapping="Wrap"+ FontTypography="Title"+ Text="{ext:Loc Settings.Header.Title}"+ TextWrapping="Wrap"/>- <ui:CardControl>- <ui:CardControl.Icon>- <ui:SymbolIcon- Foreground="{DynamicResource SystemFillColorCriticalBrush}"- Symbol="Clock24"- />- </ui:CardControl.Icon>- <ui:CardControl.Header>- <StackPanel>- <ui:TextBlock- Margin="0"- Appearance="Primary"+ <StackPanel Margin="0,20,0,0">+ <ui:TextBlockFontTypography="BodyStrong"- Text="{ext:Loc Settings.Optimize.ShellTimeout.Title}"- TextWrapping="Wrap"- />- <ui:TextBlock- Appearance="Secondary"- Text="{ext:Loc Settings.Optimize.ShellTimeout.Description}"+ Text="{ext:Loc Settings.Appearance.Header}"TextWrapping="Wrap"- />- <ui:TextBlock- Foreground="{DynamicResource SystemFillColorCriticalBrush}"- Text="{ext:Loc Settings.Optimize.ShellTimeout.Warning}"- TextWrapping="Wrap"- />- </StackPanel>- </ui:CardControl.Header>+ />+ <ui:CardControl Icon="{ui:SymbolIcon Globe24}">+ <ui:CardControl.Header>+ <StackPanel>+ <ui:TextBlock+ Margin="0"+ FontTypography="BodyStrong"+ Foreground="{DynamicResource TextFillColorPrimaryBrush}"+ Text="{ext:Loc Settings.Appearance.LanguageSelector.Title}"+ TextWrapping="Wrap"+ />+ <ui:TextBlock+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ Text="{ext:Loc Settings.Appearance.LanguageSelector.Description}"+ TextWrapping="Wrap"+ />+ </StackPanel>+ </ui:CardControl.Header>+ <ComboBox+ DisplayMemberPath="DisplayName"+ ItemsSource="{Binding ViewModel.Languages}"+ SelectedValue="{Binding ViewModel.SelectedCultureName, Mode=TwoWay}"+ SelectedValuePath="Culture.Name"+ />+ </ui:CardControl>+ <ui:CardControl Icon="{ui:SymbolIcon Color24}">+ <ui:CardControl.Header>+ <StackPanel>+ <ui:TextBlock+ Margin="0"+ Foreground="{DynamicResource TextFillColorPrimaryBrush}"+ FontTypography="BodyStrong"+ Text="{ext:Loc Settings.Appearance.ThemeSelector.Title}"+ TextWrapping="Wrap"+ />+ <ui:TextBlock+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ Text="{ext:Loc Settings.Appearance.ThemeSelector.Description}"+ TextWrapping="Wrap"+ />+ </StackPanel>+ </ui:CardControl.Header>+ <ComboBox SelectedIndex="{Binding ViewModel.CurrentApplicationTheme, Converter={StaticResource ThemeToIndexConverter}, Mode=TwoWay}">+ <ComboBoxItem Content="{ext:Loc Settings.Appearance.ThemeSelector.Light}" />+ <ComboBoxItem Content="{ext:Loc Settings.Appearance.ThemeSelector.Dark}" />+ <ComboBoxItem Content="{ext:Loc Settings.Appearance.ThemeSelector.HighContrast}" />+ </ComboBox>+ </ui:CardControl>- <ui:NumberBox- Minimum="1000"- SmallChange="1000"- Value="{Binding ViewModel.ShellTimeoutMs, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"- />- </ui:CardControl>+ <StackPanel Margin="0,20,0,0">+ <ui:TextBlock+ FontTypography="BodyStrong"+ Text="{ext:Loc Settings.Optimize.Header}"+ TextWrapping="Wrap"+ />- <ui:CardControl Icon="{ui:SymbolIcon Alert24}">- <ui:CardControl.Header>- <StackPanel>- <ui:TextBlock- Margin="0"- Appearance="Primary"- FontTypography="BodyStrong"- Text="{ext:Loc Settings.Optimize.ShowCompletionNotification.Title}"- TextWrapping="Wrap"- />- <ui:TextBlock- Appearance="Secondary"- Text="{ext:Loc Settings.Optimize.ShowCompletionNotification.Description}"- TextWrapping="Wrap"- />- </StackPanel>- </ui:CardControl.Header>+ <ui:CardControl>+ <ui:CardControl.Icon>+ <ui:SymbolIcon+ Foreground="{DynamicResource SystemFillColorCriticalBrush}"+ Symbol="Clock24"+ />+ </ui:CardControl.Icon>+ <ui:CardControl.Header>+ <StackPanel>+ <ui:TextBlock+ Margin="0"+ Foreground="{DynamicResource TextFillColorPrimaryBrush}"+ FontTypography="BodyStrong"+ Text="{ext:Loc Settings.Optimize.ShellTimeout.Title}"+ TextWrapping="Wrap"+ />+ <ui:TextBlock+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ Text="{ext:Loc Settings.Optimize.ShellTimeout.Description}"+ TextWrapping="Wrap"+ />+ <ui:TextBlock+ Foreground="{DynamicResource SystemFillColorCriticalBrush}"+ Text="{ext:Loc Settings.Optimize.ShellTimeout.Warning}"+ TextWrapping="Wrap"+ />+ </StackPanel>+ </ui:CardControl.Header>- <ui:ToggleSwitch- Command="{Binding ViewModel.ToggleShowCompletionNotificationCommand}"- IsChecked="{Binding ViewModel.ShowSnackbarNotificationAfterAppliedSuccessfully, Mode=TwoWay}"- />- </ui:CardControl>- </StackPanel>+ <ui:NumberBox+ Minimum="1000"+ SmallChange="1000"+ Value="{Binding ViewModel.ShellTimeoutMs, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"+ />+ </ui:CardControl>- <StackPanel Margin="0,20,0,0">- <ui:TextBlock- FontTypography="BodyStrong"- Text="{ext:Loc Settings.Bloatware.Header}"- TextWrapping="Wrap"- />+ <ui:CardControl Icon="{ui:SymbolIcon Alert24}">+ <ui:CardControl.Header>+ <StackPanel>+ <ui:TextBlock+ Margin="0"+ Foreground="{DynamicResource TextFillColorPrimaryBrush}"+ FontTypography="BodyStrong"+ Text="{ext:Loc Settings.Optimize.ShowCompletionNotification.Title}"+ TextWrapping="Wrap"+ />+ <ui:TextBlock+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ Text="{ext:Loc Settings.Optimize.ShowCompletionNotification.Description}"+ TextWrapping="Wrap"+ />+ </StackPanel>+ </ui:CardControl.Header>- <ui:CardControl Icon="{ui:SymbolIcon UninstallApp24}">- <ui:CardControl.Header>- <StackPanel>- <ui:TextBlock- Margin="0"- Appearance="Primary"- FontTypography="BodyStrong"- Text="{ext:Loc Settings.Bloatware.RemoveProvisioned.Title}"- TextWrapping="Wrap"- />- <ui:TextBlock- Appearance="Secondary"- Text="{ext:Loc Settings.Bloatware.RemoveProvisioned.Description}"- TextWrapping="Wrap"- />+ <ui:ToggleSwitch+ Command="{Binding ViewModel.ToggleShowCompletionNotificationCommand}"+ IsChecked="{Binding ViewModel.ShowSnackbarNotificationAfterAppliedSuccessfully, Mode=TwoWay}"+ />+ </ui:CardControl></StackPanel>- </ui:CardControl.Header>- <ui:ToggleSwitch- Command="{Binding ViewModel.ToggleRemoveProvisionedCommand}"- IsChecked="{Binding ViewModel.RemoveProvisioned, Mode=TwoWay}"- />- </ui:CardControl>- </StackPanel>+ <StackPanel Margin="0,20,0,0">+ <ui:TextBlock+ FontTypography="BodyStrong"+ Text="{ext:Loc Settings.Bloatware.Header}"+ TextWrapping="Wrap"+ />- <StackPanel Margin="0,20,0,0">- <ui:TextBlock- FontTypography="BodyStrong"- Text="{ext:Loc Settings.Advanced.Header}"- TextWrapping="Wrap"- />+ <ui:CardControl Icon="{ui:SymbolIcon UninstallApp24}">+ <ui:CardControl.Header>+ <StackPanel>+ <ui:TextBlock+ Margin="0"+ Foreground="{DynamicResource TextFillColorPrimaryBrush}"+ FontTypography="BodyStrong"+ Text="{ext:Loc Settings.Bloatware.RemoveProvisioned.Title}"+ TextWrapping="Wrap"+ />+ <ui:TextBlock+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ Text="{ext:Loc Settings.Bloatware.RemoveProvisioned.Description}"+ TextWrapping="Wrap"+ />+ </StackPanel>+ </ui:CardControl.Header>- <ui:CardAction Command="{Binding ViewModel.ClearResourcesCommand}">- <ui:CardAction.Icon>- <ui:SymbolIcon- Foreground="{DynamicResource SystemFillColorCriticalBrush}"- Symbol="Archive24"- />- </ui:CardAction.Icon>- <StackPanel>- <ui:TextBlock- Margin="0"- Appearance="Primary"- FontTypography="BodyStrong"- Text="{ext:Loc Settings.Advanced.ClearResources.Title}"- TextWrapping="Wrap"- />- <ui:TextBlock- Appearance="Secondary"- Text="{ext:Loc Settings.Advanced.ClearResources.Description}"- TextWrapping="Wrap"- />- </StackPanel>- </ui:CardAction>+ <ui:ToggleSwitch+ Command="{Binding ViewModel.ToggleRemoveProvisionedCommand}"+ IsChecked="{Binding ViewModel.RemoveProvisioned, Mode=TwoWay}"+ />+ </ui:CardControl>+ </StackPanel>- <ui:CardAction Command="{Binding ViewModel.ClearAllRevertDataCommand}">- <ui:CardAction.Icon>- <ui:SymbolIcon- Foreground="{DynamicResource SystemFillColorCriticalBrush}"- Symbol="DatabaseLightning20"- />- </ui:CardAction.Icon>- <StackPanel>- <ui:TextBlock- Margin="0"- Appearance="Primary"- FontTypography="BodyStrong"- Text="{ext:Loc Settings.Advanced.ClearRevertDatas.Title}"- TextWrapping="Wrap"- />- <ui:TextBlock- Appearance="Secondary"- Text="{ext:Loc Settings.Advanced.ClearRevertDatas.Description}"- TextWrapping="Wrap"- />- </StackPanel>- </ui:CardAction>+ <StackPanel Margin="0,20,0,0">+ <ui:TextBlock+ FontTypography="BodyStrong"+ Text="{ext:Loc Settings.Advanced.Header}"+ TextWrapping="Wrap"+ />- <ui:CardAction- Command="{Binding ViewModel.OpenRootDirCommand}"- Icon="{ui:SymbolIcon Folder24}"- IsChevronVisible="False"- >- <Grid ColumnDefinitions="* Auto">- <StackPanel>- <ui:TextBlock- Margin="0"- Appearance="Primary"- FontTypography="BodyStrong"- Text="{ext:Loc Settings.Advanced.OpenRootDir.Title}"- TextWrapping="Wrap"- />- <ui:TextBlock- Appearance="Secondary"- Text="{ext:Loc Settings.Advanced.OpenRootDir.Description}"- TextWrapping="Wrap"- />+ <ui:CardAction Command="{Binding ViewModel.ClearResourcesCommand}">+ <ui:CardAction.Icon>+ <ui:SymbolIcon+ Foreground="{DynamicResource SystemFillColorCriticalBrush}"+ Symbol="Archive24"+ />+ </ui:CardAction.Icon>+ <StackPanel>+ <ui:TextBlock+ Margin="0"+ Foreground="{DynamicResource TextFillColorPrimaryBrush}"+ FontTypography="BodyStrong"+ Text="{ext:Loc Settings.Advanced.ClearResources.Title}"+ TextWrapping="Wrap"+ />+ <ui:TextBlock+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ Text="{ext:Loc Settings.Advanced.ClearResources.Description}"+ TextWrapping="Wrap"+ />+ </StackPanel>+ </ui:CardAction>++ <ui:CardAction Command="{Binding ViewModel.ClearAllRevertDataCommand}">+ <ui:CardAction.Icon>+ <ui:SymbolIcon+ Foreground="{DynamicResource SystemFillColorCriticalBrush}"+ Symbol="DatabaseLightning20"+ />+ </ui:CardAction.Icon>+ <StackPanel>+ <ui:TextBlock+ Margin="0"+ Foreground="{DynamicResource TextFillColorPrimaryBrush}"+ FontTypography="BodyStrong"+ Text="{ext:Loc Settings.Advanced.ClearRevertDatas.Title}"+ TextWrapping="Wrap"+ />+ <ui:TextBlock+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ Text="{ext:Loc Settings.Advanced.ClearRevertDatas.Description}"+ TextWrapping="Wrap"+ />+ </StackPanel>+ </ui:CardAction>++ <ui:CardAction+ Command="{Binding ViewModel.OpenRootDirCommand}"+ Icon="{ui:SymbolIcon Folder24}"+ IsChevronVisible="False"+ >+ <Grid ColumnDefinitions="* Auto">+ <StackPanel>+ <ui:TextBlock+ Margin="0"+ Foreground="{DynamicResource TextFillColorPrimaryBrush}"+ FontTypography="BodyStrong"+ Text="{ext:Loc Settings.Advanced.OpenRootDir.Title}"+ TextWrapping="Wrap"+ />+ <ui:TextBlock+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ Text="{ext:Loc Settings.Advanced.OpenRootDir.Description}"+ TextWrapping="Wrap"+ />+ </StackPanel>+ <ui:SymbolIcon Grid.Column="1" FontSize="20" Symbol="Open24" />+ </Grid>+ </ui:CardAction></StackPanel>- <ui:SymbolIcon Grid.Column="1" FontSize="20" Symbol="Open24" />- </Grid>- </ui:CardAction>- </StackPanel>- <StackPanel Margin="0,20,0,0">- <ui:TextBlock- FontTypography="BodyStrong"- Text="{ext:Loc Settings.About.Header}"- TextWrapping="Wrap"- />+ <StackPanel Margin="0,20,0,0">+ <ui:TextBlock+ FontTypography="BodyStrong"+ Text="{ext:Loc Settings.About.Header}"+ TextWrapping="Wrap"+ />- <ui:CardAction- Command="{Binding ViewModel.OpenWebsiteCommand}"- CommandParameter="Web"- IsChevronVisible="False"- >- <ui:CardAction.Icon>- <ui:ImageIcon- Height="25"- Source="pack://application:,,,/optimizerDuck;component/Resources/Images/Duck.png"- />- </ui:CardAction.Icon>+ <ui:CardAction+ Command="{Binding ViewModel.OpenWebsiteCommand}"+ CommandParameter="Web"+ IsChevronVisible="False"+ >+ <ui:CardAction.Icon>+ <ui:ImageIcon+ Height="25"+ Source="pack://application:,,,/optimizerDuck;component/Resources/Images/Duck.png"+ />+ </ui:CardAction.Icon>- <Grid ColumnDefinitions="* Auto">- <StackPanel>- <ui:TextBlock- Appearance="Primary"- FontTypography="BodyStrong"- Text="optimizerDuck"- TextWrapping="Wrap"- />- <ui:TextBlock- Appearance="Secondary"- Text="{ext:Loc Settings.About.Duck.Description,+ <Grid ColumnDefinitions="* Auto">+ <StackPanel>+ <ui:TextBlock+ Foreground="{DynamicResource TextFillColorPrimaryBrush}"+ FontTypography="BodyStrong"+ Text="optimizerDuck"+ TextWrapping="Wrap"+ />+ <ui:TextBlock+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ Text="{ext:Loc Settings.About.Duck.Description,{Binding ViewModel.Version}}"- TextWrapping="Wrap"- />- </StackPanel>- <ui:SymbolIcon Grid.Column="1" FontSize="20" Symbol="Open24" />- </Grid>- </ui:CardAction>+ TextWrapping="Wrap"+ />+ </StackPanel>+ <ui:SymbolIcon Grid.Column="1" FontSize="20" Symbol="Open24" />+ </Grid>+ </ui:CardAction>- <ui:CardAction- Command="{Binding ViewModel.OpenWebsiteCommand}"- CommandParameter="Help"- Icon="{ui:SymbolIcon ChatBubblesQuestion24}"- IsChevronVisible="False"- >- <Grid ColumnDefinitions="* Auto">- <StackPanel>- <ui:TextBlock- Padding="0"- FontTypography="BodyStrong"- Text="{ext:Loc Settings.About.NeedHelp.Title}"- />- <ui:TextBlock- Appearance="Secondary"- Text="{ext:Loc Settings.About.NeedHelp.Description}"- TextWrapping="Wrap"- />- </StackPanel>+ <ui:CardAction+ Command="{Binding ViewModel.OpenWebsiteCommand}"+ CommandParameter="Help"+ Icon="{ui:SymbolIcon ChatBubblesQuestion24}"+ IsChevronVisible="False"+ >+ <Grid ColumnDefinitions="* Auto">+ <StackPanel>+ <ui:TextBlock+ Padding="0"+ FontTypography="BodyStrong"+ Text="{ext:Loc Settings.About.NeedHelp.Title}"+ />+ <ui:TextBlock+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ Text="{ext:Loc Settings.About.NeedHelp.Description}"+ TextWrapping="Wrap"+ />+ </StackPanel>- <ui:SymbolIcon Grid.Column="1" FontSize="20" Symbol="Open24" />- </Grid>- </ui:CardAction>+ <ui:SymbolIcon Grid.Column="1" FontSize="20" Symbol="Open24" />+ </Grid>+ </ui:CardAction>- <ui:CardAction- VerticalAlignment="Stretch"- Command="{Binding ViewModel.OpenAcknowledgementsCommand}"- IsChevronVisible="False"- >- <ui:CardAction.Icon>- <ui:SymbolIcon Symbol="DocumentHeart24" />- </ui:CardAction.Icon>+ <ui:CardAction+ VerticalAlignment="Stretch"+ Command="{Binding ViewModel.OpenAcknowledgementsCommand}"+ IsChevronVisible="False"+ >+ <ui:CardAction.Icon>+ <ui:SymbolIcon Symbol="DocumentHeart24" />+ </ui:CardAction.Icon>- <Grid ColumnDefinitions="* Auto">- <StackPanel>- <ui:TextBlock- Appearance="Primary"- FontTypography="BodyStrong"- Text="{ext:Loc Settings.About.Acknowledgements.Title}"- TextWrapping="Wrap"- />- <ui:TextBlock- Appearance="Secondary"- Text="{ext:Loc Settings.About.Acknowledgements.Description}"- TextWrapping="Wrap"- />- </StackPanel>+ <Grid ColumnDefinitions="* Auto">+ <StackPanel>+ <ui:TextBlock+ Foreground="{DynamicResource TextFillColorPrimaryBrush}"+ FontTypography="BodyStrong"+ Text="{ext:Loc Settings.About.Acknowledgements.Title}"+ TextWrapping="Wrap"+ />+ <ui:TextBlock+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ Text="{ext:Loc Settings.About.Acknowledgements.Description}"+ TextWrapping="Wrap"+ />+ </StackPanel>- <ui:SymbolIcon Grid.Column="1" FontSize="20" Symbol="Open24" />- </Grid>- </ui:CardAction>+ <ui:SymbolIcon Grid.Column="1" FontSize="20" Symbol="Open24" />+ </Grid>+ </ui:CardAction>- <ui:TextBlock- Margin="0,15,0,0"- FontTypography="Subtitle"- Text="{ext:Loc Settings.About.LearnMore}"- TextTrimming="WordEllipsis"- TextWrapping="Wrap"- />- <StackPanel Margin="7,0,0,0">- <ui:HyperlinkButton- Content="{ext:Loc Settings.About.LearnMore.Website}"- NavigateUri="{Binding ViewModel.Website}"- />- <ui:HyperlinkButton- Content="{ext:Loc Settings.About.LearnMore.Contribute}"- NavigateUri="{Binding ViewModel.Contribute}"- />- <ui:HyperlinkButton- Content="{ext:Loc Settings.About.LearnMore.Documentation}"- NavigateUri="{Binding ViewModel.Documentation}"- />- <ui:HyperlinkButton- Content="{ext:Loc Settings.About.LearnMore.Community}"- NavigateUri="{Binding ViewModel.Community}"- />- <ui:HyperlinkButton- Content="{ext:Loc Settings.About.LearnMore.Acknowledgements}"- NavigateUri="{Binding ViewModel.Acknowledgements}"- />+ <ui:TextBlock+ Margin="0,15,0,0"+ FontTypography="Subtitle"+ Text="{ext:Loc Settings.About.LearnMore}"+ TextTrimming="WordEllipsis"+ TextWrapping="Wrap"+ />+ <StackPanel Margin="7,0,0,0">+ <ui:HyperlinkButton+ Content="{ext:Loc Settings.About.LearnMore.Website}"+ NavigateUri="{Binding ViewModel.Website}"+ />+ <ui:HyperlinkButton+ Content="{ext:Loc Settings.About.LearnMore.Contribute}"+ NavigateUri="{Binding ViewModel.Contribute}"+ />+ <ui:HyperlinkButton+ Content="{ext:Loc Settings.About.LearnMore.Documentation}"+ NavigateUri="{Binding ViewModel.Documentation}"+ />+ <ui:HyperlinkButton+ Content="{ext:Loc Settings.About.LearnMore.Community}"+ NavigateUri="{Binding ViewModel.Community}"+ />+ <ui:HyperlinkButton+ Content="{ext:Loc Settings.About.LearnMore.Acknowledgements}"+ NavigateUri="{Binding ViewModel.Acknowledgements}"+ />+ </StackPanel>+ </StackPanel></StackPanel>- </StackPanel></StackPanel>- </StackPanel></Page>diff --git a/optimizerDuck/UI/Pages/StartupManagerPage.xaml b/optimizerDuck/UI/Pages/StartupManagerPage.xamlindex f9c02f0..eb8728d 100644--- a/optimizerDuck/UI/Pages/StartupManagerPage.xaml+++ b/optimizerDuck/UI/Pages/StartupManagerPage.xaml@@ -1,632 +1,676 @@<Page- x:Class="optimizerDuck.UI.Pages.StartupManagerPage"- xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"- xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"- xmlns:converters="clr-namespace:optimizerDuck.Common.Converters"- xmlns:d="http://schemas.microsoft.com/expression/blend/2008"- xmlns:ext="clr-namespace:optimizerDuck.Common.Extensions"- xmlns:local="clr-namespace:optimizerDuck.UI.Pages"- xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"- xmlns:startupManager="clr-namespace:optimizerDuck.Domain.Optimizations.Models.StartupManager"- xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"- Title="StartupManagerPage"- Margin="0,32,0,0"- d:DataContext="{d:DesignInstance local:StartupManagerPage}"- d:DesignHeight="1200"- d:DesignWidth="800"- ui:Design.Background="Black"- ui:Design.Foreground="White"- Foreground="{DynamicResource TextFillColorPrimaryBrush}"- ScrollViewer.CanContentScroll="False"- mc:Ignorable="d"+ x:Class="optimizerDuck.UI.Pages.StartupManagerPage"+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"+ xmlns:converters="clr-namespace:optimizerDuck.Common.Converters"+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"+ xmlns:ext="clr-namespace:optimizerDuck.Common.Extensions"+ xmlns:local="clr-namespace:optimizerDuck.UI.Pages"+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"+ xmlns:startupManager="clr-namespace:optimizerDuck.Domain.Optimizations.Models.StartupManager"+ xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"+ Title="StartupManagerPage"+ Margin="0,32,0,0"+ d:DataContext="{d:DesignInstance local:StartupManagerPage}"+ d:DesignHeight="1200"+ d:DesignWidth="800"+ ui:Design.Background="Black"+ ui:Design.Foreground="White"+ Foreground="{DynamicResource TextFillColorPrimaryBrush}"+ ScrollViewer.CanContentScroll="False"+ mc:Ignorable="d">- <Page.Resources>- <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />- <converters:GreaterThanZeroToVisibilityConverter x:Key="GreaterThanZeroToVisibilityConverter" />- <converters:EmptyWhileNotLoadingConverter x:Key="EmptyWhileNotLoadingConverter" />- </Page.Resources>+ <Page.Resources>+ <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />+ <converters:GreaterThanZeroToVisibilityConverter x:Key="GreaterThanZeroToVisibilityConverter" />+ <converters:EmptyWhileNotLoadingConverter x:Key="EmptyWhileNotLoadingConverter" />+ </Page.Resources>- <Grid RowDefinitions="Auto, *">- <!-- Header -->- <StackPanel Margin="0,0,0,20">- <Grid>- <Grid.ColumnDefinitions>- <ColumnDefinition Width="*" />- <ColumnDefinition Width="Auto" />- </Grid.ColumnDefinitions>- <StackPanel Grid.Column="0">- <ui:TextBlock FontTypography="Title" Text="{ext:Loc StartupManager.Header.Title}" />- <ui:TextBlock- Margin="0,4,0,0"- Appearance="Secondary"- FontTypography="Body"- Text="{ext:Loc StartupManager.Header.Description}"- TextWrapping="Wrap"- />- </StackPanel>- <WrapPanel Grid.Column="1" VerticalAlignment="Center" Orientation="Horizontal">- <ui:Button- Appearance="Primary"- Command="{Binding ViewModel.RefreshCommand}"- Content="{ext:Loc StartupManager.Menu.Refresh}"- Icon="{ui:SymbolIcon ArrowClockwise24,+ <Grid RowDefinitions="Auto, *">+ <!-- Header -->+ <StackPanel Margin="0,0,0,20">+ <Grid>+ <Grid.ColumnDefinitions>+ <ColumnDefinition Width="*" />+ <ColumnDefinition Width="Auto" />+ </Grid.ColumnDefinitions>+ <StackPanel Grid.Column="0">+ <ui:TextBlock+ FontTypography="Title"+ Text="{ext:Loc StartupManager.Header.Title}"+ />+ <ui:TextBlock+ Margin="0,4,0,0"+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ FontTypography="Body"+ Text="{ext:Loc StartupManager.Header.Description}"+ TextWrapping="Wrap"+ />+ </StackPanel>+ <WrapPanel Grid.Column="1" VerticalAlignment="Center" Orientation="Horizontal">+ <ui:Button+ Appearance="Primary"+ Command="{Binding ViewModel.RefreshCommand}"+ Content="{ext:Loc StartupManager.Menu.Refresh}"+ Icon="{ui:SymbolIcon ArrowClockwise24,FontSize=18}"- />- </WrapPanel>- </Grid>- </StackPanel>-- <!-- Loading Indicator -->- <Border- Grid.Row="1"- Visibility="{Binding ViewModel.IsLoading, Converter={StaticResource BooleanToVisibilityConverter}}"- >- <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">- <ui:ProgressRing- Width="48"- Height="48"- Margin="0,0,0,16"- HorizontalAlignment="Center"- VerticalAlignment="Center"- IsIndeterminate="True"- />- <ui:TextBlock- HorizontalAlignment="Center"- FontTypography="BodyStrong"- Text="{ext:Loc StartupManager.Loading}"- />- <ui:TextBlock- Margin="0,4,0,0"- HorizontalAlignment="Center"- Appearance="Secondary"- FontTypography="Caption"- Text="{ext:Loc StartupManager.Loading.Hint}"- />- </StackPanel>- </Border>-- <!-- Empty State (no data at all) -->- <Border Grid.Row="1">- <Border.Style>- <Style TargetType="Border">- <Setter Property="Visibility" Value="Collapsed" />- <Style.Triggers>- <MultiDataTrigger>- <MultiDataTrigger.Conditions>- <Condition Binding="{Binding ViewModel.HasData}" Value="False" />- <Condition Binding="{Binding ViewModel.IsLoading}" Value="False" />- </MultiDataTrigger.Conditions>- <Setter Property="Visibility" Value="Visible" />- </MultiDataTrigger>- </Style.Triggers>- </Style>- </Border.Style>-- <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">- <ui:SymbolIcon- Margin="0,0,0,15"- HorizontalAlignment="Center"- FontSize="46"- Foreground="{DynamicResource SystemFillColorCriticalBrush}"- Symbol="AppGeneric24"- />- <ui:TextBlock- HorizontalAlignment="Center"- FontTypography="Subtitle"- Text="{ext:Loc StartupManager.Empty.Title}"- />- <ui:TextBlock- Margin="0,0,0,10"- HorizontalAlignment="Center"- Appearance="Secondary"- FontTypography="Body"- Text="{ext:Loc StartupManager.Empty.Description}"- />- <ui:Button- HorizontalAlignment="Center"- Appearance="Primary"- Command="{Binding ViewModel.RefreshCommand}"- Content="{ext:Loc StartupManager.Menu.Refresh}"- Icon="{ui:SymbolIcon ArrowClockwise24,- FontSize=18}"- />- </StackPanel>- </Border>+ Visibility="{Binding ViewModel.ShowRefreshButton, Converter={StaticResource BooleanToVisibilityConverter}}"+ />+ </WrapPanel>+ </Grid>+ </StackPanel>- <!-- Main Content -->- <Border- Grid.Row="1"- Visibility="{Binding ViewModel.HasData, Converter={StaticResource BooleanToVisibilityConverter}}"- >- <ScrollViewer>- <StackPanel Margin="0,0,16,0">- <!-- ═══════════ Startup Apps Section ═══════════ -->- <ui:CardExpander- Margin="0,0,0,12"- Icon="{ui:SymbolIcon Apps24}"- IsExpanded="True"- Visibility="{Binding ViewModel.HasApps, Converter={StaticResource BooleanToVisibilityConverter}}"- >- <ui:CardExpander.Header>- <StackPanel>- <StackPanel Orientation="Horizontal">- <ui:TextBlock+ <!-- Loading Indicator -->+ <Border+ Grid.Row="1"+ Visibility="{Binding ViewModel.IsLoading, Converter={StaticResource BooleanToVisibilityConverter}}"+ >+ <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">+ <ui:ProgressRing+ Width="48"+ Height="48"+ Margin="0,0,0,16"+ HorizontalAlignment="Center"VerticalAlignment="Center"+ IsIndeterminate="True"+ />+ <ui:TextBlock+ HorizontalAlignment="Center"FontTypography="BodyStrong"- Text="{ext:Loc StartupManager.Apps.Title}"- />- <Border- Margin="8,0,0,0"- Padding="8,2"- VerticalAlignment="Center"- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"- CornerRadius="10"- >- <ui:TextBlock- VerticalAlignment="Center"- Appearance="Tertiary"- FontTypography="Caption"- Text="{ext:Loc StartupManager.Apps.CountSuffix,- {Binding ViewModel.Apps.Count}}"- />- </Border>- </StackPanel>+ Text="{ext:Loc StartupManager.Loading}"+ /><ui:TextBlock- Margin="0,4,0,0"- Appearance="Secondary"- FontTypography="Caption"- Text="{ext:Loc StartupManager.Apps.Description}"- TextWrapping="Wrap"+ Margin="0,4,0,0"+ HorizontalAlignment="Center"+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ FontTypography="Caption"+ Text="{ext:Loc StartupManager.Loading.Hint}"/>- </StackPanel>- </ui:CardExpander.Header>+ </StackPanel>+ </Border>- <StackPanel>- <!-- Apps Toolbar -->- <WrapPanel Margin="0,0,0,8" Orientation="Horizontal">- <ui:TextBox- MinWidth="200"- Margin="0,0,8,0"- VerticalAlignment="Center"- Icon="{ui:SymbolIcon Search24}"- PlaceholderText="{ext:Loc Common.Search.Placeholder}"- Text="{Binding ViewModel.AppSearchText, UpdateSourceTrigger=PropertyChanged}"- />- <ComboBox- Margin="0,0,8,0"- VerticalAlignment="Center"- SelectedIndex="{Binding ViewModel.AppSortByIndex}"- ToolTip="{ext:Loc Common.SortBy}"- >- <ComboBoxItem HorizontalContentAlignment="Left">- <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">- <ui:SymbolIcon- Margin="0,0,6,0"- HorizontalAlignment="Left"- Symbol="TextSortAscending24"- />- <TextBlock- Grid.Column="1"- HorizontalAlignment="Left"- Text="{ext:Loc Common.SortBy.Name}"- />- </Grid>- </ComboBoxItem>- <ComboBoxItem HorizontalContentAlignment="Left">- <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">- <ui:SymbolIcon- Margin="0,0,6,0"- HorizontalAlignment="Left"- Symbol="ToggleRight24"- />- <TextBlock- Grid.Column="1"- HorizontalAlignment="Left"- Text="{ext:Loc Common.SortBy.Status}"- />- </Grid>- </ComboBoxItem>- <ComboBoxItem HorizontalContentAlignment="Left">- <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">- <ui:SymbolIcon- Margin="0,0,6,0"- HorizontalAlignment="Left"- Symbol="Folder24"- />- <TextBlock- Grid.Column="1"- HorizontalAlignment="Left"- Text="{ext:Loc Common.SortBy.Path}"- />- </Grid>- </ComboBoxItem>- </ComboBox>- <ui:Button- Padding="8"- VerticalAlignment="Center"- Appearance="Secondary"- Command="{Binding ViewModel.OpenStartupSettingsCommand}"- Icon="{ui:SymbolIcon Settings24,- FontSize=16}"- ToolTip="{ext:Loc StartupManager.Menu.OpenSettings}"- />- </WrapPanel>+ <!-- Empty State (no data at all) -->+ <Border Grid.Row="1">+ <Border.Style>+ <Style TargetType="Border">+ <Setter Property="Visibility" Value="Collapsed" />+ <Style.Triggers>+ <MultiDataTrigger>+ <MultiDataTrigger.Conditions>+ <Condition Binding="{Binding ViewModel.HasData}" Value="False" />+ <Condition Binding="{Binding ViewModel.IsLoading}" Value="False" />+ </MultiDataTrigger.Conditions>+ <Setter Property="Visibility" Value="Visible" />+ </MultiDataTrigger>+ </Style.Triggers>+ </Style>+ </Border.Style>- <!-- No search results (Apps) -->- <StackPanel- Margin="0,32,0,32"- HorizontalAlignment="Center"- VerticalAlignment="Center"- >- <StackPanel.Visibility>- <MultiBinding Converter="{StaticResource EmptyWhileNotLoadingConverter}">- <Binding Path="ViewModel.Apps.Count" />- <Binding Path="ViewModel.IsLoading" />- </MultiBinding>- </StackPanel.Visibility>+ <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center"><ui:SymbolIcon- Margin="0,0,0,10"- HorizontalAlignment="Center"- FontSize="36"- Foreground="{DynamicResource SystemFillColorCriticalBrush}"- Symbol="SearchInfo24"+ Margin="0,0,0,15"+ HorizontalAlignment="Center"+ FontSize="46"+ Foreground="{DynamicResource SystemFillColorCriticalBrush}"+ Symbol="AppGeneric24"/><ui:TextBlock- HorizontalAlignment="Center"- Appearance="Secondary"- FontTypography="Body"- Text="{ext:Loc Bloatware.Search.NoResults}"+ HorizontalAlignment="Center"+ FontTypography="Subtitle"+ Text="{ext:Loc StartupManager.Empty.Title}"/>- </StackPanel>+ <ui:TextBlock+ Margin="0,0,0,10"+ HorizontalAlignment="Center"+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ FontTypography="Body"+ Text="{ext:Loc StartupManager.Empty.Description}"+ />+ <ui:Button+ HorizontalAlignment="Center"+ Appearance="Primary"+ Command="{Binding ViewModel.RefreshCommand}"+ Content="{ext:Loc StartupManager.Menu.Refresh}"+ Icon="{ui:SymbolIcon ArrowClockwise24,+ FontSize=18}"+ />+ </StackPanel>+ </Border>++ <!-- Main Content -->+ <Border+ Grid.Row="1"+ Visibility="{Binding ViewModel.HasData, Converter={StaticResource BooleanToVisibilityConverter}}"+ >+ <ScrollViewer>+ <StackPanel Margin="0,0,16,0">+ <!-- ═══════════ Startup Apps Section ═══════════ -->+ <ui:CardExpander+ Margin="0,0,0,12"+ Icon="{ui:SymbolIcon Apps24}"+ IsExpanded="True"+ Visibility="{Binding ViewModel.HasApps, Converter={StaticResource BooleanToVisibilityConverter}}"+ >+ <ui:CardExpander.Header>+ <StackPanel>+ <StackPanel Orientation="Horizontal">+ <ui:TextBlock+ VerticalAlignment="Center"+ FontTypography="BodyStrong"+ Text="{ext:Loc StartupManager.Apps.Title}"+ />+ <Border+ Margin="8,0,0,0"+ Padding="8,2"+ VerticalAlignment="Center"+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"+ CornerRadius="10"+ >+ <ui:TextBlock+ VerticalAlignment="Center"+ Appearance="Tertiary"+ FontTypography="Caption"+ Text="{ext:Loc StartupManager.Apps.CountSuffix,+ {Binding ViewModel.Apps.Count}}"+ />+ </Border>+ </StackPanel>+ <ui:TextBlock+ Margin="0,4,0,0"+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ FontTypography="Caption"+ Text="{ext:Loc StartupManager.Apps.Description}"+ TextWrapping="Wrap"+ />+ </StackPanel>+ </ui:CardExpander.Header>++ <StackPanel>+ <!-- Apps Toolbar -->+ <WrapPanel Margin="0,0,0,8" Orientation="Horizontal">+ <ui:TextBox+ MinWidth="200"+ Margin="0,0,8,0"+ VerticalAlignment="Center"+ Icon="{ui:SymbolIcon Search24}"+ PlaceholderText="{ext:Loc Common.Search.Placeholder}"+ Text="{Binding ViewModel.AppSearchText, UpdateSourceTrigger=PropertyChanged}"+ />+ <ComboBox+ Margin="0,0,8,0"+ VerticalAlignment="Center"+ SelectedIndex="{Binding ViewModel.AppSortByIndex}"+ ToolTip="{ext:Loc Common.SortBy}"+ >+ <ComboBoxItem HorizontalContentAlignment="Left">+ <Grid+ HorizontalAlignment="Left"+ ColumnDefinitions="Auto Auto"+ >+ <ui:SymbolIcon+ Margin="0,0,6,0"+ HorizontalAlignment="Left"+ Symbol="TextSortAscending24"+ />+ <TextBlock+ Grid.Column="1"+ HorizontalAlignment="Left"+ Text="{ext:Loc Common.SortBy.Name}"+ />+ </Grid>+ </ComboBoxItem>+ <ComboBoxItem HorizontalContentAlignment="Left">+ <Grid+ HorizontalAlignment="Left"+ ColumnDefinitions="Auto Auto"+ >+ <ui:SymbolIcon+ Margin="0,0,6,0"+ HorizontalAlignment="Left"+ Symbol="ToggleRight24"+ />+ <TextBlock+ Grid.Column="1"+ HorizontalAlignment="Left"+ Text="{ext:Loc Common.SortBy.Status}"+ />+ </Grid>+ </ComboBoxItem>+ <ComboBoxItem HorizontalContentAlignment="Left">+ <Grid+ HorizontalAlignment="Left"+ ColumnDefinitions="Auto Auto"+ >+ <ui:SymbolIcon+ Margin="0,0,6,0"+ HorizontalAlignment="Left"+ Symbol="Folder24"+ />+ <TextBlock+ Grid.Column="1"+ HorizontalAlignment="Left"+ Text="{ext:Loc Common.SortBy.Path}"+ />+ </Grid>+ </ComboBoxItem>+ </ComboBox>+ <ui:Button+ Padding="8"+ VerticalAlignment="Center"+ Appearance="Secondary"+ Command="{Binding ViewModel.OpenStartupSettingsCommand}"+ Icon="{ui:SymbolIcon Settings24,+ FontSize=16}"+ ToolTip="{ext:Loc StartupManager.Menu.OpenSettings}"+ />+ </WrapPanel>- <!-- Apps List -->- <ItemsControl- ItemsSource="{Binding ViewModel.Apps}"- Visibility="{Binding ViewModel.Apps.Count, Converter={StaticResource GreaterThanZeroToVisibilityConverter}}"- >- <ItemsControl.ItemTemplate>- <DataTemplate DataType="{x:Type startupManager:StartupApp}">- <Grid>- <ui:CardAction- x:Name="ActionCard"- Margin="0,0,0,4"- Padding="12,10"- Command="{Binding DataContext.ViewModel.OpenLocationCommand, RelativeSource={RelativeSource AncestorType=Page}}"- CommandParameter="{Binding}"- IsChevronVisible="False"- >- <Grid>- <Grid.ColumnDefinitions>- <ColumnDefinition Width="Auto" />- <ColumnDefinition Width="*" />- <ColumnDefinition Width="Auto" />- </Grid.ColumnDefinitions>- <Image- Grid.Column="0"- Width="36"- Height="36"- Margin="0,0,12,0"- VerticalAlignment="Center"- Source="{Binding LogoImage}"- Stretch="UniformToFill"- />- <StackPanel Grid.Column="1" VerticalAlignment="Center">- <DockPanel LastChildFill="False">- <ui:TextBlock FontTypography="BodyStrong" Text="{Binding Name}" />- <Border- Margin="8,0,0,0"- Padding="6,1"+ <!-- No search results (Apps) -->+ <StackPanel+ Margin="0,32,0,32"+ HorizontalAlignment="Center"VerticalAlignment="Center"- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"- CornerRadius="4"- >+ >+ <StackPanel.Visibility>+ <MultiBinding Converter="{StaticResource EmptyWhileNotLoadingConverter}">+ <Binding Path="ViewModel.Apps.Count" />+ <Binding Path="ViewModel.IsLoading" />+ </MultiBinding>+ </StackPanel.Visibility>+ <ui:SymbolIcon+ Margin="0,0,0,10"+ HorizontalAlignment="Center"+ FontSize="36"+ Foreground="{DynamicResource SystemFillColorCriticalBrush}"+ Symbol="SearchInfo24"+ /><ui:TextBlock- VerticalAlignment="Center"- Appearance="Tertiary"- FontTypography="Caption"- Text="{Binding LocationDisplay}"+ HorizontalAlignment="Center"+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ FontTypography="Body"+ Text="{ext:Loc Bloatware.Search.NoResults}"/>- </Border>- </DockPanel>- <ui:TextBlock- Margin="0,2,0,0"- Appearance="Secondary"- FontTypography="Caption"- Text="{Binding Publisher}"- />- <ui:TextBlock- Margin="0,2,0,0"- Appearance="Disabled"- FontTypography="Caption"- Text="{Binding Command}"- TextTrimming="CharacterEllipsis"- />- </StackPanel>- <StackPanel Grid.Column="2" Orientation="Horizontal">- <ui:ToggleSwitch- Margin="0,0,16,0"- VerticalAlignment="Center"- Cursor="Hand"- IsChecked="{Binding IsEnabled, Mode=TwoWay}"- OffContent="{ext:Loc Common.Toggle.Off}"- OnContent="{ext:Loc Common.Toggle.On}"- />- <ui:SymbolIcon FontSize="16" Symbol="Open24" />- </StackPanel>- </Grid>- </ui:CardAction>- </Grid>- </DataTemplate>- </ItemsControl.ItemTemplate>- </ItemsControl>- </StackPanel>- </ui:CardExpander>+ </StackPanel>- <!-- ═══════════ Scheduled Tasks Section ═══════════ -->- <ui:CardExpander- Margin="0,0,0,12"- Icon="{ui:SymbolIcon CalculatorArrowClockwise24}"- IsExpanded="True"- Visibility="{Binding ViewModel.HasTasks, Converter={StaticResource BooleanToVisibilityConverter}}"- >- <ui:CardExpander.Header>- <StackPanel>- <StackPanel Orientation="Horizontal">- <ui:TextBlock- VerticalAlignment="Center"- FontTypography="BodyStrong"- Text="{ext:Loc StartupManager.Tasks.Title}"- />- <Border- Margin="8,0,0,0"- Padding="8,2"- VerticalAlignment="Center"- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"- CornerRadius="10"- >- <ui:TextBlock- VerticalAlignment="Center"- Appearance="Tertiary"- FontTypography="Caption"- Text="{ext:Loc StartupManager.Tasks.CountSuffix,+ <!-- Apps List -->+ <ItemsControl+ ItemsSource="{Binding ViewModel.Apps}"+ Visibility="{Binding ViewModel.Apps.Count, Converter={StaticResource GreaterThanZeroToVisibilityConverter}}"+ >+ <ItemsControl.ItemTemplate>+ <DataTemplate DataType="{x:Type startupManager:StartupApp}">+ <Grid>+ <ui:CardAction+ x:Name="ActionCard"+ Margin="0,0,0,4"+ Padding="12,10"+ Command="{Binding DataContext.ViewModel.OpenLocationCommand, RelativeSource={RelativeSource AncestorType=Page}}"+ CommandParameter="{Binding}"+ IsChevronVisible="False"+ >+ <Grid>+ <Grid.ColumnDefinitions>+ <ColumnDefinition Width="Auto" />+ <ColumnDefinition Width="*" />+ <ColumnDefinition Width="Auto" />+ </Grid.ColumnDefinitions>+ <Image+ Grid.Column="0"+ Width="36"+ Height="36"+ Margin="0,0,12,0"+ VerticalAlignment="Center"+ Source="{Binding LogoImage}"+ Stretch="UniformToFill"+ />+ <StackPanel+ Grid.Column="1"+ VerticalAlignment="Center"+ >+ <DockPanel LastChildFill="False">+ <ui:TextBlock+ FontTypography="BodyStrong"+ Text="{Binding Name}"+ />+ <Border+ Margin="8,0,0,0"+ Padding="6,1"+ VerticalAlignment="Center"+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"+ CornerRadius="4"+ >+ <ui:TextBlock+ VerticalAlignment="Center"+ Appearance="Tertiary"+ FontTypography="Caption"+ Text="{Binding LocationDisplay}"+ />+ </Border>+ </DockPanel>+ <ui:TextBlock+ Margin="0,2,0,0"+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ FontTypography="Caption"+ Text="{Binding Publisher}"+ />+ <ui:TextBlock+ Margin="0,2,0,0"+ Foreground="{DynamicResource TextFillColorDisabledBrush}"+ FontTypography="Caption"+ Text="{Binding Command}"+ TextTrimming="CharacterEllipsis"+ />+ </StackPanel>+ <StackPanel+ Grid.Column="2"+ Orientation="Horizontal"+ >+ <ui:ToggleSwitch+ Margin="0,0,16,0"+ VerticalAlignment="Center"+ Cursor="Hand"+ IsChecked="{Binding IsEnabled, Mode=TwoWay}"+ OffContent="{ext:Loc Common.Toggle.Off}"+ OnContent="{ext:Loc Common.Toggle.On}"+ />+ <ui:SymbolIcon+ FontSize="16"+ Symbol="Open24"+ />+ </StackPanel>+ </Grid>+ </ui:CardAction>+ </Grid>+ </DataTemplate>+ </ItemsControl.ItemTemplate>+ </ItemsControl>+ </StackPanel>+ </ui:CardExpander>++ <!-- ═══════════ Scheduled Tasks Section ═══════════ -->+ <ui:CardExpander+ Margin="0,0,0,12"+ Icon="{ui:SymbolIcon CalculatorArrowClockwise24}"+ IsExpanded="True"+ Visibility="{Binding ViewModel.HasTasks, Converter={StaticResource BooleanToVisibilityConverter}}"+ >+ <ui:CardExpander.Header>+ <StackPanel>+ <StackPanel Orientation="Horizontal">+ <ui:TextBlock+ VerticalAlignment="Center"+ FontTypography="BodyStrong"+ Text="{ext:Loc StartupManager.Tasks.Title}"+ />+ <Border+ Margin="8,0,0,0"+ Padding="8,2"+ VerticalAlignment="Center"+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"+ CornerRadius="10"+ >+ <ui:TextBlock+ VerticalAlignment="Center"+ Appearance="Tertiary"+ FontTypography="Caption"+ Text="{ext:Loc StartupManager.Tasks.CountSuffix,{Binding ViewModel.Tasks.Count}}"- />- </Border>- </StackPanel>- <ui:TextBlock- Margin="0,4,0,0"- Appearance="Secondary"- FontTypography="Caption"- Text="{ext:Loc StartupManager.Tasks.Description}"- TextWrapping="Wrap"- />- </StackPanel>- </ui:CardExpander.Header>+ />+ </Border>+ </StackPanel>+ <ui:TextBlock+ Margin="0,4,0,0"+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ FontTypography="Caption"+ Text="{ext:Loc StartupManager.Tasks.Description}"+ TextWrapping="Wrap"+ />+ </StackPanel>+ </ui:CardExpander.Header>- <StackPanel>- <!-- Tasks Toolbar -->- <WrapPanel Margin="0,0,0,8" Orientation="Horizontal">- <ui:TextBox- MinWidth="200"- Margin="0,0,8,0"- VerticalAlignment="Center"- Icon="{ui:SymbolIcon Search24}"- PlaceholderText="{ext:Loc Common.Search.Placeholder}"- Text="{Binding ViewModel.TaskSearchText, UpdateSourceTrigger=PropertyChanged}"- />- <ComboBox- Margin="0,0,8,0"- VerticalAlignment="Center"- SelectedIndex="{Binding ViewModel.TaskSortByIndex}"- ToolTip="{ext:Loc Common.SortBy}"- >- <ComboBoxItem HorizontalContentAlignment="Left">- <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">- <ui:SymbolIcon- Margin="0,0,6,0"- HorizontalAlignment="Left"- Symbol="TextSortAscending24"- />- <TextBlock- Grid.Column="1"- HorizontalAlignment="Left"- Text="{ext:Loc Common.SortBy.Name}"- />- </Grid>- </ComboBoxItem>- <ComboBoxItem HorizontalContentAlignment="Left">- <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">- <ui:SymbolIcon- Margin="0,0,6,0"- HorizontalAlignment="Left"- Symbol="ToggleRight24"- />- <TextBlock- Grid.Column="1"- HorizontalAlignment="Left"- Text="{ext:Loc Common.SortBy.Status}"- />- </Grid>- </ComboBoxItem>- <ComboBoxItem HorizontalContentAlignment="Left">- <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">- <ui:SymbolIcon- Margin="0,0,6,0"- HorizontalAlignment="Left"- Symbol="Folder24"- />- <TextBlock- Grid.Column="1"- HorizontalAlignment="Left"- Text="{ext:Loc Common.SortBy.Path}"- />- </Grid>- </ComboBoxItem>- </ComboBox>- <ui:ToggleSwitch- Margin="0,0,8,0"- VerticalAlignment="Center"- Cursor="Hand"- IsChecked="{Binding ViewModel.HideMicrosoftTasks, Mode=TwoWay}"- OffContent="{ext:Loc StartupManager.Tasks.HideMicrosoft}"- OnContent="{ext:Loc StartupManager.Tasks.HideMicrosoft}"- />- <ui:Button- Padding="8"- VerticalAlignment="Center"- Appearance="Secondary"- Command="{Binding ViewModel.OpenTaskSchedulerCommand}"- Icon="{ui:SymbolIcon Settings24,+ <StackPanel>+ <!-- Tasks Toolbar -->+ <WrapPanel Margin="0,0,0,8" Orientation="Horizontal">+ <ui:TextBox+ MinWidth="200"+ Margin="0,0,8,0"+ VerticalAlignment="Center"+ Icon="{ui:SymbolIcon Search24}"+ PlaceholderText="{ext:Loc Common.Search.Placeholder}"+ Text="{Binding ViewModel.TaskSearchText, UpdateSourceTrigger=PropertyChanged}"+ />+ <ComboBox+ Margin="0,0,8,0"+ VerticalAlignment="Center"+ SelectedIndex="{Binding ViewModel.TaskSortByIndex}"+ ToolTip="{ext:Loc Common.SortBy}"+ >+ <ComboBoxItem HorizontalContentAlignment="Left">+ <Grid+ HorizontalAlignment="Left"+ ColumnDefinitions="Auto Auto"+ >+ <ui:SymbolIcon+ Margin="0,0,6,0"+ HorizontalAlignment="Left"+ Symbol="TextSortAscending24"+ />+ <TextBlock+ Grid.Column="1"+ HorizontalAlignment="Left"+ Text="{ext:Loc Common.SortBy.Name}"+ />+ </Grid>+ </ComboBoxItem>+ <ComboBoxItem HorizontalContentAlignment="Left">+ <Grid+ HorizontalAlignment="Left"+ ColumnDefinitions="Auto Auto"+ >+ <ui:SymbolIcon+ Margin="0,0,6,0"+ HorizontalAlignment="Left"+ Symbol="ToggleRight24"+ />+ <TextBlock+ Grid.Column="1"+ HorizontalAlignment="Left"+ Text="{ext:Loc Common.SortBy.Status}"+ />+ </Grid>+ </ComboBoxItem>+ <ComboBoxItem HorizontalContentAlignment="Left">+ <Grid+ HorizontalAlignment="Left"+ ColumnDefinitions="Auto Auto"+ >+ <ui:SymbolIcon+ Margin="0,0,6,0"+ HorizontalAlignment="Left"+ Symbol="Folder24"+ />+ <TextBlock+ Grid.Column="1"+ HorizontalAlignment="Left"+ Text="{ext:Loc Common.SortBy.Path}"+ />+ </Grid>+ </ComboBoxItem>+ </ComboBox>+ <ui:ToggleSwitch+ Margin="0,0,8,0"+ VerticalAlignment="Center"+ Cursor="Hand"+ IsChecked="{Binding ViewModel.HideMicrosoftTasks, Mode=TwoWay}"+ OffContent="{ext:Loc StartupManager.Tasks.HideMicrosoft}"+ OnContent="{ext:Loc StartupManager.Tasks.HideMicrosoft}"+ />+ <ui:Button+ Padding="8"+ VerticalAlignment="Center"+ Appearance="Secondary"+ Command="{Binding ViewModel.OpenTaskSchedulerCommand}"+ Icon="{ui:SymbolIcon Settings24,FontSize=16}"- ToolTip="{ext:Loc ScheduledTasks.Menu.OpenSettings}"- />- </WrapPanel>+ ToolTip="{ext:Loc ScheduledTasks.Menu.OpenSettings}"+ />+ </WrapPanel>- <!-- No search results (Tasks) -->- <StackPanel- Margin="0,32,0,32"- HorizontalAlignment="Center"- VerticalAlignment="Center"- >- <StackPanel.Visibility>- <MultiBinding Converter="{StaticResource EmptyWhileNotLoadingConverter}">- <Binding Path="ViewModel.Tasks.Count" />- <Binding Path="ViewModel.IsLoading" />- </MultiBinding>- </StackPanel.Visibility>- <ui:SymbolIcon- Margin="0,0,0,10"- HorizontalAlignment="Center"- FontSize="36"- Foreground="{DynamicResource SystemFillColorCriticalBrush}"- Symbol="SearchInfo24"- />- <ui:TextBlock- HorizontalAlignment="Center"- Appearance="Secondary"- FontTypography="Body"- Text="{ext:Loc Bloatware.Search.NoResults}"- />- </StackPanel>+ <!-- No search results (Tasks) -->+ <StackPanel+ Margin="0,32,0,32"+ HorizontalAlignment="Center"+ VerticalAlignment="Center"+ >+ <StackPanel.Visibility>+ <MultiBinding Converter="{StaticResource EmptyWhileNotLoadingConverter}">+ <Binding Path="ViewModel.Tasks.Count" />+ <Binding Path="ViewModel.IsLoading" />+ </MultiBinding>+ </StackPanel.Visibility>+ <ui:SymbolIcon+ Margin="0,0,0,10"+ HorizontalAlignment="Center"+ FontSize="36"+ Foreground="{DynamicResource SystemFillColorCriticalBrush}"+ Symbol="SearchInfo24"+ />+ <ui:TextBlock+ HorizontalAlignment="Center"+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ FontTypography="Body"+ Text="{ext:Loc Bloatware.Search.NoResults}"+ />+ </StackPanel>- <!-- Tasks List -->- <ItemsControl- ItemsSource="{Binding ViewModel.Tasks}"- Visibility="{Binding ViewModel.Tasks.Count, Converter={StaticResource GreaterThanZeroToVisibilityConverter}}"- >- <ItemsControl.ItemTemplate>- <DataTemplate DataType="{x:Type startupManager:StartupTask}">- <Border- Margin="0,0,0,6"- Padding="16,12"- Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"- CornerRadius="6"- >- <Grid>- <Grid.ColumnDefinitions>- <ColumnDefinition Width="Auto" />- <ColumnDefinition Width="*" />- <ColumnDefinition Width="Auto" />- </Grid.ColumnDefinitions>+ <!-- Tasks List -->+ <ItemsControl+ ItemsSource="{Binding ViewModel.Tasks}"+ Visibility="{Binding ViewModel.Tasks.Count, Converter={StaticResource GreaterThanZeroToVisibilityConverter}}"+ >+ <ItemsControl.ItemTemplate>+ <DataTemplate DataType="{x:Type startupManager:StartupTask}">+ <Border+ Margin="0,0,0,6"+ Padding="16,12"+ Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"+ CornerRadius="6"+ >+ <Grid>+ <Grid.ColumnDefinitions>+ <ColumnDefinition Width="Auto" />+ <ColumnDefinition Width="*" />+ <ColumnDefinition Width="Auto" />+ </Grid.ColumnDefinitions>- <Image- Grid.Column="0"- Width="36"- Height="36"- Margin="0,0,12,0"- VerticalAlignment="Center"- Source="{Binding LogoImage}"- Stretch="UniformToFill"- />+ <Image+ Grid.Column="0"+ Width="36"+ Height="36"+ Margin="0,0,12,0"+ VerticalAlignment="Center"+ Source="{Binding LogoImage}"+ Stretch="UniformToFill"+ />- <StackPanel Grid.Column="1" Margin="0,0,12,0" VerticalAlignment="Center">- <ui:TextBlock FontTypography="BodyStrong" Text="{Binding TaskName}" />- <ui:TextBlock- Margin="0,4,0,0"- Appearance="Secondary"- FontTypography="Caption"- Text="{Binding Description}"- TextWrapping="Wrap"- />- <ui:TextBlock- Margin="0,2,0,0"- Appearance="Disabled"- FontTypography="Caption"- Text="{Binding TaskPath}"- />- <ItemsControl Margin="0,4,0,0" ItemsSource="{Binding TriggerTypes}">- <ItemsControl.ItemsPanel>- <ItemsPanelTemplate>- <WrapPanel Orientation="Horizontal" />- </ItemsPanelTemplate>- </ItemsControl.ItemsPanel>- <ItemsControl.ItemTemplate>- <DataTemplate>- <Border- Margin="0,0,4,2"- Padding="6,2"- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"- CornerRadius="4"- >- <StackPanel Orientation="Horizontal">- <ui:SymbolIcon- Margin="0,0,4,0"- FontSize="15"- Foreground="{DynamicResource TextFillColorSecondaryBrush}"- Symbol="Timer24"- />- <ui:TextBlock- VerticalAlignment="Center"- FontTypography="Caption"- Foreground="{DynamicResource TextFillColorSecondaryBrush}"- Text="{Binding}"- />- </StackPanel>- </Border>- </DataTemplate>- </ItemsControl.ItemTemplate>- </ItemsControl>- <ui:TextBlock- Margin="0,2,0,0"- Appearance="Disabled"- FontTypography="Caption"- Text="{Binding ActionSummary}"- TextTrimming="CharacterEllipsis"- />- </StackPanel>+ <StackPanel+ Grid.Column="1"+ Margin="0,0,12,0"+ VerticalAlignment="Center"+ >+ <ui:TextBlock+ FontTypography="BodyStrong"+ Text="{Binding TaskName}"+ />+ <ui:TextBlock+ Margin="0,4,0,0"+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ FontTypography="Caption"+ Text="{Binding Description}"+ TextWrapping="Wrap"+ />+ <ui:TextBlock+ Margin="0,2,0,0"+ Foreground="{DynamicResource TextFillColorDisabledBrush}"+ FontTypography="Caption"+ Text="{Binding TaskPath}"+ />+ <ItemsControl+ Margin="0,4,0,0"+ ItemsSource="{Binding TriggerTypes}"+ >+ <ItemsControl.ItemsPanel>+ <ItemsPanelTemplate>+ <WrapPanel Orientation="Horizontal" />+ </ItemsPanelTemplate>+ </ItemsControl.ItemsPanel>+ <ItemsControl.ItemTemplate>+ <DataTemplate>+ <Border+ Margin="0,0,4,2"+ Padding="6,2"+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"+ CornerRadius="4"+ >+ <StackPanel Orientation="Horizontal">+ <ui:SymbolIcon+ Margin="0,0,4,0"+ FontSize="15"+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ Symbol="Timer24"+ />+ <ui:TextBlock+ VerticalAlignment="Center"+ FontTypography="Caption"+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ Text="{Binding}"+ />+ </StackPanel>+ </Border>+ </DataTemplate>+ </ItemsControl.ItemTemplate>+ </ItemsControl>+ <ui:TextBlock+ Margin="0,2,0,0"+ Foreground="{DynamicResource TextFillColorDisabledBrush}"+ FontTypography="Caption"+ Text="{Binding ActionSummary}"+ TextTrimming="CharacterEllipsis"+ />+ </StackPanel>- <StackPanel- Grid.Column="2"- VerticalAlignment="Center"- Orientation="Horizontal"- >- <ui:Button- Margin="0,0,4,0"- Padding="8"- Appearance="Transparent"- Command="{Binding DataContext.ViewModel.ViewTaskDetailsCommand, RelativeSource={RelativeSource AncestorType=Page}}"- CommandParameter="{Binding}"- Icon="{ui:SymbolIcon Info24,+ <StackPanel+ Grid.Column="2"+ VerticalAlignment="Center"+ Orientation="Horizontal"+ >+ <ui:Button+ Margin="0,0,4,0"+ Padding="8"+ Appearance="Transparent"+ Command="{Binding DataContext.ViewModel.ViewTaskDetailsCommand, RelativeSource={RelativeSource AncestorType=Page}}"+ CommandParameter="{Binding}"+ Icon="{ui:SymbolIcon Info24,FontSize=16}"- ToolTip="{ext:Loc ScheduledTasks.Action.Details}"- />- <ui:ToggleSwitch- VerticalAlignment="Center"- Cursor="Hand"- IsChecked="{Binding IsEnabled, Mode=TwoWay}"- OffContent="{ext:Loc Common.Toggle.Off}"- OnContent="{ext:Loc Common.Toggle.On}"- />+ ToolTip="{ext:Loc ScheduledTasks.Action.Details}"+ />+ <ui:ToggleSwitch+ VerticalAlignment="Center"+ Cursor="Hand"+ IsChecked="{Binding IsEnabled, Mode=TwoWay}"+ OffContent="{ext:Loc Common.Toggle.Off}"+ OnContent="{ext:Loc Common.Toggle.On}"+ />+ </StackPanel>+ </Grid>+ </Border>+ </DataTemplate>+ </ItemsControl.ItemTemplate>+ </ItemsControl></StackPanel>- </Grid>- </Border>- </DataTemplate>- </ItemsControl.ItemTemplate>- </ItemsControl>- </StackPanel>- </ui:CardExpander>- </StackPanel>- </ScrollViewer>- </Border>- </Grid>+ </ui:CardExpander>+ </StackPanel>+ </ScrollViewer>+ </Border>+ </Grid></Page>diff --git a/optimizerDuck/UI/ViewModels/Pages/DiskCleanupViewModel.cs b/optimizerDuck/UI/ViewModels/Pages/DiskCleanupViewModel.csindex 540ddbe..ee3062c 100644--- a/optimizerDuck/UI/ViewModels/Pages/DiskCleanupViewModel.cs+++ b/optimizerDuck/UI/ViewModels/Pages/DiskCleanupViewModel.cs@@ -50,7 +50,6 @@ public partial class DiskCleanupViewModel(public long TotalFileCount => CleanupItems.Sum(i => i.FileCount);public bool CanClean =>SelectedCount > 0 && TotalSelectedSizeBytes > 0 && !IsCleaning && !IsScanning;- public bool IsAllSelected => CleanupItems.Count > 0 && CleanupItems.All(i => i.IsSelected);partial void OnSelectedSortByIndexChanged(int value){@@ -176,12 +175,27 @@ public partial class DiskCleanupViewModel(}[RelayCommand]- private void SelectAll()+ private void OpenFolder(CleanupItem item){- var shouldSelect = !IsAllSelected;- foreach (var item in CleanupItems)- item.IsSelected = shouldSelect;- UpdateProperties();+ if (item?.CanOpenFolder != true)+ return;++ try+ {+ Process.Start(new ProcessStartInfo { FileName = item.Path, UseShellExecute = true });+ logger.LogInformation("Opened folder: {Path}", item.Path);+ }+ catch (Exception ex)+ {+ logger.LogError(ex, "Failed to open folder: {Path}", item.Path);+ snackbarService.Show(+ Translations.Snackbar_OpenFailed_Title,+ Translations.Snackbar_OpenFailed_Message,+ ControlAppearance.Danger,+ new SymbolIcon { Symbol = SymbolRegular.ErrorCircle24, Filled = true },+ TimeSpan.FromSeconds(3)+ );+ }}private void ApplySort()@@ -214,6 +228,5 @@ public partial class DiskCleanupViewModel(OnPropertyChanged(nameof(TotalSizeFormatted));OnPropertyChanged(nameof(TotalFileCount));OnPropertyChanged(nameof(CanClean));- OnPropertyChanged(nameof(IsAllSelected));}}diff --git a/optimizerDuck/UI/ViewModels/Pages/ScheduledTasksViewModel.cs b/optimizerDuck/UI/ViewModels/Pages/ScheduledTasksViewModel.csindex a6db8b3..ade956b 100644--- a/optimizerDuck/UI/ViewModels/Pages/ScheduledTasksViewModel.cs+++ b/optimizerDuck/UI/ViewModels/Pages/ScheduledTasksViewModel.cs@@ -26,6 +26,7 @@ public partial class ScheduledTasksViewModel : ViewModel[ObservableProperty][NotifyPropertyChangedFor(nameof(IsNotLoading))]+ [NotifyPropertyChangedFor(nameof(ShowRefreshButton))]private bool _isLoading;[ObservableProperty]@@ -50,6 +51,9 @@ public partial class ScheduledTasksViewModel : ViewModelpublic bool IsNotLoading => !IsLoading;public bool HasData => _allTasks.Count > 0;+ public bool HasResults => Tasks.Count > 0;+ public bool ShowRefreshButton => IsNotLoading && HasResults;+public override async Task OnNavigatedToAsync(){if (_isInitialized)@@ -369,6 +373,8 @@ public partial class ScheduledTasksViewModel : ViewModel}OnPropertyChanged(nameof(HasData));+ OnPropertyChanged(nameof(HasResults));+ OnPropertyChanged(nameof(ShowRefreshButton));}private async void Task_PropertyChanged(object? sender, PropertyChangedEventArgs e)@@ -377,6 +383,15 @@ public partial class ScheduledTasksViewModel : ViewModele.PropertyName == nameof(ScheduledTaskModel.IsEnabled)&& sender is ScheduledTaskModel task)- await ToggleTask(task);+ {+ try+ {+ await ToggleTask(task);+ }+ catch (Exception ex)+ {+ _logger.LogError(ex, "Failed to toggle scheduled task {Name}", task.Name);+ }+ }}}diff --git a/optimizerDuck/UI/ViewModels/Pages/SettingsViewModel.cs b/optimizerDuck/UI/ViewModels/Pages/SettingsViewModel.csindex 05fb3b8..0bcbbe4 100644--- a/optimizerDuck/UI/ViewModels/Pages/SettingsViewModel.cs+++ b/optimizerDuck/UI/ViewModels/Pages/SettingsViewModel.cs@@ -111,6 +111,29 @@ public partial class SettingsViewModel(#endregion Helpers+ private async Task SaveConfigAsync(Func<Task> saveAction, Func<Task>? revertAction = null)+ {+ try+ {+ await saveAction();+ }+ catch (Exception ex)+ {+ logger.LogError(ex, "Failed to save configuration");+ if (revertAction != null)+ {+ try+ {+ await revertAction();+ }+ catch (Exception revertEx)+ {+ logger.LogError(revertEx, "Failed to revert UI property");+ }+ }+ }+ }+#region Commands[RelayCommand]@@ -236,25 +259,46 @@ public partial class SettingsViewModel(}[RelayCommand]- private void ToggleRemoveProvisioned()+ private async Task ToggleRemoveProvisioned(){if (!_isInitialized)return;- _ = configManager.SetAsync(- "bloatware:removeProvisioned",- (!appOptionsMonitor.CurrentValue.Bloatware.RemoveProvisioned).ToString()- );+ try+ {+ await configManager.SetAsync(+ "bloatware:removeProvisioned",+ (!appOptionsMonitor.CurrentValue.Bloatware.RemoveProvisioned).ToString()+ );+ }+ catch (Exception ex)+ {+ logger.LogError(ex, "Failed to toggle RemoveProvisioned setting");+ // Revert UI property on failure+ RemoveProvisioned = appOptionsMonitor.CurrentValue.Bloatware.RemoveProvisioned;+ }}[RelayCommand]- private void ToggleShowCompletionNotification()+ private async Task ToggleShowCompletionNotification(){if (!_isInitialized)return;- _ = configManager.SetAsync(- "optimize:showCompletionNotification",- (!appOptionsMonitor.CurrentValue.Optimize.ShowCompletionNotification).ToString()- );+ try+ {+ await configManager.SetAsync(+ "optimize:showCompletionNotification",+ (!appOptionsMonitor.CurrentValue.Optimize.ShowCompletionNotification).ToString()+ );+ }+ catch (Exception ex)+ {+ logger.LogError(ex, "Failed to toggle ShowCompletionNotification setting");+ // Revert UI property on failure+ ShowSnackbarNotificationAfterAppliedSuccessfully = appOptionsMonitor+ .CurrentValue+ .Optimize+ .ShowCompletionNotification;+ }}[RelayCommand]@@ -297,16 +341,32 @@ public partial class SettingsViewModel(return;if (string.IsNullOrEmpty(value))return;- _ = configManager.SetAsync(x => x.App.Language, value);++ var oldValue = appOptionsMonitor.CurrentValue.App.Language;+ _ = SaveConfigAsync(+ async () =>+ {+ await configManager.SetAsync(x => x.App.Language, value);+ },+ async () =>+ {+ SelectedCultureName = oldValue;+ }+ );if (value == Loc.CurrentCulture.Name)return;- contentDialogService.ShowAlertAsync(- Translations.Settings_LanguageChanged_Title,- Translations.Settings_LanguageChanged_Description,- Translations.Button_Ok,- CancellationToken.None- );+ _ = contentDialogService+ .ShowAlertAsync(+ Translations.Settings_LanguageChanged_Title,+ Translations.Settings_LanguageChanged_Description,+ Translations.Button_Ok,+ CancellationToken.None+ )+ .ContinueWith(+ t => logger.LogError(t.Exception, "Failed to show language changed dialog"),+ TaskContinuationOptions.OnlyOnFaulted+ );}partial void OnCurrentApplicationThemeChanged(@@ -317,7 +377,16 @@ public partial class SettingsViewModel(if (!_isInitialized)return;ApplicationThemeManager.Apply(newValue, updateAccent: false);- _ = configManager.SetAsync(x => x.App.Theme, newValue);+ _ = SaveConfigAsync(+ async () =>+ {+ await configManager.SetAsync(x => x.App.Theme, newValue);+ },+ async () =>+ {+ CurrentApplicationTheme = oldValue;+ }+ );}partial void OnShellTimeoutMsChanged(int value)@@ -326,7 +395,18 @@ public partial class SettingsViewModel(return;if (value <= 0)return;- _ = configManager.SetAsync(x => x.Optimize.ShellTimeoutMs, value);++ var oldValue = appOptionsMonitor.CurrentValue.Optimize.ShellTimeoutMs;+ _ = SaveConfigAsync(+ async () =>+ {+ await configManager.SetAsync(x => x.Optimize.ShellTimeoutMs, value);+ },+ async () =>+ {+ ShellTimeoutMs = oldValue;+ }+ );}#endregion Property Changeddiff --git a/optimizerDuck/UI/ViewModels/Pages/StartupManagerViewModel.cs b/optimizerDuck/UI/ViewModels/Pages/StartupManagerViewModel.csindex 57d9e15..fdc8cf8 100644--- a/optimizerDuck/UI/ViewModels/Pages/StartupManagerViewModel.cs+++ b/optimizerDuck/UI/ViewModels/Pages/StartupManagerViewModel.cs@@ -35,6 +35,7 @@ public partial class StartupManagerViewModel : ViewModel[ObservableProperty][NotifyPropertyChangedFor(nameof(IsNotLoading))]+ [NotifyPropertyChangedFor(nameof(ShowRefreshButton))]private bool _isLoading;// Per-section: Tasks@@ -64,6 +65,9 @@ public partial class StartupManagerViewModel : ViewModelpublic bool HasTasks => _allTasks.Count > 0;public bool HasData => HasApps || HasTasks;+ public bool HasResults => Apps.Count > 0 || Tasks.Count > 0;+ public bool ShowRefreshButton => IsNotLoading && HasResults;+public override async Task OnNavigatedToAsync(){if (_isInitialized)@@ -175,6 +179,8 @@ public partial class StartupManagerViewModel : ViewModelOnPropertyChanged(nameof(HasApps));OnPropertyChanged(nameof(HasTasks));OnPropertyChanged(nameof(HasData));+ OnPropertyChanged(nameof(HasResults));+ OnPropertyChanged(nameof(ShowRefreshButton));try{@@ -183,8 +189,8 @@ public partial class StartupManagerViewModel : ViewModelawait Task.WhenAll(appsTask, tasksTask);- _allApps.AddRange(appsTask.Result);- _allTasks.AddRange(tasksTask.Result);+ _allApps.AddRange(await appsTask);+ _allTasks.AddRange(await tasksTask);ApplyAppFilter();ApplyTaskFilter();@@ -233,6 +239,8 @@ public partial class StartupManagerViewModel : ViewModelOnPropertyChanged(nameof(HasApps));OnPropertyChanged(nameof(HasData));+ OnPropertyChanged(nameof(HasResults));+ OnPropertyChanged(nameof(ShowRefreshButton));}private void ApplyTaskFilter()@@ -274,17 +282,41 @@ public partial class StartupManagerViewModel : ViewModelOnPropertyChanged(nameof(HasTasks));OnPropertyChanged(nameof(HasData));+ OnPropertyChanged(nameof(HasResults));+ OnPropertyChanged(nameof(ShowRefreshButton));}private async void App_PropertyChanged(object? sender, PropertyChangedEventArgs e){if (e.PropertyName == nameof(StartupApp.IsEnabled) && sender is StartupApp app)- await _startupManagerService.ToggleStartupApp(app, app.IsEnabled);+ {+ try+ {+ await _startupManagerService+ .ToggleStartupApp(app, app.IsEnabled)+ .ConfigureAwait(false);+ }+ catch (Exception ex)+ {+ _logger.LogError(ex, "Failed to toggle startup app {Name}", app.Name);+ }+ }}private async void Task_PropertyChanged(object? sender, PropertyChangedEventArgs e){if (e.PropertyName == nameof(StartupTask.IsEnabled) && sender is StartupTask task)- await _startupManagerService.ToggleStartupTask(task, task.IsEnabled);+ {+ try+ {+ await _startupManagerService+ .ToggleStartupTask(task, task.IsEnabled)+ .ConfigureAwait(false);+ }+ catch (Exception ex)+ {+ _logger.LogError(ex, "Failed to toggle startup task {Name}", task.TaskName);+ }+ }}}diff --git a/optimizerDuck/UI/Windows/MainWindow.xaml b/optimizerDuck/UI/Windows/MainWindow.xamlindex 1e1826d..56dc021 100644--- a/optimizerDuck/UI/Windows/MainWindow.xaml+++ b/optimizerDuck/UI/Windows/MainWindow.xaml@@ -1,164 +1,164 @@<ui:FluentWindow- x:Class="optimizerDuck.UI.Windows.MainWindow"- xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"- xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"- xmlns:controls="clr-namespace:optimizerDuck.UI.Controls"- xmlns:d="http://schemas.microsoft.com/expression/blend/2008"- xmlns:extensions="clr-namespace:optimizerDuck.Common.Extensions"- xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"- xmlns:pages="clr-namespace:optimizerDuck.UI.Pages"- xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"- xmlns:viewmodels="clr-namespace:optimizerDuck.UI.ViewModels.Windows"- xmlns:windows="clr-namespace:optimizerDuck.UI.Windows"- Title="optimizerDuck"- Width="1350"- Height="800"- d:DataContext="{d:DesignInstance viewmodels:MainWindowViewModel}"- ui:Design.Background="Black"- ui:Design.Foreground="White"- ExtendsContentIntoTitleBar="True"- SnapsToDevicePixels="True"- TextOptions.TextRenderingMode="ClearType"- UseLayoutRounding="True"- WindowBackdropType="Mica"- WindowCornerPreference="Round"- WindowStartupLocation="CenterScreen"- mc:Ignorable="d"+ x:Class="optimizerDuck.UI.Windows.MainWindow"+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"+ xmlns:controls="clr-namespace:optimizerDuck.UI.Controls"+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"+ xmlns:extensions="clr-namespace:optimizerDuck.Common.Extensions"+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"+ xmlns:pages="clr-namespace:optimizerDuck.UI.Pages"+ xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"+ xmlns:viewmodels="clr-namespace:optimizerDuck.UI.ViewModels.Windows"+ xmlns:windows="clr-namespace:optimizerDuck.UI.Windows"+ Title="optimizerDuck"+ Width="1350"+ Height="800"+ d:DataContext="{d:DesignInstance viewmodels:MainWindowViewModel}"+ ui:Design.Background="Black"+ ui:Design.Foreground="White"+ ExtendsContentIntoTitleBar="True"+ SnapsToDevicePixels="True"+ TextOptions.TextRenderingMode="ClearType"+ UseLayoutRounding="True"+ WindowBackdropType="Mica"+ WindowCornerPreference="Round"+ WindowStartupLocation="CenterScreen"+ mc:Ignorable="d">- <Grid>- <ui:NavigationView- x:Name="RootNavigation"- Margin="0"- Padding="42,0,42,0"- FrameMargin="0"- IsFooterSeparatorVisible="False"- IsPaneToggleVisible="True"- IsTopSeparatorVisible="False"- OpenPaneLength="180"- PaneDisplayMode="Left"- TitleBar="{Binding ElementName=TitleBar, Mode=OneWay}"- >- <ui:NavigationView.MenuItems>- <controls:FilledNavigationViewItem- Content="{extensions:Loc Sidebar.Dashboard}"- Cursor="Hand"- Icon="{ui:SymbolIcon Home24}"- TargetPageType="{x:Type pages:DashboardPage}"- />+ <Grid>+ <ui:NavigationView+ x:Name="RootNavigation"+ Margin="0"+ Padding="42,0,42,0"+ FrameMargin="0"+ IsFooterSeparatorVisible="False"+ IsPaneToggleVisible="True"+ IsTopSeparatorVisible="False"+ OpenPaneLength="180"+ PaneDisplayMode="Left"+ TitleBar="{Binding ElementName=TitleBar, Mode=OneWay}"+ >+ <ui:NavigationView.MenuItems>+ <controls:FilledNavigationViewItem+ Content="{extensions:Loc Sidebar.Dashboard}"+ Cursor="Hand"+ Icon="{ui:SymbolIcon Home24}"+ TargetPageType="{x:Type pages:DashboardPage}"+ />- <ui:NavigationViewItemSeparator Margin="0,2,0,2" />+ <ui:NavigationViewItemSeparator Margin="0,2,0,2" />- <controls:FilledNavigationViewItem- Content="{extensions:Loc Sidebar.Optimize}"- Cursor="Hand"- Icon="{ui:SymbolIcon Rocket24}"- TargetPageType="{x:Type pages:OptimizePage}"- />+ <controls:FilledNavigationViewItem+ Content="{extensions:Loc Sidebar.Optimize}"+ Cursor="Hand"+ Icon="{ui:SymbolIcon Rocket24}"+ TargetPageType="{x:Type pages:OptimizePage}"+ />- <ui:NavigationViewItem- x:Name="FeaturesMenuItem"- Content="{extensions:Loc Sidebar.Features}"- Icon="{ui:SymbolIcon ToggleLeft24}"- />+ <ui:NavigationViewItem+ x:Name="FeaturesMenuItem"+ Content="{extensions:Loc Sidebar.Features}"+ Icon="{ui:SymbolIcon ToggleLeft24}"+ />- <controls:FilledNavigationViewItem- Content="{extensions:Loc Sidebar.Bloatware}"- Cursor="Hand"- Icon="{ui:SymbolIcon Delete24}"- TargetPageType="{x:Type pages:BloatwarePage}"- />+ <controls:FilledNavigationViewItem+ Content="{extensions:Loc Sidebar.Bloatware}"+ Cursor="Hand"+ Icon="{ui:SymbolIcon Delete24}"+ TargetPageType="{x:Type pages:BloatwarePage}"+ />- <ui:NavigationViewItemSeparator Margin="0,2,0,2" />+ <ui:NavigationViewItemSeparator Margin="0,2,0,2" />- <controls:FilledNavigationViewItem- Content="{extensions:Loc Sidebar.StartupManager}"- Cursor="Hand"- Icon="{ui:SymbolIcon WindowArrowUp24}"- TargetPageType="{x:Type pages:StartupManagerPage}"- />+ <controls:FilledNavigationViewItem+ Content="{extensions:Loc Sidebar.StartupManager}"+ Cursor="Hand"+ Icon="{ui:SymbolIcon WindowArrowUp24}"+ TargetPageType="{x:Type pages:StartupManagerPage}"+ />- <controls:FilledNavigationViewItem- Content="{extensions:Loc Sidebar.ScheduledTasks}"- Cursor="Hand"- Icon="{ui:SymbolIcon CalendarLtr24}"- TargetPageType="{x:Type pages:ScheduledTasksPage}"- />+ <controls:FilledNavigationViewItem+ Content="{extensions:Loc Sidebar.ScheduledTasks}"+ Cursor="Hand"+ Icon="{ui:SymbolIcon CalendarLtr24}"+ TargetPageType="{x:Type pages:ScheduledTasksPage}"+ />- <controls:FilledNavigationViewItem- Content="{extensions:Loc Sidebar.DiskCleanup}"- Cursor="Hand"- Icon="{ui:SymbolIcon HardDrive20}"- TargetPageType="{x:Type pages:DiskCleanupPage}"- />- </ui:NavigationView.MenuItems>+ <controls:FilledNavigationViewItem+ Content="{extensions:Loc Sidebar.DiskCleanup}"+ Cursor="Hand"+ Icon="{ui:SymbolIcon HardDrive20}"+ TargetPageType="{x:Type pages:DiskCleanupPage}"+ />+ </ui:NavigationView.MenuItems>- <ui:NavigationView.FooterMenuItems>- <ui:NavigationViewItemSeparator Margin="0,2,0,2" />- <controls:FilledNavigationViewItem- Content="{extensions:Loc Sidebar.Settings}"- Cursor="Hand"- Icon="{ui:SymbolIcon Settings24}"- TargetPageType="{x:Type pages:SettingsPage}"- />- </ui:NavigationView.FooterMenuItems>+ <ui:NavigationView.FooterMenuItems>+ <ui:NavigationViewItemSeparator Margin="0,2,0,2" />+ <controls:FilledNavigationViewItem+ Content="{extensions:Loc Sidebar.Settings}"+ Cursor="Hand"+ Icon="{ui:SymbolIcon Settings24}"+ TargetPageType="{x:Type pages:SettingsPage}"+ />+ </ui:NavigationView.FooterMenuItems>- <ui:NavigationView.ContentOverlay>- <Grid>- <ui:SnackbarPresenter x:Name="SnackbarPresenter" />- </Grid>- </ui:NavigationView.ContentOverlay>- </ui:NavigationView>+ <ui:NavigationView.ContentOverlay>+ <Grid>+ <ui:SnackbarPresenter x:Name="SnackbarPresenter" />+ </Grid>+ </ui:NavigationView.ContentOverlay>+ </ui:NavigationView>- <ui:TitleBar x:Name="TitleBar">- <ui:TitleBar.Header>- <StackPanel Margin="10,0,0,0" VerticalAlignment="Center" Orientation="Horizontal">- <ui:SymbolIcon- FontSize="16"- Foreground="{DynamicResource TextFillColorDisabledBrush}"- Symbol="Shield24"- />- <ui:ImageIcon- Height="25"- Margin="7,0,5,0"- VerticalAlignment="Center"- Source="pack://application:,,,/Resources/Images/Duck.png"- />- <ui:TextBlock- Margin="0,0,5,0"- VerticalAlignment="Center"- FontTypography="Body"- Text="optimizerDuck"- />- <ui:TextBlock- VerticalAlignment="Center"- Appearance="Disabled"- FontTypography="Body"- Text="{Binding Version, Mode=OneWay}"- />- </StackPanel>- </ui:TitleBar.Header>+ <ui:TitleBar x:Name="TitleBar">+ <ui:TitleBar.Header>+ <StackPanel Margin="10,0,0,0" VerticalAlignment="Center" Orientation="Horizontal">+ <ui:SymbolIcon+ FontSize="16"+ Foreground="{DynamicResource TextFillColorDisabledBrush}"+ Symbol="Shield24"+ />+ <ui:ImageIcon+ Height="25"+ Margin="7,0,5,0"+ VerticalAlignment="Center"+ Source="pack://application:,,,/Resources/Images/Duck.png"+ />+ <ui:TextBlock+ Margin="0,0,5,0"+ VerticalAlignment="Center"+ FontTypography="Body"+ Text="optimizerDuck"+ />+ <ui:TextBlock+ VerticalAlignment="Center"+ Foreground="{DynamicResource TextFillColorDisabledBrush}"+ FontTypography="Body"+ Text="{Binding Version, Mode=OneWay}"+ />+ </StackPanel>+ </ui:TitleBar.Header>- <ui:TitleBar.TrailingContent>- <StackPanel VerticalAlignment="Center" Orientation="Horizontal">- <ui:Button- Margin="0,0,5,0"- Appearance="Transparent"- Command="{Binding OpenSupportLinkCommand}"- Icon="{ui:SymbolIcon Heart24}"- >+ <ui:TitleBar.TrailingContent>+ <StackPanel VerticalAlignment="Center" Orientation="Horizontal">+ <ui:Button+ Margin="0,0,5,0"+ Appearance="Transparent"+ Command="{Binding OpenSupportLinkCommand}"+ Icon="{ui:SymbolIcon Heart24}"+ >Support the project</ui:Button>- <ui:Button- Appearance="Transparent"- Command="{Binding OpenDiscordLinkCommand}"- Icon="{ui:SymbolIcon Link24}"- >+ <ui:Button+ Appearance="Transparent"+ Command="{Binding OpenDiscordLinkCommand}"+ Icon="{ui:SymbolIcon Link24}"+ >Join our Discord</ui:Button>- </StackPanel>- </ui:TitleBar.TrailingContent>- </ui:TitleBar>+ </StackPanel>+ </ui:TitleBar.TrailingContent>+ </ui:TitleBar>- <ui:ContentDialogHost x:Name="RootContentDialogPresenter" />- </Grid>+ <ui:ContentDialogHost x:Name="RootContentDialogPresenter" />+ </Grid></ui:FluentWindow>diff --git a/optimizerDuck/optimizerDuck.csproj b/optimizerDuck/optimizerDuck.csprojindex f499969..e1d8fdd 100644--- a/optimizerDuck/optimizerDuck.csproj+++ b/optimizerDuck/optimizerDuck.csproj@@ -1,79 +1,79 @@<Project Sdk="Microsoft.NET.Sdk">- <PropertyGroup>- <OutputType>WinExe</OutputType>- <TargetFramework>net10.0-windows10.0.17763.0</TargetFramework>- <LangVersion>latest</LangVersion>- <Nullable>enable</Nullable>- <ImplicitUsings>enable</ImplicitUsings>- <UseWPF>true</UseWPF>- <Authors>fatDuck</Authors>- <ApplicationIcon>Logo.ico</ApplicationIcon>- <Company>fatDuck</Company>- <FileVersion>2.9.1</FileVersion>- <Version>1.0.0</Version>- <Product>optimizerDuck</Product>- <Copyright>Copyright fatDuck 2026</Copyright>- <AssemblyTitle>optimizerDuck</AssemblyTitle>- <AssemblyDescription>Free, open-source Windows optimization tool for performance, privacy, and simplicity.</AssemblyDescription>- <NeutralLanguage>en-US</NeutralLanguage>- <ApplicationManifest>app.manifest</ApplicationManifest>- </PropertyGroup>+ <PropertyGroup>+ <OutputType>WinExe</OutputType>+ <TargetFramework>net10.0-windows</TargetFramework>+ <LangVersion>latest</LangVersion>+ <Nullable>enable</Nullable>+ <ImplicitUsings>enable</ImplicitUsings>+ <UseWPF>true</UseWPF>+ <Authors>fatDuck</Authors>+ <ApplicationIcon>Logo.ico</ApplicationIcon>+ <Company>fatDuck</Company>+ <FileVersion>2.9.1</FileVersion>+ <Version>2.9.1</Version>+ <Product>optimizerDuck</Product>+ <Copyright>Copyright fatDuck 2026</Copyright>+ <AssemblyTitle>optimizerDuck</AssemblyTitle>+ <AssemblyDescription>Free, open-source Windows optimization tool for performance, privacy, and simplicity.</AssemblyDescription>+ <NeutralLanguage>en-US</NeutralLanguage>+ <ApplicationManifest>app.manifest</ApplicationManifest>+ </PropertyGroup>- <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">- <PlatformTarget>x64</PlatformTarget>- </PropertyGroup>+ <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">+ <PlatformTarget>x64</PlatformTarget>+ </PropertyGroup>- <ItemGroup>- <Page Update="UI\Windows\MainWindow.xaml">- <Generator>MSBuild:Compile</Generator>- <XamlRuntime>Wpf</XamlRuntime>- <SubType>Designer</SubType>- </Page>- <Page Update="UI\Pages\Optimize\Categories\OptimizationPage.xaml">- <Generator>MSBuild:Compile</Generator>- <XamlRuntime>Wpf</XamlRuntime>- <SubType>Designer</SubType>- </Page>- <Page Update="UI\Pages\Features\FeaturesPage.xaml">- <XamlRuntime>Wpf</XamlRuntime>- <SubType>Designer</SubType>- </Page>- </ItemGroup>+ <ItemGroup>+ <Page Update="UI\Windows\MainWindow.xaml">+ <Generator>MSBuild:Compile</Generator>+ <XamlRuntime>Wpf</XamlRuntime>+ <SubType>Designer</SubType>+ </Page>+ <Page Update="UI\Pages\Optimize\Categories\OptimizationPage.xaml">+ <Generator>MSBuild:Compile</Generator>+ <XamlRuntime>Wpf</XamlRuntime>+ <SubType>Designer</SubType>+ </Page>+ <Page Update="UI\Pages\Features\FeaturesPage.xaml">+ <XamlRuntime>Wpf</XamlRuntime>+ <SubType>Designer</SubType>+ </Page>+ </ItemGroup>- <ItemGroup>- <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.2" />- <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.5" />- <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.5" />- <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.5" />- <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />- <PackageReference Include="Serilog" Version="4.3.1" />- <PackageReference Include="Serilog.Extensions.Hosting" Version="10.0.0" />- <PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />- <PackageReference Include="System.Management.Automation" Version="7.6.0" />- <PackageReference Include="TaskScheduler" Version="2.12.2" />- <PackageReference Include="WPF-UI" Version="4.2.0" />- <PackageReference Include="WPF-UI.DependencyInjection" Version="4.2.0" />- </ItemGroup>+ <ItemGroup>+ <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.2" />+ <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.7" />+ <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.7" />+ <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.7" />+ <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />+ <PackageReference Include="Serilog" Version="4.3.1" />+ <PackageReference Include="Serilog.Extensions.Hosting" Version="10.0.0" />+ <PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />+ <PackageReference Include="System.Management.Automation" Version="7.6.1" />+ <PackageReference Include="TaskScheduler" Version="2.12.2" />+ <PackageReference Include="WPF-UI" Version="4.2.1" />+ <PackageReference Include="WPF-UI.DependencyInjection" Version="4.2.1" />+ </ItemGroup>- <ItemGroup>- <EmbeddedResource Update="Resources\Languages\Translations.resx">- <Generator>ResXFileCodeGenerator</Generator>- <LastGenOutput>Translations.Designer.cs</LastGenOutput>- </EmbeddedResource>- </ItemGroup>+ <ItemGroup>+ <EmbeddedResource Update="Resources\Languages\Translations.resx">+ <Generator>ResXFileCodeGenerator</Generator>+ <LastGenOutput>Translations.Designer.cs</LastGenOutput>+ </EmbeddedResource>+ </ItemGroup>- <ItemGroup>- <Resource Include="Resources\Images\Duck.png" />- <Resource Include="Resources\Images\GitHubLogoBlack.png" />- <Resource Include="Resources\Images\GitHubLogoWhite.png" />- <Resource Include="Resources\Images\DiscordLogo.png" />- </ItemGroup>+ <ItemGroup>+ <Resource Include="Resources\Images\Duck.png" />+ <Resource Include="Resources\Images\GitHubLogoBlack.png" />+ <Resource Include="Resources\Images\GitHubLogoWhite.png" />+ <Resource Include="Resources\Images\DiscordLogo.png" />+ </ItemGroup>- <ItemGroup>- <Compile Update="Resources\Languages\Translations.Designer.cs">- <DesignTime>True</DesignTime>- <AutoGen>True</AutoGen>- <DependentUpon>Translations.resx</DependentUpon>- </Compile>- </ItemGroup>+ <ItemGroup>+ <Compile Update="Resources\Languages\Translations.Designer.cs">+ <DesignTime>True</DesignTime>+ <AutoGen>True</AutoGen>+ <DependentUpon>Translations.resx</DependentUpon>+ </Compile>+ </ItemGroup></Project>