Skip to content

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

feat: add Status sort by option to optimization category

fatDuck8677b7415d73
diff --git a/optimizerDuck/UI/Pages/Optimize/Categories/OptimizationPage.xaml b/optimizerDuck/UI/Pages/Optimize/Categories/OptimizationPage.xaml
index 6e16c73..c5e082c 100644
--- a/optimizerDuck/UI/Pages/Optimize/Categories/OptimizationPage.xaml
+++ b/optimizerDuck/UI/Pages/Optimize/Categories/OptimizationPage.xaml
@@ -1,16 +1,7 @@
<Page
- Foreground="{DynamicResource TextFillColorPrimaryBrush}"
- Margin="0,32,0,0"
- ScrollViewer.CanContentScroll="False"
- Title="OptimizationPage"
- d:DataContext="{d:DesignInstance optimizations:OptimizationPage}"
- d:DesignHeight="650"
- d:DesignWidth="800"
- mc:Ignorable="d"
- ui:Design.Background="Black"
- ui:Design.Foreground="White"
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"
@@ -18,20 +9,29 @@
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"
- xmlns:x="http://schemas.microsoft.com/winfx/2006/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"
- x:Key="InverseBooleanToVisibilityConverter" />
+ True="Collapsed" />
<converters:NullToVisibilityConverter
+ x:Key="NullToVisibilityConverter"
False="Visible"
- True="Collapsed"
- x:Key="NullToVisibilityConverter" />
+ True="Collapsed" />
</Page.Resources>
<Grid>
@@ -41,31 +41,31 @@
<WrapPanel
Grid.Row="0"
Margin="5,0,5,10"
- Orientation="Horizontal"
- VerticalAlignment="Center">
+ VerticalAlignment="Center"
+ Orientation="Horizontal">
<!-- 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"
@@ -74,28 +74,28 @@
</Grid>
</ComboBoxItem>
<ComboBoxItem HorizontalContentAlignment="Left">
- <Grid ColumnDefinitions="Auto Auto" HorizontalAlignment="Left">
+ <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
<ui:SymbolIcon
- Foreground="{DynamicResource SystemFillColorSuccessBrush}"
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 ColumnDefinitions="Auto Auto" HorizontalAlignment="Left">
+ <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
<ui:SymbolIcon
- Foreground="{DynamicResource SystemFillColorCautionBrush}"
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 ColumnDefinitions="Auto Auto" HorizontalAlignment="Left">
+ <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
<ui:SymbolIcon
- Foreground="{DynamicResource SystemFillColorCriticalBrush}"
Margin="0,0,6,0"
+ Foreground="{DynamicResource SystemFillColorCriticalBrush}"
Symbol="ShieldError24" />
<TextBlock Grid.Column="1" Text="{ext:Loc Optimizer.UI.Risk.Risky}" />
</Grid>
@@ -105,17 +105,17 @@
<!-- 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="Filter24" />
<TextBlock Grid.Column="1" HorizontalAlignment="Left">
<Run Text="{ext:Loc Common.SortBy.Risk}" />
@@ -125,10 +125,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="TextSortAscending24" />
<TextBlock
Grid.Column="1"
@@ -137,10 +137,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"
@@ -148,13 +148,25 @@
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>
<!-- Hide Applied toggle -->
<ToggleButton
- IsChecked="{Binding ViewModel.HideApplied}"
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" />
@@ -170,15 +182,15 @@
VerticalAlignment="Center"
Visibility="{Binding ViewModel.Optimizations.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>
@@ -196,7 +208,7 @@
</ui:VirtualizingItemsControl.Template>
<ui:VirtualizingItemsControl.ItemsPanel>
<ItemsPanelTemplate>
- <UniformGrid Columns="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=ScrollViewer}, Converter={StaticResource WidthToColumnConverter}}" VerticalAlignment="Top" />
+ <UniformGrid VerticalAlignment="Top" Columns="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=ScrollViewer}, Converter={StaticResource WidthToColumnConverter}}" />
</ItemsPanelTemplate>
</ui:VirtualizingItemsControl.ItemsPanel>
<ui:VirtualizingItemsControl.ItemContainerStyle>
@@ -209,28 +221,28 @@
<ui:VirtualizingItemsControl.ItemTemplate>
<DataTemplate DataType="{x:Type optimization:BaseOptimization}">
<Border
+ Padding="20,10"
Background="{DynamicResource CardBackground}"
BorderBrush="{DynamicResource CardBorderBrush}"
BorderThickness="1"
- CornerRadius="5"
- Padding="20,10">
+ CornerRadius="5">
<Grid RowDefinitions="Auto,Auto,Auto,Auto,*">
<ui:TextBlock
+ Grid.Row="0"
Appearance="Disabled"
FontTypography="Caption"
- Grid.Row="0"
Text="{Binding Id}"
TextWrapping="Wrap" />
<ui:TextBlock
- FontTypography="Subtitle"
Grid.Row="1"
+ FontTypography="Subtitle"
Text="{Binding Name}"
TextWrapping="Wrap" />
<ui:VirtualizingItemsControl
Grid.Row="2"
- ItemsSource="{Binding TagDisplays}"
- Margin="0,2,0,2">
+ Margin="0,2,0,2"
+ ItemsSource="{Binding TagDisplays}">
<ui:VirtualizingItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<WrapPanel HorizontalAlignment="Left" VerticalAlignment="Top" />
@@ -245,24 +257,24 @@
<ui:VirtualizingItemsControl.ItemTemplate>
<DataTemplate>
<Border
- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
- CornerRadius="5"
+ Padding="4,2"
HorizontalAlignment="Left"
- Padding="4,2">
+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
+ CornerRadius="5">
<StackPanel Orientation="Horizontal">
<ui:SymbolIcon
- Foreground="{DynamicResource TextFillColorSecondaryBrush}"
Margin="0,0,5,0"
+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"
Symbol="{Binding Icon}" />
<ui:TextBlock
+ HorizontalAlignment="Center"
+ VerticalAlignment="Center"
Appearance="Secondary"
FontTypography="Caption"
Foreground="{DynamicResource TextFillColorInverseBrush}"
- HorizontalAlignment="Center"
Text="{Binding Display}"
- TextWrapping="Wrap"
- VerticalAlignment="Center" />
+ TextWrapping="Wrap" />
</StackPanel>
</Border>
</DataTemplate>
@@ -270,23 +282,23 @@
</ui:VirtualizingItemsControl>
<ui:TextBlock
- FontTypography="Body"
Grid.Row="3"
Margin="0,10,0,0"
+ FontTypography="Body"
Text="{Binding ShortDescription}"
TextTrimming="WordEllipsis"
TextWrapping="Wrap" />
<Grid
- ColumnDefinitions="*,Auto"
Grid.Row="4"
Margin="0,10,0,0"
- VerticalAlignment="Bottom">
+ VerticalAlignment="Bottom"
+ ColumnDefinitions="*,Auto">
<Grid RowDefinitions="Auto,Auto">
<Border
- CornerRadius="5"
+ Padding="4,2"
HorizontalAlignment="Left"
- Padding="4,2">
+ CornerRadius="5">
<Border.Style>
<Style TargetType="Border">
<Setter Property="Background" Value="{DynamicResource SystemFillColorSuccessBrush}" />
@@ -302,72 +314,72 @@
</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>
<Border
- Background="{DynamicResource CardBackgroundDisabled}"
- CornerRadius="5"
Grid.Row="1"
- HorizontalAlignment="Left"
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}}">
<ui:TextBlock
- FontTypography="Caption"
HorizontalAlignment="Center"
+ VerticalAlignment="Center"
+ FontTypography="Caption"
Text="{Binding State.RelativeTime}"
- TextWrapping="Wrap"
- VerticalAlignment="Center" />
+ TextWrapping="Wrap" />
</Border>
</Grid>
<StackPanel
Grid.Column="1"
Margin="10,0,0,0"
- Orientation="Horizontal"
- VerticalAlignment="Bottom">
+ 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"
- HorizontalAlignment="Right"
- IsChecked="{Binding State.IsApplied, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
- Margin="0,0,5,0"
- VerticalAlignment="Center" />
+ 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"
- HorizontalAlignment="Right"
Icon="{ui:SymbolIcon Open24}"
- ToolTip="{ext:Loc Optimizer.Menu.ViewSource}"
- VerticalAlignment="Bottom" />
+ 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"
- HorizontalAlignment="Right"
- Icon="{ui:SymbolIcon MoreVertical24}"
- VerticalAlignment="Bottom" />
+ Icon="{ui:SymbolIcon MoreVertical24}" />
</StackPanel>
</Grid>
</Grid>
@@ -381,21 +393,21 @@
<Border 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 Optimizations.Loading}" />
<ui:TextBlock
+ Margin="0,4,0,0"
+ HorizontalAlignment="Center"
Appearance="Secondary"
FontTypography="Caption"
- HorizontalAlignment="Center"
- Margin="0,4,0,0"
Text="{ext:Loc Optimizations.Loading.Hint}" />
</StackPanel>
</Border>
diff --git a/optimizerDuck/UI/Controls/StartupManagerPage.xaml b/optimizerDuck/UI/Pages/StartupManagerPage.xaml
similarity index 100%
rename from optimizerDuck/UI/Controls/StartupManagerPage.xaml
rename to optimizerDuck/UI/Pages/StartupManagerPage.xaml
diff --git a/optimizerDuck/UI/Controls/StartupManagerPage.xaml.cs b/optimizerDuck/UI/Pages/StartupManagerPage.xaml.cs
similarity index 100%
rename from optimizerDuck/UI/Controls/StartupManagerPage.xaml.cs
rename to optimizerDuck/UI/Pages/StartupManagerPage.xaml.cs
diff --git a/optimizerDuck/UI/ViewModels/Optimizer/OptimizationCategoryViewModel.cs b/optimizerDuck/UI/ViewModels/Optimizer/OptimizationCategoryViewModel.cs
index f257bf0..2bdfa33 100644
--- a/optimizerDuck/UI/ViewModels/Optimizer/OptimizationCategoryViewModel.cs
+++ b/optimizerDuck/UI/ViewModels/Optimizer/OptimizationCategoryViewModel.cs
@@ -52,7 +52,7 @@ public partial class OptimizationCategoryViewModel : ViewModel
[ObservableProperty] private string _searchText = string.Empty;
[ObservableProperty] private int _selectedRiskFilterIndex; // 0=All, 1=Safe, 2=Moderate, 3=Risky
- [ObservableProperty] private int _selectedSortByIndex; // 0=Risk & Status, 1=Name, 2=Risk
+ [ObservableProperty] private int _selectedSortByIndex; // 0=Risk & Status, 1=Name, 2=Risk, 3=Status
public OptimizationCategoryViewModel(
IOptimizationCategory category,
@@ -387,6 +387,7 @@ public partial class OptimizationCategoryViewModel : ViewModel
{
1 => query.OrderBy(o => o.Name),
2 => query.OrderBy(o => o.Risk),
+ 3 => query.OrderByDescending(o => o.State.IsApplied ? 1 : 0), // Status
_ => query.OrderBy(o => o.Risk).ThenByDescending(o => o.State.IsApplied ? 1 : 0) // Risk & Status (default)
};
diff --git a/optimizerDuck/optimizerDuck.csproj b/optimizerDuck/optimizerDuck.csproj
index 93390b4..dd9ebd9 100644
--- a/optimizerDuck/optimizerDuck.csproj
+++ b/optimizerDuck/optimizerDuck.csproj
@@ -10,7 +10,7 @@
<Authors>fatDuck</Authors>
<ApplicationIcon>Logo.ico</ApplicationIcon>
<Company>fatDuck</Company>
- <FileVersion>2.7.5</FileVersion>
+ <FileVersion>2.7.6</FileVersion>
<Version>1.0.0</Version>
<Product>optimizerDuck</Product>
<Copyright>Copyright fatDuck 2026</Copyright>