Skip to content

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

fix: small app's logo in bloatware feat: add confirmation dialog for bloatware removing refactor: redesign view details dialogs

fatDuckdaa2fe34d0e4
diff --git a/optimizerDuck/Resources/Languages/Translations.Designer.cs b/optimizerDuck/Resources/Languages/Translations.Designer.cs
index 7e51c06..6b90ec8 100644
--- a/optimizerDuck/Resources/Languages/Translations.Designer.cs
+++ b/optimizerDuck/Resources/Languages/Translations.Designer.cs
@@ -159,6 +159,15 @@ namespace optimizerDuck.Resources.Languages {
}
}
+ /// <summary>
+ /// Looks up a localized string similar to Review the selected apps before removal. Proceed only if you are sure..
+ /// </summary>
+ internal static string BloatwareDialog_Confirmation_Description {
+ get {
+ return ResourceManager.GetString("BloatwareDialog.Confirmation.Description", resourceCulture);
+ }
+ }
+
/// <summary>
/// Looks up a localized string similar to You are about to remove: {0}.
/// </summary>
@@ -168,6 +177,15 @@ namespace optimizerDuck.Resources.Languages {
}
}
+ /// <summary>
+ /// Looks up a localized string similar to Selected applications.
+ /// </summary>
+ internal static string BloatwareDialog_Confirmation_SelectedList {
+ get {
+ return ResourceManager.GetString("BloatwareDialog.Confirmation.SelectedList", resourceCulture);
+ }
+ }
+
/// <summary>
/// Looks up a localized string similar to Remove {0} App(s)?.
/// </summary>
@@ -1114,6 +1132,60 @@ namespace optimizerDuck.Resources.Languages {
}
}
+ /// <summary>
+ /// Looks up a localized string similar to Display the Control Panel icon on your desktop.
+ /// </summary>
+ internal static string Features_Desktop_ShowControlPanel_Description {
+ get {
+ return ResourceManager.GetString("Features.Desktop.ShowControlPanel.Description", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Show Control Panel.
+ /// </summary>
+ internal static string Features_Desktop_ShowControlPanel_Name {
+ get {
+ return ResourceManager.GetString("Features.Desktop.ShowControlPanel.Name", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Show or hide all desktop icons at once.
+ /// </summary>
+ internal static string Features_Desktop_ShowDesktopIcons_Description {
+ get {
+ return ResourceManager.GetString("Features.Desktop.ShowDesktopIcons.Description", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Show Desktop Icons.
+ /// </summary>
+ internal static string Features_Desktop_ShowDesktopIcons_Name {
+ get {
+ return ResourceManager.GetString("Features.Desktop.ShowDesktopIcons.Name", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Display the Network icon on your desktop.
+ /// </summary>
+ internal static string Features_Desktop_ShowNetwork_Description {
+ get {
+ return ResourceManager.GetString("Features.Desktop.ShowNetwork.Description", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Show Network.
+ /// </summary>
+ internal static string Features_Desktop_ShowNetwork_Name {
+ get {
+ return ResourceManager.GetString("Features.Desktop.ShowNetwork.Name", resourceCulture);
+ }
+ }
+
/// <summary>
/// Looks up a localized string similar to Display the Recycle Bin icon on your desktop.
/// </summary>
@@ -1150,6 +1222,24 @@ namespace optimizerDuck.Resources.Languages {
}
}
+ /// <summary>
+ /// Looks up a localized string similar to Display your user profile folder as a desktop icon.
+ /// </summary>
+ internal static string Features_Desktop_ShowUserFiles_Description {
+ get {
+ return ResourceManager.GetString("Features.Desktop.ShowUserFiles.Description", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Show User Files.
+ /// </summary>
+ internal static string Features_Desktop_ShowUserFiles_Name {
+ get {
+ return ResourceManager.GetString("Features.Desktop.ShowUserFiles.Name", resourceCulture);
+ }
+ }
+
/// <summary>
/// Looks up a localized string similar to Controls automatic background game recording (Game DVR) and app capture..
/// </summary>
@@ -1339,6 +1429,24 @@ namespace optimizerDuck.Resources.Languages {
}
}
+ /// <summary>
+ /// Looks up a localized string similar to Keep multiple copied items so you can paste them later with Win+V..
+ /// </summary>
+ internal static string Features_Preferences_ClipboardHistory_Description {
+ get {
+ return ResourceManager.GetString("Features.Preferences.ClipboardHistory.Description", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Clipboard History.
+ /// </summary>
+ internal static string Features_Preferences_ClipboardHistory_Name {
+ get {
+ return ResourceManager.GetString("Features.Preferences.ClipboardHistory.Name", resourceCulture);
+ }
+ }
+
/// <summary>
/// Looks up a localized string similar to Enables dark mode for system apps, Settings, and shell elements..
/// </summary>
@@ -1762,6 +1870,24 @@ namespace optimizerDuck.Resources.Languages {
}
}
+ /// <summary>
+ /// Looks up a localized string similar to Shake a window to minimize all other open windows..
+ /// </summary>
+ internal static string Features_Preferences_WindowShake_Description {
+ get {
+ return ResourceManager.GetString("Features.Preferences.WindowShake.Description", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Window Shake.
+ /// </summary>
+ internal static string Features_Preferences_WindowShake_Name {
+ get {
+ return ResourceManager.GetString("Features.Preferences.WindowShake.Name", resourceCulture);
+ }
+ }
+
/// <summary>
/// Looks up a localized string similar to Optimize core system features and behaviors.
/// </summary>
diff --git a/optimizerDuck/Resources/Languages/Translations.resx b/optimizerDuck/Resources/Languages/Translations.resx
index 77063e9..67639cf 100644
--- a/optimizerDuck/Resources/Languages/Translations.resx
+++ b/optimizerDuck/Resources/Languages/Translations.resx
@@ -1102,6 +1102,12 @@ This ensures you can always go back if anything goes wrong.</value>
<data name="BloatwareDialog.Confirmation.Message" xml:space="preserve">
<value>You are about to remove: {0}</value>
</data>
+ <data name="BloatwareDialog.Confirmation.Description" xml:space="preserve">
+ <value>Review the selected apps before removal. Proceed only if you are sure.</value>
+ </data>
+ <data name="BloatwareDialog.Confirmation.SelectedList" xml:space="preserve">
+ <value>Selected applications</value>
+ </data>
<data name="Settings.Bloatware.Header" xml:space="preserve">
<value>Bloatware</value>
</data>
diff --git a/optimizerDuck/Resources/Languages/Translations.vi-VN.resx b/optimizerDuck/Resources/Languages/Translations.vi-VN.resx
index cf164b8..2ad688f 100644
--- a/optimizerDuck/Resources/Languages/Translations.vi-VN.resx
+++ b/optimizerDuck/Resources/Languages/Translations.vi-VN.resx
@@ -1066,6 +1066,12 @@ Hãy yên tâm rằng hệ thống của bạn luôn có đường lui nếu có
<data name="BloatwareDialog.Confirmation.Message" xml:space="preserve">
<value>Bạn chuẩn bị sẽ xóa: {0}</value>
</data>
+ <data name="BloatwareDialog.Confirmation.Description" xml:space="preserve">
+ <value>Hãy kiểm tra lại các ứng dụng đã chọn trước khi gỡ. Chỉ tiếp tục khi bạn chắc chắn.</value>
+ </data>
+ <data name="BloatwareDialog.Confirmation.SelectedList" xml:space="preserve">
+ <value>Các ứng dụng đã chọn</value>
+ </data>
<data name="Settings.Bloatware.Header" xml:space="preserve">
<value>Bloatware</value>
</data>
diff --git a/optimizerDuck/Services/Features/Bloatware/BloatwareService.cs b/optimizerDuck/Services/Features/Bloatware/BloatwareService.cs
index 60e6517..4a7fbfb 100644
--- a/optimizerDuck/Services/Features/Bloatware/BloatwareService.cs
+++ b/optimizerDuck/Services/Features/Bloatware/BloatwareService.cs
@@ -1,4 +1,5 @@
-using System.IO;
+using System.Collections.Concurrent;
+using System.IO;
using System.Text.Json;
using System.Text.Json.Serialization;
using System.Text.RegularExpressions;
@@ -19,6 +20,11 @@ namespace optimizerDuck.Services;
/// </summary>
public class BloatwareService(ILogger<BloatwareService> logger, IOptionsMonitor<AppSettings> appOptionsMonitor)
{
+ private static readonly ConcurrentDictionary<string, string?> LogoCache = new(StringComparer.OrdinalIgnoreCase);
+ private static readonly Regex ScaleRegex = new(@"(?:^|[._])scale-(\d+)", RegexOptions.IgnoreCase | RegexOptions.Compiled);
+ private static readonly Regex TargetSizeRegex = new(@"(?:^|[._])targetsize-(\d+)", RegexOptions.IgnoreCase | RegexOptions.Compiled);
+ private static readonly string[] SupportedImageExtensions = [".png", ".jpg", ".jpeg"];
+
/// <summary>
/// Gets all removable AppX packages on the system.
/// </summary>
@@ -73,7 +79,8 @@ public class BloatwareService(ILogger<BloatwareService> logger, IOptionsMonitor<
try
{
var manifestLogo = ResolveLogo(app.InstallLocation);
- if (manifestLogo != null) app.LogoImage = manifestLogo;
+ if (manifestLogo != null)
+ app.LogoImage = manifestLogo;
}
catch
{
@@ -174,95 +181,237 @@ public class BloatwareService(ILogger<BloatwareService> logger, IOptionsMonitor<
}
private static string? ResolveLogo(string installLocation)
+ {
+ if (string.IsNullOrWhiteSpace(installLocation))
+ return null;
+
+ if (LogoCache.TryGetValue(installLocation, out var cachedLogo))
+ return cachedLogo;
+
+ var resolved = ResolveLogoCore(installLocation);
+ LogoCache[installLocation] = resolved;
+ return resolved;
+ }
+
+ private static string? ResolveLogoCore(string installLocation)
{
try
{
- // check for common high-quality logos first without parsing manifest
+ var candidateResources = GetManifestLogoCandidates(installLocation);
+ foreach (var candidate in candidateResources)
+ {
+ var bestFromCandidate = ResolveBestQualifiedVariant(installLocation, candidate,
+ includeThemeSpecific: true);
+ if (!string.IsNullOrWhiteSpace(bestFromCandidate))
+ return bestFromCandidate;
+ }
+
var assetsDir = Path.Combine(installLocation, "Assets");
- if (Directory.Exists(assetsDir))
+ if (!Directory.Exists(assetsDir))
+ return null;
+
+ // Per Microsoft guidance, AppList/Square44x44 assets are a better primary app icon source than StoreLogo.
+ var fallbackCandidates = new[]
{
- var commonLogos = new[] { "Logo.png" };
- foreach (var cl in commonLogos)
- {
- var path = Path.Combine(assetsDir, cl);
- if (File.Exists(path)) return path;
- }
+ @"Assets\AppList.png",
+ @"Assets\Square44x44Logo.png",
+ @"Assets\SmallTile.png",
+ @"Assets\MedTile.png",
+ @"Assets\Square150x150Logo.png",
+ @"Assets\Logo.png",
+ @"Assets\StoreLogo.png"
+ };
- // if exact matches aren't found, try patterns that might have scale modifiers
- var highQualityPatterns = new[] { "*StoreLogo*.png", "*Logo*.png" };
- foreach (var pattern in highQualityPatterns)
- {
- var match = Directory.EnumerateFiles(assetsDir, pattern, SearchOption.TopDirectoryOnly)
- .OrderByDescending(f => new FileInfo(f).Length)
- .FirstOrDefault();
- if (match != null) return match;
- }
+ foreach (var fallbackCandidate in fallbackCandidates)
+ {
+ var bestFallback = ResolveBestQualifiedVariant(installLocation, fallbackCandidate,
+ includeThemeSpecific: true);
+ if (!string.IsNullOrWhiteSpace(bestFallback))
+ return bestFallback;
}
+ }
+ catch
+ {
+ // ignored: returning null if any file access/parsing fails
+ }
- // fallback: parse AppxManifest.xml
- var manifest = Path.Combine(installLocation, "AppxManifest.xml");
- if (!File.Exists(manifest)) return null;
+ return null;
+ }
- var doc = XDocument.Load(manifest);
- var root = doc.Root;
- if (root == null) return null;
+ private static List<string> GetManifestLogoCandidates(string installLocation)
+ {
+ var manifest = Path.Combine(installLocation, "AppxManifest.xml");
+ if (!File.Exists(manifest))
+ return [];
- var ns = root.Name.Namespace;
- List<string> candidates = [];
+ var candidates = new List<string>();
+ var doc = XDocument.Load(manifest);
+ var root = doc.Root;
+ if (root == null)
+ return candidates;
- var props = root.Element(ns + "Properties");
- if (props != null)
- {
- var logo = props.Element(ns + "Logo")?.Value;
- if (!string.IsNullOrWhiteSpace(logo)) candidates.Add(logo);
- }
+ var ns = root.Name.Namespace;
+ var visualElements = root.Descendants().FirstOrDefault(e => e.Name.LocalName == "VisualElements");
+ var defaultTile = root.Descendants().FirstOrDefault(e => e.Name.LocalName == "DefaultTile");
+ var properties = root.Element(ns + "Properties");
- var visual = root.Descendants().FirstOrDefault(e =>
- e.Name.LocalName == "VisualElements" || e.Name.LocalName == "DefaultTile");
- if (visual != null)
- {
- AddAttr(candidates, visual, "Square150x150Logo");
- AddAttr(candidates, visual, "Wide310x150Logo");
- AddAttr(candidates, visual, "Square44x44Logo");
- }
+ if (visualElements != null)
+ {
+ AddAttr(candidates, visualElements, "Square44x44Logo");
+ AddAttr(candidates, visualElements, "Square150x150Logo");
+ AddAttr(candidates, visualElements, "Wide310x150Logo");
+ AddAttr(candidates, visualElements, "Square310x310Logo");
+ }
+
+ if (defaultTile != null)
+ {
+ AddAttr(candidates, defaultTile, "Square71x71Logo");
+ AddAttr(candidates, defaultTile, "Square310x310Logo");
+ AddAttr(candidates, defaultTile, "Wide310x150Logo");
+ AddAttr(candidates, defaultTile, "Square44x44Logo");
+ AddAttr(candidates, defaultTile, "Square150x150Logo");
+ }
- // resolve manifest candidates
- foreach (var rel in candidates)
+ var packageLogo = properties?.Element(ns + "Logo")?.Value;
+ if (!string.IsNullOrWhiteSpace(packageLogo))
+ candidates.Add(packageLogo);
+
+ return candidates
+ .Where(c => !string.IsNullOrWhiteSpace(c))
+ .Distinct(StringComparer.OrdinalIgnoreCase)
+ .ToList();
+ }
+
+ private static string? ResolveBestQualifiedVariant(string installLocation, string resourcePath,
+ bool includeThemeSpecific)
+ {
+ var normalizedResource = resourcePath.Replace('/', '\\').TrimStart('\\');
+ if (string.IsNullOrWhiteSpace(normalizedResource))
+ return null;
+
+ var fullExactPath = Path.Combine(installLocation, normalizedResource);
+ if (File.Exists(fullExactPath))
+ return fullExactPath;
+
+ var candidateDirectory = Path.GetDirectoryName(fullExactPath) ?? installLocation;
+ if (!Directory.Exists(candidateDirectory))
+ return null;
+
+ var resourceFileName = Path.GetFileName(normalizedResource);
+ var extension = Path.GetExtension(resourceFileName);
+ if (!string.IsNullOrWhiteSpace(extension) &&
+ !SupportedImageExtensions.Contains(extension, StringComparer.OrdinalIgnoreCase))
+ return null;
+
+ var baseResourceName = Path.GetFileNameWithoutExtension(resourceFileName);
+ var baseNameWithoutQualifiers = StripKnownQualifiers(baseResourceName);
+ var preferredLogicalSize = GuessLogicalBaseSize(baseNameWithoutQualifiers);
+
+ var files = Directory.EnumerateFiles(candidateDirectory, "*.*", SearchOption.TopDirectoryOnly)
+ .Where(path => SupportedImageExtensions.Contains(Path.GetExtension(path), StringComparer.OrdinalIgnoreCase))
+ .Where(path =>
{
- var clean = rel.Replace('/', '\\');
- var full = Path.Combine(installLocation, clean);
+ var fileName = Path.GetFileNameWithoutExtension(path);
+ var stripped = StripKnownQualifiers(fileName);
+ return stripped.Equals(baseNameWithoutQualifiers, StringComparison.OrdinalIgnoreCase);
+ })
+ .Select(path => new LogoVariant(path, preferredLogicalSize, includeThemeSpecific))
+ .OrderByDescending(v => v.SortScore)
+ .ToList();
+
+ return files.FirstOrDefault()?.Path;
+ }
- if (File.Exists(full)) return full;
+ private static string StripKnownQualifiers(string fileNameWithoutExtension)
+ {
+ return Regex.Replace(
+ fileNameWithoutExtension,
+ @"(?:[._](?:scale|targetsize)-\d+|_[^._]+)+$",
+ string.Empty,
+ RegexOptions.IgnoreCase).TrimEnd('.', '_');
+ }
- // fallback: search for file with matching name and extension but different scale modifiers
- var nameWithoutExt = Path.GetFileNameWithoutExtension(clean);
- var ext = Path.GetExtension(clean);
- var dirPath = Path.GetDirectoryName(clean);
- var searchDir = string.IsNullOrEmpty(dirPath)
- ? installLocation
- : Path.Combine(installLocation, dirPath);
+ private static int GuessLogicalBaseSize(string baseName)
+ {
+ if (baseName.Contains("applist", StringComparison.OrdinalIgnoreCase) ||
+ baseName.Contains("square44x44", StringComparison.OrdinalIgnoreCase) ||
+ baseName.Contains("smalltile", StringComparison.OrdinalIgnoreCase))
+ return 44;
- if (Directory.Exists(searchDir))
- {
- var found = Directory
- .EnumerateFiles(searchDir, $"{nameWithoutExt}*{ext}", SearchOption.TopDirectoryOnly)
- .OrderByDescending(f => new FileInfo(f).Length)
- .FirstOrDefault();
- if (found != null) return found;
- }
+ if (baseName.Contains("medtile", StringComparison.OrdinalIgnoreCase) ||
+ baseName.Contains("square150x150", StringComparison.OrdinalIgnoreCase))
+ return 150;
+
+ if (baseName.Contains("widetile", StringComparison.OrdinalIgnoreCase) ||
+ baseName.Contains("wide310x150", StringComparison.OrdinalIgnoreCase))
+ return 150;
+
+ if (baseName.Contains("large", StringComparison.OrdinalIgnoreCase) ||
+ baseName.Contains("square310x310", StringComparison.OrdinalIgnoreCase))
+ return 310;
+
+ if (baseName.Contains("storelogo", StringComparison.OrdinalIgnoreCase))
+ return 50;
+
+ return 64;
+ }
+
+ private sealed class LogoVariant
+ {
+ public LogoVariant(string path, int logicalBaseSize, bool includeThemeSpecific)
+ {
+ Path = path;
+ var fileNameWithoutExtension = System.IO.Path.GetFileNameWithoutExtension(path);
+
+ var targetSize = TryGetQualifierNumber(TargetSizeRegex, fileNameWithoutExtension);
+ var scale = TryGetQualifierNumber(ScaleRegex, fileNameWithoutExtension);
+
+ var resolvedPixelSize = targetSize
+ ?? (scale.HasValue ? logicalBaseSize * scale.Value / 100 : logicalBaseSize);
+
+ var score = 0;
+ score += resolvedPixelSize >= 48 ? 600 : 0;
+ score += resolvedPixelSize >= 64 ? 350 : 0;
+ score += resolvedPixelSize >= 96 ? 100 : 0;
+ score -= Math.Abs(64 - resolvedPixelSize);
+
+ if (targetSize.HasValue)
+ score += 220;
+
+ if (scale.HasValue)
+ score += Math.Min(scale.Value, 400);
+
+ if (includeThemeSpecific)
+ {
+ if (fileNameWithoutExtension.Contains("_altform-unplated", StringComparison.OrdinalIgnoreCase))
+ score += 120;
+ if (fileNameWithoutExtension.Contains("_altform-lightunplated", StringComparison.OrdinalIgnoreCase))
+ score += 110;
}
+
+ if (fileNameWithoutExtension.Contains("storelogo", StringComparison.OrdinalIgnoreCase))
+ score -= 300;
+
+ SortScore = score;
}
- catch
+
+ public string Path { get; }
+ public int SortScore { get; }
+
+ private static int? TryGetQualifierNumber(Regex regex, string text)
{
- // ignored: returning null if any file access/parsing fails
- }
+ var match = regex.Match(text);
+ if (!match.Success)
+ return null;
- return null;
+ return int.TryParse(match.Groups[1].Value, out var value) ? value : null;
+ }
}
private static void AddAttr(List<string> list, XElement el, string name)
{
var val = el.Attribute(name)?.Value;
- if (!string.IsNullOrWhiteSpace(val)) list.Add(val);
+ if (!string.IsNullOrWhiteSpace(val))
+ list.Add(val);
}
-}
\ No newline at end of file
+}
diff --git a/optimizerDuck/UI/Dialogs/BloatwareConfirmationDialog.xaml b/optimizerDuck/UI/Dialogs/BloatwareConfirmationDialog.xaml
new file mode 100644
index 0000000..1547dc4
--- /dev/null
+++ b/optimizerDuck/UI/Dialogs/BloatwareConfirmationDialog.xaml
@@ -0,0 +1,183 @@
+<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">
+ <UserControl.Resources>
+ <converters:GreaterThanZeroToVisibilityConverter x:Key="GreaterThanZeroToVisibilityConverter" />
+ <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
+ </UserControl.Resources>
+
+ <Grid>
+ <Grid.RowDefinitions>
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="*" />
+ </Grid.RowDefinitions>
+
+ <Border
+ Grid.Row="0"
+ Margin="0,0,0,12"
+ Padding="12"
+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
+ CornerRadius="8">
+ <StackPanel>
+ <StackPanel Orientation="Horizontal">
+ <ui:SymbolIcon
+ Margin="0,0,8,0"
+ VerticalAlignment="Center"
+ Filled="True"
+ Foreground="{DynamicResource SystemFillColorCautionBrush}"
+ Symbol="Warning24" />
+ <ui:TextBlock
+ FontTypography="BodyStrong"
+ Text="{ext:Loc BloatwareDialog.Confirmation.Description}"
+ TextWrapping="Wrap" />
+ </StackPanel>
+
+ <ui:TextBlock
+ Margin="0,6,0,0"
+ Appearance="Secondary"
+ FontTypography="Caption"
+ Text="{ext:Loc BloatwareDialog.Confirmation.SelectedList}"
+ TextWrapping="Wrap" />
+ </StackPanel>
+ </Border>
+
+ <ScrollViewer
+ Grid.Row="1"
+ 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">
+ <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>
+
+ <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}" />
+
+ <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}" />
+
+ <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"
+ Appearance="Disabled"
+ 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>
+</UserControl>
diff --git a/optimizerDuck/UI/Dialogs/BloatwareConfirmationDialog.xaml.cs b/optimizerDuck/UI/Dialogs/BloatwareConfirmationDialog.xaml.cs
new file mode 100644
index 0000000..1bddd5a
--- /dev/null
+++ b/optimizerDuck/UI/Dialogs/BloatwareConfirmationDialog.xaml.cs
@@ -0,0 +1,11 @@
+using System.Windows.Controls;
+
+namespace optimizerDuck.UI.Dialogs;
+
+public partial class BloatwareConfirmationDialog : UserControl
+{
+ public BloatwareConfirmationDialog()
+ {
+ InitializeComponent();
+ }
+}
diff --git a/optimizerDuck/UI/Dialogs/OptimizationDetailsDialog.xaml b/optimizerDuck/UI/Dialogs/OptimizationDetailsDialog.xaml
index 027c1b1..50d64dc 100644
--- a/optimizerDuck/UI/Dialogs/OptimizationDetailsDialog.xaml
+++ b/optimizerDuck/UI/Dialogs/OptimizationDetailsDialog.xaml
@@ -1,7 +1,7 @@
-<UserControl
+<UserControl
ScrollViewer.CanContentScroll="False"
- d:DesignHeight="700"
- d:DesignWidth="600"
+ d:DesignHeight="760"
+ d:DesignWidth="760"
mc:Ignorable="d"
x:Class="optimizerDuck.UI.Dialogs.OptimizationDetailsDialog"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
@@ -10,264 +10,224 @@
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 Margin="0,0,16,0">
+ <ScrollViewer Margin="0,0,12,0" VerticalScrollBarVisibility="Auto">
+ <StackPanel>
+ <!-- Header card: keep same visual language as optimization item -->
+ <Border
+ Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
+ BorderBrush="{DynamicResource CardBorderBrush}"
+ BorderThickness="1"
+ CornerRadius="8"
+ Margin="0,0,0,12"
+ Padding="16">
+ <Grid RowDefinitions="Auto,Auto,Auto,Auto">
+ <ui:TextBlock
+ Appearance="Disabled"
+ FontTypography="Caption"
+ Text="{Binding Optimization.Id}" />
- <!-- Description -->
- <Border
- Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
- CornerRadius="8"
- Margin="0,0,0,12"
- Padding="16">
- <ui:TextBlock
- FontTypography="Body"
- Foreground="{DynamicResource TextFillColorSecondaryBrush}"
- Text="{Binding Optimization.ShortDescription}"
- TextWrapping="Wrap" />
- </Border>
+ <ui:TextBlock
+ Grid.Row="1"
+ FontTypography="Subtitle"
+ Margin="0,2,0,0"
+ Text="{Binding Optimization.Name}"
+ TextWrapping="Wrap" />
- <!-- Status & Risk -->
- <Border
- Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
- CornerRadius="8"
- Margin="0,0,0,12"
- Padding="16">
- <Grid>
- <Grid.ColumnDefinitions>
- <ColumnDefinition Width="*" />
- <ColumnDefinition Width="*" />
- </Grid.ColumnDefinitions>
+ <ui:VirtualizingItemsControl
+ Grid.Row="2"
+ ItemsSource="{Binding Optimization.TagDisplays}"
+ Margin="0,8,0,0">
+ <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
+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
+ CornerRadius="5"
+ Padding="6,3">
+ <StackPanel Orientation="Horizontal">
+ <ui:SymbolIcon
+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"
+ Margin="0,0,6,0"
+ Symbol="{Binding Icon}" />
+ <ui:TextBlock
+ Appearance="Secondary"
+ FontTypography="Caption"
+ Text="{Binding Display}"
+ VerticalAlignment="Center" />
+ </StackPanel>
+ </Border>
+ </DataTemplate>
+ </ui:VirtualizingItemsControl.ItemTemplate>
+ </ui:VirtualizingItemsControl>
- <StackPanel Grid.Column="0">
- <StackPanel Margin="0,0,0,8" Orientation="Horizontal">
- <ui:TextBlock
- FontTypography="BodyStrong"
- Text="{ext:Loc OptimizationDetailsDialog.Risk}"
- TextTrimming="WordEllipsis"
- TextWrapping="Wrap" />
- <ui:SymbolIcon
- Foreground="{DynamicResource TextFillColorSecondaryBrush}"
- Margin="6,0,0,0"
- Symbol="QuestionCircle24"
- ToolTip="{ext:Loc Optimizer.UI.Risk.Help}"
+ <Grid Grid.Row="3" Margin="0,4,0,0" ColumnDefinitions="Auto,Auto,*">
+ <Border
+ CornerRadius="5"
+ HorizontalAlignment="Left"
+ Padding="6,4">
+ <Border.Style>
+ <Style TargetType="Border">
+ <Setter Property="Background" Value="{DynamicResource SystemFillColorSuccessBrush}" />
+ <Style.Triggers>
+ <DataTrigger Binding="{Binding Optimization.Risk}" Value="Moderate">
+ <Setter Property="Background" Value="{DynamicResource SystemFillColorCautionBrush}" />
+ </DataTrigger>
+ <DataTrigger Binding="{Binding Optimization.Risk}" Value="Risky">
+ <Setter Property="Background" Value="{DynamicResource SystemFillColorCriticalBrush}" />
+ </DataTrigger>
+ </Style.Triggers>
+ </Style>
+ </Border.Style>
+ <StackPanel Orientation="Horizontal">
+ <ui:SymbolIcon
+ Foreground="{DynamicResource TextFillColorInverseBrush}"
+ Margin="0,0,6,0"
+ Symbol="{Binding Optimization.RiskVisual.Icon}" />
+ <ui:TextBlock
+ FontTypography="Caption"
+ Foreground="{DynamicResource TextFillColorInverseBrush}"
+ Text="{Binding Optimization.RiskVisual.Display}"
+ VerticalAlignment="Center" />
+ </StackPanel>
+ </Border>
+
+ <Border
+ Grid.Column="1"
+ Background="{DynamicResource CardBackgroundDisabled}"
+ CornerRadius="5"
+ HorizontalAlignment="Left"
+ Margin="8,0,0,0"
+ Padding="6,4"
+ ToolTip="{Binding Optimization.State.AppliedAt}"
ToolTipService.InitialShowDelay="150"
ToolTipService.Placement="Top"
- VerticalAlignment="Center" />
- </StackPanel>
- <Border
- CornerRadius="5"
- HorizontalAlignment="Left"
- Padding="6,4">
- <Border.Style>
- <Style TargetType="Border">
- <Setter Property="Background" Value="{DynamicResource SystemFillColorSuccessBrush}" />
- <Style.Triggers>
- <DataTrigger Binding="{Binding Optimization.Risk}" Value="Moderate">
- <Setter Property="Background" Value="{DynamicResource SystemFillColorCautionBrush}" />
- </DataTrigger>
- <DataTrigger Binding="{Binding Optimization.Risk}" Value="Risky">
- <Setter Property="Background" Value="{DynamicResource SystemFillColorCriticalBrush}" />
- </DataTrigger>
- </Style.Triggers>
- </Style>
- </Border.Style>
- <StackPanel Orientation="Horizontal">
- <ui:SymbolIcon
- Foreground="{DynamicResource TextFillColorInverseBrush}"
- Margin="0,0,6,0"
- Symbol="{Binding Optimization.RiskVisual.Icon}" />
- <ui:TextBlock
- FontTypography="Caption"
- Foreground="{DynamicResource TextFillColorInverseBrush}"
- HorizontalAlignment="Center"
- Text="{Binding Optimization.RiskVisual.Display}"
- TextWrapping="Wrap"
- VerticalAlignment="Center" />
- </StackPanel>
- </Border>
- </StackPanel>
+ Visibility="{Binding Optimization.State.AppliedAt, Converter={StaticResource NullToVisibilityConverter}}">
+ <StackPanel Orientation="Horizontal">
+ <ui:SymbolIcon Margin="0,0,6,0" Symbol="CheckmarkCircle24" />
+ <ui:TextBlock
+ FontTypography="Caption"
+ Text="{Binding Optimization.State.RelativeTime}"
+ VerticalAlignment="Center" />
+ </StackPanel>
+ </Border>
+ </Grid>
+ </Grid>
+ </Border>
- <StackPanel Grid.Column="1" Visibility="{Binding Optimization.State.AppliedAt, Converter={StaticResource NullToVisibilityConverter}}">
+ <Border
+ Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
+ BorderBrush="{DynamicResource CardBorderBrush}"
+ BorderThickness="1"
+ CornerRadius="8"
+ Margin="0,0,0,12"
+ Padding="16">
+ <StackPanel>
<ui:TextBlock
FontTypography="BodyStrong"
Margin="0,0,0,8"
- Text="{ext:Loc Common.Status.Applied}"
- TextTrimming="WordEllipsis"
+ Text="{ext:Loc OptimizationDetailsDialog.DetailedDescription}" />
+ <ui:TextBlock
+ Appearance="Secondary"
+ FontTypography="Body"
+ Text="{Binding Optimization.ShortDescription}"
TextWrapping="Wrap" />
- <Border
- Background="{DynamicResource CardBackgroundDisabled}"
- CornerRadius="5"
- HorizontalAlignment="Left"
- Padding="6,4"
- ToolTip="{Binding Optimization.State.AppliedAt}"
- ToolTipService.InitialShowDelay="150"
- ToolTipService.Placement="Top">
+ </StackPanel>
+ </Border>
+
+ <Border
+ Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
+ BorderBrush="{DynamicResource CardBorderBrush}"
+ BorderThickness="1"
+ CornerRadius="8"
+ Margin="0,0,0,12"
+ Padding="0">
+ <StackPanel>
+ <Grid Margin="16">
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="150" />
+ <ColumnDefinition Width="*" />
+ </Grid.ColumnDefinitions>
+ <ui:TextBlock
+ Appearance="Secondary"
+ Grid.Column="0"
+ Text="{ext:Loc OptimizationDetailsDialog.Id}"
+ VerticalAlignment="Center" />
+ <ui:TextBlock
+ FontFamily="Consolas"
+ Grid.Column="1"
+ Text="{Binding Optimization.Id}"
+ TextWrapping="Wrap"
+ VerticalAlignment="Center" />
+ </Grid>
+ <Separator Margin="16,0" />
+ <Grid Margin="16">
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="150" />
+ <ColumnDefinition Width="*" />
+ </Grid.ColumnDefinitions>
+ <ui:TextBlock
+ Appearance="Secondary"
+ Grid.Column="0"
+ Text="{ext:Loc OptimizationDetailsDialog.Class}"
+ VerticalAlignment="Center" />
<ui:TextBlock
- FontTypography="Caption"
- HorizontalAlignment="Center"
- Text="{Binding Optimization.State.RelativeTime}"
+ FontFamily="Consolas"
+ Grid.Column="1"
+ Text="{Binding Optimization.OptimizationKey}"
TextWrapping="Wrap"
VerticalAlignment="Center" />
- </Border>
+ </Grid>
</StackPanel>
- </Grid>
- </Border>
+ </Border>
+
+ <ui:TextBlock
+ FontTypography="BodyStrong"
+ Margin="0,0,0,8"
+ Text="{ext:Loc OptimizationDetailsDialog.Other}" />
- <!-- Tags -->
- <Border
- Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
- CornerRadius="8"
- Margin="0,0,0,12"
- Padding="16">
- <StackPanel>
- <StackPanel Margin="0,0,0,12" Orientation="Horizontal">
+ <ui:CardAction
+ Command="{Binding ViewSourceOnGitHubCommand}"
+ Icon="{ui:SymbolIcon Code24}"
+ Margin="0,0,0,8">
+ <StackPanel>
<ui:TextBlock
FontTypography="BodyStrong"
- Text="{ext:Loc OptimizationDetailsDialog.Tags}"
- TextTrimming="WordEllipsis"
+ Text="{ext:Loc OptimizationDetailsDialog.Other.ViewSource.Title}"
TextWrapping="Wrap" />
- <ui:SymbolIcon
- Foreground="{DynamicResource TextFillColorSecondaryBrush}"
- Margin="6,0,0,0"
- Symbol="QuestionCircle24"
- ToolTip="{ext:Loc Optimizer.UI.Tags.Help}"
- ToolTipService.InitialShowDelay="150"
- ToolTipService.Placement="Top"
- VerticalAlignment="Center" />
- </StackPanel>
- <ui:VirtualizingItemsControl ItemsSource="{Binding Optimization.TagDisplays}">
- <ui:VirtualizingItemsControl.ItemsPanel>
- <ItemsPanelTemplate>
- <WrapPanel HorizontalAlignment="Left" VerticalAlignment="Top" />
- </ItemsPanelTemplate>
- </ui:VirtualizingItemsControl.ItemsPanel>
- <ui:VirtualizingItemsControl.ItemContainerStyle>
- <Style TargetType="ContentPresenter">
- <Setter Property="Margin" Value="0,0,6,6" />
- <Setter Property="HorizontalAlignment" Value="Left" />
- </Style>
- </ui:VirtualizingItemsControl.ItemContainerStyle>
- <ui:VirtualizingItemsControl.ItemTemplate>
- <DataTemplate>
- <Border
- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
- CornerRadius="5"
- HorizontalAlignment="Left"
- Padding="6,4">
- <StackPanel Orientation="Horizontal">
- <ui:SymbolIcon
- Foreground="{DynamicResource TextFillColorSecondaryBrush}"
- Margin="0,0,6,0"
- Symbol="{Binding Icon}" />
-
- <ui:TextBlock
- Appearance="Secondary"
- FontTypography="Caption"
- Foreground="{DynamicResource TextFillColorInverseBrush}"
- HorizontalAlignment="Center"
- Text="{Binding Display}"
- TextWrapping="Wrap"
- VerticalAlignment="Center" />
- </StackPanel>
- </Border>
- </DataTemplate>
- </ui:VirtualizingItemsControl.ItemTemplate>
- </ui:VirtualizingItemsControl>
- </StackPanel>
- </Border>
-
- <!-- Technical Details Section -->
- <ui:TextBlock
- FontTypography="BodyStrong"
- Margin="0,12,0,8"
- Text="{ext:Loc OptimizationDetailsDialog.TechnicalDetails}"
- TextWrapping="Wrap" />
-
- <Border
- Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
- CornerRadius="8"
- Margin="0,0,0,12"
- Padding="0">
- <StackPanel>
- <Grid Margin="16">
- <Grid.ColumnDefinitions>
- <ColumnDefinition Width="150" />
- <ColumnDefinition Width="*" />
- </Grid.ColumnDefinitions>
<ui:TextBlock
Appearance="Secondary"
- Grid.Column="0"
- Text="{ext:Loc OptimizationDetailsDialog.Id}"
- VerticalAlignment="Center" />
+ FontTypography="Body"
+ Text="{ext:Loc OptimizationDetailsDialog.Other.ViewSource.Description}"
+ TextWrapping="Wrap" />
+ </StackPanel>
+ </ui:CardAction>
+
+ <ui:CardAction
+ Command="{Binding OpenRevertFileCommand}"
+ Icon="{ui:SymbolIcon FolderOpen24}"
+ Margin="0,0,0,4"
+ Visibility="{Binding Optimization.State.AppliedAt, Converter={StaticResource NullToVisibilityConverter}}">
+ <StackPanel>
<ui:TextBlock
- FontFamily="Consolas"
- Grid.Column="1"
- Text="{Binding Optimization.Id}"
- TextWrapping="Wrap"
- VerticalAlignment="Center" />
- </Grid>
- <Separator Margin="16,0,16,0" />
- <Grid Margin="16">
- <Grid.ColumnDefinitions>
- <ColumnDefinition Width="150" />
- <ColumnDefinition Width="*" />
- </Grid.ColumnDefinitions>
+ FontTypography="BodyStrong"
+ Text="{ext:Loc OptimizationDetailsDialog.Other.OpenRevertFile.Title}"
+ TextWrapping="Wrap" />
<ui:TextBlock
Appearance="Secondary"
- Grid.Column="0"
- Text="{ext:Loc OptimizationDetailsDialog.Class}"
- VerticalAlignment="Center" />
- <ui:TextBlock
- FontFamily="Consolas"
- Grid.Column="1"
- Text="{Binding Optimization.OptimizationKey}"
- TextWrapping="Wrap"
- VerticalAlignment="Center" />
- </Grid>
- </StackPanel>
- </Border>
-
- <!-- Actions -->
- <ui:TextBlock
- FontTypography="BodyStrong"
- Margin="0,12,0,8"
- Text="{ext:Loc OptimizationDetailsDialog.Other}"
- TextTrimming="WordEllipsis"
- TextWrapping="Wrap" />
-
- <ui:CardAction
- Command="{Binding ViewSourceOnGitHubCommand}"
- Icon="{ui:SymbolIcon Code24}"
- Margin="0,0,0,8">
- <StackPanel>
- <ui:TextBlock
- FontTypography="BodyStrong"
- Text="{ext:Loc OptimizationDetailsDialog.Other.ViewSource.Title}"
- TextWrapping="Wrap" />
- <ui:TextBlock
- Appearance="Secondary"
- FontTypography="Body"
- Text="{ext:Loc OptimizationDetailsDialog.Other.ViewSource.Description}"
- TextWrapping="Wrap" />
- </StackPanel>
- </ui:CardAction>
-
- <ui:CardAction
- Command="{Binding OpenRevertFileCommand}"
- Icon="{ui:SymbolIcon FolderOpen24}"
- Margin="0,0,0,4"
- Visibility="{Binding Optimization.State.AppliedAt, Converter={StaticResource NullToVisibilityConverter}}">
- <StackPanel>
- <ui:TextBlock
- FontTypography="BodyStrong"
- Text="{ext:Loc OptimizationDetailsDialog.Other.OpenRevertFile.Title}"
- TextWrapping="Wrap" />
- <ui:TextBlock
- Appearance="Secondary"
- FontTypography="Body"
- Text="{ext:Loc OptimizationDetailsDialog.Other.OpenRevertFile.Description}"
- TextWrapping="Wrap" />
- </StackPanel>
- </ui:CardAction>
-
- </StackPanel>
-</UserControl>
\ No newline at end of file
+ FontTypography="Body"
+ Text="{ext:Loc OptimizationDetailsDialog.Other.OpenRevertFile.Description}"
+ TextWrapping="Wrap" />
+ </StackPanel>
+ </ui:CardAction>
+ </StackPanel>
+ </ScrollViewer>
+</UserControl>
diff --git a/optimizerDuck/UI/Dialogs/ScheduledTaskDetailsDialog.xaml b/optimizerDuck/UI/Dialogs/ScheduledTaskDetailsDialog.xaml
index f252ab0..a19971f 100644
--- a/optimizerDuck/UI/Dialogs/ScheduledTaskDetailsDialog.xaml
+++ b/optimizerDuck/UI/Dialogs/ScheduledTaskDetailsDialog.xaml
@@ -1,6 +1,6 @@
-<UserControl
- d:DesignHeight="400"
- d:DesignWidth="500"
+<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"
@@ -9,257 +9,281 @@
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 MinWidth="450" x:Name="RootPanel">
- <!-- General Info Card -->
- <Border
- Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
- CornerRadius="8"
- Margin="0,0,0,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="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">
+ <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>
- <ui:SymbolIcon
- FontSize="14"
- Foreground="{DynamicResource TextFillColorSecondaryBrush}"
- Margin="0,0,10,0"
- Symbol="TextDescription24"
- VerticalAlignment="Top" />
- <StackPanel Grid.Column="1">
+
+ <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>
+
<ui:TextBlock
Appearance="Secondary"
FontTypography="Caption"
- Text="{ext:Loc ScheduledTasks.Details.Description}" />
- <ui:TextBlock
- FontTypography="Body"
- Margin="0,2,0,0"
+ Margin="0,4,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="Person24"
- VerticalAlignment="Top" />
- <StackPanel Grid.Column="1">
<ui:TextBlock
- Appearance="Secondary"
+ Appearance="Disabled"
FontTypography="Caption"
- Text="{ext:Loc ScheduledTasks.Details.Author}" />
- <ui:TextBlock
- FontTypography="Body"
Margin="0,2,0,0"
Text=""
- x:Name="AuthorText" />
+ 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" />
+ </StackPanel>
+ </Border>
+ </DataTemplate>
+ </ItemsControl.ItemTemplate>
+ </ItemsControl>
</StackPanel>
</Grid>
- </StackPanel>
- </Border>
+ </Border>
- <!-- State & Triggers Card -->
- <Border
- Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
- CornerRadius="8"
- Margin="0,0,0,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="Flash24"
- VerticalAlignment="Top" />
- <StackPanel Grid.Column="1">
- <ui:TextBlock
- Appearance="Secondary"
- FontTypography="Caption"
- Text="{ext:Loc ScheduledTasks.Details.State}" />
- <Border
- CornerRadius="4"
- HorizontalAlignment="Left"
- Margin="0,4,0,0"
- Padding="8,2"
- x:Name="StateBorder">
+ <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"
- Foreground="{DynamicResource TextFillColorInverseBrush}"
+ Text="{ext:Loc ScheduledTasks.Details.Author}" />
+ <ui:TextBlock
+ FontTypography="Body"
+ Margin="0,2,0,0"
Text=""
- x:Name="StateText" />
- </Border>
- </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>
+ x:Name="AuthorText" />
+ </StackPanel>
+ </Grid>
+ <Separator Margin="14,0" />
- <!-- Run History Card -->
- <Border
- Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
- 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>
-</UserControl>
\ No newline at end of file
+ <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>
+
+ <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>
+ </ScrollViewer>
+</UserControl>
diff --git a/optimizerDuck/UI/Dialogs/ScheduledTaskDetailsDialog.xaml.cs b/optimizerDuck/UI/Dialogs/ScheduledTaskDetailsDialog.xaml.cs
index a3222c8..136f5e7 100644
--- a/optimizerDuck/UI/Dialogs/ScheduledTaskDetailsDialog.xaml.cs
+++ b/optimizerDuck/UI/Dialogs/ScheduledTaskDetailsDialog.xaml.cs
@@ -1,5 +1,6 @@
-using System.Windows.Controls;
+using System.Windows.Controls;
using System.Windows.Media;
+using Wpf.Ui.Controls;
using ScheduledTaskModel = optimizerDuck.Domain.Optimizations.Models.ScheduledTask.ScheduledTaskModel;
namespace optimizerDuck.UI.Dialogs;
@@ -21,6 +22,8 @@ public partial class ScheduledTaskDetailsDialog : UserControl
_taskModel = value;
if (value == null) return;
+ TaskLogoImage.Source = value.LogoImage;
+ TaskNameText.Text = value.Name;
PathText.Text = value.FullPath;
DescriptionText.Text = value.Description ?? "—";
AuthorText.Text = value.Author ?? "—";
@@ -30,9 +33,9 @@ public partial class ScheduledTaskDetailsDialog : UserControl
LastRunText.Text = value.LastRunTime?.ToString("g") ?? "—";
NextRunText.Text = value.NextRunTime?.ToString("g") ?? "—";
LastResultText.Text = value.LastRunResult?.ToString() ?? "—";
+ TriggerBadgesItems.ItemsSource = value.TriggerTypes;
- // Set state badge color
- var brushKey = value.State switch
+ var backgroundBrushKey = value.State switch
{
"Ready" => "SystemFillColorSuccessBrush",
"Running" => "AccentButtonBackground",
@@ -40,8 +43,29 @@ public partial class ScheduledTaskDetailsDialog : UserControl
_ => "CardBackgroundFillColorSecondaryBrush"
};
- if (TryFindResource(brushKey) is Brush brush)
- StateBorder.Background = brush;
+ var iconSymbol = value.State switch
+ {
+ "Ready" => SymbolRegular.CheckmarkCircle24,
+ "Running" => SymbolRegular.Play24,
+ "Disabled" => SymbolRegular.Dismiss24,
+ _ => SymbolRegular.Circle24
+ };
+
+ var iconBrushKey = value.State switch
+ {
+ "Ready" => "TextFillColorInverseBrush",
+ "Running" => "TextFillColorInverseBrush",
+ "Disabled" => "TextFillColorInverseBrush",
+ _ => "TextFillColorPrimaryBrush"
+ };
+
+ if (TryFindResource(backgroundBrushKey) is Brush backgroundBrush)
+ StateBorder.Background = backgroundBrush;
+
+ StateIcon.Symbol = iconSymbol;
+
+ if (TryFindResource(iconBrushKey) is Brush iconBrush)
+ StateIcon.Foreground = iconBrush;
}
}
-}
\ No newline at end of file
+}
diff --git a/optimizerDuck/UI/Dialogs/StartupTaskDetailsPanel.xaml b/optimizerDuck/UI/Dialogs/StartupTaskDetailsPanel.xaml
index ad10d55..a7c72a6 100644
--- a/optimizerDuck/UI/Dialogs/StartupTaskDetailsPanel.xaml
+++ b/optimizerDuck/UI/Dialogs/StartupTaskDetailsPanel.xaml
@@ -1,6 +1,6 @@
-<UserControl
- d:DesignHeight="200"
- d:DesignWidth="400"
+<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"
@@ -9,148 +9,251 @@
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>
- <Border
- Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
- CornerRadius="8"
- MinWidth="400"
- Padding="0">
- <StackPanel>
- <!-- Name -->
- <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" />
+ <Image
+ Grid.Column="0"
+ Height="40"
+ Margin="0,0,12,0"
+ Source="{x:Null}"
+ Stretch="UniformToFill"
+ VerticalAlignment="Center"
+ Width="40"
+ x:Name="LogoImageControl" />
- <!-- Description -->
- <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" />
+ <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>
- <!-- Path -->
- <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" />
+ <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" />
- <!-- Triggers -->
- <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" />
+ <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>
+ </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" />
+
+ <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="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" />
- <!-- Action -->
- <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" />
+ <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>
- </Grid>
+ </Border>
</StackPanel>
- </Border>
-</UserControl>
\ No newline at end of file
+ </ScrollViewer>
+</UserControl>
diff --git a/optimizerDuck/UI/Dialogs/StartupTaskDetailsPanel.xaml.cs b/optimizerDuck/UI/Dialogs/StartupTaskDetailsPanel.xaml.cs
index 53cc285..6e275d0 100644
--- a/optimizerDuck/UI/Dialogs/StartupTaskDetailsPanel.xaml.cs
+++ b/optimizerDuck/UI/Dialogs/StartupTaskDetailsPanel.xaml.cs
@@ -1,4 +1,6 @@
-using System.Windows.Controls;
+using System.Windows.Controls;
+using System.Windows.Media;
+using optimizerDuck.Resources.Languages;
using StartupTask = optimizerDuck.Domain.Optimizations.Models.StartupManager.StartupTask;
namespace optimizerDuck.UI.Dialogs;
@@ -14,5 +16,12 @@ public partial class StartupTaskDetailsPanel : UserControl
PathText.Text = task.TaskPath;
TriggersText.Text = task.TriggerSummary ?? "—";
ActionText.Text = task.ActionSummary ?? "—";
+ LogoImageControl.Source = task.LogoImage;
+ TriggerBadgesItems.ItemsSource = task.TriggerTypes;
+
+ TaskStateText.Text = task.IsEnabled ? Translations.Common_Toggle_On : Translations.Common_Toggle_Off;
+ var brushKey = task.IsEnabled ? "SystemFillColorSuccessBrush" : "SystemFillColorCriticalBrush";
+ if (TryFindResource(brushKey) is Brush brush)
+ TaskStateBadge.Background = brush;
}
-}
\ No newline at end of file
+}
diff --git a/optimizerDuck/UI/Pages/BloatwarePage.xaml b/optimizerDuck/UI/Pages/BloatwarePage.xaml
index c2116d2..201c186 100644
--- a/optimizerDuck/UI/Pages/BloatwarePage.xaml
+++ b/optimizerDuck/UI/Pages/BloatwarePage.xaml
@@ -1,16 +1,7 @@
<Page
- Foreground="{DynamicResource TextFillColorPrimaryBrush}"
- Margin="0,32,0,0"
- ScrollViewer.CanContentScroll="False"
- Title="BloatwarePage"
- d:DataContext="{d:DesignInstance local:BloatwarePage}"
- d:DesignHeight="1200"
- d:DesignWidth="800"
- mc:Ignorable="d"
- ui:Design.Background="Black"
- ui:Design.Foreground="White"
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"
@@ -18,7 +9,16 @@
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"
- xmlns:x="http://schemas.microsoft.com/winfx/2006/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" />
@@ -32,9 +32,9 @@
Text="{ext:Loc Bloatware.Header.Title}"
TextWrapping="Wrap" />
<ui:TextBlock
+ Margin="0,4,0,0"
Appearance="Secondary"
FontTypography="Body"
- Margin="0,4,0,0"
Text="{ext:Loc Bloatware.Header.Description}"
TextWrapping="Wrap" />
</StackPanel>
@@ -58,26 +58,26 @@
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
<ui:SymbolIcon
+ Margin="0,0,0,15"
+ HorizontalAlignment="Center"
FontSize="46"
Foreground="{DynamicResource SystemFillColorCriticalBrush}"
- HorizontalAlignment="Center"
- Margin="0,0,0,15"
Symbol="DeleteOff24" />
<ui:TextBlock
- FontTypography="Subtitle"
HorizontalAlignment="Center"
+ FontTypography="Subtitle"
Text="{ext:Loc Bloatware.Empty.Title}" />
<ui:TextBlock
+ Margin="0,0,0,10"
+ HorizontalAlignment="Center"
Appearance="Secondary"
FontTypography="Body"
- HorizontalAlignment="Center"
- Margin="0,0,0,10"
Text="{ext:Loc Bloatware.Empty.Description}" />
<ui:Button
+ HorizontalAlignment="Center"
Appearance="Primary"
Command="{Binding ViewModel.RefreshCommand}"
Content="{ext:Loc Bloatware.Menu.Refresh}"
- HorizontalAlignment="Center"
Icon="{ui:SymbolIcon ArrowClockwise24,
FontSize=18}" />
</StackPanel>
@@ -87,29 +87,29 @@
<Border Grid.Row="1" Visibility="{Binding ViewModel.IsLoading, Converter={StaticResource BooleanToVisibilityConverter}}">
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
<ui:ProgressRing
+ Width="48"
Height="48"
- HorizontalAlignment="Center"
- IsIndeterminate="True"
Margin="0,0,0,16"
+ HorizontalAlignment="Center"
VerticalAlignment="Center"
- Width="48" />
+ IsIndeterminate="True" />
<ui:TextBlock
- FontTypography="BodyStrong"
HorizontalAlignment="Center"
+ FontTypography="BodyStrong"
Text="{ext:Loc Bloatware.Loading}" />
<ui:TextBlock
+ Margin="0,4,0,0"
+ HorizontalAlignment="Center"
Appearance="Secondary"
FontTypography="Caption"
- HorizontalAlignment="Center"
- Margin="0,4,0,0"
Text="{ext:Loc Bloatware.Loading.Hint}" />
</StackPanel>
</Border>
<Border
- CornerRadius="6"
Grid.Row="1"
Padding="8,0,8,0"
+ CornerRadius="6"
Visibility="{Binding ViewModel.HasData, Converter={StaticResource BooleanToVisibilityConverter}}">
<Grid RowDefinitions="Auto,Auto,*">
<!-- Search / Filter / Sort toolbar -->
@@ -120,26 +120,26 @@
<!-- Search -->
<ui:TextBox
- Icon="{ui:SymbolIcon Search24}"
- Margin="0,0,8,0"
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}"
- VerticalAlignment="Center" />
+ 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"
- VerticalAlignment="Center">
+ ToolTipService.Placement="Top">
<ComboBoxItem HorizontalContentAlignment="Left">
- <Grid ColumnDefinitions="Auto Auto" HorizontalAlignment="Left">
+ <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
<ui:SymbolIcon
- HorizontalAlignment="Left"
Margin="0,0,6,0"
+ HorizontalAlignment="Left"
Symbol="Filter24" />
<TextBlock
Grid.Column="1"
@@ -148,21 +148,21 @@
</Grid>
</ComboBoxItem>
<ComboBoxItem HorizontalContentAlignment="Left">
- <Grid ColumnDefinitions="Auto Auto" HorizontalAlignment="Left">
+ <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
<ui:SymbolIcon
- Foreground="{DynamicResource SystemFillColorSuccessBrush}"
- HorizontalAlignment="Left"
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 ColumnDefinitions="Auto Auto" HorizontalAlignment="Left">
+ <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
<ui:SymbolIcon
- Foreground="{DynamicResource SystemFillColorCautionBrush}"
- HorizontalAlignment="Left"
Margin="0,0,6,0"
+ HorizontalAlignment="Left"
+ Foreground="{DynamicResource SystemFillColorCautionBrush}"
Symbol="Warning24" />
<TextBlock Grid.Column="1" Text="{ext:Loc Optimizer.UI.Risk.Moderate}" />
</Grid>
@@ -171,16 +171,16 @@
<!-- 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"
- VerticalAlignment="Center">
+ ToolTipService.Placement="Top">
<ComboBoxItem HorizontalContentAlignment="Left">
- <Grid ColumnDefinitions="Auto Auto" HorizontalAlignment="Left">
+ <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
<ui:SymbolIcon
- HorizontalAlignment="Left"
Margin="0,0,6,0"
+ HorizontalAlignment="Left"
Symbol="TextSortAscending24" />
<TextBlock
Grid.Column="1"
@@ -189,10 +189,10 @@
</Grid>
</ComboBoxItem>
<ComboBoxItem HorizontalContentAlignment="Left">
- <Grid ColumnDefinitions="Auto Auto" HorizontalAlignment="Left">
+ <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
<ui:SymbolIcon
- HorizontalAlignment="Left"
Margin="0,0,6,0"
+ HorizontalAlignment="Left"
Symbol="Certificate24" />
<TextBlock
Grid.Column="1"
@@ -201,10 +201,10 @@
</Grid>
</ComboBoxItem>
<ComboBoxItem HorizontalContentAlignment="Left">
- <Grid ColumnDefinitions="Auto Auto" HorizontalAlignment="Left">
+ <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
<ui:SymbolIcon
- HorizontalAlignment="Left"
Margin="0,0,6,0"
+ HorizontalAlignment="Left"
Symbol="Shield24" />
<TextBlock
Grid.Column="1"
@@ -272,15 +272,15 @@
VerticalAlignment="Center"
Visibility="{Binding ViewModel.AppxPackages.Count, Converter={StaticResource ZeroToVisibilityConverter}}">
<ui:SymbolIcon
+ Margin="0,0,0,10"
+ HorizontalAlignment="Center"
FontSize="36"
Foreground="{DynamicResource SystemFillColorCriticalBrush}"
- HorizontalAlignment="Center"
- Margin="0,0,0,10"
Symbol="SearchInfo24" />
<ui:TextBlock
+ HorizontalAlignment="Center"
Appearance="Secondary"
FontTypography="Body"
- HorizontalAlignment="Center"
Text="{ext:Loc Bloatware.Search.NoResults}" />
</StackPanel>
@@ -306,10 +306,10 @@
<ItemsControl.ItemTemplate>
<DataTemplate DataType="{x:Type bloatware1:AppXPackage}">
<Border
- Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
- CornerRadius="6"
Margin="0,0,0,4"
- Padding="12">
+ Padding="12"
+ Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
+ CornerRadius="6">
<Grid>
<Grid.ColumnDefinitions>
@@ -322,19 +322,19 @@
<!-- Checkbox -->
<CheckBox
Grid.Column="0"
- IsChecked="{Binding IsSelected, Mode=TwoWay}"
Margin="0,4,12,0"
- VerticalAlignment="Top" />
+ VerticalAlignment="Top"
+ IsChecked="{Binding IsSelected, Mode=TwoWay}" />
<!-- Logo Image -->
<Image
Grid.Column="1"
+ Width="36"
Height="36"
Margin="0,0,12,0"
- Source="{Binding LogoImage}"
- Stretch="UniformToFill"
VerticalAlignment="Top"
- Width="36" />
+ Source="{Binding LogoImage}"
+ Stretch="UniformToFill" />
<!-- Content -->
<StackPanel Grid.Column="2">
@@ -346,25 +346,25 @@
<ui:TextBlock FontTypography="BodyStrong" Text="{Binding Name}" />
<Border
- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
- CornerRadius="5"
- HorizontalAlignment="Left"
Margin="5,0,0,0"
Padding="4,1"
- VerticalAlignment="Center">
+ HorizontalAlignment="Left"
+ VerticalAlignment="Center"
+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
+ CornerRadius="5">
<!-- Version -->
<ui:TextBlock
+ VerticalAlignment="Center"
Appearance="Tertiary"
FontTypography="Body"
- Text="{Binding Version}"
- VerticalAlignment="Center" />
+ Text="{Binding Version}" />
</Border>
<Border
- CornerRadius="5"
- HorizontalAlignment="Left"
Margin="5,0,0,0"
Padding="4,2"
+ HorizontalAlignment="Left"
+ CornerRadius="5"
Visibility="{Binding ShouldVisibleRisk, Converter={StaticResource BooleanToVisibilityConverter}}">
<Border.Style>
<Style TargetType="Border">
@@ -378,42 +378,42 @@
</Border.Style>
<StackPanel Orientation="Horizontal">
<ui:SymbolIcon
- Foreground="{DynamicResource TextFillColorInverseBrush}"
Margin="0,0,5,0"
+ Foreground="{DynamicResource TextFillColorInverseBrush}"
Symbol="{Binding RiskVisual.Icon}" />
<ui:TextBlock
+ HorizontalAlignment="Center"
+ VerticalAlignment="Center"
FontTypography="Caption"
Foreground="{DynamicResource TextFillColorInverseBrush}"
- HorizontalAlignment="Center"
Text="{Binding RiskVisual.Display}"
- TextWrapping="Wrap"
- VerticalAlignment="Center" />
+ TextWrapping="Wrap" />
</StackPanel>
</Border>
</DockPanel>
<!-- Publisher -->
<ui:TextBlock
+ Margin="0,2,0,0"
Appearance="Disabled"
FontTypography="Body"
- Margin="0,2,0,0"
Text="{Binding Publisher}"
TextTrimming="CharacterEllipsis" />
<!-- Install location -->
<ui:TextBlock
+ Margin="0,2,0,0"
Appearance="Disabled"
FontTypography="Body"
- Margin="0,2,0,0"
Text="{Binding InstallLocation}"
TextTrimming="CharacterEllipsis" />
<!-- Package full name -->
<ui:TextBlock
+ Margin="0,4,0,0"
Appearance="Secondary"
FontTypography="Caption"
- Margin="0,4,0,0"
Text="{Binding PackageFullName}"
TextTrimming="CharacterEllipsis" />
</StackPanel>
@@ -425,4 +425,4 @@
</Grid>
</Border>
</Grid>
-</Page>
\ No newline at end of file
+</Page>
diff --git a/optimizerDuck/UI/ViewModels/Dialogs/BloatwareConfirmationDialogViewModel.cs b/optimizerDuck/UI/ViewModels/Dialogs/BloatwareConfirmationDialogViewModel.cs
new file mode 100644
index 0000000..0eabdb3
--- /dev/null
+++ b/optimizerDuck/UI/ViewModels/Dialogs/BloatwareConfirmationDialogViewModel.cs
@@ -0,0 +1,22 @@
+using optimizerDuck.Domain.Optimizations.Models.Bloatware;
+
+namespace optimizerDuck.UI.ViewModels.Dialogs;
+
+public sealed class BloatwareConfirmationDialogViewModel
+{
+ public BloatwareConfirmationDialogViewModel(IEnumerable<AppXPackage> selectedPackages)
+ {
+ Items = selectedPackages
+ .Select((package, index) => new BloatwareConfirmationItemViewModel(index + 1, package))
+ .ToList();
+ }
+
+ public IReadOnlyList<BloatwareConfirmationItemViewModel> Items { get; }
+}
+
+public sealed class BloatwareConfirmationItemViewModel(int index, AppXPackage package)
+{
+ public int Index { get; } = index;
+
+ public AppXPackage Package { get; } = package;
+}
diff --git a/optimizerDuck/UI/ViewModels/Pages/BloatwareViewModel.cs b/optimizerDuck/UI/ViewModels/Pages/BloatwareViewModel.cs
index 7172902..f443374 100644
--- a/optimizerDuck/UI/ViewModels/Pages/BloatwareViewModel.cs
+++ b/optimizerDuck/UI/ViewModels/Pages/BloatwareViewModel.cs
@@ -165,12 +165,12 @@ public partial class BloatwareViewModel : ViewModel
private async Task RemoveSelected()
{
var toRemove = AppxPackages.Where(x => x.IsSelected).ToList();
+ var confirmationViewModel = new BloatwareConfirmationDialogViewModel(toRemove);
var askForConfirmationDialog = new ContentDialog
{
Title = string.Format(Translations.BloatwareDialog_Confirmation_Title, SelectedCount),
- Content = string.Format(Translations.BloatwareDialog_Confirmation_Message,
- string.Join(", ", toRemove.Select(a => a.Name))),
+ Content = new BloatwareConfirmationDialog { DataContext = confirmationViewModel },
PrimaryButtonText = Translations.Button_Ok,
CloseButtonText = Translations.Button_Cancel
};
@@ -243,4 +243,4 @@ public partial class BloatwareViewModel : ViewModel
}
#endregion Commands
-}
\ No newline at end of file
+}