Skip to content

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

feat: redesign bloatware confirmation dialog

fatDuckb525f3540797
diff --git a/optimizerDuck/UI/Dialogs/BloatwareConfirmationDialog.xaml b/optimizerDuck/UI/Dialogs/BloatwareConfirmationDialog.xaml
index 1547dc4..2d80f2c 100644
--- a/optimizerDuck/UI/Dialogs/BloatwareConfirmationDialog.xaml
+++ b/optimizerDuck/UI/Dialogs/BloatwareConfirmationDialog.xaml
@@ -18,41 +18,29 @@
<Grid>
<Grid.RowDefinitions>
+ <RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
- <Border
+ <ui:InfoBar
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>
+ IsClosable="False"
+ IsOpen="True"
+ Message="{ext:Loc BloatwareDialog.Confirmation.Description}"
+ Severity="Warning" />
- <ui:TextBlock
- Margin="0,6,0,0"
- Appearance="Secondary"
- FontTypography="Caption"
- Text="{ext:Loc BloatwareDialog.Confirmation.SelectedList}"
- TextWrapping="Wrap" />
- </StackPanel>
- </Border>
- <ScrollViewer
+ <ui:TextBlock
Grid.Row="1"
+ Margin="0,0,0,6"
+ Appearance="Primary"
+ FontTypography="BodyStrong"
+ Text="{ext:Loc BloatwareDialog.Confirmation.SelectedList}"
+ TextWrapping="Wrap" />
+ <ScrollViewer
+ Grid.Row="2"
MaxHeight="420"
VerticalScrollBarVisibility="Auto">
<ItemsControl ItemsSource="{Binding Items}" Visibility="{Binding Items.Count, Converter={StaticResource GreaterThanZeroToVisibilityConverter}}">
diff --git a/optimizerDuck/UI/Dialogs/OptimizationDetailsDialog.xaml b/optimizerDuck/UI/Dialogs/OptimizationDetailsDialog.xaml
index 50d64dc..ded7cdc 100644
--- a/optimizerDuck/UI/Dialogs/OptimizationDetailsDialog.xaml
+++ b/optimizerDuck/UI/Dialogs/OptimizationDetailsDialog.xaml
@@ -1,233 +1,233 @@
<UserControl
- ScrollViewer.CanContentScroll="False"
- d:DesignHeight="760"
- d:DesignWidth="760"
- mc:Ignorable="d"
x:Class="optimizerDuck.UI.Dialogs.OptimizationDetailsDialog"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:ext="clr-namespace:optimizerDuck.Common.Extensions"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
- xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
- <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}" />
+ d:DesignHeight="760"
+ d:DesignWidth="760"
+ ScrollViewer.CanContentScroll="False"
+ mc:Ignorable="d">
+ <StackPanel>
+ <Border
+ Margin="0,0,0,12"
+ Padding="16"
+ Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
+ BorderBrush="{DynamicResource CardBorderBrush}"
+ BorderThickness="1"
+ CornerRadius="8">
+ <Grid RowDefinitions="Auto,Auto,Auto,Auto">
+ <ui:TextBlock
+ Appearance="Disabled"
+ FontTypography="Caption"
+ Text="{Binding Optimization.Id}" />
- <ui:TextBlock
- Grid.Row="1"
- FontTypography="Subtitle"
- Margin="0,2,0,0"
- Text="{Binding Optimization.Name}"
- TextWrapping="Wrap" />
+ <ui:TextBlock
+ Grid.Row="1"
+ Margin="0,2,0,0"
+ FontTypography="Subtitle"
+ Text="{Binding Optimization.Name}"
+ TextWrapping="Wrap" />
- <ui:VirtualizingItemsControl
- Grid.Row="2"
- 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>
+ <ui:VirtualizingItemsControl
+ Grid.Row="2"
+ Margin="0,8,0,0"
+ ItemsSource="{Binding Optimization.TagDisplays}">
+ <ui:VirtualizingItemsControl.ItemsPanel>
+ <ItemsPanelTemplate>
+ <WrapPanel HorizontalAlignment="Left" VerticalAlignment="Top" />
+ </ItemsPanelTemplate>
+ </ui:VirtualizingItemsControl.ItemsPanel>
+ <ui:VirtualizingItemsControl.ItemContainerStyle>
+ <Style TargetType="ContentPresenter">
+ <Setter Property="Margin" Value="0,0,6,6" />
+ </Style>
+ </ui:VirtualizingItemsControl.ItemContainerStyle>
+ <ui:VirtualizingItemsControl.ItemTemplate>
+ <DataTemplate>
+ <Border
+ Padding="6,3"
+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
+ CornerRadius="5">
+ <StackPanel Orientation="Horizontal">
+ <ui:SymbolIcon
+ Margin="0,0,6,0"
+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"
+ Symbol="{Binding Icon}" />
+ <ui:TextBlock
+ VerticalAlignment="Center"
+ Appearance="Secondary"
+ FontTypography="Caption"
+ Text="{Binding Display}" />
+ </StackPanel>
+ </Border>
+ </DataTemplate>
+ </ui:VirtualizingItemsControl.ItemTemplate>
+ </ui:VirtualizingItemsControl>
- <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>
+ <Grid
+ Grid.Row="3"
+ Margin="0,4,0,0"
+ ColumnDefinitions="Auto,Auto,*">
+ <Border
+ Padding="6,4"
+ HorizontalAlignment="Left"
+ CornerRadius="5">
+ <Border.Style>
+ <Style TargetType="Border">
+ <Setter Property="Background" Value="{DynamicResource SystemFillColorSuccessBrush}" />
+ <Style.Triggers>
+ <DataTrigger Binding="{Binding Optimization.Risk}" Value="Moderate">
+ <Setter Property="Background" Value="{DynamicResource SystemFillColorCautionBrush}" />
+ </DataTrigger>
+ <DataTrigger Binding="{Binding Optimization.Risk}" Value="Risky">
+ <Setter Property="Background" Value="{DynamicResource SystemFillColorCriticalBrush}" />
+ </DataTrigger>
+ </Style.Triggers>
+ </Style>
+ </Border.Style>
+ <StackPanel Orientation="Horizontal">
+ <ui:SymbolIcon
+ Margin="0,0,6,0"
+ Foreground="{DynamicResource TextFillColorInverseBrush}"
+ Symbol="{Binding Optimization.RiskVisual.Icon}" />
+ <ui:TextBlock
+ VerticalAlignment="Center"
+ FontTypography="Caption"
+ Foreground="{DynamicResource TextFillColorInverseBrush}"
+ Text="{Binding Optimization.RiskVisual.Display}" />
+ </StackPanel>
+ </Border>
- <Border
- Grid.Column="1"
- 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"
- 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>
+ <Border
+ Grid.Column="1"
+ Margin="8,0,0,0"
+ Padding="6,4"
+ HorizontalAlignment="Left"
+ Background="{DynamicResource CardBackgroundDisabled}"
+ CornerRadius="5"
+ ToolTip="{Binding Optimization.State.AppliedAt}"
+ ToolTipService.InitialShowDelay="150"
+ ToolTipService.Placement="Top"
+ Visibility="{Binding Optimization.State.AppliedAt, Converter={StaticResource NullToVisibilityConverter}}">
+ <StackPanel Orientation="Horizontal">
+ <ui:SymbolIcon Margin="0,0,6,0" Symbol="CheckmarkCircle24" />
+ <ui:TextBlock
+ VerticalAlignment="Center"
+ FontTypography="Caption"
+ Text="{Binding Optimization.State.RelativeTime}" />
+ </StackPanel>
+ </Border>
</Grid>
- </Border>
+ </Grid>
+ </Border>
- <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 OptimizationDetailsDialog.DetailedDescription}" />
- <ui:TextBlock
- Appearance="Secondary"
- FontTypography="Body"
- Text="{Binding Optimization.ShortDescription}"
- TextWrapping="Wrap" />
- </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
- FontFamily="Consolas"
- Grid.Column="1"
- Text="{Binding Optimization.OptimizationKey}"
- TextWrapping="Wrap"
- VerticalAlignment="Center" />
- </Grid>
- </StackPanel>
- </Border>
+ <Border
+ Margin="0,0,0,12"
+ Padding="16"
+ Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
+ BorderBrush="{DynamicResource CardBorderBrush}"
+ BorderThickness="1"
+ CornerRadius="8">
+ <StackPanel>
+ <ui:TextBlock
+ Margin="0,0,0,8"
+ FontTypography="BodyStrong"
+ Text="{ext:Loc OptimizationDetailsDialog.DetailedDescription}" />
+ <ui:TextBlock
+ Appearance="Secondary"
+ FontTypography="Body"
+ Text="{Binding Optimization.ShortDescription}"
+ TextWrapping="Wrap" />
+ </StackPanel>
+ </Border>
- <ui:TextBlock
- FontTypography="BodyStrong"
- Margin="0,0,0,8"
- Text="{ext:Loc OptimizationDetailsDialog.Other}" />
-
- <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" />
+ <Border
+ Margin="0,0,0,12"
+ Padding="0"
+ Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
+ BorderBrush="{DynamicResource CardBorderBrush}"
+ BorderThickness="1"
+ CornerRadius="8">
+ <StackPanel>
+ <Grid Margin="16">
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="150" />
+ <ColumnDefinition Width="*" />
+ </Grid.ColumnDefinitions>
<ui:TextBlock
+ Grid.Column="0"
+ VerticalAlignment="Center"
Appearance="Secondary"
- 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>
+ Text="{ext:Loc OptimizationDetailsDialog.Id}" />
<ui:TextBlock
- FontTypography="BodyStrong"
- Text="{ext:Loc OptimizationDetailsDialog.Other.OpenRevertFile.Title}"
+ Grid.Column="1"
+ VerticalAlignment="Center"
+ FontFamily="Consolas"
+ Text="{Binding Optimization.Id}"
TextWrapping="Wrap" />
+ </Grid>
+ <Separator Margin="16,0" />
+ <Grid Margin="16">
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="150" />
+ <ColumnDefinition Width="*" />
+ </Grid.ColumnDefinitions>
<ui:TextBlock
+ Grid.Column="0"
+ VerticalAlignment="Center"
Appearance="Secondary"
- FontTypography="Body"
- Text="{ext:Loc OptimizationDetailsDialog.Other.OpenRevertFile.Description}"
+ Text="{ext:Loc OptimizationDetailsDialog.Class}" />
+ <ui:TextBlock
+ Grid.Column="1"
+ VerticalAlignment="Center"
+ FontFamily="Consolas"
+ Text="{Binding Optimization.OptimizationKey}"
TextWrapping="Wrap" />
- </StackPanel>
- </ui:CardAction>
- </StackPanel>
- </ScrollViewer>
+ </Grid>
+ </StackPanel>
+ </Border>
+
+ <ui:TextBlock
+ Margin="0,0,0,8"
+ FontTypography="BodyStrong"
+ Text="{ext:Loc OptimizationDetailsDialog.Other}" />
+
+ <ui:CardAction
+ Margin="0,0,0,8"
+ Command="{Binding ViewSourceOnGitHubCommand}"
+ Icon="{ui:SymbolIcon Code24}">
+ <StackPanel>
+ <ui:TextBlock
+ FontTypography="BodyStrong"
+ Text="{ext:Loc OptimizationDetailsDialog.Other.ViewSource.Title}"
+ TextWrapping="Wrap" />
+ <ui:TextBlock
+ Appearance="Secondary"
+ FontTypography="Body"
+ Text="{ext:Loc OptimizationDetailsDialog.Other.ViewSource.Description}"
+ TextWrapping="Wrap" />
+ </StackPanel>
+ </ui:CardAction>
+
+ <ui:CardAction
+ Margin="0,0,0,4"
+ Command="{Binding OpenRevertFileCommand}"
+ Icon="{ui:SymbolIcon FolderOpen24}"
+ Visibility="{Binding Optimization.State.AppliedAt, Converter={StaticResource NullToVisibilityConverter}}">
+ <StackPanel>
+ <ui:TextBlock
+ FontTypography="BodyStrong"
+ Text="{ext:Loc OptimizationDetailsDialog.Other.OpenRevertFile.Title}"
+ TextWrapping="Wrap" />
+ <ui:TextBlock
+ Appearance="Secondary"
+ FontTypography="Body"
+ Text="{ext:Loc OptimizationDetailsDialog.Other.OpenRevertFile.Description}"
+ TextWrapping="Wrap" />
+ </StackPanel>
+ </ui:CardAction>
+ </StackPanel>
</UserControl>
diff --git a/optimizerDuck/UI/Pages/Features/Categories/FeatureCategoryPage.xaml b/optimizerDuck/UI/Pages/Features/Categories/FeatureCategoryPage.xaml
index e84d8a0..2c5d5f1 100644
--- a/optimizerDuck/UI/Pages/Features/Categories/FeatureCategoryPage.xaml
+++ b/optimizerDuck/UI/Pages/Features/Categories/FeatureCategoryPage.xaml
@@ -1,23 +1,23 @@
<Page
- Foreground="{DynamicResource TextFillColorPrimaryBrush}"
- Margin="0,32,0,0"
- ScrollViewer.CanContentScroll="False"
- Title="{Binding ViewModel.CategoryName}"
- d:DataContext="{d:DesignInstance features:FeatureCategoryPage}"
- d:DesignHeight="650"
- d:DesignWidth="800"
- mc:Ignorable="d"
- ui:Design.Background="Black"
- ui:Design.Foreground="White"
x:Class="optimizerDuck.UI.Pages.Features.FeatureCategoryPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:converters="clr-namespace:optimizerDuck.Common.Converters"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:ext="clr-namespace:optimizerDuck.Common.Extensions"
xmlns:features="clr-namespace:optimizerDuck.UI.Pages.Features"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
- xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+ Title="{Binding ViewModel.CategoryName}"
+ Margin="0,32,0,0"
+ d:DataContext="{d:DesignInstance features:FeatureCategoryPage}"
+ d:DesignHeight="650"
+ d:DesignWidth="800"
+ ui:Design.Background="Black"
+ ui:Design.Foreground="White"
+ Foreground="{DynamicResource TextFillColorPrimaryBrush}"
+ ScrollViewer.CanContentScroll="False"
+ mc:Ignorable="d">
<Page.Resources>
<converters:BooleanToVisibilityConverter x:Key="BoolToVisibilityConverter" />
@@ -33,14 +33,14 @@
<StackPanel Grid.Row="0" Margin="42,0,42,16">
<StackPanel Margin="0,0,0,8" Orientation="Horizontal">
<ui:SymbolIcon
- FontSize="24"
Margin="0,0,12,0"
- Symbol="{Binding ViewModel.CategoryIcon}"
- VerticalAlignment="Center" />
+ VerticalAlignment="Center"
+ FontSize="24"
+ Symbol="{Binding ViewModel.CategoryIcon}" />
<ui:TextBlock
+ VerticalAlignment="Center"
FontTypography="Title"
- Text="{Binding ViewModel.CategoryName}"
- VerticalAlignment="Center" />
+ Text="{Binding ViewModel.CategoryName}" />
</StackPanel>
<ui:TextBlock
Appearance="Secondary"
@@ -53,24 +53,24 @@
Margin="42,0,42,16"
Orientation="Horizontal">
<ui:TextBox
+ MinWidth="200"
+ Margin="0,0,8,0"
HorizontalAlignment="Left"
+ VerticalAlignment="Center"
Icon="{ui:SymbolIcon Search24}"
- Margin="0,0,8,0"
- MinWidth="200"
PlaceholderText="{ext:Loc Common.Search.Placeholder}"
- Text="{Binding ViewModel.SearchText, UpdateSourceTrigger=PropertyChanged}"
- VerticalAlignment="Center" />
+ Text="{Binding ViewModel.SearchText, UpdateSourceTrigger=PropertyChanged}" />
<ComboBox
Margin="0,0,8,0"
+ VerticalAlignment="Center"
SelectedIndex="{Binding ViewModel.SelectedSortByIndex}"
- ToolTip="{ext:Loc Common.SortBy}"
- VerticalAlignment="Center">
+ ToolTip="{ext:Loc Common.SortBy}">
<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"
@@ -79,10 +79,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="ToggleRight24" />
<TextBlock
Grid.Column="1"
@@ -95,18 +95,18 @@
<ScrollViewer
Grid.Row="2"
- HorizontalScrollBarVisibility="Disabled"
Margin="42,0,42,0"
+ HorizontalScrollBarVisibility="Disabled"
VerticalScrollBarVisibility="Auto">
<!-- Sections -->
- <ItemsControl ItemsSource="{Binding ViewModel.Sections}" Margin="0,0,0,16">
+ <ItemsControl Margin="0,0,0,16" ItemsSource="{Binding ViewModel.Sections}">
<ItemsControl.ItemTemplate>
<DataTemplate>
- <StackPanel Margin="0,0,0,18">
+ <StackPanel Margin="0,0,0,0">
<ui:TextBlock
- FontTypography="BodyStrong"
Margin="0,0,0,6"
+ FontTypography="BodyStrong"
Text="{Binding Name}" />
<ItemsControl ItemsSource="{Binding Features}">
<ItemsControl.ItemTemplate>
@@ -122,22 +122,22 @@
Text="{Binding Name}"
TextWrapping="Wrap" />
<ui:TextBlock
+ Margin="0,4,0,0"
Appearance="Secondary"
FontTypography="Caption"
- Margin="0,4,0,0"
Text="{Binding Description}"
TextTrimming="WordEllipsis"
TextWrapping="Wrap" />
</StackPanel>
</ui:CardControl.Header>
<ui:ToggleSwitch
- OffContent="{ext:Loc Common.Toggle.Off}"
-OnContent="{ext:Loc Common.Toggle.On}"
+ HorizontalAlignment="Right"
+ VerticalAlignment="Center"
Command="{Binding ToggleCommand}"
Cursor="Hand"
- HorizontalAlignment="Right"
IsChecked="{Binding IsEnabled, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
- VerticalAlignment="Center" />
+ OffContent="{ext:Loc Common.Toggle.Off}"
+ OnContent="{ext:Loc Common.Toggle.On}" />
</ui:CardControl>
</DataTemplate>
</ItemsControl.ItemTemplate>
@@ -151,15 +151,15 @@ OnContent="{ext:Loc Common.Toggle.On}"
<Border Grid.Row="2" Visibility="{Binding ViewModel.IsLoading, Converter={StaticResource BoolToVisibilityConverter}}">
<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 Features.Loading}" />
</StackPanel>
</Border>
diff --git a/optimizerDuck/UI/Pages/Optimize/Categories/OptimizationPage.xaml b/optimizerDuck/UI/Pages/Optimize/Categories/OptimizationPage.xaml
index c5e082c..81abefb 100644
--- a/optimizerDuck/UI/Pages/Optimize/Categories/OptimizationPage.xaml
+++ b/optimizerDuck/UI/Pages/Optimize/Categories/OptimizationPage.xaml
@@ -339,12 +339,15 @@
ToolTipService.InitialShowDelay="150"
ToolTipService.Placement="Top"
Visibility="{Binding State.AppliedAt, Converter={StaticResource NullToVisibilityConverter}}">
- <ui:TextBlock
- HorizontalAlignment="Center"
- VerticalAlignment="Center"
- FontTypography="Caption"
- Text="{Binding State.RelativeTime}"
- TextWrapping="Wrap" />
+ <StackPanel Orientation="Horizontal">
+ <ui:SymbolIcon Margin="0,0,6,0" Symbol="CheckmarkCircle24" />
+ <ui:TextBlock
+ HorizontalAlignment="Center"
+ VerticalAlignment="Center"
+ FontTypography="Caption"
+ Text="{Binding State.RelativeTime}"
+ TextWrapping="Wrap" />
+ </StackPanel>
</Border>
</Grid>
diff --git a/optimizerDuck/UI/Pages/SettingsPage.xaml b/optimizerDuck/UI/Pages/SettingsPage.xaml
index 3d76735..4ea7a02 100644
--- a/optimizerDuck/UI/Pages/SettingsPage.xaml
+++ b/optimizerDuck/UI/Pages/SettingsPage.xaml
@@ -1,22 +1,22 @@
<Page
- Foreground="{DynamicResource TextFillColorPrimaryBrush}"
- Margin="0,32,0,0"
- Title="SettingsPage"
- d:DataContext="{d:DesignInstance pages:SettingsPage}"
- d:DesignHeight="1200"
- d:DesignWidth="800"
- mc:Ignorable="d"
- ui:Design.Background="Black"
- ui:Design.Foreground="White"
x:Class="optimizerDuck.UI.Pages.SettingsPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:converters="clr-namespace:optimizerDuck.Common.Converters"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:ext="clr-namespace:optimizerDuck.Common.Extensions"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:pages="clr-namespace:optimizerDuck.UI.Pages"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
- xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+ Title="SettingsPage"
+ Margin="0,32,0,0"
+ d:DataContext="{d:DesignInstance pages:SettingsPage}"
+ d:DesignHeight="1200"
+ d:DesignWidth="800"
+ ui:Design.Background="Black"
+ ui:Design.Foreground="White"
+ Foreground="{DynamicResource TextFillColorPrimaryBrush}"
+ mc:Ignorable="d">
<Page.Resources>
<converters:ThemeToIndexConverter x:Key="ThemeToIndexConverter" />
@@ -37,9 +37,9 @@
<ui:CardControl.Header>
<StackPanel>
<ui:TextBlock
+ Margin="0"
FontTypography="BodyStrong"
Foreground="{DynamicResource TextFillColorPrimaryBrush}"
- Margin="0"
Text="{ext:Loc Settings.Appearance.LanguageSelector.Title}"
TextWrapping="Wrap" />
<ui:TextBlock
@@ -59,9 +59,9 @@
<ui:CardControl.Header>
<StackPanel>
<ui:TextBlock
+ Margin="0"
Appearance="Primary"
FontTypography="BodyStrong"
- Margin="0"
Text="{ext:Loc Settings.Appearance.ThemeSelector.Title}"
TextWrapping="Wrap" />
<ui:TextBlock
@@ -90,9 +90,9 @@
<ui:CardControl.Header>
<StackPanel>
<ui:TextBlock
+ Margin="0"
Appearance="Primary"
FontTypography="BodyStrong"
- Margin="0"
Text="{ext:Loc Settings.Optimize.ShellTimeout.Title}"
TextWrapping="Wrap" />
<ui:TextBlock
@@ -116,9 +116,9 @@
<ui:CardControl.Header>
<StackPanel>
<ui:TextBlock
+ Margin="0"
Appearance="Primary"
FontTypography="BodyStrong"
- Margin="0"
Text="{ext:Loc Settings.Optimize.ShowCompletionNotification.Title}"
TextWrapping="Wrap" />
<ui:TextBlock
@@ -142,9 +142,9 @@
<ui:CardControl.Header>
<StackPanel>
<ui:TextBlock
+ Margin="0"
Appearance="Primary"
FontTypography="BodyStrong"
- Margin="0"
Text="{ext:Loc Settings.Bloatware.RemoveProvisioned.Title}"
TextWrapping="Wrap" />
<ui:TextBlock
@@ -170,9 +170,9 @@
</ui:CardAction.Icon>
<StackPanel>
<ui:TextBlock
+ Margin="0"
Appearance="Primary"
FontTypography="BodyStrong"
- Margin="0"
Text="{ext:Loc Settings.Advanced.ClearResources.Title}"
TextWrapping="Wrap" />
<ui:TextBlock
@@ -188,9 +188,9 @@
</ui:CardAction.Icon>
<StackPanel>
<ui:TextBlock
+ Margin="0"
Appearance="Primary"
FontTypography="BodyStrong"
- Margin="0"
Text="{ext:Loc Settings.Advanced.ClearRevertDatas.Title}"
TextWrapping="Wrap" />
<ui:TextBlock
@@ -200,19 +200,28 @@
</StackPanel>
</ui:CardAction>
- <ui:CardAction Command="{Binding ViewModel.OpenRootDirCommand}" Icon="{ui:SymbolIcon Folder24}">
- <StackPanel>
- <ui:TextBlock
- Appearance="Primary"
- FontTypography="BodyStrong"
- Margin="0"
- Text="{ext:Loc Settings.Advanced.OpenRootDir.Title}"
- TextWrapping="Wrap" />
- <ui:TextBlock
- Appearance="Secondary"
- Text="{ext:Loc Settings.Advanced.OpenRootDir.Description}"
- TextWrapping="Wrap" />
- </StackPanel>
+ <ui:CardAction
+ Command="{Binding ViewModel.OpenRootDirCommand}"
+ Icon="{ui:SymbolIcon Folder24}"
+ IsChevronVisible="False">
+ <Grid ColumnDefinitions="* Auto">
+ <StackPanel>
+ <ui:TextBlock
+ Margin="0"
+ Appearance="Primary"
+ FontTypography="BodyStrong"
+ Text="{ext:Loc Settings.Advanced.OpenRootDir.Title}"
+ TextWrapping="Wrap" />
+ <ui:TextBlock
+ Appearance="Secondary"
+ Text="{ext:Loc Settings.Advanced.OpenRootDir.Description}"
+ TextWrapping="Wrap" />
+ </StackPanel>
+ <ui:SymbolIcon
+ Grid.Column="1"
+ FontSize="20"
+ Symbol="Open24" />
+ </Grid>
</ui:CardAction>
</StackPanel>
@@ -222,61 +231,89 @@
Text="{ext:Loc Settings.About.Header}"
TextWrapping="Wrap" />
- <ui:CardAction Command="{Binding ViewModel.OpenWebsiteCommand}" CommandParameter="Web">
+ <ui:CardAction
+ Command="{Binding ViewModel.OpenWebsiteCommand}"
+ CommandParameter="Web"
+ IsChevronVisible="False">
<ui:CardAction.Icon>
<ui:ImageIcon Height="25" Source="pack://application:,,,/optimizerDuck;component/Resources/Images/Duck.png" />
</ui:CardAction.Icon>
- <StackPanel>
- <ui:TextBlock
- Appearance="Primary"
- FontTypography="BodyStrong"
- Text="optimizerDuck"
- TextWrapping="Wrap" />
- <ui:TextBlock
- Appearance="Secondary"
- Text="{ext:Loc Settings.About.Duck.Description,
- {Binding ViewModel.Version}}"
- TextWrapping="Wrap" />
- </StackPanel>
+ <Grid ColumnDefinitions="* Auto">
+ <StackPanel>
+ <ui:TextBlock
+ Appearance="Primary"
+ FontTypography="BodyStrong"
+ Text="optimizerDuck"
+ TextWrapping="Wrap" />
+ <ui:TextBlock
+ Appearance="Secondary"
+ Text="{ext:Loc Settings.About.Duck.Description,
+ {Binding ViewModel.Version}}"
+ TextWrapping="Wrap" />
+ </StackPanel>
+ <ui:SymbolIcon
+ Grid.Column="1"
+ FontSize="20"
+ Symbol="Open24" />
+ </Grid>
</ui:CardAction>
<ui:CardAction
Command="{Binding ViewModel.OpenWebsiteCommand}"
CommandParameter="Help"
- Icon="{ui:SymbolIcon ChatBubblesQuestion24}">
- <StackPanel>
- <ui:TextBlock
- FontTypography="BodyStrong"
- Padding="0"
- Text="{ext:Loc Settings.About.NeedHelp.Title}" />
- <ui:TextBlock
- Appearance="Secondary"
- Text="{ext:Loc Settings.About.NeedHelp.Description}"
- TextWrapping="Wrap" />
- </StackPanel>
+ Icon="{ui:SymbolIcon ChatBubblesQuestion24}"
+ IsChevronVisible="False">
+ <Grid ColumnDefinitions="* Auto">
+ <StackPanel>
+ <ui:TextBlock
+ Padding="0"
+ FontTypography="BodyStrong"
+ Text="{ext:Loc Settings.About.NeedHelp.Title}" />
+ <ui:TextBlock
+ Appearance="Secondary"
+ Text="{ext:Loc Settings.About.NeedHelp.Description}"
+ TextWrapping="Wrap" />
+ </StackPanel>
+
+ <ui:SymbolIcon
+ Grid.Column="1"
+ FontSize="20"
+ Symbol="Open24" />
+ </Grid>
</ui:CardAction>
- <ui:CardAction Command="{Binding ViewModel.OpenAcknowledgementsCommand}" VerticalAlignment="Stretch">
+ <ui:CardAction
+ VerticalAlignment="Stretch"
+ Command="{Binding ViewModel.OpenAcknowledgementsCommand}"
+ IsChevronVisible="False">
<ui:CardAction.Icon>
<ui:SymbolIcon Symbol="DocumentHeart24" />
</ui:CardAction.Icon>
- <StackPanel>
- <ui:TextBlock
- Appearance="Primary"
- FontTypography="BodyStrong"
- Text="{ext:Loc Settings.About.Acknowledgements.Title}"
- TextWrapping="Wrap" />
- <ui:TextBlock
- Appearance="Secondary"
- Text="{ext:Loc Settings.About.Acknowledgements.Description}"
- TextWrapping="Wrap" />
- </StackPanel>
+
+ <Grid ColumnDefinitions="* Auto">
+ <StackPanel>
+ <ui:TextBlock
+ Appearance="Primary"
+ FontTypography="BodyStrong"
+ Text="{ext:Loc Settings.About.Acknowledgements.Title}"
+ TextWrapping="Wrap" />
+ <ui:TextBlock
+ Appearance="Secondary"
+ Text="{ext:Loc Settings.About.Acknowledgements.Description}"
+ TextWrapping="Wrap" />
+ </StackPanel>
+
+ <ui:SymbolIcon
+ Grid.Column="1"
+ FontSize="20"
+ Symbol="Open24" />
+ </Grid>
</ui:CardAction>
<ui:TextBlock
- FontTypography="Subtitle"
Margin="0,15,0,0"
+ FontTypography="Subtitle"
Text="{ext:Loc Settings.About.LearnMore}"
TextTrimming="WordEllipsis"
TextWrapping="Wrap" />
diff --git a/optimizerDuck/optimizerDuck.csproj b/optimizerDuck/optimizerDuck.csproj
index dd9ebd9..3aca2a1 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.6</FileVersion>
+ <FileVersion>2.7.9</FileVersion>
<Version>1.0.0</Version>
<Product>optimizerDuck</Product>
<Copyright>Copyright fatDuck 2026</Copyright>