Skip to content

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

feat(ui): show each scheduled task trigger detail on hover

fatDuck45e6b5bc0386
diff --git a/optimizerDuck.Test/Domain/Optimizations/Models/ScheduledTask/ScheduledTaskTriggerTests.cs b/optimizerDuck.Test/Domain/Optimizations/Models/ScheduledTask/ScheduledTaskTriggerTests.cs
index 552ef0f..a63f6d0 100644
--- a/optimizerDuck.Test/Domain/Optimizations/Models/ScheduledTask/ScheduledTaskTriggerTests.cs
+++ b/optimizerDuck.Test/Domain/Optimizations/Models/ScheduledTask/ScheduledTaskTriggerTests.cs
@@ -7,7 +7,7 @@ namespace optimizerDuck.Test.Domain.Optimizations.Models.ScheduledTask;
public class ScheduledTaskTriggerTests
{
[Fact]
- public void TriggerTypes_ResolveLocalizedLabelsFromInfos()
+ public void TriggerBadges_ResolveLocalizedLabelsFromInfos()
{
var model = new ScheduledTaskModel
{
@@ -30,7 +30,7 @@ public class ScheduledTaskTriggerTests
Loc.Instance["ScheduledTasks.Trigger.Logon"],
Loc.Instance["ScheduledTasks.Trigger.Daily"],
],
- model.TriggerTypes
+ model.TriggerBadges.Select(b => b.Label)
);
Assert.Equal(
string.Format(
@@ -49,7 +49,39 @@ public class ScheduledTaskTriggerTests
}
[Fact]
- public void TriggerTypes_AfterCultureChange_ResolveInNewLanguage()
+ public void TriggerBadges_CarryTheDetailEachChipTooltips()
+ {
+ var model = new ScheduledTaskModel
+ {
+ Name = "T",
+ Path = "\\",
+ FullPath = "\\T",
+ TriggerInfos =
+ [
+ new("ScheduledTasks.Trigger.Logon", null, [], null),
+ new(
+ "ScheduledTasks.Trigger.Daily",
+ "ScheduledTasks.TriggerDetail.Daily",
+ ["1", "9:00 AM"],
+ null
+ ),
+ ],
+ };
+
+ var detail = string.Format(
+ CultureInfo.CurrentCulture,
+ Loc.Instance["ScheduledTasks.TriggerDetail.Daily"],
+ "1",
+ "9:00 AM"
+ );
+
+ // A trigger without its own detail falls back to the label, so the tooltip still reads.
+ Assert.Equal(Loc.Instance["ScheduledTasks.Trigger.Logon"], model.TriggerBadges[0].Detail);
+ Assert.Equal(detail, model.TriggerBadges[1].Detail);
+ }
+
+ [Fact]
+ public void TriggerBadges_AfterCultureChange_ResolveInNewLanguage()
{
var original = Loc.CurrentCulture;
try
@@ -63,10 +95,10 @@ public class ScheduledTaskTriggerTests
};
Loc.Instance.ChangeCulture(new CultureInfo("vi"));
- var vi = model.TriggerTypes[0];
+ var vi = model.TriggerBadges[0].Label;
Loc.Instance.ChangeCulture(new CultureInfo("en-US"));
- var en = model.TriggerTypes[0];
+ var en = model.TriggerBadges[0].Label;
// Keys exist in resx; the resolved text must not be the raw key or a raw ToString.
Assert.DoesNotContain("ScheduledTasks.Trigger.Boot", vi);
@@ -133,7 +165,7 @@ public class ScheduledTaskTriggerTests
"x"
);
Assert.Equal($"On workstation unlock; {expectedTime}", model.TriggerSummary);
- Assert.Equal(Loc.Instance["ScheduledTasks.Trigger.Event"], model.TriggerTypes[0]);
+ Assert.Equal(Loc.Instance["ScheduledTasks.Trigger.Event"], model.TriggerBadges[0].Label);
}
[Fact]
@@ -171,6 +203,9 @@ public class ScheduledTaskTriggerTests
);
Assert.Equal(expected, model.TriggerSummary);
// Badges stay short labels; the repetition lives in the summary only.
- Assert.Equal([Loc.Instance["ScheduledTasks.Trigger.Daily"]], model.TriggerTypes);
+ Assert.Equal(
+ [Loc.Instance["ScheduledTasks.Trigger.Daily"]],
+ model.TriggerBadges.Select(b => b.Label)
+ );
}
}
diff --git a/optimizerDuck/Domain/Optimizations/Models/ScheduledTask/ScheduledTaskModel.cs b/optimizerDuck/Domain/Optimizations/Models/ScheduledTask/ScheduledTaskModel.cs
index 685dc79..ea79edf 100644
--- a/optimizerDuck/Domain/Optimizations/Models/ScheduledTask/ScheduledTaskModel.cs
+++ b/optimizerDuck/Domain/Optimizations/Models/ScheduledTask/ScheduledTaskModel.cs
@@ -54,9 +54,11 @@ public partial class ScheduledTaskModel : LocalizedObject
public IReadOnlyList<ScheduledTaskTriggerInfo> TriggerInfos { get; init; } = [];
/// <summary>
- /// Localized trigger labels for badge display (e.g. "At log on", "Daily").
+ /// Badges for the task's triggers (e.g. "At log on", "Daily"), each carrying the
+ /// localized detail the chip tooltip shows.
/// </summary>
- public IReadOnlyList<string> TriggerTypes => TriggerInfos.Select(t => t.Label).ToList();
+ public IReadOnlyList<ScheduledTaskTriggerBadge> TriggerBadges =>
+ TriggerInfos.Select(t => new ScheduledTaskTriggerBadge(t.Label, t.Detail)).ToList();
/// <summary>
/// Localized summary of when the task triggers, keeping each trigger's data.
diff --git a/optimizerDuck/Domain/Optimizations/Models/ScheduledTask/ScheduledTaskTriggerInfo.cs b/optimizerDuck/Domain/Optimizations/Models/ScheduledTask/ScheduledTaskTriggerInfo.cs
index 3dd22fe..79562f9 100644
--- a/optimizerDuck/Domain/Optimizations/Models/ScheduledTask/ScheduledTaskTriggerInfo.cs
+++ b/optimizerDuck/Domain/Optimizations/Models/ScheduledTask/ScheduledTaskTriggerInfo.cs
@@ -37,3 +37,9 @@ public sealed record ScheduledTaskTriggerInfo(
}
}
}
+
+/// <summary>
+/// One trigger badge: the localized label on the chip plus the detail the tooltip shows.
+/// The list is rebuilt on a language change, so both strings follow the culture.
+/// </summary>
+public sealed record ScheduledTaskTriggerBadge(string Label, string Detail);
diff --git a/optimizerDuck/Domain/Optimizations/Models/StartupManager/StartupTask.cs b/optimizerDuck/Domain/Optimizations/Models/StartupManager/StartupTask.cs
index 4eea592..0aa8dbd 100644
--- a/optimizerDuck/Domain/Optimizations/Models/StartupManager/StartupTask.cs
+++ b/optimizerDuck/Domain/Optimizations/Models/StartupManager/StartupTask.cs
@@ -29,9 +29,11 @@ public partial class StartupTask : LocalizedObject
public IReadOnlyList<ScheduledTaskTriggerInfo> TriggerInfos { get; init; } = [];
/// <summary>
- /// Localized trigger labels for badge display (e.g. "At log on", "At startup").
+ /// Badges for the task's triggers (e.g. "At log on", "At startup"), each carrying the
+ /// localized detail the chip tooltip shows.
/// </summary>
- public IReadOnlyList<string> TriggerTypes => TriggerInfos.Select(t => t.Label).ToList();
+ public IReadOnlyList<ScheduledTaskTriggerBadge> TriggerBadges =>
+ TriggerInfos.Select(t => new ScheduledTaskTriggerBadge(t.Label, t.Detail)).ToList();
public string TriggerSummary => string.Join("; ", TriggerInfos.Select(t => t.Detail));
diff --git a/optimizerDuck/UI/Controls/TriggerBadgeList.xaml b/optimizerDuck/UI/Controls/TriggerBadgeList.xaml
index c9ecc03..ca715c4 100644
--- a/optimizerDuck/UI/Controls/TriggerBadgeList.xaml
+++ b/optimizerDuck/UI/Controls/TriggerBadgeList.xaml
@@ -16,7 +16,10 @@
Margin="0,0,4,2"
Padding="6,2"
Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
- CornerRadius="{StaticResource CornerRadiusSmall}">
+ CornerRadius="{StaticResource CornerRadiusSmall}"
+ ToolTip="{Binding Detail}"
+ ToolTipService.InitialShowDelay="150"
+ ToolTipService.Placement="Top">
<StackPanel Orientation="Horizontal">
<ui:SymbolIcon
Margin="0,0,4,0"
@@ -27,7 +30,7 @@
VerticalAlignment="Center"
FontTypography="Caption"
Foreground="{DynamicResource TextFillColorSecondaryBrush}"
- Text="{Binding}" />
+ Text="{Binding Label}" />
</StackPanel>
</Border>
</DataTemplate>
diff --git a/optimizerDuck/UI/Dialogs/ScheduledTaskDetailsDialog.xaml b/optimizerDuck/UI/Dialogs/ScheduledTaskDetailsDialog.xaml
index 7850ac1..d03c730 100644
--- a/optimizerDuck/UI/Dialogs/ScheduledTaskDetailsDialog.xaml
+++ b/optimizerDuck/UI/Dialogs/ScheduledTaskDetailsDialog.xaml
@@ -75,7 +75,7 @@
Text="{Binding FullPath}"
TextTrimming="CharacterEllipsis" />
- <controls:TriggerBadgeList Margin="0,6,0,0" ItemsSource="{Binding TriggerTypes}" />
+ <controls:TriggerBadgeList Margin="0,6,0,0" ItemsSource="{Binding TriggerBadges}" />
</StackPanel>
</Grid>
</Border>
diff --git a/optimizerDuck/UI/Dialogs/StartupTaskDetailsPanel.xaml b/optimizerDuck/UI/Dialogs/StartupTaskDetailsPanel.xaml
index d240cea..58a48ca 100644
--- a/optimizerDuck/UI/Dialogs/StartupTaskDetailsPanel.xaml
+++ b/optimizerDuck/UI/Dialogs/StartupTaskDetailsPanel.xaml
@@ -71,7 +71,7 @@
Text="{Binding TaskPath}"
TextTrimming="CharacterEllipsis" />
- <controls:TriggerBadgeList Margin="0,6,0,0" ItemsSource="{Binding TriggerTypes}" />
+ <controls:TriggerBadgeList Margin="0,6,0,0" ItemsSource="{Binding TriggerBadges}" />
</StackPanel>
</Grid>
</Border>
diff --git a/optimizerDuck/UI/Pages/ScheduledTasksPage.xaml b/optimizerDuck/UI/Pages/ScheduledTasksPage.xaml
index aca9538..a5b5266 100644
--- a/optimizerDuck/UI/Pages/ScheduledTasksPage.xaml
+++ b/optimizerDuck/UI/Pages/ScheduledTasksPage.xaml
@@ -229,8 +229,8 @@
<!-- Row 4: Trigger badges -->
<controls:TriggerBadgeList
Margin="0,4,0,0"
- ItemsSource="{Binding TriggerTypes}"
- Visibility="{Binding TriggerTypes.Count, Converter={StaticResource GreaterThanZeroToVisibilityConverter}}" />
+ ItemsSource="{Binding TriggerBadges}"
+ Visibility="{Binding TriggerBadges.Count, Converter={StaticResource GreaterThanZeroToVisibilityConverter}}" />
<!-- Row 5: Action summary -->
<ui:TextBlock
diff --git a/optimizerDuck/UI/Pages/StartupManagerPage.xaml b/optimizerDuck/UI/Pages/StartupManagerPage.xaml
index eb225d8..39799de 100644
--- a/optimizerDuck/UI/Pages/StartupManagerPage.xaml
+++ b/optimizerDuck/UI/Pages/StartupManagerPage.xaml
@@ -416,8 +416,8 @@
Visibility="{Binding TaskPath, Converter={StaticResource NotEmptyToVisibilityConverter}}" />
<controls:TriggerBadgeList
Margin="0,4,0,0"
- ItemsSource="{Binding TriggerTypes}"
- Visibility="{Binding TriggerTypes.Count, Converter={StaticResource GreaterThanZeroToVisibilityConverter}}" />
+ ItemsSource="{Binding TriggerBadges}"
+ Visibility="{Binding TriggerBadges.Count, Converter={StaticResource GreaterThanZeroToVisibilityConverter}}" />
<ui:TextBlock
Margin="0,2,0,0"
FontTypography="Caption"