Skip to content

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

refactor(styles): remove Duck prefix from FluentDesign resource keys

fatDuck8b4cd9acf962
diff --git a/optimizerDuck/UI/Dialogs/BloatwareConfirmationDialog.xaml b/optimizerDuck/UI/Dialogs/BloatwareConfirmationDialog.xaml
index 989eff0..c1e170b 100644
--- a/optimizerDuck/UI/Dialogs/BloatwareConfirmationDialog.xaml
+++ b/optimizerDuck/UI/Dialogs/BloatwareConfirmationDialog.xaml
@@ -10,8 +10,7 @@
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
d:DesignHeight="520"
d:DesignWidth="900"
- mc:Ignorable="d"
->
+ mc:Ignorable="d">
<UserControl.Resources>
<converters:GreaterThanZeroToVisibilityConverter x:Key="GreaterThanZeroToVisibilityConverter" />
<converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
@@ -30,21 +29,19 @@
IsClosable="False"
IsOpen="True"
Message="{ext:Loc BloatwareDialog.Confirmation.Description}"
- Severity="Warning"
- />
+ Severity="Warning" />
<ui:TextBlock
Grid.Row="1"
Margin="0,0,0,6"
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}}"
- >
+ TextWrapping="Wrap" />
+ <ScrollViewer
+ Grid.Row="2"
+ MaxHeight="420"
+ VerticalScrollBarVisibility="Auto">
+ <ItemsControl ItemsSource="{Binding Items}" Visibility="{Binding Items.Count, Converter={StaticResource GreaterThanZeroToVisibilityConverter}}">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<VirtualizingStackPanel />
@@ -53,9 +50,7 @@
<ItemsControl.ItemTemplate>
<DataTemplate DataType="{x:Type dialogVm:BloatwareConfirmationItemViewModel}">
- <Border
- Style="{StaticResource DuckListRowStyle}"
- >
+ <Border Style="{StaticResource ListRowStyle}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
@@ -70,15 +65,13 @@
Padding="6,2"
VerticalAlignment="Top"
Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
- CornerRadius="{StaticResource DuckCornerRadiusSmall}"
- >
+ CornerRadius="{StaticResource CornerRadiusSmall}">
<ui:TextBlock
HorizontalAlignment="Center"
VerticalAlignment="Center"
- Foreground="{DynamicResource TextFillColorSecondaryBrush}"
FontTypography="Caption"
- Text="{Binding Index, StringFormat=#{0}}"
- />
+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"
+ Text="{Binding Index, StringFormat=#{0}}" />
</Border>
<Image
@@ -88,15 +81,11 @@
Margin="0,0,12,0"
VerticalAlignment="Top"
Source="{Binding Package.LogoImage}"
- Stretch="UniformToFill"
- />
+ Stretch="UniformToFill" />
<StackPanel Grid.Column="2">
<DockPanel LastChildFill="False">
- <ui:TextBlock
- FontTypography="BodyStrong"
- Text="{Binding Package.Name}"
- />
+ <ui:TextBlock FontTypography="BodyStrong" Text="{Binding Package.Name}" />
<Border
Margin="8,0,0,0"
@@ -104,38 +93,26 @@
HorizontalAlignment="Left"
VerticalAlignment="Center"
Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
- CornerRadius="{StaticResource DuckCornerRadiusSmall}"
- >
+ CornerRadius="{StaticResource CornerRadiusSmall}">
<ui:TextBlock
VerticalAlignment="Center"
Appearance="Tertiary"
FontTypography="Body"
- Text="{Binding Package.Version}"
- />
+ Text="{Binding Package.Version}" />
</Border>
<Border
Margin="8,0,0,0"
Padding="6,2"
HorizontalAlignment="Left"
- CornerRadius="{StaticResource DuckCornerRadiusSmall}"
- Visibility="{Binding Package.ShouldVisibleRisk, Converter={StaticResource BooleanToVisibilityConverter}}"
- >
+ CornerRadius="{StaticResource CornerRadiusSmall}"
+ Visibility="{Binding Package.ShouldVisibleRisk, Converter={StaticResource BooleanToVisibilityConverter}}">
<Border.Style>
<Style TargetType="Border">
- <Setter
- Property="Background"
- Value="{DynamicResource SystemFillColorSuccessBrush}"
- />
+ <Setter Property="Background" Value="{DynamicResource SystemFillColorSuccessBrush}" />
<Style.Triggers>
- <DataTrigger
- Binding="{Binding Package.Risk}"
- Value="Caution"
- >
- <Setter
- Property="Background"
- Value="{DynamicResource SystemFillColorCautionBrush}"
- />
+ <DataTrigger Binding="{Binding Package.Risk}" Value="Caution">
+ <Setter Property="Background" Value="{DynamicResource SystemFillColorCautionBrush}" />
</DataTrigger>
</Style.Triggers>
</Style>
@@ -144,8 +121,7 @@
<ui:SymbolIcon
Margin="0,0,8,0"
Foreground="{DynamicResource TextFillColorInverseBrush}"
- Symbol="{Binding Package.RiskVisual.Icon}"
- />
+ Symbol="{Binding Package.RiskVisual.Icon}" />
<ui:TextBlock
HorizontalAlignment="Center"
@@ -153,35 +129,31 @@
FontTypography="Caption"
Foreground="{DynamicResource TextFillColorInverseBrush}"
Text="{Binding Package.RiskVisual.Display}"
- TextWrapping="Wrap"
- />
+ TextWrapping="Wrap" />
</StackPanel>
</Border>
</DockPanel>
<ui:TextBlock
Margin="0,2,0,0"
- Foreground="{DynamicResource TextFillColorDisabledBrush}"
FontTypography="Body"
+ Foreground="{DynamicResource TextFillColorDisabledBrush}"
Text="{Binding Package.Publisher}"
- TextTrimming="CharacterEllipsis"
- />
+ TextTrimming="CharacterEllipsis" />
<ui:TextBlock
Margin="0,2,0,0"
- Foreground="{DynamicResource TextFillColorDisabledBrush}"
FontTypography="Body"
+ Foreground="{DynamicResource TextFillColorDisabledBrush}"
Text="{Binding Package.InstallLocation}"
- TextTrimming="CharacterEllipsis"
- />
+ TextTrimming="CharacterEllipsis" />
<ui:TextBlock
Margin="0,4,0,0"
- Foreground="{DynamicResource TextFillColorSecondaryBrush}"
FontTypography="Caption"
+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"
Text="{Binding Package.PackageFullName}"
- TextTrimming="CharacterEllipsis"
- />
+ TextTrimming="CharacterEllipsis" />
</StackPanel>
</Grid>
</Border>
diff --git a/optimizerDuck/UI/Dialogs/LegalDialog.xaml b/optimizerDuck/UI/Dialogs/LegalDialog.xaml
index e548918..b0ee00c 100644
--- a/optimizerDuck/UI/Dialogs/LegalDialog.xaml
+++ b/optimizerDuck/UI/Dialogs/LegalDialog.xaml
@@ -8,9 +8,8 @@
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
d:DesignHeight="420"
d:DesignWidth="520"
- mc:Ignorable="d"
->
- <Grid Style="{StaticResource DuckDialogRootStyle}">
+ mc:Ignorable="d">
+ <Grid Style="{StaticResource DialogRootStyle}">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
@@ -21,44 +20,41 @@
<ui:TextBlock
FontTypography="BodyStrong"
Text="{ext:Loc LegalDialog.Intro.ThankYou}"
- TextWrapping="Wrap"
- />
+ TextWrapping="Wrap" />
<ui:TextBlock
Margin="0,8,0,0"
FontTypography="Body"
Text="{ext:Loc LegalDialog.Intro.Safety}"
- TextWrapping="Wrap"
- />
+ TextWrapping="Wrap" />
<ui:TextBlock
Margin="0,4,0,0"
FontTypography="Body"
Text="{ext:Loc LegalDialog.Intro.Review}"
- TextWrapping="Wrap"
- />
+ TextWrapping="Wrap" />
</StackPanel>
- <Border Grid.Row="1" Margin="0,12,0,12" Style="{StaticResource DuckToolbarSurfaceStyle}">
- <StackPanel>
- <ui:HyperlinkButton
- Content="{ext:Loc Key=LegalDialog.Link.TermsOfService}"
- Icon="{ui:SymbolIcon DocumentText24}"
- NavigateUri="https://github.com/itsfatduck/optimizerDuck/blob/master/TERMS.md"
- />
+ <Border
+ Grid.Row="1"
+ Margin="0,12,0,12"
+ Style="{StaticResource ToolbarSurfaceStyle}">
+ <StackPanel>
+ <ui:HyperlinkButton
+ Content="{ext:Loc Key=LegalDialog.Link.TermsOfService}"
+ Icon="{ui:SymbolIcon DocumentText24}"
+ NavigateUri="https://github.com/itsfatduck/optimizerDuck/blob/master/TERMS.md" />
- <ui:HyperlinkButton
- Margin="0,4,0,0"
- Content="{ext:Loc Key=LegalDialog.Link.PrivacyPolicy}"
- Icon="{ui:SymbolIcon ShieldLock24}"
- NavigateUri="https://github.com/itsfatduck/optimizerDuck/blob/master/PRIVACY.md"
- />
+ <ui:HyperlinkButton
+ Margin="0,4,0,0"
+ Content="{ext:Loc Key=LegalDialog.Link.PrivacyPolicy}"
+ Icon="{ui:SymbolIcon ShieldLock24}"
+ NavigateUri="https://github.com/itsfatduck/optimizerDuck/blob/master/PRIVACY.md" />
- <ui:HyperlinkButton
- Margin="0,4,0,0"
- Content="{ext:Loc Key=LegalDialog.Link.Disclaimer}"
- Icon="{ui:SymbolIcon Warning24}"
- NavigateUri="https://github.com/itsfatduck/optimizerDuck/blob/master/DISCLAIMER.md"
- />
- </StackPanel>
+ <ui:HyperlinkButton
+ Margin="0,4,0,0"
+ Content="{ext:Loc Key=LegalDialog.Link.Disclaimer}"
+ Icon="{ui:SymbolIcon Warning24}"
+ NavigateUri="https://github.com/itsfatduck/optimizerDuck/blob/master/DISCLAIMER.md" />
+ </StackPanel>
</Border>
<ui:InfoBar
@@ -67,7 +63,6 @@
IsClosable="False"
IsOpen="True"
Message="{ext:Loc Key=LegalDialog.Warning.Message}"
- Severity="Warning"
- />
+ Severity="Warning" />
</Grid>
</UserControl>
diff --git a/optimizerDuck/UI/Dialogs/OptimizationDetailsDialog.xaml b/optimizerDuck/UI/Dialogs/OptimizationDetailsDialog.xaml
index 7b7068f..c58de95 100644
--- a/optimizerDuck/UI/Dialogs/OptimizationDetailsDialog.xaml
+++ b/optimizerDuck/UI/Dialogs/OptimizationDetailsDialog.xaml
@@ -9,8 +9,7 @@
d:DesignHeight="760"
d:DesignWidth="760"
ScrollViewer.CanContentScroll="False"
- mc:Ignorable="d"
->
+ mc:Ignorable="d">
<StackPanel>
<Border
Margin="0,0,0,12"
@@ -18,28 +17,24 @@
Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
BorderBrush="{DynamicResource CardStrokeColorDefaultBrush}"
BorderThickness="1"
- CornerRadius="{StaticResource DuckCornerRadiusMedium}"
- >
+ CornerRadius="{StaticResource CornerRadiusMedium}">
<Grid RowDefinitions="Auto,Auto,Auto,Auto">
<ui:TextBlock
Appearance="Disabled"
FontTypography="Caption"
- Text="{Binding Optimization.Id}"
- />
+ Text="{Binding Optimization.Id}" />
<ui:TextBlock
Grid.Row="1"
Margin="0,2,0,0"
FontTypography="Subtitle"
Text="{Binding Optimization.Name}"
- TextWrapping="Wrap"
- />
+ TextWrapping="Wrap" />
<ui:VirtualizingItemsControl
Grid.Row="2"
Margin="0,8,0,0"
- ItemsSource="{Binding Optimization.TagDisplays}"
- >
+ ItemsSource="{Binding Optimization.TagDisplays}">
<ui:VirtualizingItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<WrapPanel HorizontalAlignment="Left" VerticalAlignment="Top" />
@@ -55,52 +50,40 @@
<Border
Padding="6,2"
Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
- CornerRadius="{StaticResource DuckCornerRadiusSmall}"
- >
+ CornerRadius="{StaticResource CornerRadiusSmall}">
<StackPanel Orientation="Horizontal">
<ui:SymbolIcon
Margin="0,0,6,0"
Foreground="{DynamicResource TextFillColorSecondaryBrush}"
- Symbol="{Binding Icon}"
- />
+ Symbol="{Binding Icon}" />
<ui:TextBlock
VerticalAlignment="Center"
Appearance="Secondary"
FontTypography="Caption"
- Text="{Binding Display}"
- />
+ Text="{Binding Display}" />
</StackPanel>
</Border>
</DataTemplate>
</ui:VirtualizingItemsControl.ItemTemplate>
</ui:VirtualizingItemsControl>
- <Grid Grid.Row="3" Margin="0,4,0,0" ColumnDefinitions="Auto,Auto,*">
- <Border Padding="6,4" HorizontalAlignment="Left" CornerRadius="{StaticResource DuckCornerRadiusSmall}">
+ <Grid
+ Grid.Row="3"
+ Margin="0,4,0,0"
+ ColumnDefinitions="Auto,Auto,*">
+ <Border
+ Padding="6,4"
+ HorizontalAlignment="Left"
+ CornerRadius="{StaticResource CornerRadiusSmall}">
<Border.Style>
<Style TargetType="Border">
- <Setter
- Property="Background"
- Value="{DynamicResource SystemFillColorSuccessBrush}"
- />
+ <Setter Property="Background" Value="{DynamicResource SystemFillColorSuccessBrush}" />
<Style.Triggers>
- <DataTrigger
- Binding="{Binding Optimization.Risk}"
- Value="Moderate"
- >
- <Setter
- Property="Background"
- Value="{DynamicResource SystemFillColorCautionBrush}"
- />
+ <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 Binding="{Binding Optimization.Risk}" Value="Risky">
+ <Setter Property="Background" Value="{DynamicResource SystemFillColorCriticalBrush}" />
</DataTrigger>
</Style.Triggers>
</Style>
@@ -109,14 +92,12 @@
<ui:SymbolIcon
Margin="0,0,6,0"
Foreground="{DynamicResource TextFillColorInverseBrush}"
- Symbol="{Binding Optimization.RiskVisual.Icon}"
- />
+ Symbol="{Binding Optimization.RiskVisual.Icon}" />
<ui:TextBlock
VerticalAlignment="Center"
FontTypography="Caption"
Foreground="{DynamicResource TextFillColorInverseBrush}"
- Text="{Binding Optimization.RiskVisual.Display}"
- />
+ Text="{Binding Optimization.RiskVisual.Display}" />
</StackPanel>
</Border>
@@ -126,19 +107,17 @@
Padding="6,4"
HorizontalAlignment="Left"
Background="{DynamicResource CardBackgroundDisabled}"
- CornerRadius="{StaticResource DuckCornerRadiusSmall}"
+ CornerRadius="{StaticResource CornerRadiusSmall}"
ToolTip="{Binding Optimization.State.AppliedAt}"
ToolTipService.InitialShowDelay="150"
ToolTipService.Placement="Top"
- Visibility="{Binding Optimization.State.AppliedAt, Converter={StaticResource NullToVisibilityConverter}}"
- >
+ 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}"
- />
+ Text="{Binding Optimization.State.RelativeTime}" />
</StackPanel>
</Border>
</Grid>
@@ -151,20 +130,17 @@
Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
BorderBrush="{DynamicResource CardStrokeColorDefaultBrush}"
BorderThickness="1"
- CornerRadius="{StaticResource DuckCornerRadiusMedium}"
- >
+ CornerRadius="{StaticResource CornerRadiusMedium}">
<StackPanel>
<ui:TextBlock
Margin="0,0,0,8"
FontTypography="BodyStrong"
- Text="{ext:Loc OptimizationDetailsDialog.DetailedDescription}"
- />
+ Text="{ext:Loc OptimizationDetailsDialog.DetailedDescription}" />
<ui:TextBlock
Appearance="Secondary"
FontTypography="Body"
Text="{Binding Optimization.ShortDescription}"
- TextWrapping="Wrap"
- />
+ TextWrapping="Wrap" />
</StackPanel>
</Border>
@@ -174,8 +150,7 @@
Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
BorderBrush="{DynamicResource CardStrokeColorDefaultBrush}"
BorderThickness="1"
- CornerRadius="{StaticResource DuckCornerRadiusMedium}"
- >
+ CornerRadius="{StaticResource CornerRadiusMedium}">
<StackPanel>
<Grid Margin="16">
<Grid.ColumnDefinitions>
@@ -186,15 +161,13 @@
Grid.Column="0"
VerticalAlignment="Center"
Appearance="Secondary"
- Text="{ext:Loc OptimizationDetailsDialog.Id}"
- />
+ Text="{ext:Loc OptimizationDetailsDialog.Id}" />
<ui:TextBlock
Grid.Column="1"
VerticalAlignment="Center"
FontFamily="Consolas"
Text="{Binding Optimization.Id}"
- TextWrapping="Wrap"
- />
+ TextWrapping="Wrap" />
</Grid>
<Separator Margin="16,0" />
<Grid Margin="16">
@@ -206,15 +179,13 @@
Grid.Column="0"
VerticalAlignment="Center"
Appearance="Secondary"
- Text="{ext:Loc OptimizationDetailsDialog.Class}"
- />
+ Text="{ext:Loc OptimizationDetailsDialog.Class}" />
<ui:TextBlock
Grid.Column="1"
VerticalAlignment="Center"
FontFamily="Consolas"
Text="{Binding Optimization.OptimizationKey}"
- TextWrapping="Wrap"
- />
+ TextWrapping="Wrap" />
</Grid>
</StackPanel>
</Border>
@@ -222,26 +193,23 @@
<ui:TextBlock
Margin="0,0,0,8"
FontTypography="BodyStrong"
- Text="{ext:Loc OptimizationDetailsDialog.Other}"
- />
+ Text="{ext:Loc OptimizationDetailsDialog.Other}" />
<ui:CardAction
Margin="0,0,0,8"
Command="{Binding ViewSourceOnGitHubCommand}"
- Icon="{ui:SymbolIcon Code24}"
- >
+ Cursor="Hand"
+ Icon="{ui:SymbolIcon Code24}">
<StackPanel>
<ui:TextBlock
FontTypography="BodyStrong"
Text="{ext:Loc OptimizationDetailsDialog.Other.ViewSource.Title}"
- TextWrapping="Wrap"
- />
+ TextWrapping="Wrap" />
<ui:TextBlock
Appearance="Secondary"
FontTypography="Body"
Text="{ext:Loc OptimizationDetailsDialog.Other.ViewSource.Description}"
- TextWrapping="Wrap"
- />
+ TextWrapping="Wrap" />
</StackPanel>
</ui:CardAction>
@@ -249,20 +217,17 @@
Margin="0,0,0,4"
Command="{Binding OpenRevertFileCommand}"
Icon="{ui:SymbolIcon FolderOpen24}"
- Visibility="{Binding Optimization.State.AppliedAt, Converter={StaticResource NullToVisibilityConverter}}"
- >
+ Visibility="{Binding Optimization.State.AppliedAt, Converter={StaticResource NullToVisibilityConverter}}">
<StackPanel>
<ui:TextBlock
FontTypography="BodyStrong"
Text="{ext:Loc OptimizationDetailsDialog.Other.OpenRevertFile.Title}"
- TextWrapping="Wrap"
- />
+ TextWrapping="Wrap" />
<ui:TextBlock
Appearance="Secondary"
FontTypography="Body"
Text="{ext:Loc OptimizationDetailsDialog.Other.OpenRevertFile.Description}"
- TextWrapping="Wrap"
- />
+ TextWrapping="Wrap" />
</StackPanel>
</ui:CardAction>
</StackPanel>
diff --git a/optimizerDuck/UI/Dialogs/OptimizationResultDialog.xaml b/optimizerDuck/UI/Dialogs/OptimizationResultDialog.xaml
index 4138745..4adc41d 100644
--- a/optimizerDuck/UI/Dialogs/OptimizationResultDialog.xaml
+++ b/optimizerDuck/UI/Dialogs/OptimizationResultDialog.xaml
@@ -1,50 +1,45 @@
<UserControl
- d:DesignHeight="450"
- d:DesignWidth="800"
- mc:Ignorable="d"
x:Class="optimizerDuck.UI.Dialogs.OptimizationResultDialog"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns: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:ui="http://schemas.lepo.co/wpfui/2022/xaml"
- xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
->
+ d:DesignHeight="450"
+ d:DesignWidth="800"
+ mc:Ignorable="d">
<UserControl.Resources>
<converters:NullToVisibilityConverter
- False="Visible"
- True="Collapsed"
x:Key="NullToVisibilityConverter"
- />
+ False="Visible"
+ True="Collapsed" />
</UserControl.Resources>
<StackPanel MinWidth="560">
- <!-- Header with failed count summary -->
- <StackPanel Orientation="Horizontal" Margin="0,0,0,4">
+ <!-- Header with failed count summary -->
+ <StackPanel Margin="0,0,0,4" Orientation="Horizontal">
<ui:SymbolIcon
- Filled="True"
- Foreground="{DynamicResource SystemFillColorCriticalBrush}"
Margin="0,0,8,0"
- Symbol="ErrorCircle24"
VerticalAlignment="Center"
- />
+ Filled="True"
+ Foreground="{DynamicResource SystemFillColorCriticalBrush}"
+ Symbol="ErrorCircle24" />
<ui:TextBlock
FontTypography="Subtitle"
Text="{ext:Loc OptimizationResultDialog.Header,
{Binding FailedCount}}"
TextTrimming="WordEllipsis"
- TextWrapping="Wrap"
- />
+ TextWrapping="Wrap" />
</StackPanel>
<ui:TextBlock
+ Margin="0,2,0,12"
Appearance="Secondary"
FontTypography="Body"
- Margin="0,2,0,12"
Text="{ext:Loc OptimizationResultDialog.Description}"
- TextWrapping="Wrap"
- />
+ TextWrapping="Wrap" />
<ScrollViewer MaxHeight="350" VerticalScrollBarVisibility="Auto">
<ItemsControl ItemsSource="{Binding FailedSteps}">
@@ -53,76 +48,68 @@
<ui:CardControl Margin="0,0,0,8">
<ui:CardControl.Header>
<StackPanel>
- <!-- Top row: index + service type badge + step name -->
- <StackPanel Orientation="Horizontal" Margin="0,0,0,6">
- <!-- Step index badge -->
+ <!-- Top row: index + service type badge + step name -->
+ <StackPanel Margin="0,0,0,6" Orientation="Horizontal">
+ <!-- Step index badge -->
<Border
- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
- CornerRadius="4"
- HorizontalAlignment="Left"
Margin="0,0,8,0"
Padding="6,2"
+ HorizontalAlignment="Left"
VerticalAlignment="Center"
- >
+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
+ CornerRadius="4">
<ui:TextBlock
+ VerticalAlignment="Center"
Appearance="Disabled"
FontTypography="Caption"
- Text="{Binding Index, StringFormat=# {0}}"
- VerticalAlignment="Center"
- />
+ Text="{Binding Index, StringFormat=# {0}}" />
</Border>
- <!-- Service type badge -->
+ <!-- Service type badge -->
<Border
- Background="{DynamicResource SystemFillColorAttentionBackgroundBrush}"
- CornerRadius="4"
- HorizontalAlignment="Left"
Margin="0,0,8,0"
Padding="6,2"
+ HorizontalAlignment="Left"
VerticalAlignment="Center"
- >
+ Background="{DynamicResource SystemFillColorAttentionBackgroundBrush}"
+ CornerRadius="4">
<ui:TextBlock
+ VerticalAlignment="Center"
FontTypography="Caption"
Foreground="{DynamicResource SystemFillColorAttentionBrush}"
- Text="{Binding Name}"
- VerticalAlignment="Center"
- />
+ Text="{Binding Name}" />
</Border>
</StackPanel>
- <!-- Step description -->
+ <!-- Step description -->
<ui:TextBlock
- FontTypography="BodyStrong"
Margin="0,0,0,4"
+ FontTypography="BodyStrong"
Text="{Binding Description}"
- TextWrapping="Wrap"
- />
+ TextWrapping="Wrap" />
- <!-- Error message -->
+ <!-- Error message -->
<Border
- BorderBrush="{DynamicResource SystemFillColorCriticalBrush}"
- BorderThickness="1"
- CornerRadius="{StaticResource DuckCornerRadiusMedium}"
- HorizontalAlignment="Left"
Margin="0,4,0,0"
Padding="8,6"
- Visibility="{Binding Error, Converter={StaticResource NullToVisibilityConverter}}"
- >
+ HorizontalAlignment="Left"
+ BorderBrush="{DynamicResource SystemFillColorCriticalBrush}"
+ BorderThickness="1"
+ CornerRadius="{StaticResource CornerRadiusMedium}"
+ Visibility="{Binding Error, Converter={StaticResource NullToVisibilityConverter}}">
<StackPanel Orientation="Horizontal">
<ui:SymbolIcon
- Filled="True"
- Foreground="{DynamicResource SystemFillColorCriticalBrush}"
Margin="0,0,6,0"
- Symbol="Warning24"
VerticalAlignment="Center"
- />
+ Filled="True"
+ Foreground="{DynamicResource SystemFillColorCriticalBrush}"
+ Symbol="Warning24" />
<ui:TextBlock
+ HorizontalAlignment="Stretch"
FontTypography="Caption"
Foreground="{DynamicResource SystemFillColorCriticalBrush}"
- HorizontalAlignment="Stretch"
Text="{Binding Error}"
- TextWrapping="Wrap"
- />
+ TextWrapping="Wrap" />
</StackPanel>
</Border>
</StackPanel>
diff --git a/optimizerDuck/UI/Dialogs/RestorePointDialog.xaml b/optimizerDuck/UI/Dialogs/RestorePointDialog.xaml
index eee8310..971d7ec 100644
--- a/optimizerDuck/UI/Dialogs/RestorePointDialog.xaml
+++ b/optimizerDuck/UI/Dialogs/RestorePointDialog.xaml
@@ -1,35 +1,30 @@
<UserControl
- d:DesignHeight="300"
- d:DesignWidth="300"
- mc:Ignorable="d"
x:Class="optimizerDuck.UI.Dialogs.RestorePointDialog"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns: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"
->
- <Grid Style="{StaticResource DuckDialogRootStyle}">
- <StackPanel Style="{StaticResource DuckDialogContentStackStyle}">
- <ui:SymbolIcon
- Style="{StaticResource DuckDialogIconStyle}"
- Symbol="DatabaseLightning20" />
+ d:DesignHeight="300"
+ d:DesignWidth="300"
+ mc:Ignorable="d">
+ <Grid Style="{StaticResource DialogRootStyle}">
+ <StackPanel Style="{StaticResource DialogContentStackStyle}">
+ <ui:SymbolIcon Style="{StaticResource DialogIconStyle}" Symbol="DatabaseLightning20" />
<ui:TextBlock
- FontTypography="BodyStrong"
HorizontalAlignment="Center"
+ FontTypography="BodyStrong"
Text="{ext:Loc RestorePointDialog.Description}"
TextAlignment="Center"
- TextWrapping="Wrap"
- />
+ TextWrapping="Wrap" />
<ui:InfoBar
+ Margin="0,16,0,0"
IsClosable="False"
IsOpen="True"
- Margin="0,16,0,0"
Message="{ext:Loc RestorePointDialog.Help}"
- Severity="Success"
- />
+ Severity="Success" />
</StackPanel>
</Grid>
</UserControl>
diff --git a/optimizerDuck/UI/Dialogs/ScheduledTaskCreateDialog.xaml b/optimizerDuck/UI/Dialogs/ScheduledTaskCreateDialog.xaml
index 411dd0b..477d18d 100644
--- a/optimizerDuck/UI/Dialogs/ScheduledTaskCreateDialog.xaml
+++ b/optimizerDuck/UI/Dialogs/ScheduledTaskCreateDialog.xaml
@@ -1,15 +1,14 @@
<UserControl
- d:DesignHeight="400"
- d:DesignWidth="500"
- mc:Ignorable="d"
x:Class="optimizerDuck.UI.Dialogs.ScheduledTaskCreateDialog"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns: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"
->
+ d:DesignHeight="400"
+ d:DesignWidth="500"
+ mc:Ignorable="d">
<Grid MinWidth="560">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
@@ -26,141 +25,124 @@
<!-- Left Column: General & Action Info -->
<StackPanel Grid.Column="0">
<ui:TextBlock
- FontTypography="Caption"
Margin="0,0,0,4"
- Text="{ext:Loc ScheduledTasks.Dialog.TaskName}"
- />
+ FontTypography="Caption"
+ Text="{ext:Loc ScheduledTasks.Dialog.TaskName}" />
<ui:TextBox
- Margin="0,0,0,12"
- PlaceholderText="{ext:Loc ScheduledTasks.Dialog.TaskNameHint}"
x:Name="TaskNameBox"
- />
+ Margin="0,0,0,12"
+ PlaceholderText="{ext:Loc ScheduledTasks.Dialog.TaskNameHint}" />
<ui:TextBlock
- FontTypography="Caption"
Margin="0,0,0,4"
- Text="{ext:Loc ScheduledTasks.Dialog.Description}"
- />
+ FontTypography="Caption"
+ Text="{ext:Loc ScheduledTasks.Dialog.Description}" />
<ui:TextBox
- AcceptsReturn="True"
- Margin="0,0,0,12"
+ x:Name="DescriptionBox"
MinHeight="60"
+ Margin="0,0,0,12"
+ AcceptsReturn="True"
PlaceholderText="{ext:Loc ScheduledTasks.Dialog.DescriptionHint}"
- TextWrapping="Wrap"
- x:Name="DescriptionBox"
- />
+ TextWrapping="Wrap" />
<ui:TextBlock
- FontTypography="Caption"
Margin="0,0,0,4"
- Text="{ext:Loc ScheduledTasks.Dialog.FolderPath}"
- />
- <ui:TextBox Margin="0,0,0,12" PlaceholderText="\" x:Name="FolderPathBox" />
+ FontTypography="Caption"
+ Text="{ext:Loc ScheduledTasks.Dialog.FolderPath}" />
+ <ui:TextBox
+ x:Name="FolderPathBox"
+ Margin="0,0,0,12"
+ PlaceholderText="\" />
<ui:TextBlock
- FontTypography="Caption"
Margin="0,0,0,4"
- Text="{ext:Loc ScheduledTasks.Dialog.Executable}"
- />
+ FontTypography="Caption"
+ Text="{ext:Loc ScheduledTasks.Dialog.Executable}" />
<ui:TextBox
- Margin="0,0,0,12"
- PlaceholderText="{ext:Loc ScheduledTasks.Dialog.ExecutableHint}"
x:Name="ExecutableBox"
- />
+ Margin="0,0,0,12"
+ PlaceholderText="{ext:Loc ScheduledTasks.Dialog.ExecutableHint}" />
<ui:TextBlock
- FontTypography="Caption"
Margin="0,0,0,4"
- Text="{ext:Loc ScheduledTasks.Dialog.Arguments}"
- />
+ FontTypography="Caption"
+ Text="{ext:Loc ScheduledTasks.Dialog.Arguments}" />
<ui:TextBox
- Margin="0,0,0,12"
- PlaceholderText="{ext:Loc ScheduledTasks.Dialog.ArgumentsHint}"
x:Name="ArgumentsBox"
- />
+ Margin="0,0,0,12"
+ PlaceholderText="{ext:Loc ScheduledTasks.Dialog.ArgumentsHint}" />
</StackPanel>
<!-- Right Column: Triggers & Settings -->
<StackPanel Grid.Column="2">
<ui:TextBlock
- FontTypography="Caption"
Margin="0,0,0,4"
- Text="{ext:Loc ScheduledTasks.Dialog.Trigger}"
- />
+ FontTypography="Caption"
+ Text="{ext:Loc ScheduledTasks.Dialog.Trigger}" />
<Border
+ Margin="0,0,0,12"
+ Padding="{StaticResource CardPadding}"
Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
BorderBrush="{DynamicResource CardStrokeColorDefaultBrush}"
BorderThickness="1"
- CornerRadius="{StaticResource DuckCornerRadiusMedium}"
- Margin="0,0,0,12"
- Padding="{StaticResource DuckCardPadding}"
- >
+ CornerRadius="{StaticResource CornerRadiusMedium}">
<StackPanel>
<CheckBox
- Content="{ext:Loc ScheduledTasks.Dialog.TriggerLogon}"
- IsChecked="True"
- Margin="0,0,0,8"
x:Name="LogonTriggerCheck"
- />
- <CheckBox
- Content="{ext:Loc ScheduledTasks.Dialog.TriggerBoot}"
Margin="0,0,0,8"
- x:Name="BootTriggerCheck"
- />
+ Content="{ext:Loc ScheduledTasks.Dialog.TriggerLogon}"
+ IsChecked="True" />
<CheckBox
- Content="{ext:Loc ScheduledTasks.Dialog.TriggerIdle}"
+ x:Name="BootTriggerCheck"
Margin="0,0,0,8"
- x:Name="IdleTriggerCheck"
- />
+ Content="{ext:Loc ScheduledTasks.Dialog.TriggerBoot}" />
<CheckBox
- Content="{ext:Loc ScheduledTasks.Dialog.TriggerRegistration}"
+ x:Name="IdleTriggerCheck"
Margin="0,0,0,8"
+ Content="{ext:Loc ScheduledTasks.Dialog.TriggerIdle}" />
+ <CheckBox
x:Name="RegistrationTriggerCheck"
- />
+ Margin="0,0,0,8"
+ Content="{ext:Loc ScheduledTasks.Dialog.TriggerRegistration}" />
<StackPanel Margin="0,0,0,0" Orientation="Horizontal">
<CheckBox
- Content="{ext:Loc ScheduledTasks.Dialog.TriggerDaily}"
+ x:Name="DailyTriggerCheck"
Margin="0,0,12,0"
VerticalAlignment="Center"
- x:Name="DailyTriggerCheck"
- />
+ Content="{ext:Loc ScheduledTasks.Dialog.TriggerDaily}" />
<ui:TextBox
+ x:Name="DailyTimeBox"
+ Width="80"
IsEnabled="{Binding ElementName=DailyTriggerCheck, Path=IsChecked}"
PlaceholderText="12:00"
- ToolTip="{ext:Loc ScheduledTasks.Dialog.Time}"
- Width="80"
- x:Name="DailyTimeBox"
- />
+ ToolTip="{ext:Loc ScheduledTasks.Dialog.Time}" />
</StackPanel>
</StackPanel>
</Border>
- <ui:TextBlock FontTypography="Caption" Margin="0,0,0,4" Text="Settings" />
+ <ui:TextBlock
+ Margin="0,0,0,4"
+ FontTypography="Caption"
+ Text="Settings" />
<Border
+ Margin="0,0,0,12"
+ Padding="{StaticResource CardPadding}"
Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
BorderBrush="{DynamicResource CardStrokeColorDefaultBrush}"
BorderThickness="1"
- CornerRadius="{StaticResource DuckCornerRadiusMedium}"
- Margin="0,0,0,12"
- Padding="{StaticResource DuckCardPadding}"
- >
+ CornerRadius="{StaticResource CornerRadiusMedium}">
<StackPanel>
<CheckBox
- Content="{ext:Loc ScheduledTasks.Dialog.Enabled}"
- IsChecked="True"
- Margin="0,0,0,8"
x:Name="EnabledCheck"
- />
- <CheckBox
- Content="{ext:Loc ScheduledTasks.Dialog.HighestPrivileges}"
Margin="0,0,0,8"
- x:Name="HighestPrivilegesCheck"
- />
+ Content="{ext:Loc ScheduledTasks.Dialog.Enabled}"
+ IsChecked="True" />
<CheckBox
- Content="{ext:Loc ScheduledTasks.Dialog.Hidden}"
- x:Name="HiddenCheck"
- />
+ x:Name="HighestPrivilegesCheck"
+ Margin="0,0,0,8"
+ Content="{ext:Loc ScheduledTasks.Dialog.HighestPrivileges}" />
+ <CheckBox x:Name="HiddenCheck" Content="{ext:Loc ScheduledTasks.Dialog.Hidden}" />
</StackPanel>
</Border>
</StackPanel>
diff --git a/optimizerDuck/UI/Dialogs/ScheduledTaskDetailsDialog.xaml b/optimizerDuck/UI/Dialogs/ScheduledTaskDetailsDialog.xaml
index 066fafe..f69e14a 100644
--- a/optimizerDuck/UI/Dialogs/ScheduledTaskDetailsDialog.xaml
+++ b/optimizerDuck/UI/Dialogs/ScheduledTaskDetailsDialog.xaml
@@ -1,25 +1,23 @@
<UserControl
- d:DesignHeight="700"
- d:DesignWidth="760"
- mc:Ignorable="d"
x:Class="optimizerDuck.UI.Dialogs.ScheduledTaskDetailsDialog"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns: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"
->
+ d:DesignHeight="700"
+ d:DesignWidth="760"
+ mc:Ignorable="d">
<ScrollViewer VerticalScrollBarVisibility="Auto">
- <StackPanel MinWidth="620" x:Name="RootPanel">
+ <StackPanel x:Name="RootPanel" MinWidth="620">
<Border
+ Margin="0,0,0,12"
+ Padding="{StaticResource CardPadding}"
Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
BorderBrush="{DynamicResource CardStrokeColorDefaultBrush}"
BorderThickness="1"
- CornerRadius="{StaticResource DuckCornerRadiusMedium}"
- Margin="0,0,0,12"
- Padding="{StaticResource DuckCardPadding}"
- >
+ CornerRadius="{StaticResource CornerRadiusMedium}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
@@ -27,80 +25,71 @@
</Grid.ColumnDefinitions>
<Image
+ x:Name="TaskLogoImage"
Grid.Column="0"
+ Width="40"
Height="40"
Margin="0,0,12,0"
- Stretch="UniformToFill"
VerticalAlignment="Center"
- Width="40"
- x:Name="TaskLogoImage"
- />
+ Stretch="UniformToFill" />
<StackPanel Grid.Column="1" VerticalAlignment="Center">
<DockPanel LastChildFill="False">
<ui:TextBlock
+ x:Name="TaskNameText"
FontTypography="BodyStrong"
Text=""
- TextWrapping="Wrap"
- x:Name="TaskNameText"
- />
+ TextWrapping="Wrap" />
<Border
- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
- CornerRadius="4"
Margin="8,0,0,0"
Padding="6,1"
VerticalAlignment="Center"
- >
+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
+ CornerRadius="4">
<ui:TextBlock
+ VerticalAlignment="Center"
Appearance="Tertiary"
FontTypography="Caption"
- Text="{ext:Loc ScheduledTasks.Header.Title}"
- VerticalAlignment="Center"
- />
+ Text="{ext:Loc ScheduledTasks.Header.Title}" />
</Border>
<Border
- CornerRadius="4"
+ x:Name="StateBorder"
Margin="8,0,0,0"
Padding="6,1"
VerticalAlignment="Center"
- x:Name="StateBorder"
- >
+ CornerRadius="4">
<StackPanel Orientation="Horizontal">
<ui:SymbolIcon
- FontSize="10"
- Margin="0,0,4,0"
- Symbol="Circle24"
x:Name="StateIcon"
- />
+ Margin="0,0,4,0"
+ FontSize="10"
+ Symbol="Circle24" />
<ui:TextBlock
+ x:Name="StateText"
+ VerticalAlignment="Center"
FontTypography="Caption"
Foreground="{Binding ElementName=StateIcon, Path=Foreground}"
- Text=""
- VerticalAlignment="Center"
- x:Name="StateText"
- />
+ Text="" />
</StackPanel>
</Border>
</DockPanel>
<ui:TextBlock
+ x:Name="DescriptionText"
+ Margin="0,4,0,0"
Appearance="Secondary"
FontTypography="Caption"
- Margin="0,4,0,0"
Text=""
- TextWrapping="Wrap"
- x:Name="DescriptionText"
- />
+ TextWrapping="Wrap" />
<ui:TextBlock
+ x:Name="PathText"
+ Margin="0,2,0,0"
Appearance="Disabled"
FontTypography="Caption"
- Margin="0,2,0,0"
Text=""
- TextTrimming="CharacterEllipsis"
- x:Name="PathText"
- />
+ TextTrimming="CharacterEllipsis" />
- <ItemsControl Margin="0,6,0,0" x:Name="TriggerBadgesItems">
+ <ItemsControl x:Name="TriggerBadgesItems" Margin="0,6,0,0">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<WrapPanel Orientation="Horizontal" />
@@ -109,23 +98,20 @@
<ItemsControl.ItemTemplate>
<DataTemplate>
<Border
- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
- CornerRadius="4"
Margin="0,0,4,2"
Padding="6,2"
- >
+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
+ CornerRadius="4">
<StackPanel Orientation="Horizontal">
<ui:SymbolIcon
- Foreground="{DynamicResource TextFillColorSecondaryBrush}"
Margin="0,0,4,0"
- Symbol="Timer24"
- />
+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"
+ Symbol="Timer24" />
<ui:TextBlock
+ VerticalAlignment="Center"
FontTypography="Caption"
Foreground="{DynamicResource TextFillColorSecondaryBrush}"
- Text="{Binding}"
- VerticalAlignment="Center"
- />
+ Text="{Binding}" />
</StackPanel>
</Border>
</DataTemplate>
@@ -136,13 +122,12 @@
</Border>
<Border
+ Margin="0,0,0,12"
+ Padding="0"
Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
BorderBrush="{DynamicResource CardStrokeColorDefaultBrush}"
BorderThickness="1"
- CornerRadius="{StaticResource DuckCornerRadiusMedium}"
- Margin="0,0,0,12"
- Padding="0"
- >
+ CornerRadius="{StaticResource CornerRadiusMedium}">
<StackPanel>
<Grid Margin="14,12">
<Grid.ColumnDefinitions>
@@ -150,24 +135,21 @@
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<ui:SymbolIcon
- FontSize="14"
- Foreground="{DynamicResource TextFillColorSecondaryBrush}"
Margin="0,0,10,0"
- Symbol="Person24"
VerticalAlignment="Top"
- />
+ FontSize="14"
+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"
+ Symbol="Person24" />
<StackPanel Grid.Column="1">
<ui:TextBlock
Appearance="Secondary"
FontTypography="Caption"
- Text="{ext:Loc ScheduledTasks.Details.Author}"
- />
+ Text="{ext:Loc ScheduledTasks.Details.Author}" />
<ui:TextBlock
- FontTypography="Body"
- Margin="0,2,0,0"
- Text=""
x:Name="AuthorText"
- />
+ Margin="0,2,0,0"
+ FontTypography="Body"
+ Text="" />
</StackPanel>
</Grid>
<Separator Margin="14,0" />
@@ -178,25 +160,22 @@
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<ui:SymbolIcon
- FontSize="14"
- Foreground="{DynamicResource TextFillColorSecondaryBrush}"
Margin="0,0,10,0"
- Symbol="Timer24"
VerticalAlignment="Top"
- />
+ FontSize="14"
+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"
+ Symbol="Timer24" />
<StackPanel Grid.Column="1">
<ui:TextBlock
Appearance="Secondary"
FontTypography="Caption"
- Text="{ext:Loc ScheduledTasks.Details.Triggers}"
- />
+ Text="{ext:Loc ScheduledTasks.Details.Triggers}" />
<ui:TextBlock
- FontTypography="Body"
+ x:Name="TriggersText"
Margin="0,2,0,0"
+ FontTypography="Body"
Text=""
- TextWrapping="Wrap"
- x:Name="TriggersText"
- />
+ TextWrapping="Wrap" />
</StackPanel>
</Grid>
<Separator Margin="14,0" />
@@ -207,38 +186,34 @@
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<ui:SymbolIcon
- FontSize="14"
- Foreground="{DynamicResource TextFillColorSecondaryBrush}"
Margin="0,0,10,0"
- Symbol="Play24"
VerticalAlignment="Top"
- />
+ FontSize="14"
+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"
+ Symbol="Play24" />
<StackPanel Grid.Column="1">
<ui:TextBlock
Appearance="Secondary"
FontTypography="Caption"
- Text="{ext:Loc ScheduledTasks.Details.Action}"
- />
+ Text="{ext:Loc ScheduledTasks.Details.Action}" />
<ui:TextBlock
+ x:Name="ActionText"
+ Margin="0,2,0,0"
FontFamily="Consolas"
FontTypography="Body"
- Margin="0,2,0,0"
Text=""
- TextWrapping="Wrap"
- x:Name="ActionText"
- />
+ TextWrapping="Wrap" />
</StackPanel>
</Grid>
</StackPanel>
</Border>
<Border
+ Padding="0"
Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
BorderBrush="{DynamicResource CardStrokeColorDefaultBrush}"
BorderThickness="1"
- CornerRadius="{StaticResource DuckCornerRadiusMedium}"
- Padding="0"
- >
+ CornerRadius="{StaticResource CornerRadiusMedium}">
<StackPanel>
<Grid Margin="14,12">
<Grid.ColumnDefinitions>
@@ -248,45 +223,39 @@
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<ui:SymbolIcon
- FontSize="14"
- Foreground="{DynamicResource TextFillColorSecondaryBrush}"
Margin="0,0,10,0"
- Symbol="History24"
VerticalAlignment="Top"
- />
+ FontSize="14"
+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"
+ Symbol="History24" />
<StackPanel Grid.Column="1" Margin="0,0,16,0">
<ui:TextBlock
Appearance="Secondary"
FontTypography="Caption"
- Text="{ext:Loc ScheduledTasks.Details.LastRun}"
- />
+ Text="{ext:Loc ScheduledTasks.Details.LastRun}" />
<ui:TextBlock
- FontTypography="Body"
- Margin="0,2,0,0"
- Text=""
x:Name="LastRunText"
- />
+ Margin="0,2,0,0"
+ FontTypography="Body"
+ Text="" />
</StackPanel>
<ui:SymbolIcon
- FontSize="14"
- Foreground="{DynamicResource TextFillColorSecondaryBrush}"
Grid.Column="2"
Margin="0,0,10,0"
- Symbol="CalendarArrowRight24"
VerticalAlignment="Top"
- />
+ FontSize="14"
+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"
+ Symbol="CalendarArrowRight24" />
<StackPanel Grid.Column="3">
<ui:TextBlock
Appearance="Secondary"
FontTypography="Caption"
- Text="{ext:Loc ScheduledTasks.Details.NextRun}"
- />
+ Text="{ext:Loc ScheduledTasks.Details.NextRun}" />
<ui:TextBlock
- FontTypography="Body"
- Margin="0,2,0,0"
- Text=""
x:Name="NextRunText"
- />
+ Margin="0,2,0,0"
+ FontTypography="Body"
+ Text="" />
</StackPanel>
</Grid>
<Separator Margin="14,0" />
@@ -296,24 +265,21 @@
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<ui:SymbolIcon
- FontSize="14"
- Foreground="{DynamicResource TextFillColorSecondaryBrush}"
Margin="0,0,10,0"
- Symbol="CheckmarkCircle24"
VerticalAlignment="Top"
- />
+ FontSize="14"
+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"
+ Symbol="CheckmarkCircle24" />
<StackPanel Grid.Column="1">
<ui:TextBlock
Appearance="Secondary"
FontTypography="Caption"
- Text="{ext:Loc ScheduledTasks.Details.LastResult}"
- />
+ Text="{ext:Loc ScheduledTasks.Details.LastResult}" />
<ui:TextBlock
- FontTypography="Body"
- Margin="0,2,0,0"
- Text=""
x:Name="LastResultText"
- />
+ Margin="0,2,0,0"
+ FontTypography="Body"
+ Text="" />
</StackPanel>
</Grid>
</StackPanel>
diff --git a/optimizerDuck/UI/Dialogs/StartupTaskDetailsPanel.xaml b/optimizerDuck/UI/Dialogs/StartupTaskDetailsPanel.xaml
index 6e47187..0e4f464 100644
--- a/optimizerDuck/UI/Dialogs/StartupTaskDetailsPanel.xaml
+++ b/optimizerDuck/UI/Dialogs/StartupTaskDetailsPanel.xaml
@@ -1,25 +1,23 @@
<UserControl
- d:DesignHeight="520"
- d:DesignWidth="620"
- mc:Ignorable="d"
x:Class="optimizerDuck.UI.Dialogs.StartupTaskDetailsPanel"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns: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"
->
+ d:DesignHeight="520"
+ d:DesignWidth="620"
+ mc:Ignorable="d">
<ScrollViewer VerticalScrollBarVisibility="Auto">
<StackPanel MinWidth="540">
<Border
+ Margin="0,0,0,12"
+ Padding="{StaticResource CardPadding}"
Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
BorderBrush="{DynamicResource CardStrokeColorDefaultBrush}"
BorderThickness="1"
- CornerRadius="{StaticResource DuckCornerRadiusMedium}"
- Margin="0,0,0,12"
- Padding="{StaticResource DuckCardPadding}"
- >
+ CornerRadius="{StaticResource CornerRadiusMedium}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
@@ -27,72 +25,64 @@
</Grid.ColumnDefinitions>
<Image
+ x:Name="LogoImageControl"
Grid.Column="0"
+ Width="40"
Height="40"
Margin="0,0,12,0"
- Source="{x:Null}"
- Stretch="UniformToFill"
VerticalAlignment="Center"
- Width="40"
- x:Name="LogoImageControl"
- />
+ Source="{x:Null}"
+ Stretch="UniformToFill" />
<StackPanel Grid.Column="1" VerticalAlignment="Center">
<DockPanel LastChildFill="False">
<ui:TextBlock
FontTypography="BodyStrong"
Text="{Binding Text, ElementName=NameText}"
- TextWrapping="Wrap"
- />
+ TextWrapping="Wrap" />
<Border
- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
- CornerRadius="4"
+ x:Name="TaskKindBadge"
Margin="8,0,0,0"
Padding="6,1"
VerticalAlignment="Center"
- x:Name="TaskKindBadge"
- >
+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
+ CornerRadius="4">
<ui:TextBlock
+ VerticalAlignment="Center"
Appearance="Tertiary"
FontTypography="Caption"
- Text="{ext:Loc ScheduledTasks.Header.Title}"
- VerticalAlignment="Center"
- />
+ Text="{ext:Loc ScheduledTasks.Header.Title}" />
</Border>
<Border
- CornerRadius="4"
+ x:Name="TaskStateBadge"
Margin="8,0,0,0"
Padding="6,1"
VerticalAlignment="Center"
- x:Name="TaskStateBadge"
- >
+ CornerRadius="4">
<ui:TextBlock
+ x:Name="TaskStateText"
+ VerticalAlignment="Center"
FontTypography="Caption"
Foreground="{DynamicResource TextFillColorInverseBrush}"
- Text=""
- VerticalAlignment="Center"
- x:Name="TaskStateText"
- />
+ Text="" />
</Border>
</DockPanel>
<ui:TextBlock
+ Margin="0,4,0,0"
Appearance="Secondary"
FontTypography="Caption"
- Margin="0,4,0,0"
Text="{Binding Text, ElementName=DescriptionText}"
TextTrimming="CharacterEllipsis"
- TextWrapping="Wrap"
- />
+ TextWrapping="Wrap" />
<ui:TextBlock
+ Margin="0,2,0,0"
Appearance="Disabled"
FontTypography="Caption"
- Margin="0,2,0,0"
Text="{Binding Text, ElementName=PathText}"
- TextTrimming="CharacterEllipsis"
- />
+ TextTrimming="CharacterEllipsis" />
- <ItemsControl Margin="0,6,0,0" x:Name="TriggerBadgesItems">
+ <ItemsControl x:Name="TriggerBadgesItems" Margin="0,6,0,0">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<WrapPanel Orientation="Horizontal" />
@@ -101,24 +91,21 @@
<ItemsControl.ItemTemplate>
<DataTemplate>
<Border
- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
- CornerRadius="4"
Margin="0,0,4,2"
Padding="6,2"
- >
+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
+ CornerRadius="4">
<StackPanel Orientation="Horizontal">
<ui:SymbolIcon
+ Margin="0,0,4,0"
FontSize="14"
Foreground="{DynamicResource TextFillColorSecondaryBrush}"
- Margin="0,0,4,0"
- Symbol="Timer24"
- />
+ Symbol="Timer24" />
<ui:TextBlock
+ VerticalAlignment="Center"
FontTypography="Caption"
Foreground="{DynamicResource TextFillColorSecondaryBrush}"
- Text="{Binding}"
- VerticalAlignment="Center"
- />
+ Text="{Binding}" />
</StackPanel>
</Border>
</DataTemplate>
@@ -129,12 +116,11 @@
</Border>
<Border
+ Padding="0"
Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
BorderBrush="{DynamicResource CardStrokeColorDefaultBrush}"
BorderThickness="1"
- CornerRadius="{StaticResource DuckCornerRadiusMedium}"
- Padding="0"
- >
+ CornerRadius="{StaticResource CornerRadiusMedium}">
<StackPanel>
<Grid Margin="14,12">
<Grid.ColumnDefinitions>
@@ -142,25 +128,22 @@
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<ui:SymbolIcon
- FontSize="14"
- Foreground="{DynamicResource TextFillColorSecondaryBrush}"
Margin="0,0,10,0"
- Symbol="AppGeneric24"
VerticalAlignment="Top"
- />
+ FontSize="14"
+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"
+ Symbol="AppGeneric24" />
<StackPanel Grid.Column="1">
<ui:TextBlock
Appearance="Secondary"
FontTypography="Caption"
- Text="{ext:Loc ScheduledTasks.Details.Name}"
- />
+ Text="{ext:Loc ScheduledTasks.Details.Name}" />
<ui:TextBlock
- FontTypography="Body"
+ x:Name="NameText"
Margin="0,2,0,0"
+ FontTypography="Body"
Text=""
- TextWrapping="Wrap"
- x:Name="NameText"
- />
+ TextWrapping="Wrap" />
</StackPanel>
</Grid>
<Separator Margin="14,0" />
@@ -171,25 +154,22 @@
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<ui:SymbolIcon
- FontSize="14"
- Foreground="{DynamicResource TextFillColorSecondaryBrush}"
Margin="0,0,10,0"
- Symbol="TextDescription24"
VerticalAlignment="Top"
- />
+ FontSize="14"
+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"
+ Symbol="TextDescription24" />
<StackPanel Grid.Column="1">
<ui:TextBlock
Appearance="Secondary"
FontTypography="Caption"
- Text="{ext:Loc ScheduledTasks.Details.Description}"
- />
+ Text="{ext:Loc ScheduledTasks.Details.Description}" />
<ui:TextBlock
- FontTypography="Body"
+ x:Name="DescriptionText"
Margin="0,2,0,0"
+ FontTypography="Body"
Text=""
- TextWrapping="Wrap"
- x:Name="DescriptionText"
- />
+ TextWrapping="Wrap" />
</StackPanel>
</Grid>
<Separator Margin="14,0" />
@@ -200,26 +180,23 @@
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<ui:SymbolIcon
- FontSize="14"
- Foreground="{DynamicResource TextFillColorSecondaryBrush}"
Margin="0,0,10,0"
- Symbol="Folder24"
VerticalAlignment="Top"
- />
+ FontSize="14"
+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"
+ Symbol="Folder24" />
<StackPanel Grid.Column="1">
<ui:TextBlock
Appearance="Secondary"
FontTypography="Caption"
- Text="{ext:Loc ScheduledTasks.Details.Path}"
- />
+ Text="{ext:Loc ScheduledTasks.Details.Path}" />
<ui:TextBlock
+ x:Name="PathText"
+ Margin="0,2,0,0"
FontFamily="Consolas"
FontTypography="Body"
- Margin="0,2,0,0"
Text=""
- TextWrapping="Wrap"
- x:Name="PathText"
- />
+ TextWrapping="Wrap" />
</StackPanel>
</Grid>
<Separator Margin="14,0" />
@@ -230,25 +207,22 @@
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<ui:SymbolIcon
- FontSize="14"
- Foreground="{DynamicResource TextFillColorSecondaryBrush}"
Margin="0,0,10,0"
- Symbol="Timer24"
VerticalAlignment="Top"
- />
+ FontSize="14"
+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"
+ Symbol="Timer24" />
<StackPanel Grid.Column="1">
<ui:TextBlock
Appearance="Secondary"
FontTypography="Caption"
- Text="{ext:Loc ScheduledTasks.Details.Triggers}"
- />
+ Text="{ext:Loc ScheduledTasks.Details.Triggers}" />
<ui:TextBlock
- FontTypography="Body"
+ x:Name="TriggersText"
Margin="0,2,0,0"
+ FontTypography="Body"
Text=""
- TextWrapping="Wrap"
- x:Name="TriggersText"
- />
+ TextWrapping="Wrap" />
</StackPanel>
</Grid>
<Separator Margin="14,0" />
@@ -259,26 +233,23 @@
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<ui:SymbolIcon
- FontSize="14"
- Foreground="{DynamicResource TextFillColorSecondaryBrush}"
Margin="0,0,10,0"
- Symbol="Play24"
VerticalAlignment="Top"
- />
+ FontSize="14"
+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"
+ Symbol="Play24" />
<StackPanel Grid.Column="1">
<ui:TextBlock
Appearance="Secondary"
FontTypography="Caption"
- Text="{ext:Loc ScheduledTasks.Details.Action}"
- />
+ Text="{ext:Loc ScheduledTasks.Details.Action}" />
<ui:TextBlock
+ x:Name="ActionText"
+ Margin="0,2,0,0"
FontFamily="Consolas"
FontTypography="Body"
- Margin="0,2,0,0"
Text=""
- TextWrapping="Wrap"
- x:Name="ActionText"
- />
+ TextWrapping="Wrap" />
</StackPanel>
</Grid>
</StackPanel>
diff --git a/optimizerDuck/UI/Pages/BloatwarePage.xaml b/optimizerDuck/UI/Pages/BloatwarePage.xaml
index d722540..71b6716 100644
--- a/optimizerDuck/UI/Pages/BloatwarePage.xaml
+++ b/optimizerDuck/UI/Pages/BloatwarePage.xaml
@@ -10,15 +10,14 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
Title="BloatwarePage"
- Style="{StaticResource DuckPageRootStyle}"
d:DataContext="{d:DesignInstance local:BloatwarePage}"
d:DesignHeight="1200"
d:DesignWidth="800"
ui:Design.Background="Black"
ui:Design.Foreground="White"
ScrollViewer.CanContentScroll="False"
- mc:Ignorable="d"
->
+ Style="{StaticResource PageRootStyle}"
+ mc:Ignorable="d">
<Page.Resources>
<converters:GreaterThanZeroToVisibilityConverter x:Key="GreaterThanZeroToVisibilityConverter" />
<converters:ZeroToVisibilityConverter x:Key="ZeroToVisibilityConverter" />
@@ -26,15 +25,9 @@
</Page.Resources>
<Grid RowDefinitions="Auto *">
- <StackPanel Style="{StaticResource DuckPageHeaderStyle}">
- <ui:TextBlock
- Style="{StaticResource DuckPageTitleStyle}"
- Text="{ext:Loc Bloatware.Header.Title}"
- />
- <ui:TextBlock
- Style="{StaticResource DuckPageDescriptionStyle}"
- Text="{ext:Loc Bloatware.Header.Description}"
- />
+ <StackPanel Style="{StaticResource PageHeaderStyle}">
+ <ui:TextBlock Style="{StaticResource PageTitleStyle}" Text="{ext:Loc Bloatware.Header.Title}" />
+ <ui:TextBlock Style="{StaticResource PageDescriptionStyle}" Text="{ext:Loc Bloatware.Header.Description}" />
</StackPanel>
<!-- Empty (truly no packages installed) -->
@@ -54,38 +47,29 @@
</Style>
</Border.Style>
- <StackPanel Style="{StaticResource DuckEmptyStatePanelStyle}">
- <ui:SymbolIcon
- Style="{StaticResource DuckEmptyStateIconStyle}"
- Symbol="DeleteOff24"
- />
+ <StackPanel Style="{StaticResource EmptyStatePanelStyle}">
+ <ui:SymbolIcon Style="{StaticResource EmptyStateIconStyle}" Symbol="DeleteOff24" />
<ui:TextBlock
HorizontalAlignment="Center"
FontTypography="Subtitle"
- Text="{ext:Loc Bloatware.Empty.Title}"
- />
+ Text="{ext:Loc Bloatware.Empty.Title}" />
<ui:TextBlock
Margin="0,4,0,16"
HorizontalAlignment="Center"
- Style="{StaticResource DuckSecondaryTextStyle}"
- Text="{ext:Loc Bloatware.Empty.Description}"
- />
+ Style="{StaticResource SecondaryTextStyle}"
+ Text="{ext:Loc Bloatware.Empty.Description}" />
<ui:Button
HorizontalAlignment="Center"
Appearance="Primary"
Command="{Binding ViewModel.RefreshCommand}"
Content="{ext:Loc Bloatware.Menu.Refresh}"
Icon="{ui:SymbolIcon ArrowClockwise24,
- FontSize=18}"
- />
+ FontSize=18}" />
</StackPanel>
</Border>
<!-- Loading -->
- <Border
- Grid.Row="1"
- Visibility="{Binding ViewModel.IsLoading, Converter={StaticResource BooleanToVisibilityConverter}}"
- >
+ <Border Grid.Row="1" Visibility="{Binding ViewModel.IsLoading, Converter={StaticResource BooleanToVisibilityConverter}}">
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
<ui:ProgressRing
Width="48"
@@ -93,194 +77,150 @@
Margin="0,0,0,16"
HorizontalAlignment="Center"
VerticalAlignment="Center"
- IsIndeterminate="True"
- />
+ IsIndeterminate="True" />
<ui:TextBlock
HorizontalAlignment="Center"
FontTypography="BodyStrong"
- Text="{ext:Loc Bloatware.Loading}"
- />
+ Text="{ext:Loc Bloatware.Loading}" />
<ui:TextBlock
Margin="0,4,0,0"
HorizontalAlignment="Center"
- Foreground="{DynamicResource TextFillColorSecondaryBrush}"
FontTypography="Caption"
- Text="{ext:Loc Bloatware.Loading.Hint}"
- />
+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"
+ Text="{ext:Loc Bloatware.Loading.Hint}" />
</StackPanel>
</Border>
- <Border
- Grid.Row="1"
- Visibility="{Binding ViewModel.HasData, Converter={StaticResource BooleanToVisibilityConverter}}"
- >
+ <Border Grid.Row="1" Visibility="{Binding ViewModel.HasData, Converter={StaticResource BooleanToVisibilityConverter}}">
<Grid RowDefinitions="Auto,Auto,*">
<!-- Search / Filter / Sort toolbar -->
- <Border Grid.Row="0" Style="{StaticResource DuckToolbarSurfaceStyle}">
- <WrapPanel Orientation="Horizontal">
- <!-- Search -->
- <ui:TextBox
- Style="{StaticResource DuckSearchBoxStyle}"
- PlaceholderText="{ext:Loc Common.Search.Placeholder}"
- Text="{Binding ViewModel.SearchText, UpdateSourceTrigger=PropertyChanged}"
- />
+ <Border Grid.Row="0" Style="{StaticResource ToolbarSurfaceStyle}">
+ <WrapPanel Orientation="Horizontal">
+ <!-- Search -->
+ <ui:TextBox
+ PlaceholderText="{ext:Loc Common.Search.Placeholder}"
+ Style="{StaticResource SearchBoxStyle}"
+ Text="{Binding ViewModel.SearchText, UpdateSourceTrigger=PropertyChanged}" />
- <!-- Filter by Risk -->
- <ComboBox
- Style="{StaticResource DuckComboBoxStyle}"
- SelectedIndex="{Binding ViewModel.SelectedRiskFilterIndex}"
- ToolTip="{ext:Loc Common.Filter}"
- ToolTipService.BetweenShowDelay="160"
- ToolTipService.Placement="Top"
- >
- <ComboBoxItem HorizontalContentAlignment="Left">
- <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
- <ui:SymbolIcon
- Margin="0,0,6,0"
- HorizontalAlignment="Left"
- Symbol="Filter24"
- />
- <TextBlock
- Grid.Column="1"
- HorizontalAlignment="Left"
- Text="{ext:Loc Common.Filter.All}"
- />
- </Grid>
- </ComboBoxItem>
- <ComboBoxItem HorizontalContentAlignment="Left">
- <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
- <ui:SymbolIcon
- Margin="0,0,6,0"
- HorizontalAlignment="Left"
- Foreground="{DynamicResource SystemFillColorSuccessBrush}"
- Symbol="ShieldCheckmark24"
- />
- <TextBlock
- Grid.Column="1"
- Text="{ext:Loc Optimizer.UI.Risk.Safe}"
- />
- </Grid>
- </ComboBoxItem>
- <ComboBoxItem HorizontalContentAlignment="Left">
- <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
- <ui:SymbolIcon
- Margin="0,0,6,0"
- HorizontalAlignment="Left"
- Foreground="{DynamicResource SystemFillColorCautionBrush}"
- Symbol="Warning24"
- />
- <TextBlock
- Grid.Column="1"
- Text="{ext:Loc Optimizer.UI.Risk.Moderate}"
- />
- </Grid>
- </ComboBoxItem>
- </ComboBox>
- <!-- Sort By -->
- <ComboBox
- Style="{StaticResource DuckComboBoxStyle}"
- SelectedIndex="{Binding ViewModel.SelectedSortByIndex}"
- ToolTip="{ext:Loc Common.SortBy}"
- ToolTipService.BetweenShowDelay="160"
- ToolTipService.Placement="Top"
- >
- <ComboBoxItem HorizontalContentAlignment="Left">
- <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
- <ui:SymbolIcon
- Margin="0,0,6,0"
- HorizontalAlignment="Left"
- Symbol="TextSortAscending24"
- />
- <TextBlock
- Grid.Column="1"
- HorizontalAlignment="Left"
- Text="{ext:Loc Common.SortBy.Name}"
- />
- </Grid>
- </ComboBoxItem>
- <ComboBoxItem HorizontalContentAlignment="Left">
- <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
- <ui:SymbolIcon
- Margin="0,0,6,0"
- HorizontalAlignment="Left"
- Symbol="Certificate24"
- />
- <TextBlock
- Grid.Column="1"
- HorizontalAlignment="Left"
- Text="{ext:Loc Common.SortBy.Publisher}"
- />
- </Grid>
- </ComboBoxItem>
- <ComboBoxItem HorizontalContentAlignment="Left">
- <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
- <ui:SymbolIcon
- Margin="0,0,6,0"
- HorizontalAlignment="Left"
- Symbol="Shield24"
- />
- <TextBlock
- Grid.Column="1"
- HorizontalAlignment="Left"
- Text="{ext:Loc Common.SortBy.Risk}"
- />
- </Grid>
- </ComboBoxItem>
- </ComboBox>
- </WrapPanel>
+ <!-- Filter by Risk -->
+ <ComboBox
+ SelectedIndex="{Binding ViewModel.SelectedRiskFilterIndex}"
+ Style="{StaticResource ComboBoxStyle}"
+ ToolTip="{ext:Loc Common.Filter}"
+ ToolTipService.BetweenShowDelay="160"
+ ToolTipService.Placement="Top">
+ <ComboBoxItem HorizontalContentAlignment="Left">
+ <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
+ <ui:SymbolIcon
+ Margin="0,0,6,0"
+ HorizontalAlignment="Left"
+ Symbol="Filter24" />
+ <TextBlock
+ Grid.Column="1"
+ HorizontalAlignment="Left"
+ Text="{ext:Loc Common.Filter.All}" />
+ </Grid>
+ </ComboBoxItem>
+ <ComboBoxItem HorizontalContentAlignment="Left">
+ <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
+ <ui:SymbolIcon
+ Margin="0,0,6,0"
+ HorizontalAlignment="Left"
+ Foreground="{DynamicResource SystemFillColorSuccessBrush}"
+ Symbol="ShieldCheckmark24" />
+ <TextBlock Grid.Column="1" Text="{ext:Loc Optimizer.UI.Risk.Safe}" />
+ </Grid>
+ </ComboBoxItem>
+ <ComboBoxItem HorizontalContentAlignment="Left">
+ <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
+ <ui:SymbolIcon
+ Margin="0,0,6,0"
+ HorizontalAlignment="Left"
+ Foreground="{DynamicResource SystemFillColorCautionBrush}"
+ Symbol="Warning24" />
+ <TextBlock Grid.Column="1" Text="{ext:Loc Optimizer.UI.Risk.Moderate}" />
+ </Grid>
+ </ComboBoxItem>
+ </ComboBox>
+ <!-- Sort By -->
+ <ComboBox
+ SelectedIndex="{Binding ViewModel.SelectedSortByIndex}"
+ Style="{StaticResource ComboBoxStyle}"
+ ToolTip="{ext:Loc Common.SortBy}"
+ ToolTipService.BetweenShowDelay="160"
+ ToolTipService.Placement="Top">
+ <ComboBoxItem HorizontalContentAlignment="Left">
+ <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
+ <ui:SymbolIcon
+ Margin="0,0,6,0"
+ HorizontalAlignment="Left"
+ Symbol="TextSortAscending24" />
+ <TextBlock
+ Grid.Column="1"
+ HorizontalAlignment="Left"
+ Text="{ext:Loc Common.SortBy.Name}" />
+ </Grid>
+ </ComboBoxItem>
+ <ComboBoxItem HorizontalContentAlignment="Left">
+ <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
+ <ui:SymbolIcon
+ Margin="0,0,6,0"
+ HorizontalAlignment="Left"
+ Symbol="Certificate24" />
+ <TextBlock
+ Grid.Column="1"
+ HorizontalAlignment="Left"
+ Text="{ext:Loc Common.SortBy.Publisher}" />
+ </Grid>
+ </ComboBoxItem>
+ <ComboBoxItem HorizontalContentAlignment="Left">
+ <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
+ <ui:SymbolIcon
+ Margin="0,0,6,0"
+ HorizontalAlignment="Left"
+ Symbol="Shield24" />
+ <TextBlock
+ Grid.Column="1"
+ HorizontalAlignment="Left"
+ Text="{ext:Loc Common.SortBy.Risk}" />
+ </Grid>
+ </ComboBoxItem>
+ </ComboBox>
+ </WrapPanel>
</Border>
<!-- Action buttons -->
- <StackPanel Grid.Row="1" Margin="0,0,0,12" Orientation="Horizontal">
+ <StackPanel
+ Grid.Row="1"
+ Margin="0,0,0,12"
+ Orientation="Horizontal">
<ui:Button
Appearance="Danger"
Command="{Binding ViewModel.RemoveSelectedCommand}"
Content="{ext:Loc Bloatware.Menu.Remove,
{Binding ViewModel.SelectedCount}}"
Icon="{ui:SymbolIcon Delete24,
- FontSize=18}"
- />
+ FontSize=18}" />
- <Separator
- Margin="8,0,8,0"
- Visibility="{Binding ViewModel.HasSafePackages, Converter={StaticResource BooleanToVisibilityConverter}}"
- />
+ <Separator Margin="4,0,4,0" Visibility="{Binding ViewModel.HasSafePackages, Converter={StaticResource BooleanToVisibilityConverter}}" />
- <ui:Button
- Command="{Binding ViewModel.SelectAllSafeCommand}"
- Visibility="{Binding ViewModel.HasSafePackages, Converter={StaticResource BooleanToVisibilityConverter}}"
- >
+ <ui:Button Command="{Binding ViewModel.SelectAllSafeCommand}" Visibility="{Binding ViewModel.HasSafePackages, Converter={StaticResource BooleanToVisibilityConverter}}">
<ui:Button.Style>
- <Style
- BasedOn="{StaticResource {x:Type ui:Button}}"
- TargetType="ui:Button"
- >
+ <Style BasedOn="{StaticResource {x:Type ui:Button}}" TargetType="ui:Button">
<Setter Property="Appearance" Value="Success" />
- <Setter
- Property="Content"
- Value="{ext:Loc Bloatware.Menu.SelectAllSafe}"
- />
+ <Setter Property="Content" Value="{ext:Loc Bloatware.Menu.SelectAllSafe}" />
<Setter Property="Icon">
<Setter.Value>
<ui:SymbolIcon FontSize="18" Symbol="ShieldCheckmark24" />
</Setter.Value>
</Setter>
<Style.Triggers>
- <DataTrigger
- Binding="{Binding ViewModel.IsAllSafeSelected}"
- Value="True"
- >
+ <DataTrigger Binding="{Binding ViewModel.IsAllSafeSelected}" Value="True">
<Setter Property="Appearance" Value="Danger" />
- <Setter
- Property="Content"
- Value="{ext:Loc Bloatware.Menu.DeselectAllSafe}"
- />
+ <Setter Property="Content" Value="{ext:Loc Bloatware.Menu.DeselectAllSafe}" />
<Setter Property="Icon">
<Setter.Value>
- <ui:SymbolIcon
- FontSize="18"
- Symbol="CheckboxUnchecked24"
- />
+ <ui:SymbolIcon FontSize="18" Symbol="CheckboxUnchecked24" />
</Setter.Value>
</Setter>
</DataTrigger>
@@ -289,40 +229,33 @@
</ui:Button.Style>
</ui:Button>
- <Separator Margin="8,0,8,0" />
+ <Separator Margin="4,0,4,0" />
<ui:Button
Appearance="Primary"
Command="{Binding ViewModel.RefreshCommand}"
Content="{ext:Loc Bloatware.Menu.Refresh}"
Icon="{ui:SymbolIcon ArrowClockwise24,
- FontSize=18}"
- />
+ FontSize=18}" />
</StackPanel>
<!-- No search results -->
<StackPanel
Grid.Row="2"
- Style="{StaticResource DuckEmptyStatePanelStyle}"
- Visibility="{Binding ViewModel.AppxPackages.Count, Converter={StaticResource ZeroToVisibilityConverter}}"
- >
- <ui:SymbolIcon
- Style="{StaticResource DuckEmptyStateIconStyle}"
- Symbol="SearchInfo24"
- />
+ Style="{StaticResource EmptyStatePanelStyle}"
+ Visibility="{Binding ViewModel.AppxPackages.Count, Converter={StaticResource ZeroToVisibilityConverter}}">
+ <ui:SymbolIcon Style="{StaticResource EmptyStateIconStyle}" Symbol="SearchInfo24" />
<ui:TextBlock
HorizontalAlignment="Center"
- Foreground="{DynamicResource TextFillColorSecondaryBrush}"
FontTypography="Body"
- Text="{ext:Loc Bloatware.Search.NoResults}"
- />
+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"
+ Text="{ext:Loc Bloatware.Search.NoResults}" />
</StackPanel>
<ItemsControl
Grid.Row="2"
ItemsSource="{Binding ViewModel.AppxPackages}"
- Visibility="{Binding ViewModel.AppxPackages.Count, Converter={StaticResource GreaterThanZeroToVisibilityConverter}}"
- >
+ Visibility="{Binding ViewModel.AppxPackages.Count, Converter={StaticResource GreaterThanZeroToVisibilityConverter}}">
<ItemsControl.Template>
<ControlTemplate TargetType="ItemsControl">
<ScrollViewer HorizontalScrollBarVisibility="Disabled">
@@ -340,9 +273,7 @@
<!-- Item template -->
<ItemsControl.ItemTemplate>
<DataTemplate DataType="{x:Type bloatware1:AppXPackage}">
- <Border
- Style="{StaticResource DuckListRowStyle}"
- >
+ <Border Style="{StaticResource ListRowStyle}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
@@ -356,8 +287,7 @@
Grid.Column="0"
Margin="0,4,12,0"
VerticalAlignment="Top"
- IsChecked="{Binding IsSelected, Mode=TwoWay}"
- />
+ IsChecked="{Binding IsSelected, Mode=TwoWay}" />
<!-- Logo Image -->
<Image
@@ -367,18 +297,14 @@
Margin="0,0,12,0"
VerticalAlignment="Top"
Source="{Binding LogoImage}"
- Stretch="UniformToFill"
- />
+ Stretch="UniformToFill" />
<!-- Content -->
<StackPanel Grid.Column="2">
<!-- Top row -->
<DockPanel LastChildFill="False">
<!-- App Name -->
- <ui:TextBlock
- FontTypography="BodyStrong"
- Text="{Binding Name}"
- />
+ <ui:TextBlock FontTypography="BodyStrong" Text="{Binding Name}" />
<Border
Margin="8,0,0,0"
@@ -386,39 +312,27 @@
HorizontalAlignment="Left"
VerticalAlignment="Center"
Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
- CornerRadius="{StaticResource DuckCornerRadiusSmall}"
- >
+ CornerRadius="{StaticResource CornerRadiusSmall}">
<!-- Version -->
<ui:TextBlock
VerticalAlignment="Center"
Appearance="Tertiary"
FontTypography="Body"
- Text="{Binding Version}"
- />
+ Text="{Binding Version}" />
</Border>
<Border
Margin="8,0,0,0"
Padding="6,2"
HorizontalAlignment="Left"
- CornerRadius="{StaticResource DuckCornerRadiusSmall}"
- Visibility="{Binding ShouldVisibleRisk, Converter={StaticResource BooleanToVisibilityConverter}}"
- >
+ CornerRadius="{StaticResource CornerRadiusSmall}"
+ Visibility="{Binding ShouldVisibleRisk, Converter={StaticResource BooleanToVisibilityConverter}}">
<Border.Style>
<Style TargetType="Border">
- <Setter
- Property="Background"
- Value="{DynamicResource SystemFillColorSuccessBrush}"
- />
+ <Setter Property="Background" Value="{DynamicResource SystemFillColorSuccessBrush}" />
<Style.Triggers>
- <DataTrigger
- Binding="{Binding Risk}"
- Value="Caution"
- >
- <Setter
- Property="Background"
- Value="{DynamicResource SystemFillColorCautionBrush}"
- />
+ <DataTrigger Binding="{Binding Risk}" Value="Caution">
+ <Setter Property="Background" Value="{DynamicResource SystemFillColorCautionBrush}" />
</DataTrigger>
</Style.Triggers>
</Style>
@@ -427,8 +341,7 @@
<ui:SymbolIcon
Margin="0,0,8,0"
Foreground="{DynamicResource TextFillColorInverseBrush}"
- Symbol="{Binding RiskVisual.Icon}"
- />
+ Symbol="{Binding RiskVisual.Icon}" />
<ui:TextBlock
HorizontalAlignment="Center"
@@ -436,8 +349,7 @@
FontTypography="Caption"
Foreground="{DynamicResource TextFillColorInverseBrush}"
Text="{Binding RiskVisual.Display}"
- TextWrapping="Wrap"
- />
+ TextWrapping="Wrap" />
</StackPanel>
</Border>
</DockPanel>
@@ -445,29 +357,26 @@
<!-- Publisher -->
<ui:TextBlock
Margin="0,2,0,0"
- Foreground="{DynamicResource TextFillColorDisabledBrush}"
FontTypography="Body"
+ Foreground="{DynamicResource TextFillColorDisabledBrush}"
Text="{Binding Publisher}"
- TextTrimming="CharacterEllipsis"
- />
+ TextTrimming="CharacterEllipsis" />
<!-- Install location -->
<ui:TextBlock
Margin="0,2,0,0"
- Foreground="{DynamicResource TextFillColorDisabledBrush}"
FontTypography="Body"
+ Foreground="{DynamicResource TextFillColorDisabledBrush}"
Text="{Binding InstallLocation}"
- TextTrimming="CharacterEllipsis"
- />
+ TextTrimming="CharacterEllipsis" />
<!-- Package full name -->
<ui:TextBlock
Margin="0,4,0,0"
- Foreground="{DynamicResource TextFillColorSecondaryBrush}"
FontTypography="Caption"
+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"
Text="{Binding PackageFullName}"
- TextTrimming="CharacterEllipsis"
- />
+ TextTrimming="CharacterEllipsis" />
</StackPanel>
</Grid>
</Border>
diff --git a/optimizerDuck/UI/Pages/DashboardPage.xaml b/optimizerDuck/UI/Pages/DashboardPage.xaml
index 37f239b..6df4781 100644
--- a/optimizerDuck/UI/Pages/DashboardPage.xaml
+++ b/optimizerDuck/UI/Pages/DashboardPage.xaml
@@ -1,31 +1,27 @@
<Page
- Style="{StaticResource DuckPageRootStyle}"
- ScrollViewer.CanContentScroll="False"
- Title="Dashboard"
- d:DataContext="{d:DesignInstance pages:DashboardPage}"
- d:DesignHeight="650"
- d:DesignWidth="800"
- mc:Ignorable="d"
- ui:Design.Background="Black"
- ui:Design.Foreground="White"
x:Class="optimizerDuck.UI.Pages.DashboardPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns: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="Dashboard"
+ d:DataContext="{d:DesignInstance pages:DashboardPage}"
+ d:DesignHeight="650"
+ d:DesignWidth="800"
+ ui:Design.Background="Black"
+ ui:Design.Foreground="White"
+ ScrollViewer.CanContentScroll="False"
+ Style="{StaticResource PageRootStyle}"
+ mc:Ignorable="d">
<Page.Resources>
<converters:BooleanToVisibilityConverter x:Key="BoolToVisibilityConverter" />
<converters:MBToGBConverter x:Key="MBToGBConverter" />
- <converters:GreaterThanNumberToVisibilityConverter
- Threshold="1"
- x:Key="GreaterThanOneToVisibilityConverter"
- />
- <converters:MinusNumberConverter NumberToMinus="1" x:Key="MinusOneConverter" />
+ <converters:GreaterThanNumberToVisibilityConverter x:Key="GreaterThanOneToVisibilityConverter" Threshold="1" />
+ <converters:MinusNumberConverter x:Key="MinusOneConverter" NumberToMinus="1" />
<converters:ThemeToGitHubIconConverter x:Key="ThemeToGitHubIconConverter" />
</Page.Resources>
@@ -34,37 +30,37 @@
<Grid
Grid.RowSpan="3"
Panel.ZIndex="1000"
- Visibility="{Binding ViewModel.IsLoading, Converter={StaticResource BoolToVisibilityConverter}}"
- >
+ Visibility="{Binding ViewModel.IsLoading, Converter={StaticResource BoolToVisibilityConverter}}">
<Border Background="{DynamicResource ApplicationBackgroundBrush}" Opacity="0.8" />
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
- <ui:ProgressRing Height="60" IsIndeterminate="True" Width="60" />
+ <ui:ProgressRing
+ Width="60"
+ Height="60"
+ IsIndeterminate="True" />
<ui:TextBlock
- FontTypography="Subtitle"
- HorizontalAlignment="Center"
Margin="0,16,0,0"
+ HorizontalAlignment="Center"
+ FontTypography="Subtitle"
Text="{ext:Loc Dashboard.SystemInfo.Loading}"
- TextWrapping="Wrap"
- />
+ TextWrapping="Wrap" />
</StackPanel>
</Grid>
<!-- Header -->
- <StackPanel Style="{StaticResource DuckPageHeaderStyle}">
+ <StackPanel Style="{StaticResource PageHeaderStyle}">
<ui:InfoBar
- IsOpen="{Binding ViewModel.IsUpdateInfoOpen, Mode=TwoWay}"
Margin="0,0,0,12"
+ IsOpen="{Binding ViewModel.IsUpdateInfoOpen, Mode=TwoWay}"
Message="{ext:Loc Dashboard.UpdateInfoBar.Message,
{Binding ViewModel.LatestVersion}}"
- Severity="Warning"
- />
+ Severity="Warning" />
<Grid ColumnDefinitions="*,Auto">
- <ui:TextBlock
- Style="{StaticResource DuckPageTitleStyle}"
- Text="{ext:Loc Dashboard.Header.Title}"
- />
+ <ui:TextBlock Style="{StaticResource PageTitleStyle}" Text="{ext:Loc Dashboard.Header.Title}" />
- <WrapPanel Grid.Column="1" VerticalAlignment="Center" Orientation="Horizontal">
+ <WrapPanel
+ Grid.Column="1"
+ VerticalAlignment="Center"
+ Orientation="Horizontal">
<ui:Button
Margin="0,0,8,0"
Appearance="Secondary"
@@ -82,107 +78,89 @@
</StackPanel>
<!-- Action Cards -->
- <UniformGrid Columns="3" Grid.Row="1" Margin="0,0,0,24">
+ <UniformGrid
+ Grid.Row="1"
+ Margin="0,0,0,24"
+ Columns="3">
<ui:CardAction
- Command="{Binding ViewModel.OpenActionCommand}"
- CommandParameter="Discord"
Margin="0,0,12,0"
Padding="16,14"
VerticalAlignment="Stretch"
- >
+ Command="{Binding ViewModel.OpenActionCommand}"
+ CommandParameter="Discord"
+ Cursor="Hand">
<ui:CardAction.Icon>
- <ui:ImageIcon
- Height="25"
- Source="pack://application:,,,/Resources/Images/DiscordLogo.png"
- />
+ <ui:ImageIcon Height="25" Source="pack://application:,,,/Resources/Images/DiscordLogo.png" />
</ui:CardAction.Icon>
<StackPanel>
+ <ui:TextBlock FontTypography="BodyStrong" Text="{ext:Loc Dashboard.Actions.Discord.Title}" />
<ui:TextBlock
- FontTypography="BodyStrong"
- Text="{ext:Loc Dashboard.Actions.Discord.Title}"
- />
- <ui:TextBlock
- Foreground="{DynamicResource TextFillColorSecondaryBrush}"
FontTypography="Caption"
+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"
Text="{ext:Loc Dashboard.Actions.Discord.Description}"
- TextWrapping="Wrap"
- />
+ TextWrapping="Wrap" />
</StackPanel>
</ui:CardAction>
<ui:CardAction
- Command="{Binding ViewModel.OpenActionCommand}"
- CommandParameter="GitHub"
Margin="0,0,12,0"
Padding="16,14"
VerticalAlignment="Stretch"
- >
+ Command="{Binding ViewModel.OpenActionCommand}"
+ CommandParameter="GitHub"
+ Cursor="Hand">
<ui:CardAction.Icon>
- <ui:ImageIcon
- Height="40"
- Source="{Binding ViewModel.CurrentApplicationTheme, Converter={StaticResource ThemeToGitHubIconConverter}}"
- />
+ <ui:ImageIcon Height="40" Source="{Binding ViewModel.CurrentApplicationTheme, Converter={StaticResource ThemeToGitHubIconConverter}}" />
</ui:CardAction.Icon>
<StackPanel>
+ <ui:TextBlock FontTypography="BodyStrong" Text="{ext:Loc Dashboard.Actions.GitHub.Title}" />
<ui:TextBlock
- FontTypography="BodyStrong"
- Text="{ext:Loc Dashboard.Actions.GitHub.Title}"
- />
- <ui:TextBlock
- Foreground="{DynamicResource TextFillColorSecondaryBrush}"
FontTypography="Caption"
+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"
Text="{ext:Loc Dashboard.Actions.GitHub.Description}"
- TextWrapping="Wrap"
- />
+ TextWrapping="Wrap" />
</StackPanel>
</ui:CardAction>
<ui:CardAction
- BorderThickness="1"
- Command="{Binding ViewModel.OpenActionCommand}"
- CommandParameter="Contribute"
Margin="0"
Padding="16,14"
VerticalAlignment="Stretch"
- >
+ BorderThickness="1"
+ Command="{Binding ViewModel.OpenActionCommand}"
+ CommandParameter="Contribute"
+ Cursor="Hand">
<ui:CardAction.Icon>
<ui:SymbolIcon
Filled="True"
Foreground="{DynamicResource SystemFillColorCautionBrush}"
- Symbol="Star24"
- />
+ Symbol="Star24" />
</ui:CardAction.Icon>
<StackPanel>
+ <ui:TextBlock FontTypography="BodyStrong" Text="{ext:Loc Dashboard.Actions.SupportMe.Title}" />
<ui:TextBlock
- FontTypography="BodyStrong"
- Text="{ext:Loc Dashboard.Actions.SupportMe.Title}"
- />
- <ui:TextBlock
- Foreground="{DynamicResource TextFillColorSecondaryBrush}"
FontTypography="Caption"
+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"
Text="{ext:Loc Dashboard.Actions.SupportMe.Description}"
- TextWrapping="Wrap"
- />
+ TextWrapping="Wrap" />
</StackPanel>
</ui:CardAction>
</UniformGrid>
<ScrollViewer
Grid.Row="2"
- HorizontalScrollBarVisibility="Disabled"
Padding="0"
- VerticalScrollBarVisibility="Auto"
- >
- <StackPanel>
+ HorizontalScrollBarVisibility="Disabled"
+ VerticalScrollBarVisibility="Auto">
+ <StackPanel Margin="0,0,12,0">
<!-- System Info Cards -->
<UniformGrid Columns="2" Rows="2">
<!-- Operating System -->
<ui:CardControl
- Icon="{ui:SymbolIcon Tv24}"
Margin="0,0,12,12"
VerticalAlignment="Stretch"
- >
+ Icon="{ui:SymbolIcon Tv24}">
<ui:CardControl.Header>
<Grid>
<Grid.RowDefinitions>
@@ -191,53 +169,38 @@
</Grid.RowDefinitions>
<StackPanel Grid.Row="0">
- <ui:TextBlock
- FontTypography="BodyStrong"
- Text="{Binding ViewModel.SystemInfo.Os.Name}"
- />
- <ui:TextBlock
- Foreground="{DynamicResource TextFillColorSecondaryBrush}"
- FontTypography="Caption"
- >
+ <ui:TextBlock FontTypography="BodyStrong" Text="{Binding ViewModel.SystemInfo.Os.Name}" />
+ <ui:TextBlock FontTypography="Caption" Foreground="{DynamicResource TextFillColorSecondaryBrush}">
<Run Text="{Binding ViewModel.SystemInfo.Os.Edition}" />
<Run Text="·" />
<Run Text="{Binding ViewModel.SystemInfo.Os.Architecture}" />
</ui:TextBlock>
</StackPanel>
- <WrapPanel Grid.Row="1" Margin="0,8,0,0" Orientation="Horizontal">
+ <WrapPanel
+ Grid.Row="1"
+ Margin="0,8,0,0"
+ Orientation="Horizontal">
<Border
- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
- CornerRadius="{StaticResource DuckCornerRadiusSmall}"
Margin="0,0,4,4"
Padding="6,2"
- >
- <ui:TextBlock
- FontTypography="Caption"
- Text="{ext:Loc Dashboard.SystemInfo.Os.Build, {Binding ViewModel.SystemInfo.Os.BuildNumber}}"
- />
+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
+ CornerRadius="{StaticResource CornerRadiusSmall}">
+ <ui:TextBlock FontTypography="Caption" Text="{ext:Loc Dashboard.SystemInfo.Os.Build, {Binding ViewModel.SystemInfo.Os.BuildNumber}}" />
</Border>
<Border
- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
- CornerRadius="{StaticResource DuckCornerRadiusSmall}"
Margin="0,0,4,4"
Padding="6,2"
- >
- <ui:TextBlock
- FontTypography="Caption"
- Text="{Binding ViewModel.SystemInfo.Os.DeviceType}"
- />
+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
+ CornerRadius="{StaticResource CornerRadiusSmall}">
+ <ui:TextBlock FontTypography="Caption" Text="{Binding ViewModel.SystemInfo.Os.DeviceType}" />
</Border>
<Border
- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
- CornerRadius="{StaticResource DuckCornerRadiusSmall}"
Margin="0,0,4,4"
Padding="6,2"
- >
- <ui:TextBlock
- FontTypography="Caption"
- Text="{Binding ViewModel.SystemInfo.Os.InstallDate}"
- />
+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
+ CornerRadius="{StaticResource CornerRadiusSmall}">
+ <ui:TextBlock FontTypography="Caption" Text="{Binding ViewModel.SystemInfo.Os.InstallDate}" />
</Border>
</WrapPanel>
</Grid>
@@ -246,10 +209,9 @@
<!-- CPU -->
<ui:CardControl
- Icon="{ui:SymbolIcon DeveloperBoard24}"
Margin="0,0,0,12"
VerticalAlignment="Stretch"
- >
+ Icon="{ui:SymbolIcon DeveloperBoard24}">
<ui:CardControl.Header>
<Grid>
<Grid.RowDefinitions>
@@ -261,12 +223,8 @@
<ui:TextBlock
FontTypography="BodyStrong"
Text="{Binding ViewModel.SystemInfo.Cpu.Name}"
- TextTrimming="CharacterEllipsis"
- />
- <ui:TextBlock
- Foreground="{DynamicResource TextFillColorSecondaryBrush}"
- FontTypography="Caption"
- >
+ TextTrimming="CharacterEllipsis" />
+ <ui:TextBlock FontTypography="Caption" Foreground="{DynamicResource TextFillColorSecondaryBrush}">
<Run Text="{Binding ViewModel.SystemInfo.Cpu.Vendor}" />
<Run Text="·" />
<Run Text="{ext:Loc Dashboard.SystemInfo.Cpu.Cores, {Binding ViewModel.SystemInfo.Cpu.Cores}}" />
@@ -275,24 +233,25 @@
</ui:TextBlock>
</StackPanel>
- <WrapPanel Grid.Row="1" Margin="0,8,0,0" Orientation="Horizontal">
+ <WrapPanel
+ Grid.Row="1"
+ Margin="0,8,0,0"
+ Orientation="Horizontal">
<Border
- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
- CornerRadius="{StaticResource DuckCornerRadiusSmall}"
Margin="0,0,4,4"
Padding="6,2"
- >
+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
+ CornerRadius="{StaticResource CornerRadiusSmall}">
<ui:TextBlock FontTypography="Caption">
<Run Text="{Binding ViewModel.SystemInfo.Cpu.CurrentClockMHz}" />
<Run Text="MHz" />
</ui:TextBlock>
</Border>
<Border
- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
- CornerRadius="{StaticResource DuckCornerRadiusSmall}"
Margin="0,0,4,4"
Padding="6,2"
- >
+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
+ CornerRadius="{StaticResource CornerRadiusSmall}">
<ui:TextBlock FontTypography="Caption">
<Run Text="L2:" />
<Run Text="{Binding ViewModel.SystemInfo.Cpu.L2CacheKB}" />
@@ -300,11 +259,10 @@
</ui:TextBlock>
</Border>
<Border
- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
- CornerRadius="{StaticResource DuckCornerRadiusSmall}"
Margin="0,0,4,4"
Padding="6,2"
- >
+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
+ CornerRadius="{StaticResource CornerRadiusSmall}">
<ui:TextBlock FontTypography="Caption">
<Run Text="L3:" />
<Run Text="{Binding ViewModel.SystemInfo.Cpu.L3CacheKB}" />
@@ -318,10 +276,9 @@
<!-- RAM -->
<ui:CardControl
- Icon="{ui:SymbolIcon Memory16}"
Margin="0,0,12,0"
VerticalAlignment="Stretch"
- >
+ Icon="{ui:SymbolIcon Memory16}">
<ui:CardControl.Header>
<Grid>
<Grid.RowDefinitions>
@@ -335,10 +292,7 @@
<Run Text="{Binding ViewModel.RuntimeRam.TotalGB, StringFormat='{}{0:F1}'}" />
<Run Text="GB RAM" />
</ui:TextBlock>
- <ui:TextBlock
- Foreground="{DynamicResource TextFillColorSecondaryBrush}"
- FontTypography="Caption"
- >
+ <ui:TextBlock FontTypography="Caption" Foreground="{DynamicResource TextFillColorSecondaryBrush}">
<Run Text="{ext:Loc Dashboard.SystemInfo.Ram.Used, {Binding ViewModel.RuntimeRam.UsedGB, StringFormat='{}{0:F1}'}}" />
<Run Text="·" />
<Run Text="{ext:Loc Dashboard.SystemInfo.Ram.Available, {Binding ViewModel.RuntimeRam.AvailableGB, StringFormat='{}{0:F1}'}}" />
@@ -350,15 +304,16 @@
Height="6"
Margin="0,8,0,0"
Maximum="100"
- Value="{Binding ViewModel.RuntimeRam.UsedPercent}"
- />
+ Value="{Binding ViewModel.RuntimeRam.UsedPercent}" />
- <WrapPanel Grid.Row="2" Margin="0,8,0,0" Orientation="Horizontal">
+ <WrapPanel
+ Grid.Row="2"
+ Margin="0,8,0,0"
+ Orientation="Horizontal">
<Border
- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
- CornerRadius="{StaticResource DuckCornerRadiusSmall}"
Padding="6,2"
- >
+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
+ CornerRadius="{StaticResource CornerRadiusSmall}">
<ui:TextBlock FontTypography="Caption">
<Run Text="{ext:Loc Dashboard.SystemInfo.Ram.Modules, {Binding ViewModel.RuntimeRam.Modules.Count, Mode=OneWay}}" />
</ui:TextBlock>
@@ -370,10 +325,9 @@
<!-- GPU -->
<ui:CardControl
- Icon="{ui:SymbolIcon NetworkAdapter16}"
Margin="0"
VerticalAlignment="Stretch"
- >
+ Icon="{ui:SymbolIcon NetworkAdapter16}">
<ui:CardControl.Header>
<Grid>
<Grid.RowDefinitions>
@@ -385,46 +339,43 @@
<ui:TextBlock
FontTypography="BodyStrong"
Text="{Binding ViewModel.SystemInfo.PrimaryGpu.Name}"
- TextTrimming="CharacterEllipsis"
- />
+ TextTrimming="CharacterEllipsis" />
<ui:TextBlock
- Foreground="{DynamicResource TextFillColorSecondaryBrush}"
FontTypography="Caption"
- Text="{Binding ViewModel.SystemInfo.PrimaryGpu.Vendor}"
- />
+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"
+ Text="{Binding ViewModel.SystemInfo.PrimaryGpu.Vendor}" />
</StackPanel>
- <WrapPanel Grid.Row="1" Margin="0,8,0,0" Orientation="Horizontal">
+ <WrapPanel
+ Grid.Row="1"
+ Margin="0,8,0,0"
+ Orientation="Horizontal">
<Border
- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
- CornerRadius="{StaticResource DuckCornerRadiusSmall}"
Margin="0,0,4,4"
Padding="6,2"
- >
+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
+ CornerRadius="{StaticResource CornerRadiusSmall}">
<ui:TextBlock FontTypography="Caption">
<Run Text="{Binding ViewModel.SystemInfo.PrimaryGpu.MemoryMB, Converter={StaticResource MBToGBConverter}}" />
<Run Text="GB" />
</ui:TextBlock>
</Border>
<Border
- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
- CornerRadius="{StaticResource DuckCornerRadiusSmall}"
Margin="0,0,4,4"
Padding="6,2"
- >
+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
+ CornerRadius="{StaticResource CornerRadiusSmall}">
<ui:TextBlock
FontTypography="Caption"
Text="{Binding ViewModel.SystemInfo.PrimaryGpu.DriverVersion}"
- TextTrimming="CharacterEllipsis"
- />
+ TextTrimming="CharacterEllipsis" />
</Border>
<Border
- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
- CornerRadius="{StaticResource DuckCornerRadiusSmall}"
Margin="0,0,4,4"
Padding="6,2"
- Visibility="{Binding ViewModel.SystemInfo.Gpus.Count, Converter={StaticResource GreaterThanOneToVisibilityConverter}}"
- >
+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
+ CornerRadius="{StaticResource CornerRadiusSmall}"
+ Visibility="{Binding ViewModel.SystemInfo.Gpus.Count, Converter={StaticResource GreaterThanOneToVisibilityConverter}}">
<ui:TextBlock FontTypography="Caption">
<Run Text="{ext:Loc Dashboard.SystemInfo.Gpu.More, {Binding ViewModel.SystemInfo.Gpus.Count, Mode=OneWay, Converter={StaticResource MinusOneConverter}}}" />
</ui:TextBlock>
@@ -437,10 +388,9 @@
<!-- Storage Section -->
<ui:TextBlock
- FontTypography="BodyStrong"
Margin="0,20,0,8"
- Text="{ext:Loc Dashboard.SystemInfo.Storage.Header}"
- />
+ FontTypography="BodyStrong"
+ Text="{ext:Loc Dashboard.SystemInfo.Storage.Header}" />
<ItemsControl ItemsSource="{Binding ViewModel.RuntimeDisk.Volumes}">
<ItemsControl.ItemTemplate>
@@ -451,14 +401,8 @@
<ui:SymbolIcon.Style>
<Style TargetType="ui:SymbolIcon">
<Style.Triggers>
- <DataTrigger
- Binding="{Binding IsSystemDrive}"
- Value="True"
- >
- <Setter
- Property="Foreground"
- Value="{DynamicResource SystemFillColorAttentionBrush}"
- />
+ <DataTrigger Binding="{Binding IsSystemDrive}" Value="True">
+ <Setter Property="Foreground" Value="{DynamicResource SystemFillColorAttentionBrush}" />
</DataTrigger>
</Style.Triggers>
</Style>
@@ -477,64 +421,44 @@
<!-- Drive Letter and Label -->
<StackPanel Grid.Row="0" Orientation="Horizontal">
<ui:TextBlock
- FontTypography="BodyStrong"
Margin="0,0,8,0"
- Text="{Binding DriveLetter, StringFormat='({0})'}"
- />
+ FontTypography="BodyStrong"
+ Text="{Binding DriveLetter, StringFormat='({0})'}" />
<ui:TextBlock
- FontTypography="Caption"
Margin="0,0,8,0"
- Text="{Binding VolumeLabel}"
VerticalAlignment="Center"
- />
+ FontTypography="Caption"
+ Text="{Binding VolumeLabel}" />
<Border
- Background="{DynamicResource SystemFillColorAttentionBrush}"
- CornerRadius="{StaticResource DuckCornerRadiusSmall}"
Margin="0,0,4,0"
Padding="5,2"
VerticalAlignment="Center"
- Visibility="{Binding IsSystemDrive, Converter={StaticResource BoolToVisibilityConverter}}"
- >
+ Background="{DynamicResource SystemFillColorAttentionBrush}"
+ CornerRadius="{StaticResource CornerRadiusSmall}"
+ Visibility="{Binding IsSystemDrive, Converter={StaticResource BoolToVisibilityConverter}}">
<ui:TextBlock
FontTypography="Caption"
Foreground="Black"
- Text="{ext:Loc Dashboard.SystemInfo.Storage.System}"
- />
+ Text="{ext:Loc Dashboard.SystemInfo.Storage.System}" />
</Border>
<Border
- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
- CornerRadius="{StaticResource DuckCornerRadiusSmall}"
Margin="0,0,4,0"
Padding="5,2"
VerticalAlignment="Center"
- >
- <ui:TextBlock
- FontTypography="Caption"
- Text="{Binding MediaType}"
- >
+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
+ CornerRadius="{StaticResource CornerRadiusSmall}">
+ <ui:TextBlock FontTypography="Caption" Text="{Binding MediaType}">
<ui:TextBlock.Style>
<Style TargetType="ui:TextBlock">
<Style.Triggers>
- <DataTrigger
- Binding="{Binding MediaType}"
- Value="SSD"
- >
- <Setter
- Property="Foreground"
- Value="{DynamicResource SystemFillColorSuccessBrush}"
- />
+ <DataTrigger Binding="{Binding MediaType}" Value="SSD">
+ <Setter Property="Foreground" Value="{DynamicResource SystemFillColorSuccessBrush}" />
</DataTrigger>
- <DataTrigger
- Binding="{Binding MediaType}"
- Value="HDD"
- >
- <Setter
- Property="Foreground"
- Value="{DynamicResource SystemFillColorCautionBrush}"
- />
+ <DataTrigger Binding="{Binding MediaType}" Value="HDD">
+ <Setter Property="Foreground" Value="{DynamicResource SystemFillColorCautionBrush}" />
</DataTrigger>
</Style.Triggers>
</Style>
@@ -543,43 +467,36 @@
</Border>
<Border
- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
- CornerRadius="{StaticResource DuckCornerRadiusSmall}"
Padding="5,2"
VerticalAlignment="Center"
- >
- <ui:TextBlock
- FontTypography="Caption"
- Text="{Binding DriveFormat}"
- />
+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
+ CornerRadius="{StaticResource CornerRadiusSmall}">
+ <ui:TextBlock FontTypography="Caption" Text="{Binding DriveFormat}" />
</Border>
</StackPanel>
<!-- Model Information -->
<ui:TextBlock
- Foreground="{DynamicResource TextFillColorSecondaryBrush}"
- FontTypography="Caption"
Grid.Row="1"
Margin="0,4,0,0"
+ FontTypography="Caption"
+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"
Text="{Binding Model}"
TextTrimming="CharacterEllipsis"
- Visibility="{Binding Model, Converter={StaticResource NullToVisibilityConverter}}"
- />
+ Visibility="{Binding Model, Converter={StaticResource NullToVisibilityConverter}}" />
<!-- Storage Stats -->
<StackPanel
Grid.Row="2"
Margin="0,4,0,0"
- Orientation="Horizontal"
- >
+ Orientation="Horizontal">
<ui:TextBlock
- Foreground="{DynamicResource TextFillColorSecondaryBrush}"
FontTypography="Caption"
+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"
Text="{ext:Loc Dashboard.SystemInfo.Storage.DiskInfo,
{Binding UsedSizeGB, StringFormat='{}{0:F1}'},
{Binding TotalSizeGB, StringFormat='{}{0:F1}'},
- {Binding AvailableSizeGB, StringFormat='{}{0:F1}'}}"
- />
+ {Binding AvailableSizeGB, StringFormat='{}{0:F1}'}}" />
</StackPanel>
<!-- Progress Bar -->
@@ -588,8 +505,7 @@
Height="6"
Margin="0,8,0,0"
Maximum="100"
- Value="{Binding UsedPercent}"
- />
+ Value="{Binding UsedPercent}" />
</Grid>
</ui:CardControl.Header>
</ui:CardControl>
diff --git a/optimizerDuck/UI/Pages/DiskCleanupPage.xaml b/optimizerDuck/UI/Pages/DiskCleanupPage.xaml
index 189575d..e4686a0 100644
--- a/optimizerDuck/UI/Pages/DiskCleanupPage.xaml
+++ b/optimizerDuck/UI/Pages/DiskCleanupPage.xaml
@@ -10,13 +10,13 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
Title="DiskCleanupPage"
- Style="{StaticResource DuckPageRootStyle}"
d:DataContext="{d:DesignInstance local:DiskCleanupPage}"
d:DesignHeight="1200"
d:DesignWidth="800"
ui:Design.Background="Black"
ui:Design.Foreground="White"
ScrollViewer.CanContentScroll="False"
+ Style="{StaticResource PageRootStyle}"
mc:Ignorable="d">
<Page.Resources>
<converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
@@ -51,15 +51,9 @@
<Grid RowDefinitions="Auto,*">
<!-- Header -->
- <StackPanel Style="{StaticResource DuckPageHeaderStyle}">
- <ui:TextBlock
- Style="{StaticResource DuckPageTitleStyle}"
- Text="{ext:Loc DiskCleanup.Header.Title}"
- />
- <ui:TextBlock
- Style="{StaticResource DuckPageDescriptionStyle}"
- Text="{ext:Loc DiskCleanup.Header.Description}"
- />
+ <StackPanel Style="{StaticResource PageHeaderStyle}">
+ <ui:TextBlock Style="{StaticResource PageTitleStyle}" Text="{ext:Loc DiskCleanup.Header.Title}" />
+ <ui:TextBlock Style="{StaticResource PageDescriptionStyle}" Text="{ext:Loc DiskCleanup.Header.Description}" />
</StackPanel>
<!-- Loading State -->
@@ -89,7 +83,7 @@
RowDefinitions="Auto,*"
Visibility="{Binding ViewModel.HasData, Converter={StaticResource BooleanToVisibilityConverter}}">
<!-- Toolbar Card -->
- <Border Style="{StaticResource DuckToolbarSurfaceStyle}">
+ <Border Style="{StaticResource ToolbarSurfaceStyle}">
<Grid ColumnDefinitions="Auto,*,Auto">
<!-- Summary Info -->
<StackPanel Grid.Column="0" VerticalAlignment="Center">
@@ -111,8 +105,8 @@
Orientation="Horizontal">
<!-- Sort Dropdown -->
<ComboBox
- Style="{StaticResource DuckComboBoxStyle}"
SelectedIndex="{Binding ViewModel.SelectedSortByIndex}"
+ Style="{StaticResource ComboBoxStyle}"
ToolTip="{ext:Loc Common.SortBy}">
<ComboBoxItem HorizontalContentAlignment="Left">
<StackPanel HorizontalAlignment="Left" Orientation="Horizontal">
@@ -188,7 +182,7 @@
<ItemsControl.ItemTemplate>
<DataTemplate DataType="{x:Type cleanup1:CleanupItem}">
- <Border Style="{StaticResource DuckListRowStyle}">
+ <Border Style="{StaticResource ListRowStyle}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
@@ -266,7 +260,7 @@
<Border
Margin="0,6,0,0"
HorizontalAlignment="Left"
- CornerRadius="{StaticResource DuckCornerRadiusSmall}">
+ CornerRadius="{StaticResource CornerRadiusSmall}">
<Border.Style>
<Style TargetType="Border">
<Setter Property="Padding" Value="8,3" />
diff --git a/optimizerDuck/UI/Pages/Features/Categories/FeatureCategoryPage.xaml b/optimizerDuck/UI/Pages/Features/Categories/FeatureCategoryPage.xaml
index 988dec7..c2277f0 100644
--- a/optimizerDuck/UI/Pages/Features/Categories/FeatureCategoryPage.xaml
+++ b/optimizerDuck/UI/Pages/Features/Categories/FeatureCategoryPage.xaml
@@ -9,13 +9,13 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
Title="{Binding ViewModel.CategoryName}"
- Style="{StaticResource DuckPageRootStyle}"
d:DataContext="{d:DesignInstance features:FeatureCategoryPage}"
d:DesignHeight="650"
d:DesignWidth="800"
ui:Design.Background="Black"
ui:Design.Foreground="White"
ScrollViewer.CanContentScroll="False"
+ Style="{StaticResource PageRootStyle}"
mc:Ignorable="d">
<Page.Resources>
<converters:BooleanToVisibilityConverter x:Key="BoolToVisibilityConverter" />
@@ -28,67 +28,65 @@
<RowDefinition Height="*" />
</Grid.RowDefinitions>
- <StackPanel Grid.Row="0" Style="{StaticResource DuckPageHeaderStyle}">
+ <StackPanel Grid.Row="0" Style="{StaticResource PageHeaderStyle}">
<StackPanel Margin="0,0,0,8" Orientation="Horizontal">
<ui:SymbolIcon
Margin="0,0,12,0"
VerticalAlignment="Center"
FontSize="24"
- Foreground="{DynamicResource DuckAccentYellowBrush}"
+ Foreground="{DynamicResource AccentYellowBrush}"
Symbol="{Binding ViewModel.CategoryIcon}" />
<ui:TextBlock
VerticalAlignment="Center"
- Style="{StaticResource DuckPageTitleStyle}"
+ Style="{StaticResource PageTitleStyle}"
Text="{Binding ViewModel.CategoryName}" />
</StackPanel>
<ui:TextBlock
- Style="{StaticResource DuckPageDescriptionStyle}"
- Text="{Binding ViewModel.CategoryDescription}"
- Margin="0" />
+ Margin="0"
+ Style="{StaticResource PageDescriptionStyle}"
+ Text="{Binding ViewModel.CategoryDescription}" />
</StackPanel>
- <Border
- Grid.Row="1"
- Style="{StaticResource DuckToolbarSurfaceStyle}">
- <WrapPanel Orientation="Horizontal">
- <ui:TextBox
- Style="{StaticResource DuckSearchBoxStyle}"
- HorizontalAlignment="Left"
- PlaceholderText="{ext:Loc Common.Search.Placeholder}"
- Text="{Binding ViewModel.SearchText, UpdateSourceTrigger=PropertyChanged}" />
+ <Border Grid.Row="1" Style="{StaticResource ToolbarSurfaceStyle}">
+ <WrapPanel Orientation="Horizontal">
+ <ui:TextBox
+ HorizontalAlignment="Left"
+ PlaceholderText="{ext:Loc Common.Search.Placeholder}"
+ Style="{StaticResource SearchBoxStyle}"
+ Text="{Binding ViewModel.SearchText, UpdateSourceTrigger=PropertyChanged}" />
- <ComboBox
- Style="{StaticResource DuckComboBoxStyle}"
- SelectedIndex="{Binding ViewModel.SelectedSortByIndex}"
- ToolTip="{ext:Loc Common.SortBy}"
- ToolTipService.BetweenShowDelay="160"
- ToolTipService.Placement="Top">
- <ComboBoxItem HorizontalContentAlignment="Left">
- <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
- <ui:SymbolIcon
- Margin="0,0,6,0"
- HorizontalAlignment="Left"
- Symbol="TextSortAscending24" />
- <TextBlock
- Grid.Column="1"
- HorizontalAlignment="Left"
- Text="{ext:Loc Common.SortBy.Name}" />
- </Grid>
- </ComboBoxItem>
- <ComboBoxItem HorizontalContentAlignment="Left">
- <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
- <ui:SymbolIcon
- Margin="0,0,6,0"
- HorizontalAlignment="Left"
- Symbol="ToggleRight24" />
- <TextBlock
- Grid.Column="1"
- HorizontalAlignment="Left"
- Text="{ext:Loc Common.SortBy.Status}" />
- </Grid>
- </ComboBoxItem>
- </ComboBox>
- </WrapPanel>
+ <ComboBox
+ SelectedIndex="{Binding ViewModel.SelectedSortByIndex}"
+ Style="{StaticResource ComboBoxStyle}"
+ ToolTip="{ext:Loc Common.SortBy}"
+ ToolTipService.BetweenShowDelay="160"
+ ToolTipService.Placement="Top">
+ <ComboBoxItem HorizontalContentAlignment="Left">
+ <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
+ <ui:SymbolIcon
+ Margin="0,0,6,0"
+ HorizontalAlignment="Left"
+ Symbol="TextSortAscending24" />
+ <TextBlock
+ Grid.Column="1"
+ HorizontalAlignment="Left"
+ Text="{ext:Loc Common.SortBy.Name}" />
+ </Grid>
+ </ComboBoxItem>
+ <ComboBoxItem HorizontalContentAlignment="Left">
+ <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
+ <ui:SymbolIcon
+ Margin="0,0,6,0"
+ HorizontalAlignment="Left"
+ Symbol="ToggleRight24" />
+ <TextBlock
+ Grid.Column="1"
+ HorizontalAlignment="Left"
+ Text="{ext:Loc Common.SortBy.Status}" />
+ </Grid>
+ </ComboBoxItem>
+ </ComboBox>
+ </WrapPanel>
</Border>
<ScrollViewer
@@ -96,17 +94,18 @@
HorizontalScrollBarVisibility="Disabled"
VerticalScrollBarVisibility="Auto">
<!-- Sections -->
- <ItemsControl Style="{x:Null}" Margin="0" ItemsSource="{Binding ViewModel.Sections}">
+ <ItemsControl
+ Margin="0"
+ ItemsSource="{Binding ViewModel.Sections}"
+ Style="{x:Null}">
<ItemsControl.ItemTemplate>
<DataTemplate>
<StackPanel Margin="0,0,0,20">
- <ui:TextBlock
- Style="{StaticResource DuckSectionHeaderStyle}"
- Text="{Binding Name}" />
+ <ui:TextBlock Style="{StaticResource SectionHeaderStyle}" Text="{Binding Name}" />
<ItemsControl ItemsSource="{Binding Features}">
<ItemsControl.ItemTemplate>
<DataTemplate>
- <ui:CardControl Margin="0,0,0,8">
+ <ui:CardControl Margin="0,0,0,4">
<ui:CardControl.Icon>
<ui:SymbolIcon Symbol="{Binding Icon}" />
</ui:CardControl.Icon>
@@ -130,12 +129,12 @@
HorizontalAlignment="Right"
Orientation="Horizontal">
<ui:ToggleSwitch
- Style="{StaticResource DuckToggleSwitchStyle}"
Command="{Binding ToggleCommand}"
Cursor="Hand"
IsChecked="{Binding IsEnabled, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
OffContent="{ext:Loc Common.Toggle.Off}"
- OnContent="{ext:Loc Common.Toggle.On}" />
+ OnContent="{ext:Loc Common.Toggle.On}"
+ Style="{StaticResource ToggleSwitchStyle}" />
<ui:Button
Margin="8,0,0,0"
VerticalAlignment="Center"
diff --git a/optimizerDuck/UI/Pages/Features/FeaturesPage.xaml b/optimizerDuck/UI/Pages/Features/FeaturesPage.xaml
index deed1e0..9ee5173 100644
--- a/optimizerDuck/UI/Pages/Features/FeaturesPage.xaml
+++ b/optimizerDuck/UI/Pages/Features/FeaturesPage.xaml
@@ -1,15 +1,7 @@
<Page
- Style="{StaticResource DuckPageRootStyle}"
- ScrollViewer.CanContentScroll="False"
- Title="Features"
- d:DataContext="{d:DesignInstance pages:FeaturesPage}"
- d:DesignHeight="650"
- d:DesignWidth="800"
- mc:Ignorable="d"
- ui:Design.Background="Black"
- ui:Design.Foreground="White"
x:Class="optimizerDuck.UI.Pages.FeaturesPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns: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"
@@ -17,8 +9,15 @@
xmlns:pages="clr-namespace:optimizerDuck.UI.Pages"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
xmlns:vm="clr-namespace:optimizerDuck.UI.ViewModels.Pages"
- xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
->
+ Title="Features"
+ d:DataContext="{d:DesignInstance pages:FeaturesPage}"
+ d:DesignHeight="650"
+ d:DesignWidth="800"
+ ui:Design.Background="Black"
+ ui:Design.Foreground="White"
+ ScrollViewer.CanContentScroll="False"
+ Style="{StaticResource PageRootStyle}"
+ mc:Ignorable="d">
<Page.Resources>
<converters:BooleanToVisibilityConverter x:Key="BoolToVisibilityConverter" />
<converters:WidthToColumnConverter x:Key="WidthToColumnConverter" />
@@ -30,25 +29,18 @@
<RowDefinition Height="*" />
</Grid.RowDefinitions>
- <StackPanel Grid.Row="0" Style="{StaticResource DuckPageHeaderStyle}">
- <ui:TextBlock Style="{StaticResource DuckPageTitleStyle}" Text="{ext:Loc Features.Title}" />
- <ui:TextBlock
- Style="{StaticResource DuckPageDescriptionStyle}"
- Text="{ext:Loc Features.Description}"
- />
+ <StackPanel Grid.Row="0" Style="{StaticResource PageHeaderStyle}">
+ <ui:TextBlock Style="{StaticResource PageTitleStyle}" Text="{ext:Loc Features.Title}" />
+ <ui:TextBlock Style="{StaticResource PageDescriptionStyle}" Text="{ext:Loc Features.Description}" />
</StackPanel>
<ui:VirtualizingItemsControl
Grid.Row="1"
- ItemsSource="{Binding ViewModel.Categories}"
Margin="0"
- >
+ ItemsSource="{Binding ViewModel.Categories}">
<ui:VirtualizingItemsControl.Template>
<ControlTemplate TargetType="ItemsControl">
- <ScrollViewer
- HorizontalScrollBarVisibility="Disabled"
- VerticalScrollBarVisibility="Auto"
- >
+ <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
<ItemsPresenter />
</ScrollViewer>
</ControlTemplate>
@@ -56,10 +48,7 @@
<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>
@@ -73,60 +62,51 @@
<ui:VirtualizingItemsControl.ItemTemplate>
<DataTemplate DataType="{x:Type vm:FeatureCategoryItemViewModel}">
<ui:CardAction
+ Padding="20,18"
Command="{Binding DataContext.ViewModel.NavigateToCategoryCommand, RelativeSource={RelativeSource AncestorType=Page}}"
CommandParameter="{Binding}"
- IsChevronVisible="False"
- Padding="20,18"
- >
+ IsChevronVisible="False">
<Grid RowDefinitions="Auto,Auto,Auto">
<ui:SymbolIcon
- FontSize="32"
Grid.Row="0"
- HorizontalAlignment="Left"
Margin="0,0,0,12"
- Foreground="{DynamicResource DuckAccentYellowBrush}"
- Symbol="{Binding Icon}"
- />
+ HorizontalAlignment="Left"
+ FontSize="32"
+ Foreground="{DynamicResource AccentYellowBrush}"
+ Symbol="{Binding Icon}" />
<ui:TextBlock
- FontTypography="Subtitle"
Grid.Row="1"
Margin="0,0,0,6"
+ FontTypography="Subtitle"
Text="{Binding Name}"
- TextWrapping="Wrap"
- />
+ TextWrapping="Wrap" />
<ui:TextBlock
+ Grid.Row="2"
Appearance="Secondary"
FontTypography="Body"
- Grid.Row="2"
Text="{Binding Description}"
- TextWrapping="Wrap"
- />
+ TextWrapping="Wrap" />
</Grid>
</ui:CardAction>
</DataTemplate>
</ui:VirtualizingItemsControl.ItemTemplate>
</ui:VirtualizingItemsControl>
- <Border
- Grid.Row="1"
- Visibility="{Binding ViewModel.IsLoading, Converter={StaticResource BoolToVisibilityConverter}}"
- >
+ <Border Grid.Row="1" 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"
- Text="{ext:Loc ToggleFeatures.Loading}"
- />
+ FontTypography="BodyStrong"
+ Text="{ext:Loc ToggleFeatures.Loading}" />
</StackPanel>
</Border>
</Grid>
diff --git a/optimizerDuck/UI/Pages/Optimize/Categories/OptimizationPage.xaml b/optimizerDuck/UI/Pages/Optimize/Categories/OptimizationPage.xaml
index 2b5b742..38bfad6 100644
--- a/optimizerDuck/UI/Pages/Optimize/Categories/OptimizationPage.xaml
+++ b/optimizerDuck/UI/Pages/Optimize/Categories/OptimizationPage.xaml
@@ -10,13 +10,13 @@
xmlns:optimizations="clr-namespace:optimizerDuck.UI.Pages.Optimizations"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
Title="OptimizationPage"
- Style="{StaticResource DuckPageRootStyle}"
d:DataContext="{d:DesignInstance optimizations:OptimizationPage}"
d:DesignHeight="650"
d:DesignWidth="800"
ui:Design.Background="Black"
ui:Design.Foreground="White"
ScrollViewer.CanContentScroll="False"
+ Style="{StaticResource PageRootStyle}"
mc:Ignorable="d">
<Page.Resources>
<converters:WidthToColumnConverter x:Key="WidthToColumnConverter" />
@@ -37,134 +37,132 @@
<!-- Main Content -->
<Grid RowDefinitions="Auto,*" Visibility="{Binding ViewModel.IsLoading, Converter={StaticResource InverseBooleanToVisibilityConverter}}">
<!-- Toolbar -->
- <Border Grid.Row="0" Style="{StaticResource DuckToolbarSurfaceStyle}">
- <WrapPanel
- VerticalAlignment="Center"
- Orientation="Horizontal">
- <!-- Search -->
- <ui:TextBox
- Style="{StaticResource DuckSearchBoxStyle}"
- PlaceholderText="{ext:Loc Common.Search.Placeholder}"
- Text="{Binding ViewModel.SearchText, UpdateSourceTrigger=PropertyChanged}" />
+ <Border Grid.Row="0" Style="{StaticResource ToolbarSurfaceStyle}">
+ <WrapPanel VerticalAlignment="Center" Orientation="Horizontal">
+ <!-- Search -->
+ <ui:TextBox
+ PlaceholderText="{ext:Loc Common.Search.Placeholder}"
+ Style="{StaticResource SearchBoxStyle}"
+ Text="{Binding ViewModel.SearchText, UpdateSourceTrigger=PropertyChanged}" />
- <!-- Filter by Risk -->
- <ComboBox
- Style="{StaticResource DuckComboBoxStyle}"
- SelectedIndex="{Binding ViewModel.SelectedRiskFilterIndex}"
- ToolTip="{ext:Loc Common.Filter}"
- ToolTipService.BetweenShowDelay="160"
- ToolTipService.Placement="Top">
- <ComboBoxItem HorizontalContentAlignment="Left">
- <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
- <ui:SymbolIcon
- Margin="0,0,6,0"
- HorizontalAlignment="Left"
- Symbol="Filter24" />
- <TextBlock
- Grid.Column="1"
- HorizontalAlignment="Left"
- Text="{ext:Loc Common.Filter.All}" />
- </Grid>
- </ComboBoxItem>
- <ComboBoxItem HorizontalContentAlignment="Left">
- <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
- <ui:SymbolIcon
- Margin="0,0,6,0"
- Foreground="{DynamicResource SystemFillColorSuccessBrush}"
- Symbol="ShieldCheckmark24" />
- <TextBlock Grid.Column="1" Text="{ext:Loc Optimizer.UI.Risk.Safe}" />
- </Grid>
- </ComboBoxItem>
- <ComboBoxItem HorizontalContentAlignment="Left">
- <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
- <ui:SymbolIcon
- Margin="0,0,6,0"
- Foreground="{DynamicResource SystemFillColorCautionBrush}"
- Symbol="Warning24" />
- <TextBlock Grid.Column="1" Text="{ext:Loc Optimizer.UI.Risk.Moderate}" />
- </Grid>
- </ComboBoxItem>
- <ComboBoxItem HorizontalContentAlignment="Left">
- <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
- <ui:SymbolIcon
- Margin="0,0,6,0"
- Foreground="{DynamicResource SystemFillColorCriticalBrush}"
- Symbol="ShieldError24" />
- <TextBlock Grid.Column="1" Text="{ext:Loc Optimizer.UI.Risk.Risky}" />
- </Grid>
- </ComboBoxItem>
- </ComboBox>
+ <!-- Filter by Risk -->
+ <ComboBox
+ SelectedIndex="{Binding ViewModel.SelectedRiskFilterIndex}"
+ Style="{StaticResource ComboBoxStyle}"
+ ToolTip="{ext:Loc Common.Filter}"
+ ToolTipService.BetweenShowDelay="160"
+ ToolTipService.Placement="Top">
+ <ComboBoxItem HorizontalContentAlignment="Left">
+ <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
+ <ui:SymbolIcon
+ Margin="0,0,6,0"
+ HorizontalAlignment="Left"
+ Symbol="Filter24" />
+ <TextBlock
+ Grid.Column="1"
+ HorizontalAlignment="Left"
+ Text="{ext:Loc Common.Filter.All}" />
+ </Grid>
+ </ComboBoxItem>
+ <ComboBoxItem HorizontalContentAlignment="Left">
+ <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
+ <ui:SymbolIcon
+ Margin="0,0,6,0"
+ Foreground="{DynamicResource SystemFillColorSuccessBrush}"
+ Symbol="ShieldCheckmark24" />
+ <TextBlock Grid.Column="1" Text="{ext:Loc Optimizer.UI.Risk.Safe}" />
+ </Grid>
+ </ComboBoxItem>
+ <ComboBoxItem HorizontalContentAlignment="Left">
+ <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
+ <ui:SymbolIcon
+ Margin="0,0,6,0"
+ Foreground="{DynamicResource SystemFillColorCautionBrush}"
+ Symbol="Warning24" />
+ <TextBlock Grid.Column="1" Text="{ext:Loc Optimizer.UI.Risk.Moderate}" />
+ </Grid>
+ </ComboBoxItem>
+ <ComboBoxItem HorizontalContentAlignment="Left">
+ <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
+ <ui:SymbolIcon
+ Margin="0,0,6,0"
+ Foreground="{DynamicResource SystemFillColorCriticalBrush}"
+ Symbol="ShieldError24" />
+ <TextBlock Grid.Column="1" Text="{ext:Loc Optimizer.UI.Risk.Risky}" />
+ </Grid>
+ </ComboBoxItem>
+ </ComboBox>
- <!-- Sort By -->
- <ComboBox
- Style="{StaticResource DuckComboBoxStyle}"
- SelectedIndex="{Binding ViewModel.SelectedSortByIndex}"
- ToolTip="{ext:Loc Common.SortBy}"
- ToolTipService.BetweenShowDelay="160"
- ToolTipService.Placement="Top">
- <ComboBoxItem HorizontalContentAlignment="Left">
- <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
- <ui:SymbolIcon
- Margin="0,0,6,0"
- HorizontalAlignment="Left"
- Symbol="Filter24" />
- <TextBlock Grid.Column="1" HorizontalAlignment="Left">
- <Run Text="{ext:Loc Common.SortBy.Risk}" />
- <Run Text=" &amp; " />
- <Run Text="{ext:Loc Common.SortBy.Status}" />
- </TextBlock>
- </Grid>
- </ComboBoxItem>
- <ComboBoxItem HorizontalContentAlignment="Left">
- <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
- <ui:SymbolIcon
- Margin="0,0,6,0"
- HorizontalAlignment="Left"
- Symbol="TextSortAscending24" />
- <TextBlock
- Grid.Column="1"
- HorizontalAlignment="Left"
- Text="{ext:Loc Common.SortBy.Name}" />
- </Grid>
- </ComboBoxItem>
- <ComboBoxItem HorizontalContentAlignment="Left">
- <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
- <ui:SymbolIcon
- Margin="0,0,6,0"
- HorizontalAlignment="Left"
- Symbol="Shield24" />
- <TextBlock
- Grid.Column="1"
- HorizontalAlignment="Left"
- Text="{ext:Loc Common.SortBy.Risk}" />
- </Grid>
- </ComboBoxItem>
- <ComboBoxItem HorizontalContentAlignment="Left">
- <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
- <ui:SymbolIcon
- Margin="0,0,6,0"
- HorizontalAlignment="Left"
- Symbol="ToggleRight24" />
- <TextBlock
- Grid.Column="1"
- HorizontalAlignment="Left"
- Text="{ext:Loc Common.SortBy.Status}" />
- </Grid>
- </ComboBoxItem>
- </ComboBox>
+ <!-- Sort By -->
+ <ComboBox
+ SelectedIndex="{Binding ViewModel.SelectedSortByIndex}"
+ Style="{StaticResource ComboBoxStyle}"
+ ToolTip="{ext:Loc Common.SortBy}"
+ ToolTipService.BetweenShowDelay="160"
+ ToolTipService.Placement="Top">
+ <ComboBoxItem HorizontalContentAlignment="Left">
+ <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
+ <ui:SymbolIcon
+ Margin="0,0,6,0"
+ HorizontalAlignment="Left"
+ Symbol="Filter24" />
+ <TextBlock Grid.Column="1" HorizontalAlignment="Left">
+ <Run Text="{ext:Loc Common.SortBy.Risk}" />
+ <Run Text=" &amp; " />
+ <Run Text="{ext:Loc Common.SortBy.Status}" />
+ </TextBlock>
+ </Grid>
+ </ComboBoxItem>
+ <ComboBoxItem HorizontalContentAlignment="Left">
+ <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
+ <ui:SymbolIcon
+ Margin="0,0,6,0"
+ HorizontalAlignment="Left"
+ Symbol="TextSortAscending24" />
+ <TextBlock
+ Grid.Column="1"
+ HorizontalAlignment="Left"
+ Text="{ext:Loc Common.SortBy.Name}" />
+ </Grid>
+ </ComboBoxItem>
+ <ComboBoxItem HorizontalContentAlignment="Left">
+ <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
+ <ui:SymbolIcon
+ Margin="0,0,6,0"
+ HorizontalAlignment="Left"
+ Symbol="Shield24" />
+ <TextBlock
+ Grid.Column="1"
+ HorizontalAlignment="Left"
+ Text="{ext:Loc Common.SortBy.Risk}" />
+ </Grid>
+ </ComboBoxItem>
+ <ComboBoxItem HorizontalContentAlignment="Left">
+ <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
+ <ui:SymbolIcon
+ Margin="0,0,6,0"
+ HorizontalAlignment="Left"
+ Symbol="ToggleRight24" />
+ <TextBlock
+ Grid.Column="1"
+ HorizontalAlignment="Left"
+ Text="{ext:Loc Common.SortBy.Status}" />
+ </Grid>
+ </ComboBoxItem>
+ </ComboBox>
- <!-- Hide Applied toggle -->
- <ToggleButton
- Margin="0,0,0,0"
- VerticalAlignment="Stretch"
- IsChecked="{Binding ViewModel.HideApplied}"
- Visibility="{Binding ViewModel.HasAppliedOptimizations, Converter={StaticResource BooleanToVisibilityConverter}}">
- <StackPanel Orientation="Horizontal">
- <ui:SymbolIcon Margin="0,0,6,0" Symbol="EyeOff24" />
- <TextBlock Text="{ext:Loc Optimizer.Menu.HideApplied}" />
- </StackPanel>
- </ToggleButton>
- </WrapPanel>
+ <!-- Hide Applied toggle -->
+ <ToggleButton
+ Margin="0,0,0,0"
+ VerticalAlignment="Stretch"
+ IsChecked="{Binding ViewModel.HideApplied}"
+ Visibility="{Binding ViewModel.HasAppliedOptimizations, Converter={StaticResource BooleanToVisibilityConverter}}">
+ <StackPanel Orientation="Horizontal">
+ <ui:SymbolIcon Margin="0,0,6,0" Symbol="EyeOff24" />
+ <TextBlock Text="{ext:Loc Optimizer.Menu.HideApplied}" />
+ </StackPanel>
+ </ToggleButton>
+ </WrapPanel>
</Border>
<!-- No search results -->
@@ -217,7 +215,7 @@
Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
BorderBrush="{DynamicResource CardStrokeColorDefaultBrush}"
BorderThickness="1"
- CornerRadius="{StaticResource DuckCornerRadiusMedium}">
+ CornerRadius="{StaticResource CornerRadiusMedium}">
<Grid RowDefinitions="Auto,Auto,Auto,Auto,*">
<ui:TextBlock
Grid.Row="0"
@@ -252,7 +250,7 @@
Padding="6,2"
HorizontalAlignment="Left"
Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
- CornerRadius="{StaticResource DuckCornerRadiusSmall}">
+ CornerRadius="{StaticResource CornerRadiusSmall}">
<StackPanel Orientation="Horizontal">
<ui:SymbolIcon
Margin="0,0,6,0"
@@ -289,7 +287,7 @@
<Border
Padding="6,2"
HorizontalAlignment="Left"
- CornerRadius="{StaticResource DuckCornerRadiusSmall}">
+ CornerRadius="{StaticResource CornerRadiusSmall}">
<Border.Style>
<Style TargetType="Border">
<Setter Property="Background" Value="{DynamicResource SystemFillColorSuccessBrush}" />
@@ -325,7 +323,7 @@
Padding="6,2"
HorizontalAlignment="Left"
Background="{DynamicResource CardBackgroundDisabled}"
- CornerRadius="{StaticResource DuckCornerRadiusSmall}"
+ CornerRadius="{StaticResource CornerRadiusSmall}"
ToolTip="{Binding State.AppliedAt}"
ToolTipService.InitialShowDelay="150"
ToolTipService.Placement="Top"
@@ -348,12 +346,12 @@
VerticalAlignment="Bottom"
Orientation="Horizontal">
<ui:ToggleSwitch
- Style="{StaticResource DuckToggleSwitchStyle}"
HorizontalAlignment="Right"
Command="{Binding DataContext.ViewModel.ToggleOptimizationCommand, RelativeSource={RelativeSource AncestorType=Page}}"
CommandParameter="{Binding}"
Cursor="Hand"
- IsChecked="{Binding State.IsApplied, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+ IsChecked="{Binding State.IsApplied, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+ Style="{StaticResource ToggleSwitchStyle}" />
<ui:Button
HorizontalAlignment="Right"
VerticalAlignment="Bottom"
@@ -367,6 +365,7 @@
<ui:Button
HorizontalAlignment="Right"
VerticalAlignment="Bottom"
+ Appearance="Transparent"
Background="Transparent"
BorderBrush="Transparent"
Command="{Binding DataContext.ViewModel.ShowDetailsCommand, RelativeSource={RelativeSource AncestorType=Page}}"
diff --git a/optimizerDuck/UI/Pages/Optimize/OptimizePage.xaml b/optimizerDuck/UI/Pages/Optimize/OptimizePage.xaml
index f12d1e8..17db081 100644
--- a/optimizerDuck/UI/Pages/Optimize/OptimizePage.xaml
+++ b/optimizerDuck/UI/Pages/Optimize/OptimizePage.xaml
@@ -1,33 +1,31 @@
<Page
- Style="{StaticResource DuckPageRootStyle}"
- ScrollViewer.CanContentScroll="False"
- Title="OptimizerPage"
- d:DataContext="{d:DesignInstance pages:OptimizePage}"
- d:DesignHeight="650"
- d:DesignWidth="800"
- mc:Ignorable="d"
- ui:Design.Background="Black"
- ui:Design.Foreground="White"
x:Class="optimizerDuck.UI.Pages.OptimizePage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:pages="clr-namespace:optimizerDuck.UI.Pages"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
- xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
->
+ Title="OptimizerPage"
+ d:DataContext="{d:DesignInstance pages:OptimizePage}"
+ d:DesignHeight="650"
+ d:DesignWidth="800"
+ ui:Design.Background="Black"
+ ui:Design.Foreground="White"
+ ScrollViewer.CanContentScroll="False"
+ Style="{StaticResource PageRootStyle}"
+ mc:Ignorable="d">
<Grid>
<ui:NavigationView
+ x:Name="RootNavigation"
+ Margin="0"
+ Padding="0"
FrameMargin="0"
IsBackButtonVisible="Collapsed"
IsFooterSeparatorVisible="False"
IsPaneToggleVisible="False"
IsTopSeparatorVisible="False"
- Margin="0"
MenuItemsSource="{Binding ViewModel.OptimizationCategories}"
- Padding="0"
- PaneDisplayMode="Top"
- x:Name="RootNavigation"
- />
+ PaneDisplayMode="Top" />
</Grid>
</Page>
diff --git a/optimizerDuck/UI/Pages/ScheduledTasksPage.xaml b/optimizerDuck/UI/Pages/ScheduledTasksPage.xaml
index 56964e7..4c32573 100644
--- a/optimizerDuck/UI/Pages/ScheduledTasksPage.xaml
+++ b/optimizerDuck/UI/Pages/ScheduledTasksPage.xaml
@@ -10,15 +10,14 @@
xmlns:scheduledTask="clr-namespace:optimizerDuck.Domain.Optimizations.Models.ScheduledTask"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
Title="ScheduledTasksPage"
- Style="{StaticResource DuckPageRootStyle}"
d:DataContext="{d:DesignInstance local:ScheduledTasksPage}"
d:DesignHeight="1200"
d:DesignWidth="800"
ui:Design.Background="Black"
ui:Design.Foreground="White"
ScrollViewer.CanContentScroll="False"
- mc:Ignorable="d"
->
+ Style="{StaticResource PageRootStyle}"
+ mc:Ignorable="d">
<Page.Resources>
<converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
<BooleanToVisibilityConverter x:Key="WpfBoolToVis" />
@@ -28,48 +27,40 @@
<Grid RowDefinitions="Auto, *">
<!-- Header -->
- <StackPanel Style="{StaticResource DuckPageHeaderStyle}">
+ <StackPanel Style="{StaticResource PageHeaderStyle}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<StackPanel Grid.Column="0">
- <ui:TextBlock
- Style="{StaticResource DuckPageTitleStyle}"
- Text="{ext:Loc ScheduledTasks.Header.Title}"
- />
- <ui:TextBlock
- Style="{StaticResource DuckPageDescriptionStyle}"
- Text="{ext:Loc ScheduledTasks.Header.Description}"
- />
+ <ui:TextBlock Style="{StaticResource PageTitleStyle}" Text="{ext:Loc ScheduledTasks.Header.Title}" />
+ <ui:TextBlock Style="{StaticResource PageDescriptionStyle}" Text="{ext:Loc ScheduledTasks.Header.Description}" />
</StackPanel>
- <WrapPanel Grid.Column="1" VerticalAlignment="Center" Orientation="Horizontal">
+ <WrapPanel
+ Grid.Column="1"
+ VerticalAlignment="Center"
+ Orientation="Horizontal">
<ui:Button
Margin="0,0,8,0"
Appearance="Secondary"
Command="{Binding ViewModel.OpenTaskSchedulerCommand}"
Content="{ext:Loc ScheduledTasks.Menu.OpenSettings}"
Icon="{ui:SymbolIcon Settings24,
- FontSize=18}"
- />
+ FontSize=18}" />
<ui:Button
Appearance="Primary"
Command="{Binding ViewModel.RefreshCommand}"
Content="{ext:Loc StartupManager.Menu.Refresh}"
Icon="{ui:SymbolIcon ArrowClockwise24,
FontSize=18}"
- Visibility="{Binding ViewModel.ShowRefreshButton, Converter={StaticResource BooleanToVisibilityConverter}}"
- />
+ Visibility="{Binding ViewModel.ShowRefreshButton, Converter={StaticResource BooleanToVisibilityConverter}}" />
</WrapPanel>
</Grid>
</StackPanel>
<!-- Loading Indicator -->
- <Border
- Grid.Row="1"
- Visibility="{Binding ViewModel.IsLoading, Converter={StaticResource BooleanToVisibilityConverter}}"
- >
+ <Border Grid.Row="1" Visibility="{Binding ViewModel.IsLoading, Converter={StaticResource BooleanToVisibilityConverter}}">
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
<ui:ProgressRing
Width="48"
@@ -77,20 +68,17 @@
Margin="0,0,0,16"
HorizontalAlignment="Center"
VerticalAlignment="Center"
- IsIndeterminate="True"
- />
+ IsIndeterminate="True" />
<ui:TextBlock
HorizontalAlignment="Center"
FontTypography="BodyStrong"
- Text="{ext:Loc ScheduledTasks.Loading}"
- />
+ Text="{ext:Loc ScheduledTasks.Loading}" />
<ui:TextBlock
Margin="0,4,0,0"
HorizontalAlignment="Center"
- Foreground="{DynamicResource TextFillColorSecondaryBrush}"
FontTypography="Caption"
- Text="{ext:Loc ScheduledTasks.Loading.Hint}"
- />
+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"
+ Text="{ext:Loc ScheduledTasks.Loading.Hint}" />
</StackPanel>
</Border>
@@ -102,10 +90,7 @@
<Style.Triggers>
<MultiDataTrigger>
<MultiDataTrigger.Conditions>
- <Condition
- Binding="{Binding ViewModel.IsNotLoading}"
- Value="True"
- />
+ <Condition Binding="{Binding ViewModel.IsNotLoading}" Value="True" />
<Condition Binding="{Binding ViewModel.IsLoading}" Value="False" />
</MultiDataTrigger.Conditions>
<Setter Property="Visibility" Value="Visible" />
@@ -118,117 +103,96 @@
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<!-- Toolbar -->
- <Border Grid.Row="0" Style="{StaticResource DuckToolbarSurfaceStyle}">
- <WrapPanel Orientation="Horizontal">
- <!-- Search -->
- <ui:TextBox
- Style="{StaticResource DuckSearchBoxStyle}"
- PlaceholderText="{ext:Loc Common.Search.Placeholder}"
- Text="{Binding ViewModel.SearchText, UpdateSourceTrigger=PropertyChanged}"
- />
+ <Border Grid.Row="0" Style="{StaticResource ToolbarSurfaceStyle}">
+ <WrapPanel Orientation="Horizontal">
+ <!-- Search -->
+ <ui:TextBox
+ PlaceholderText="{ext:Loc Common.Search.Placeholder}"
+ Style="{StaticResource SearchBoxStyle}"
+ Text="{Binding ViewModel.SearchText, UpdateSourceTrigger=PropertyChanged}" />
- <!-- Sort By -->
- <ComboBox
- Style="{StaticResource DuckComboBoxStyle}"
- SelectedIndex="{Binding ViewModel.SortByIndex}"
- ToolTip="{ext:Loc Common.SortBy}"
- >
- <ComboBoxItem HorizontalContentAlignment="Left">
- <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
- <ui:SymbolIcon
- Margin="0,0,6,0"
- HorizontalAlignment="Left"
- Symbol="TextSortAscending24"
- />
- <TextBlock
- Grid.Column="1"
- HorizontalAlignment="Left"
- Text="{ext:Loc Common.SortBy.Name}"
- />
- </Grid>
- </ComboBoxItem>
- <ComboBoxItem HorizontalContentAlignment="Left">
- <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
- <ui:SymbolIcon
- Margin="0,0,6,0"
- HorizontalAlignment="Left"
- Symbol="ToggleRight24"
- />
- <TextBlock
- Grid.Column="1"
- HorizontalAlignment="Left"
- Text="{ext:Loc Common.SortBy.Status}"
- />
- </Grid>
- </ComboBoxItem>
- <ComboBoxItem HorizontalContentAlignment="Left">
- <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
- <ui:SymbolIcon
- Margin="0,0,6,0"
- HorizontalAlignment="Left"
- Symbol="Folder24"
- />
- <TextBlock
- Grid.Column="1"
- HorizontalAlignment="Left"
- Text="{ext:Loc Common.SortBy.Path}"
- />
- </Grid>
- </ComboBoxItem>
- <ComboBoxItem HorizontalContentAlignment="Left">
- <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
- <ui:SymbolIcon
- Margin="0,0,6,0"
- HorizontalAlignment="Left"
- Symbol="Flash24"
- />
- <TextBlock
- Grid.Column="1"
- HorizontalAlignment="Left"
- Text="{ext:Loc Common.SortBy.State}"
- />
- </Grid>
- </ComboBoxItem>
- </ComboBox>
+ <!-- Sort By -->
+ <ComboBox
+ SelectedIndex="{Binding ViewModel.SortByIndex}"
+ Style="{StaticResource ComboBoxStyle}"
+ ToolTip="{ext:Loc Common.SortBy}">
+ <ComboBoxItem HorizontalContentAlignment="Left">
+ <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
+ <ui:SymbolIcon
+ Margin="0,0,6,0"
+ HorizontalAlignment="Left"
+ Symbol="TextSortAscending24" />
+ <TextBlock
+ Grid.Column="1"
+ HorizontalAlignment="Left"
+ Text="{ext:Loc Common.SortBy.Name}" />
+ </Grid>
+ </ComboBoxItem>
+ <ComboBoxItem HorizontalContentAlignment="Left">
+ <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
+ <ui:SymbolIcon
+ Margin="0,0,6,0"
+ HorizontalAlignment="Left"
+ Symbol="ToggleRight24" />
+ <TextBlock
+ Grid.Column="1"
+ HorizontalAlignment="Left"
+ Text="{ext:Loc Common.SortBy.Status}" />
+ </Grid>
+ </ComboBoxItem>
+ <ComboBoxItem HorizontalContentAlignment="Left">
+ <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
+ <ui:SymbolIcon
+ Margin="0,0,6,0"
+ HorizontalAlignment="Left"
+ Symbol="Folder24" />
+ <TextBlock
+ Grid.Column="1"
+ HorizontalAlignment="Left"
+ Text="{ext:Loc Common.SortBy.Path}" />
+ </Grid>
+ </ComboBoxItem>
+ <ComboBoxItem HorizontalContentAlignment="Left">
+ <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
+ <ui:SymbolIcon
+ Margin="0,0,6,0"
+ HorizontalAlignment="Left"
+ Symbol="Flash24" />
+ <TextBlock
+ Grid.Column="1"
+ HorizontalAlignment="Left"
+ Text="{ext:Loc Common.SortBy.State}" />
+ </Grid>
+ </ComboBoxItem>
+ </ComboBox>
- <!-- Hide Microsoft -->
- <ui:ToggleSwitch
- Style="{StaticResource DuckToggleSwitchStyle}"
- IsChecked="{Binding ViewModel.HideMicrosoftTasks, Mode=TwoWay}"
- OffContent="{ext:Loc ScheduledTasks.HideMicrosoft}"
- OnContent="{ext:Loc ScheduledTasks.HideMicrosoft}"
- />
- </WrapPanel>
+ <!-- Hide Microsoft -->
+ <ui:ToggleSwitch
+ IsChecked="{Binding ViewModel.HideMicrosoftTasks, Mode=TwoWay}"
+ OffContent="{ext:Loc ScheduledTasks.HideMicrosoft}"
+ OnContent="{ext:Loc ScheduledTasks.HideMicrosoft}"
+ Style="{StaticResource ToggleSwitchStyle}" />
+ </WrapPanel>
</Border>
<!-- No search results -->
<StackPanel
Grid.Row="1"
- Style="{StaticResource DuckEmptyStatePanelStyle}"
- Visibility="{Binding ViewModel.Tasks.Count, Converter={StaticResource ZeroToVisibilityConverter}}"
- >
- <ui:SymbolIcon
- Style="{StaticResource DuckEmptyStateIconStyle}"
- Symbol="SearchInfo24"
- />
+ Style="{StaticResource EmptyStatePanelStyle}"
+ Visibility="{Binding ViewModel.Tasks.Count, Converter={StaticResource ZeroToVisibilityConverter}}">
+ <ui:SymbolIcon Style="{StaticResource EmptyStateIconStyle}" Symbol="SearchInfo24" />
<ui:TextBlock
HorizontalAlignment="Center"
- Style="{StaticResource DuckSecondaryTextStyle}"
- Text="{ext:Loc Bloatware.Search.NoResults}"
- />
+ Style="{StaticResource SecondaryTextStyle}"
+ Text="{ext:Loc Bloatware.Search.NoResults}" />
</StackPanel>
<!-- Task List -->
<ScrollViewer Grid.Row="1" Margin="0,0,0,0">
- <ItemsControl
- ItemsSource="{Binding ViewModel.Tasks}"
- Visibility="{Binding ViewModel.Tasks.Count, Converter={StaticResource GreaterThanZeroToVisibilityConverter}}"
- >
+ <ItemsControl ItemsSource="{Binding ViewModel.Tasks}" Visibility="{Binding ViewModel.Tasks.Count, Converter={StaticResource GreaterThanZeroToVisibilityConverter}}">
<ItemsControl.ItemTemplate>
<DataTemplate DataType="{x:Type scheduledTask:ScheduledTaskModel}">
- <Border
- Style="{StaticResource DuckListRowStyle}"
- >
+ <Border Style="{StaticResource ListRowStyle}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
@@ -244,60 +208,33 @@
Margin="0,0,12,0"
VerticalAlignment="Center"
Source="{Binding LogoImage}"
- Stretch="UniformToFill"
- />
+ Stretch="UniformToFill" />
<!-- Task info -->
<StackPanel
Grid.Column="1"
Margin="0,0,12,0"
- VerticalAlignment="Center"
- >
+ VerticalAlignment="Center">
<!-- Row 1: Name + State badge -->
<DockPanel LastChildFill="False">
- <ui:TextBlock
- FontTypography="BodyStrong"
- Text="{Binding Name}"
- />
+ <ui:TextBlock FontTypography="BodyStrong" Text="{Binding Name}" />
<Border
Margin="8,0,0,0"
Padding="6,1"
VerticalAlignment="Center"
- CornerRadius="4"
- >
+ CornerRadius="4">
<Border.Style>
<Style TargetType="Border">
- <Setter
- Property="Background"
- Value="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
- />
+ <Setter Property="Background" Value="{DynamicResource CardBackgroundFillColorSecondaryBrush}" />
<Style.Triggers>
- <DataTrigger
- Binding="{Binding IsReady}"
- Value="True"
- >
- <Setter
- Property="Background"
- Value="{DynamicResource SystemFillColorSuccessBrush}"
- />
+ <DataTrigger Binding="{Binding IsReady}" Value="True">
+ <Setter Property="Background" Value="{DynamicResource SystemFillColorSuccessBrush}" />
</DataTrigger>
- <DataTrigger
- Binding="{Binding IsRunning}"
- Value="True"
- >
- <Setter
- Property="Background"
- Value="{DynamicResource AccentButtonBackground}"
- />
+ <DataTrigger Binding="{Binding IsRunning}" Value="True">
+ <Setter Property="Background" Value="{DynamicResource AccentButtonBackground}" />
</DataTrigger>
- <DataTrigger
- Binding="{Binding IsDisabledState}"
- Value="True"
- >
- <Setter
- Property="Background"
- Value="{DynamicResource SystemFillColorCriticalBrush}"
- />
+ <DataTrigger Binding="{Binding IsDisabledState}" Value="True">
+ <Setter Property="Background" Value="{DynamicResource SystemFillColorCriticalBrush}" />
</DataTrigger>
</Style.Triggers>
</Style>
@@ -306,57 +243,23 @@
<ui:SymbolIcon
x:Name="StateIcon"
Margin="0,0,4,0"
- FontSize="10"
- >
+ FontSize="10">
<ui:SymbolIcon.Style>
<Style TargetType="ui:SymbolIcon">
- <Setter
- Property="Symbol"
- Value="Circle24"
- />
- <Setter
- Property="Foreground"
- Value="{DynamicResource TextFillColorPrimaryBrush}"
- />
+ <Setter Property="Symbol" Value="Circle24" />
+ <Setter Property="Foreground" Value="{DynamicResource TextFillColorPrimaryBrush}" />
<Style.Triggers>
- <DataTrigger
- Binding="{Binding IsReady}"
- Value="True"
- >
- <Setter
- Property="Symbol"
- Value="CheckmarkCircle24"
- />
- <Setter
- Property="Foreground"
- Value="{DynamicResource TextFillColorInverseBrush}"
- />
+ <DataTrigger Binding="{Binding IsReady}" Value="True">
+ <Setter Property="Symbol" Value="CheckmarkCircle24" />
+ <Setter Property="Foreground" Value="{DynamicResource TextFillColorInverseBrush}" />
</DataTrigger>
- <DataTrigger
- Binding="{Binding IsRunning}"
- Value="True"
- >
- <Setter
- Property="Foreground"
- Value="{DynamicResource TextFillColorInverseBrush}"
- />
- <Setter
- Property="Symbol"
- Value="Play24"
- />
+ <DataTrigger Binding="{Binding IsRunning}" Value="True">
+ <Setter Property="Foreground" Value="{DynamicResource TextFillColorInverseBrush}" />
+ <Setter Property="Symbol" Value="Play24" />
</DataTrigger>
- <DataTrigger
- Binding="{Binding IsDisabledState}"
- Value="True"
- >
- <Setter
- Property="Symbol"
- Value="Dismiss24"
- />
- <Setter
- Property="Foreground"
- Value="{DynamicResource TextFillColorInverseBrush}"
- />
+ <DataTrigger Binding="{Binding IsDisabledState}" Value="True">
+ <Setter Property="Symbol" Value="Dismiss24" />
+ <Setter Property="Foreground" Value="{DynamicResource TextFillColorInverseBrush}" />
</DataTrigger>
</Style.Triggers>
</Style>
@@ -366,8 +269,7 @@
VerticalAlignment="Center"
FontTypography="Caption"
Foreground="{Binding ElementName=StateIcon, Path=Foreground}"
- Text="{Binding State}"
- />
+ Text="{Binding State}" />
</StackPanel>
</Border>
</DockPanel>
@@ -375,25 +277,20 @@
<!-- Row 2: Description -->
<ui:TextBlock
Margin="0,4,0,0"
- Foreground="{DynamicResource TextFillColorSecondaryBrush}"
FontTypography="Caption"
+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"
Text="{Binding Description}"
- TextWrapping="Wrap"
- />
+ TextWrapping="Wrap" />
<!-- Row 3: Path -->
<ui:TextBlock
Margin="0,2,0,0"
- Foreground="{DynamicResource TextFillColorDisabledBrush}"
FontTypography="Caption"
- Text="{Binding FullPath}"
- />
+ Foreground="{DynamicResource TextFillColorDisabledBrush}"
+ Text="{Binding FullPath}" />
<!-- Row 4: Trigger badges -->
- <ItemsControl
- Margin="0,4,0,0"
- ItemsSource="{Binding TriggerTypes}"
- >
+ <ItemsControl Margin="0,4,0,0" ItemsSource="{Binding TriggerTypes}">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<WrapPanel Orientation="Horizontal" />
@@ -405,20 +302,17 @@
Margin="0,0,4,2"
Padding="6,2"
Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
- CornerRadius="4"
- >
+ CornerRadius="4">
<StackPanel Orientation="Horizontal">
<ui:SymbolIcon
Margin="0,0,4,0"
Foreground="{DynamicResource TextFillColorSecondaryBrush}"
- Symbol="Timer24"
- />
+ Symbol="Timer24" />
<ui:TextBlock
VerticalAlignment="Center"
FontTypography="Caption"
Foreground="{DynamicResource TextFillColorSecondaryBrush}"
- Text="{Binding}"
- />
+ Text="{Binding}" />
</StackPanel>
</Border>
</DataTemplate>
@@ -428,19 +322,17 @@
<!-- Row 5: Action summary -->
<ui:TextBlock
Margin="0,2,0,0"
- Foreground="{DynamicResource TextFillColorDisabledBrush}"
FontTypography="Caption"
+ Foreground="{DynamicResource TextFillColorDisabledBrush}"
Text="{Binding ActionSummary}"
- TextTrimming="CharacterEllipsis"
- />
+ TextTrimming="CharacterEllipsis" />
</StackPanel>
<!-- Actions -->
<StackPanel
Grid.Column="2"
VerticalAlignment="Center"
- Orientation="Horizontal"
- >
+ Orientation="Horizontal">
<ui:Button
Margin="0,0,4,0"
Padding="8"
@@ -449,8 +341,7 @@
CommandParameter="{Binding}"
Icon="{ui:SymbolIcon Info24,
FontSize=16}"
- ToolTip="{ext:Loc ScheduledTasks.Action.Details}"
- />
+ ToolTip="{ext:Loc ScheduledTasks.Action.Details}" />
<!-- Run: visible only when not running -->
<ui:Button
Margin="0,0,4,0"
@@ -460,23 +351,13 @@
CommandParameter="{Binding}"
Icon="{ui:SymbolIcon Play24,
FontSize=16}"
- ToolTip="{ext:Loc ScheduledTasks.Action.Run}"
- >
+ ToolTip="{ext:Loc ScheduledTasks.Action.Run}">
<ui:Button.Style>
- <Style
- BasedOn="{StaticResource {x:Type ui:Button}}"
- TargetType="ui:Button"
- >
+ <Style BasedOn="{StaticResource {x:Type ui:Button}}" TargetType="ui:Button">
<Setter Property="Visibility" Value="Visible" />
<Style.Triggers>
- <DataTrigger
- Binding="{Binding IsRunning}"
- Value="True"
- >
- <Setter
- Property="Visibility"
- Value="Collapsed"
- />
+ <DataTrigger Binding="{Binding IsRunning}" Value="True">
+ <Setter Property="Visibility" Value="Collapsed" />
</DataTrigger>
</Style.Triggers>
</Style>
@@ -492,8 +373,7 @@
Icon="{ui:SymbolIcon Stop24,
FontSize=16}"
ToolTip="{ext:Loc ScheduledTasks.Action.Stop}"
- Visibility="{Binding IsRunning, Converter={StaticResource WpfBoolToVis}}"
- />
+ Visibility="{Binding IsRunning, Converter={StaticResource WpfBoolToVis}}" />
<ui:Button
Margin="0,0,8,0"
Padding="8"
@@ -502,14 +382,12 @@
CommandParameter="{Binding}"
Icon="{ui:SymbolIcon Delete24,
FontSize=16}"
- ToolTip="{ext:Loc ScheduledTasks.Action.Delete}"
- />
+ ToolTip="{ext:Loc ScheduledTasks.Action.Delete}" />
<ui:ToggleSwitch
- Style="{StaticResource DuckToggleSwitchStyle}"
IsChecked="{Binding IsEnabled, Mode=TwoWay}"
OffContent="{ext:Loc Common.Toggle.Off}"
OnContent="{ext:Loc Common.Toggle.On}"
- />
+ Style="{StaticResource ToggleSwitchStyle}" />
</StackPanel>
</Grid>
</Border>
diff --git a/optimizerDuck/UI/Pages/SettingsPage.xaml b/optimizerDuck/UI/Pages/SettingsPage.xaml
index 6fb8246..152c33e 100644
--- a/optimizerDuck/UI/Pages/SettingsPage.xaml
+++ b/optimizerDuck/UI/Pages/SettingsPage.xaml
@@ -9,381 +9,343 @@
xmlns:pages="clr-namespace:optimizerDuck.UI.Pages"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
Title="SettingsPage"
- Style="{StaticResource DuckPageRootStyle}"
d:DataContext="{d:DesignInstance pages:SettingsPage}"
d:DesignHeight="1200"
d:DesignWidth="800"
ui:Design.Background="Black"
ui:Design.Foreground="White"
- mc:Ignorable="d"
->
+ Style="{StaticResource PageRootStyle}"
+ mc:Ignorable="d">
<Page.Resources>
<converters:ThemeToIndexConverter x:Key="ThemeToIndexConverter" />
</Page.Resources>
- <StackPanel>
- <ui:TextBlock
- Style="{StaticResource DuckPageTitleStyle}"
- Text="{ext:Loc Settings.Header.Title}"
- />
+ <ScrollViewer>
+ <StackPanel Margin="0,0,12,0">
+ <ui:TextBlock Style="{StaticResource PageTitleStyle}" Text="{ext:Loc Settings.Header.Title}" />
- <StackPanel Style="{StaticResource DuckSettingsSectionStyle}">
- <ui:TextBlock
- Style="{StaticResource DuckSectionHeaderStyle}"
- Text="{ext:Loc Settings.Appearance.Header}"
- />
- <ui:CardControl Margin="0,0,0,8" Icon="{ui:SymbolIcon Globe24}">
- <ui:CardControl.Header>
- <StackPanel>
- <ui:TextBlock
- Margin="0"
- FontTypography="BodyStrong"
- Text="{ext:Loc Settings.Appearance.LanguageSelector.Title}"
- TextWrapping="Wrap"
- />
- <ui:TextBlock
- Foreground="{DynamicResource TextFillColorSecondaryBrush}"
- Text="{ext:Loc Settings.Appearance.LanguageSelector.Description}"
- TextWrapping="Wrap"
- />
- </StackPanel>
- </ui:CardControl.Header>
- <ComboBox
- DisplayMemberPath="DisplayName"
- ItemsSource="{Binding ViewModel.Languages}"
- SelectedValue="{Binding ViewModel.SelectedCultureName, Mode=TwoWay}"
- SelectedValuePath="Culture.Name"
- />
- </ui:CardControl>
- <ui:CardControl Margin="0,0,0,8" Icon="{ui:SymbolIcon Color24}">
- <ui:CardControl.Header>
- <StackPanel>
- <ui:TextBlock
- Margin="0"
- FontTypography="BodyStrong"
- Text="{ext:Loc Settings.Appearance.ThemeSelector.Title}"
- TextWrapping="Wrap"
- />
- <ui:TextBlock
- Foreground="{DynamicResource TextFillColorSecondaryBrush}"
- Text="{ext:Loc Settings.Appearance.ThemeSelector.Description}"
- TextWrapping="Wrap"
- />
- </StackPanel>
- </ui:CardControl.Header>
- <ComboBox SelectedIndex="{Binding ViewModel.CurrentApplicationTheme, Converter={StaticResource ThemeToIndexConverter}, Mode=TwoWay}">
- <ComboBoxItem Content="{ext:Loc Settings.Appearance.ThemeSelector.Light}" />
- <ComboBoxItem Content="{ext:Loc Settings.Appearance.ThemeSelector.Dark}" />
- <ComboBoxItem Content="{ext:Loc Settings.Appearance.ThemeSelector.HighContrast}" />
- </ComboBox>
- </ui:CardControl>
-
- <StackPanel Style="{StaticResource DuckSettingsSectionStyle}">
- <ui:TextBlock
- Style="{StaticResource DuckSectionHeaderStyle}"
- Text="{ext:Loc Settings.Optimize.Header}"
- />
-
- <ui:CardControl Margin="0,0,0,8">
- <ui:CardControl.Icon>
- <ui:SymbolIcon
- Foreground="{DynamicResource SystemFillColorCriticalBrush}"
- Symbol="Clock24"
- />
- </ui:CardControl.Icon>
+ <StackPanel Style="{StaticResource SettingsSectionStyle}">
+ <ui:TextBlock Style="{StaticResource SectionHeaderStyle}" Text="{ext:Loc Settings.Appearance.Header}" />
+ <ui:CardControl Margin="0,0,0,4" Icon="{ui:SymbolIcon Globe24}">
<ui:CardControl.Header>
<StackPanel>
<ui:TextBlock
Margin="0"
- Foreground="{DynamicResource TextFillColorPrimaryBrush}"
FontTypography="BodyStrong"
- Text="{ext:Loc Settings.Optimize.ShellTimeout.Title}"
- TextWrapping="Wrap"
- />
+ Text="{ext:Loc Settings.Appearance.LanguageSelector.Title}"
+ TextWrapping="Wrap" />
<ui:TextBlock
Foreground="{DynamicResource TextFillColorSecondaryBrush}"
- Text="{ext:Loc Settings.Optimize.ShellTimeout.Description}"
- TextWrapping="Wrap"
- />
- <ui:TextBlock
- Foreground="{DynamicResource SystemFillColorCriticalBrush}"
- Text="{ext:Loc Settings.Optimize.ShellTimeout.Warning}"
- TextWrapping="Wrap"
- />
+ Text="{ext:Loc Settings.Appearance.LanguageSelector.Description}"
+ TextWrapping="Wrap" />
</StackPanel>
</ui:CardControl.Header>
-
- <ui:NumberBox
- Minimum="1000"
- SmallChange="1000"
- Value="{Binding ViewModel.ShellTimeoutMs, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
- />
+ <ComboBox
+ DisplayMemberPath="DisplayName"
+ ItemsSource="{Binding ViewModel.Languages}"
+ SelectedValue="{Binding ViewModel.SelectedCultureName, Mode=TwoWay}"
+ SelectedValuePath="Culture.Name" />
</ui:CardControl>
-
- <ui:CardControl Margin="0,0,0,8" Icon="{ui:SymbolIcon Alert24}">
+ <ui:CardControl Margin="0,0,0,4" Icon="{ui:SymbolIcon Color24}">
<ui:CardControl.Header>
<StackPanel>
<ui:TextBlock
Margin="0"
- Foreground="{DynamicResource TextFillColorPrimaryBrush}"
FontTypography="BodyStrong"
- Text="{ext:Loc Settings.Optimize.ShowCompletionNotification.Title}"
- TextWrapping="Wrap"
- />
+ Text="{ext:Loc Settings.Appearance.ThemeSelector.Title}"
+ TextWrapping="Wrap" />
<ui:TextBlock
Foreground="{DynamicResource TextFillColorSecondaryBrush}"
- Text="{ext:Loc Settings.Optimize.ShowCompletionNotification.Description}"
- TextWrapping="Wrap"
- />
+ Text="{ext:Loc Settings.Appearance.ThemeSelector.Description}"
+ TextWrapping="Wrap" />
</StackPanel>
</ui:CardControl.Header>
-
- <ui:ToggleSwitch
- Command="{Binding ViewModel.ToggleShowCompletionNotificationCommand}"
- IsChecked="{Binding ViewModel.ShowSnackbarNotificationAfterAppliedSuccessfully, Mode=TwoWay}"
- />
+ <ComboBox SelectedIndex="{Binding ViewModel.CurrentApplicationTheme, Converter={StaticResource ThemeToIndexConverter}, Mode=TwoWay}">
+ <ComboBoxItem Content="{ext:Loc Settings.Appearance.ThemeSelector.Light}" />
+ <ComboBoxItem Content="{ext:Loc Settings.Appearance.ThemeSelector.Dark}" />
+ <ComboBoxItem Content="{ext:Loc Settings.Appearance.ThemeSelector.HighContrast}" />
+ </ComboBox>
</ui:CardControl>
- </StackPanel>
- <StackPanel Style="{StaticResource DuckSettingsSectionStyle}">
- <ui:TextBlock
- Style="{StaticResource DuckSectionHeaderStyle}"
- Text="{ext:Loc Settings.Bloatware.Header}"
- />
+ <StackPanel Style="{StaticResource SettingsSectionStyle}">
+ <ui:TextBlock Style="{StaticResource SectionHeaderStyle}" Text="{ext:Loc Settings.Optimize.Header}" />
- <ui:CardControl Margin="0,0,0,8" Icon="{ui:SymbolIcon UninstallApp24}">
- <ui:CardControl.Header>
- <StackPanel>
- <ui:TextBlock
- Margin="0"
- Foreground="{DynamicResource TextFillColorPrimaryBrush}"
- FontTypography="BodyStrong"
- Text="{ext:Loc Settings.Bloatware.RemoveProvisioned.Title}"
- TextWrapping="Wrap"
- />
- <ui:TextBlock
- Foreground="{DynamicResource TextFillColorSecondaryBrush}"
- Text="{ext:Loc Settings.Bloatware.RemoveProvisioned.Description}"
- TextWrapping="Wrap"
- />
- </StackPanel>
- </ui:CardControl.Header>
+ <ui:CardControl Margin="0,0,0,4">
+ <ui:CardControl.Icon>
+ <ui:SymbolIcon Foreground="{DynamicResource SystemFillColorCriticalBrush}" Symbol="Clock24" />
+ </ui:CardControl.Icon>
+ <ui:CardControl.Header>
+ <StackPanel>
+ <ui:TextBlock
+ Margin="0"
+ FontTypography="BodyStrong"
+ Foreground="{DynamicResource TextFillColorPrimaryBrush}"
+ Text="{ext:Loc Settings.Optimize.ShellTimeout.Title}"
+ TextWrapping="Wrap" />
+ <ui:TextBlock
+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"
+ Text="{ext:Loc Settings.Optimize.ShellTimeout.Description}"
+ TextWrapping="Wrap" />
+ <ui:TextBlock
+ Foreground="{DynamicResource SystemFillColorCriticalBrush}"
+ Text="{ext:Loc Settings.Optimize.ShellTimeout.Warning}"
+ TextWrapping="Wrap" />
+ </StackPanel>
+ </ui:CardControl.Header>
- <ui:ToggleSwitch
- Command="{Binding ViewModel.ToggleRemoveProvisionedCommand}"
- IsChecked="{Binding ViewModel.RemoveProvisioned, Mode=TwoWay}"
- />
- </ui:CardControl>
- </StackPanel>
+ <ui:NumberBox
+ Minimum="1000"
+ SmallChange="1000"
+ Value="{Binding ViewModel.ShellTimeoutMs, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+ </ui:CardControl>
- <StackPanel Style="{StaticResource DuckSettingsSectionStyle}">
- <ui:TextBlock
- Style="{StaticResource DuckSectionHeaderStyle}"
- Text="{ext:Loc Settings.Advanced.Header}"
- />
+ <ui:CardControl Margin="0,0,0,4" Icon="{ui:SymbolIcon Alert24}">
+ <ui:CardControl.Header>
+ <StackPanel>
+ <ui:TextBlock
+ Margin="0"
+ FontTypography="BodyStrong"
+ Foreground="{DynamicResource TextFillColorPrimaryBrush}"
+ Text="{ext:Loc Settings.Optimize.ShowCompletionNotification.Title}"
+ TextWrapping="Wrap" />
+ <ui:TextBlock
+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"
+ Text="{ext:Loc Settings.Optimize.ShowCompletionNotification.Description}"
+ TextWrapping="Wrap" />
+ </StackPanel>
+ </ui:CardControl.Header>
- <ui:CardAction Margin="0,0,0,8" Padding="16,14" Command="{Binding ViewModel.ClearResourcesCommand}">
- <ui:CardAction.Icon>
- <ui:SymbolIcon
- Foreground="{DynamicResource SystemFillColorCriticalBrush}"
- Symbol="Archive24"
- />
- </ui:CardAction.Icon>
- <StackPanel>
- <ui:TextBlock
- Margin="0"
- FontTypography="BodyStrong"
- Text="{ext:Loc Settings.Advanced.ClearResources.Title}"
- TextWrapping="Wrap"
- />
- <ui:TextBlock
- Foreground="{DynamicResource TextFillColorSecondaryBrush}"
- Text="{ext:Loc Settings.Advanced.ClearResources.Description}"
- TextWrapping="Wrap"
- />
- </StackPanel>
- </ui:CardAction>
+ <ui:ToggleSwitch
+ Command="{Binding ViewModel.ToggleShowCompletionNotificationCommand}"
+ Cursor="Hand"
+ IsChecked="{Binding ViewModel.ShowSnackbarNotificationAfterAppliedSuccessfully, Mode=TwoWay}"
+ OffContent="{ext:Loc Common.Toggle.Off}"
+ OnContent="{ext:Loc Common.Toggle.On}" />
+ </ui:CardControl>
+ </StackPanel>
- <ui:CardAction Margin="0,0,0,8" Padding="16,14" Command="{Binding ViewModel.ClearAllRevertDataCommand}">
- <ui:CardAction.Icon>
- <ui:SymbolIcon
- Foreground="{DynamicResource SystemFillColorCriticalBrush}"
- Symbol="DatabaseLightning20"
- />
- </ui:CardAction.Icon>
- <StackPanel>
- <ui:TextBlock
- Margin="0"
- FontTypography="BodyStrong"
- Text="{ext:Loc Settings.Advanced.ClearRevertDatas.Title}"
- TextWrapping="Wrap"
- />
- <ui:TextBlock
- Foreground="{DynamicResource TextFillColorSecondaryBrush}"
- Text="{ext:Loc Settings.Advanced.ClearRevertDatas.Description}"
- TextWrapping="Wrap"
- />
- </StackPanel>
- </ui:CardAction>
+ <StackPanel Style="{StaticResource SettingsSectionStyle}">
+ <ui:TextBlock Style="{StaticResource SectionHeaderStyle}" Text="{ext:Loc Settings.Bloatware.Header}" />
- <ui:CardAction
- Margin="0,0,0,8"
- Padding="16,14"
- Command="{Binding ViewModel.OpenRootDirCommand}"
- Icon="{ui:SymbolIcon Folder24}"
- IsChevronVisible="False"
- >
- <Grid ColumnDefinitions="* Auto">
- <StackPanel>
- <ui:TextBlock
- Margin="0"
- Foreground="{DynamicResource TextFillColorPrimaryBrush}"
- FontTypography="BodyStrong"
- Text="{ext:Loc Settings.Advanced.OpenRootDir.Title}"
- TextWrapping="Wrap"
- />
- <ui:TextBlock
- Foreground="{DynamicResource TextFillColorSecondaryBrush}"
- Text="{ext:Loc Settings.Advanced.OpenRootDir.Description}"
- TextWrapping="Wrap"
- />
- </StackPanel>
- <ui:SymbolIcon Grid.Column="1" FontSize="20" Symbol="Open24" />
- </Grid>
- </ui:CardAction>
- </StackPanel>
+ <ui:CardControl Margin="0,0,0,4" Icon="{ui:SymbolIcon UninstallApp24}">
+ <ui:CardControl.Header>
+ <StackPanel>
+ <ui:TextBlock
+ Margin="0"
+ FontTypography="BodyStrong"
+ Foreground="{DynamicResource TextFillColorPrimaryBrush}"
+ Text="{ext:Loc Settings.Bloatware.RemoveProvisioned.Title}"
+ TextWrapping="Wrap" />
+ <ui:TextBlock
+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"
+ Text="{ext:Loc Settings.Bloatware.RemoveProvisioned.Description}"
+ TextWrapping="Wrap" />
+ </StackPanel>
+ </ui:CardControl.Header>
- <StackPanel Style="{StaticResource DuckSettingsSectionStyle}">
- <ui:TextBlock
- Style="{StaticResource DuckSectionHeaderStyle}"
- Text="{ext:Loc Settings.About.Header}"
- />
+ <ui:ToggleSwitch
+ Command="{Binding ViewModel.ToggleRemoveProvisionedCommand}"
+ Cursor="Hand"
+ IsChecked="{Binding ViewModel.RemoveProvisioned, Mode=TwoWay}"
+ OffContent="{ext:Loc Common.Toggle.Off}"
+ OnContent="{ext:Loc Common.Toggle.On}" />
+ </ui:CardControl>
+ </StackPanel>
- <ui:CardAction
- Margin="0,0,0,8"
- Padding="16,14"
- 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 Style="{StaticResource SettingsSectionStyle}">
+ <ui:TextBlock Style="{StaticResource SectionHeaderStyle}" Text="{ext:Loc Settings.Advanced.Header}" />
- <Grid ColumnDefinitions="* Auto">
+ <ui:CardAction
+ Margin="0,0,0,4"
+ Padding="16,14"
+ Command="{Binding ViewModel.ClearResourcesCommand}"
+ Cursor="Hand">
+ <ui:CardAction.Icon>
+ <ui:SymbolIcon Foreground="{DynamicResource SystemFillColorCriticalBrush}" Symbol="Archive24" />
+ </ui:CardAction.Icon>
<StackPanel>
<ui:TextBlock
- Foreground="{DynamicResource TextFillColorPrimaryBrush}"
+ Margin="0"
FontTypography="BodyStrong"
- Text="optimizerDuck"
- TextWrapping="Wrap"
- />
+ Text="{ext:Loc Settings.Advanced.ClearResources.Title}"
+ TextWrapping="Wrap" />
<ui:TextBlock
Foreground="{DynamicResource TextFillColorSecondaryBrush}"
- Text="{ext:Loc Settings.About.Duck.Description,
- {Binding ViewModel.Version}}"
- TextWrapping="Wrap"
- />
+ Text="{ext:Loc Settings.Advanced.ClearResources.Description}"
+ TextWrapping="Wrap" />
</StackPanel>
- <ui:SymbolIcon Grid.Column="1" FontSize="20" Symbol="Open24" />
- </Grid>
- </ui:CardAction>
+ </ui:CardAction>
- <ui:CardAction
- Margin="0,0,0,8"
- Padding="16,14"
- Command="{Binding ViewModel.OpenWebsiteCommand}"
- CommandParameter="Help"
- Icon="{ui:SymbolIcon ChatBubblesQuestion24}"
- IsChevronVisible="False"
- >
- <Grid ColumnDefinitions="* Auto">
+ <ui:CardAction
+ Margin="0,0,0,4"
+ Padding="16,14"
+ Command="{Binding ViewModel.ClearAllRevertDataCommand}"
+ Cursor="Hand">
+ <ui:CardAction.Icon>
+ <ui:SymbolIcon Foreground="{DynamicResource SystemFillColorCriticalBrush}" Symbol="DatabaseLightning20" />
+ </ui:CardAction.Icon>
<StackPanel>
<ui:TextBlock
- Padding="0"
+ Margin="0"
FontTypography="BodyStrong"
- Text="{ext:Loc Settings.About.NeedHelp.Title}"
- />
+ Text="{ext:Loc Settings.Advanced.ClearRevertDatas.Title}"
+ TextWrapping="Wrap" />
<ui:TextBlock
Foreground="{DynamicResource TextFillColorSecondaryBrush}"
- Text="{ext:Loc Settings.About.NeedHelp.Description}"
- TextWrapping="Wrap"
- />
+ Text="{ext:Loc Settings.Advanced.ClearRevertDatas.Description}"
+ TextWrapping="Wrap" />
</StackPanel>
+ </ui:CardAction>
- <ui:SymbolIcon Grid.Column="1" FontSize="20" Symbol="Open24" />
- </Grid>
- </ui:CardAction>
+ <ui:CardAction
+ Margin="0,0,0,4"
+ Padding="16,14"
+ Command="{Binding ViewModel.OpenRootDirCommand}"
+ Cursor="Hand"
+ Icon="{ui:SymbolIcon Folder24}"
+ IsChevronVisible="False">
+ <Grid ColumnDefinitions="* Auto">
+ <StackPanel>
+ <ui:TextBlock
+ Margin="0"
+ FontTypography="BodyStrong"
+ Foreground="{DynamicResource TextFillColorPrimaryBrush}"
+ Text="{ext:Loc Settings.Advanced.OpenRootDir.Title}"
+ TextWrapping="Wrap" />
+ <ui:TextBlock
+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"
+ Text="{ext:Loc Settings.Advanced.OpenRootDir.Description}"
+ TextWrapping="Wrap" />
+ </StackPanel>
+ <ui:SymbolIcon
+ Grid.Column="1"
+ FontSize="20"
+ Symbol="Open24" />
+ </Grid>
+ </ui:CardAction>
+ </StackPanel>
- <ui:CardAction
- Margin="0,0,0,8"
- Padding="16,14"
- VerticalAlignment="Stretch"
- Command="{Binding ViewModel.OpenAcknowledgementsCommand}"
- IsChevronVisible="False"
- >
- <ui:CardAction.Icon>
- <ui:SymbolIcon Symbol="DocumentHeart24" />
- </ui:CardAction.Icon>
+ <StackPanel Style="{StaticResource SettingsSectionStyle}">
+ <ui:TextBlock Style="{StaticResource SectionHeaderStyle}" Text="{ext:Loc Settings.About.Header}" />
- <Grid ColumnDefinitions="* Auto">
- <StackPanel>
- <ui:TextBlock
- Foreground="{DynamicResource TextFillColorPrimaryBrush}"
- FontTypography="BodyStrong"
- Text="{ext:Loc Settings.About.Acknowledgements.Title}"
- TextWrapping="Wrap"
- />
- <ui:TextBlock
- Foreground="{DynamicResource TextFillColorSecondaryBrush}"
- Text="{ext:Loc Settings.About.Acknowledgements.Description}"
- TextWrapping="Wrap"
- />
- </StackPanel>
+ <ui:CardAction
+ Margin="0,0,0,4"
+ Padding="16,14"
+ Command="{Binding ViewModel.OpenWebsiteCommand}"
+ CommandParameter="Web"
+ Cursor="Hand"
+ IsChevronVisible="False">
+ <ui:CardAction.Icon>
+ <ui:ImageIcon Height="25" Source="pack://application:,,,/optimizerDuck;component/Resources/Images/Duck.png" />
+ </ui:CardAction.Icon>
+
+ <Grid ColumnDefinitions="* Auto">
+ <StackPanel>
+ <ui:TextBlock
+ FontTypography="BodyStrong"
+ Foreground="{DynamicResource TextFillColorPrimaryBrush}"
+ Text="optimizerDuck"
+ TextWrapping="Wrap" />
+ <ui:TextBlock
+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"
+ Text="{ext:Loc Settings.About.Duck.Description,
+ {Binding ViewModel.Version}}"
+ TextWrapping="Wrap" />
+ </StackPanel>
+ <ui:SymbolIcon
+ Grid.Column="1"
+ FontSize="20"
+ Symbol="Open24" />
+ </Grid>
+ </ui:CardAction>
+
+ <ui:CardAction
+ Margin="0,0,0,4"
+ Padding="16,14"
+ Command="{Binding ViewModel.OpenWebsiteCommand}"
+ CommandParameter="Help"
+ Cursor="Hand"
+ Icon="{ui:SymbolIcon ChatBubblesQuestion24}"
+ IsChevronVisible="False">
+ <Grid ColumnDefinitions="* Auto">
+ <StackPanel>
+ <ui:TextBlock
+ Padding="0"
+ FontTypography="BodyStrong"
+ Text="{ext:Loc Settings.About.NeedHelp.Title}" />
+ <ui:TextBlock
+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"
+ Text="{ext:Loc Settings.About.NeedHelp.Description}"
+ TextWrapping="Wrap" />
+ </StackPanel>
+
+ <ui:SymbolIcon
+ Grid.Column="1"
+ FontSize="20"
+ Symbol="Open24" />
+ </Grid>
+ </ui:CardAction>
+
+ <ui:CardAction
+ Margin="0,0,0,4"
+ Padding="16,14"
+ VerticalAlignment="Stretch"
+ Command="{Binding ViewModel.OpenAcknowledgementsCommand}"
+ Cursor="Hand"
+ IsChevronVisible="False">
+ <ui:CardAction.Icon>
+ <ui:SymbolIcon Symbol="DocumentHeart24" />
+ </ui:CardAction.Icon>
+
+ <Grid ColumnDefinitions="* Auto">
+ <StackPanel>
+ <ui:TextBlock
+ FontTypography="BodyStrong"
+ Foreground="{DynamicResource TextFillColorPrimaryBrush}"
+ Text="{ext:Loc Settings.About.Acknowledgements.Title}"
+ TextWrapping="Wrap" />
+ <ui:TextBlock
+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"
+ Text="{ext:Loc Settings.About.Acknowledgements.Description}"
+ TextWrapping="Wrap" />
+ </StackPanel>
- <ui:SymbolIcon Grid.Column="1" FontSize="20" Symbol="Open24" />
- </Grid>
- </ui:CardAction>
+ <ui:SymbolIcon
+ Grid.Column="1"
+ FontSize="20"
+ Symbol="Open24" />
+ </Grid>
+ </ui:CardAction>
- <ui:TextBlock
- Margin="0,16,0,8"
- FontTypography="BodyStrong"
- Text="{ext:Loc Settings.About.LearnMore}"
- TextTrimming="WordEllipsis"
- TextWrapping="Wrap"
- />
- <Border Style="{StaticResource DuckToolbarSurfaceStyle}">
- <WrapPanel>
- <ui:HyperlinkButton
- Margin="0,0,8,0"
- Content="{ext:Loc Settings.About.LearnMore.Website}"
- NavigateUri="{Binding ViewModel.Website}"
- />
- <ui:HyperlinkButton
- Margin="0,0,8,0"
- Content="{ext:Loc Settings.About.LearnMore.Contribute}"
- NavigateUri="{Binding ViewModel.Contribute}"
- />
- <ui:HyperlinkButton
- Margin="0,0,8,0"
- Content="{ext:Loc Settings.About.LearnMore.Documentation}"
- NavigateUri="{Binding ViewModel.Documentation}"
- />
- <ui:HyperlinkButton
- Margin="0,0,8,0"
- Content="{ext:Loc Settings.About.LearnMore.Community}"
- NavigateUri="{Binding ViewModel.Community}"
- />
- <ui:HyperlinkButton
- Content="{ext:Loc Settings.About.LearnMore.Acknowledgements}"
- NavigateUri="{Binding ViewModel.Acknowledgements}"
- />
- </WrapPanel>
- </Border>
+ <ui:TextBlock
+ Margin="0,16,0,8"
+ FontTypography="BodyStrong"
+ Text="{ext:Loc Settings.About.LearnMore}"
+ TextTrimming="WordEllipsis"
+ TextWrapping="Wrap" />
+ <Border Style="{StaticResource ToolbarSurfaceStyle}">
+ <WrapPanel>
+ <ui:HyperlinkButton
+ Margin="0,0,8,0"
+ Content="{ext:Loc Settings.About.LearnMore.Website}"
+ NavigateUri="{Binding ViewModel.Website}" />
+ <ui:HyperlinkButton
+ Margin="0,0,8,0"
+ Content="{ext:Loc Settings.About.LearnMore.Contribute}"
+ NavigateUri="{Binding ViewModel.Contribute}" />
+ <ui:HyperlinkButton
+ Margin="0,0,8,0"
+ Content="{ext:Loc Settings.About.LearnMore.Documentation}"
+ NavigateUri="{Binding ViewModel.Documentation}" />
+ <ui:HyperlinkButton
+ Margin="0,0,8,0"
+ Content="{ext:Loc Settings.About.LearnMore.Community}"
+ NavigateUri="{Binding ViewModel.Community}" />
+ <ui:HyperlinkButton Content="{ext:Loc Settings.About.LearnMore.Acknowledgements}" NavigateUri="{Binding ViewModel.Acknowledgements}" />
+ </WrapPanel>
+ </Border>
+ </StackPanel>
</StackPanel>
</StackPanel>
- </StackPanel>
+ </ScrollViewer>
</Page>
diff --git a/optimizerDuck/UI/Pages/StartupManagerPage.xaml b/optimizerDuck/UI/Pages/StartupManagerPage.xaml
index fb37155..4b6a4e6 100644
--- a/optimizerDuck/UI/Pages/StartupManagerPage.xaml
+++ b/optimizerDuck/UI/Pages/StartupManagerPage.xaml
@@ -10,15 +10,14 @@
xmlns:startupManager="clr-namespace:optimizerDuck.Domain.Optimizations.Models.StartupManager"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
Title="StartupManagerPage"
- Style="{StaticResource DuckPageRootStyle}"
d:DataContext="{d:DesignInstance local:StartupManagerPage}"
d:DesignHeight="1200"
d:DesignWidth="800"
ui:Design.Background="Black"
ui:Design.Foreground="White"
ScrollViewer.CanContentScroll="False"
- mc:Ignorable="d"
->
+ Style="{StaticResource PageRootStyle}"
+ mc:Ignorable="d">
<Page.Resources>
<converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
<converters:GreaterThanZeroToVisibilityConverter x:Key="GreaterThanZeroToVisibilityConverter" />
@@ -27,40 +26,33 @@
<Grid RowDefinitions="Auto, *">
<!-- Header -->
- <StackPanel Style="{StaticResource DuckPageHeaderStyle}">
+ <StackPanel Style="{StaticResource PageHeaderStyle}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<StackPanel Grid.Column="0">
- <ui:TextBlock
- Style="{StaticResource DuckPageTitleStyle}"
- Text="{ext:Loc StartupManager.Header.Title}"
- />
- <ui:TextBlock
- Style="{StaticResource DuckPageDescriptionStyle}"
- Text="{ext:Loc StartupManager.Header.Description}"
- />
+ <ui:TextBlock Style="{StaticResource PageTitleStyle}" Text="{ext:Loc StartupManager.Header.Title}" />
+ <ui:TextBlock Style="{StaticResource PageDescriptionStyle}" Text="{ext:Loc StartupManager.Header.Description}" />
</StackPanel>
- <WrapPanel Grid.Column="1" VerticalAlignment="Center" Orientation="Horizontal">
+ <WrapPanel
+ Grid.Column="1"
+ VerticalAlignment="Center"
+ Orientation="Horizontal">
<ui:Button
Appearance="Primary"
Command="{Binding ViewModel.RefreshCommand}"
Content="{ext:Loc StartupManager.Menu.Refresh}"
Icon="{ui:SymbolIcon ArrowClockwise24,
FontSize=18}"
- Visibility="{Binding ViewModel.ShowRefreshButton, Converter={StaticResource BooleanToVisibilityConverter}}"
- />
+ Visibility="{Binding ViewModel.ShowRefreshButton, Converter={StaticResource BooleanToVisibilityConverter}}" />
</WrapPanel>
</Grid>
</StackPanel>
<!-- Loading Indicator -->
- <Border
- Grid.Row="1"
- Visibility="{Binding ViewModel.IsLoading, Converter={StaticResource BooleanToVisibilityConverter}}"
- >
+ <Border Grid.Row="1" Visibility="{Binding ViewModel.IsLoading, Converter={StaticResource BooleanToVisibilityConverter}}">
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
<ui:ProgressRing
Width="48"
@@ -68,20 +60,17 @@
Margin="0,0,0,16"
HorizontalAlignment="Center"
VerticalAlignment="Center"
- IsIndeterminate="True"
- />
+ IsIndeterminate="True" />
<ui:TextBlock
HorizontalAlignment="Center"
FontTypography="BodyStrong"
- Text="{ext:Loc StartupManager.Loading}"
- />
+ Text="{ext:Loc StartupManager.Loading}" />
<ui:TextBlock
Margin="0,4,0,0"
HorizontalAlignment="Center"
- Foreground="{DynamicResource TextFillColorSecondaryBrush}"
FontTypography="Caption"
- Text="{ext:Loc StartupManager.Loading.Hint}"
- />
+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"
+ Text="{ext:Loc StartupManager.Loading.Hint}" />
</StackPanel>
</Border>
@@ -108,36 +97,29 @@
HorizontalAlignment="Center"
FontSize="46"
Foreground="{DynamicResource SystemFillColorCriticalBrush}"
- Symbol="AppGeneric24"
- />
+ Symbol="AppGeneric24" />
<ui:TextBlock
HorizontalAlignment="Center"
FontTypography="Subtitle"
- Text="{ext:Loc StartupManager.Empty.Title}"
- />
+ Text="{ext:Loc StartupManager.Empty.Title}" />
<ui:TextBlock
Margin="0,0,0,10"
HorizontalAlignment="Center"
- Foreground="{DynamicResource TextFillColorSecondaryBrush}"
FontTypography="Body"
- Text="{ext:Loc StartupManager.Empty.Description}"
- />
+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"
+ Text="{ext:Loc StartupManager.Empty.Description}" />
<ui:Button
HorizontalAlignment="Center"
Appearance="Primary"
Command="{Binding ViewModel.RefreshCommand}"
Content="{ext:Loc StartupManager.Menu.Refresh}"
Icon="{ui:SymbolIcon ArrowClockwise24,
- FontSize=18}"
- />
+ FontSize=18}" />
</StackPanel>
</Border>
<!-- Main Content -->
- <Border
- Grid.Row="1"
- Visibility="{Binding ViewModel.HasData, Converter={StaticResource BooleanToVisibilityConverter}}"
- >
+ <Border Grid.Row="1" Visibility="{Binding ViewModel.HasData, Converter={StaticResource BooleanToVisibilityConverter}}">
<ScrollViewer>
<StackPanel Margin="0,0,16,0">
<!-- ═══════════ Startup Apps Section ═══════════ -->
@@ -145,124 +127,99 @@
Margin="0,0,0,12"
Icon="{ui:SymbolIcon Apps24}"
IsExpanded="True"
- Visibility="{Binding ViewModel.HasApps, Converter={StaticResource BooleanToVisibilityConverter}}"
- >
+ Visibility="{Binding ViewModel.HasApps, Converter={StaticResource BooleanToVisibilityConverter}}">
<ui:CardExpander.Header>
<StackPanel>
<StackPanel Orientation="Horizontal">
<ui:TextBlock
VerticalAlignment="Center"
FontTypography="BodyStrong"
- Text="{ext:Loc StartupManager.Apps.Title}"
- />
+ Text="{ext:Loc StartupManager.Apps.Title}" />
<Border
Margin="8,0,0,0"
Padding="8,2"
VerticalAlignment="Center"
Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
- CornerRadius="10"
- >
+ CornerRadius="10">
<ui:TextBlock
VerticalAlignment="Center"
Appearance="Tertiary"
FontTypography="Caption"
Text="{ext:Loc StartupManager.Apps.CountSuffix,
- {Binding ViewModel.Apps.Count}}"
- />
+ {Binding ViewModel.Apps.Count}}" />
</Border>
</StackPanel>
<ui:TextBlock
Margin="0,4,0,0"
- Foreground="{DynamicResource TextFillColorSecondaryBrush}"
FontTypography="Caption"
+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"
Text="{ext:Loc StartupManager.Apps.Description}"
- TextWrapping="Wrap"
- />
+ TextWrapping="Wrap" />
</StackPanel>
</ui:CardExpander.Header>
<StackPanel>
<!-- Apps Toolbar -->
- <Border Style="{StaticResource DuckToolbarSurfaceStyle}">
- <WrapPanel Orientation="Horizontal">
- <ui:TextBox
- Style="{StaticResource DuckSearchBoxStyle}"
- PlaceholderText="{ext:Loc Common.Search.Placeholder}"
- Text="{Binding ViewModel.AppSearchText, UpdateSourceTrigger=PropertyChanged}"
- />
- <ComboBox
- Style="{StaticResource DuckComboBoxStyle}"
- SelectedIndex="{Binding ViewModel.AppSortByIndex}"
- ToolTip="{ext:Loc Common.SortBy}"
- >
- <ComboBoxItem HorizontalContentAlignment="Left">
- <Grid
- HorizontalAlignment="Left"
- ColumnDefinitions="Auto Auto"
- >
- <ui:SymbolIcon
- Margin="0,0,6,0"
- HorizontalAlignment="Left"
- Symbol="TextSortAscending24"
- />
- <TextBlock
- Grid.Column="1"
- HorizontalAlignment="Left"
- Text="{ext:Loc Common.SortBy.Name}"
- />
- </Grid>
- </ComboBoxItem>
- <ComboBoxItem HorizontalContentAlignment="Left">
- <Grid
- HorizontalAlignment="Left"
- ColumnDefinitions="Auto Auto"
- >
- <ui:SymbolIcon
- Margin="0,0,6,0"
- HorizontalAlignment="Left"
- Symbol="ToggleRight24"
- />
- <TextBlock
- Grid.Column="1"
- HorizontalAlignment="Left"
- Text="{ext:Loc Common.SortBy.Status}"
- />
- </Grid>
- </ComboBoxItem>
- <ComboBoxItem HorizontalContentAlignment="Left">
- <Grid
- HorizontalAlignment="Left"
- ColumnDefinitions="Auto Auto"
- >
- <ui:SymbolIcon
- Margin="0,0,6,0"
- HorizontalAlignment="Left"
- Symbol="Folder24"
- />
- <TextBlock
- Grid.Column="1"
- HorizontalAlignment="Left"
- Text="{ext:Loc Common.SortBy.Path}"
- />
- </Grid>
- </ComboBoxItem>
- </ComboBox>
- <ui:Button
- Padding="8"
- VerticalAlignment="Center"
- Appearance="Secondary"
- Command="{Binding ViewModel.OpenStartupSettingsCommand}"
- Icon="{ui:SymbolIcon Settings24,
- FontSize=16}"
- ToolTip="{ext:Loc StartupManager.Menu.OpenSettings}"
- />
- </WrapPanel>
+ <Border Style="{StaticResource ToolbarSurfaceStyle}">
+ <WrapPanel Orientation="Horizontal">
+ <ui:TextBox
+ PlaceholderText="{ext:Loc Common.Search.Placeholder}"
+ Style="{StaticResource SearchBoxStyle}"
+ Text="{Binding ViewModel.AppSearchText, UpdateSourceTrigger=PropertyChanged}" />
+ <ComboBox
+ SelectedIndex="{Binding ViewModel.AppSortByIndex}"
+ Style="{StaticResource ComboBoxStyle}"
+ ToolTip="{ext:Loc Common.SortBy}">
+ <ComboBoxItem HorizontalContentAlignment="Left">
+ <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
+ <ui:SymbolIcon
+ Margin="0,0,6,0"
+ HorizontalAlignment="Left"
+ Symbol="TextSortAscending24" />
+ <TextBlock
+ Grid.Column="1"
+ HorizontalAlignment="Left"
+ Text="{ext:Loc Common.SortBy.Name}" />
+ </Grid>
+ </ComboBoxItem>
+ <ComboBoxItem HorizontalContentAlignment="Left">
+ <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
+ <ui:SymbolIcon
+ Margin="0,0,6,0"
+ HorizontalAlignment="Left"
+ Symbol="ToggleRight24" />
+ <TextBlock
+ Grid.Column="1"
+ HorizontalAlignment="Left"
+ Text="{ext:Loc Common.SortBy.Status}" />
+ </Grid>
+ </ComboBoxItem>
+ <ComboBoxItem HorizontalContentAlignment="Left">
+ <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
+ <ui:SymbolIcon
+ Margin="0,0,6,0"
+ HorizontalAlignment="Left"
+ Symbol="Folder24" />
+ <TextBlock
+ Grid.Column="1"
+ HorizontalAlignment="Left"
+ Text="{ext:Loc Common.SortBy.Path}" />
+ </Grid>
+ </ComboBoxItem>
+ </ComboBox>
+ <ui:Button
+ Padding="8"
+ VerticalAlignment="Center"
+ Appearance="Secondary"
+ Command="{Binding ViewModel.OpenStartupSettingsCommand}"
+ Icon="{ui:SymbolIcon Settings24,
+ FontSize=16}"
+ ToolTip="{ext:Loc StartupManager.Menu.OpenSettings}" />
+ </WrapPanel>
</Border>
<!-- No search results (Apps) -->
- <StackPanel
- Style="{StaticResource DuckEmptyStatePanelStyle}"
- >
+ <StackPanel Style="{StaticResource EmptyStatePanelStyle}">
<StackPanel.Visibility>
<MultiBinding Converter="{StaticResource EmptyWhileNotLoadingConverter}">
<Binding Path="ViewModel.Apps.Count" />
@@ -274,21 +231,16 @@
HorizontalAlignment="Center"
FontSize="36"
Foreground="{DynamicResource SystemFillColorCriticalBrush}"
- Symbol="SearchInfo24"
- />
+ Symbol="SearchInfo24" />
<ui:TextBlock
HorizontalAlignment="Center"
- Foreground="{DynamicResource TextFillColorSecondaryBrush}"
FontTypography="Body"
- Text="{ext:Loc Bloatware.Search.NoResults}"
- />
+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"
+ Text="{ext:Loc Bloatware.Search.NoResults}" />
</StackPanel>
<!-- Apps List -->
- <ItemsControl
- ItemsSource="{Binding ViewModel.Apps}"
- Visibility="{Binding ViewModel.Apps.Count, Converter={StaticResource GreaterThanZeroToVisibilityConverter}}"
- >
+ <ItemsControl ItemsSource="{Binding ViewModel.Apps}" Visibility="{Binding ViewModel.Apps.Count, Converter={StaticResource GreaterThanZeroToVisibilityConverter}}">
<ItemsControl.ItemTemplate>
<DataTemplate DataType="{x:Type startupManager:StartupApp}">
<Grid>
@@ -298,8 +250,7 @@
Padding="16,12"
Command="{Binding DataContext.ViewModel.OpenLocationCommand, RelativeSource={RelativeSource AncestorType=Page}}"
CommandParameter="{Binding}"
- IsChevronVisible="False"
- >
+ IsChevronVisible="False">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
@@ -313,60 +264,42 @@
Margin="0,0,12,0"
VerticalAlignment="Center"
Source="{Binding LogoImage}"
- Stretch="UniformToFill"
- />
- <StackPanel
- Grid.Column="1"
- VerticalAlignment="Center"
- >
+ Stretch="UniformToFill" />
+ <StackPanel Grid.Column="1" VerticalAlignment="Center">
<DockPanel LastChildFill="False">
- <ui:TextBlock
- FontTypography="BodyStrong"
- Text="{Binding Name}"
- />
+ <ui:TextBlock FontTypography="BodyStrong" Text="{Binding Name}" />
<Border
Margin="8,0,0,0"
Padding="6,1"
VerticalAlignment="Center"
Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
- CornerRadius="4"
- >
+ CornerRadius="4">
<ui:TextBlock
VerticalAlignment="Center"
Appearance="Tertiary"
FontTypography="Caption"
- Text="{Binding LocationDisplay}"
- />
+ Text="{Binding LocationDisplay}" />
</Border>
</DockPanel>
<ui:TextBlock
Margin="0,2,0,0"
- Foreground="{DynamicResource TextFillColorSecondaryBrush}"
FontTypography="Caption"
- Text="{Binding Publisher}"
- />
+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"
+ Text="{Binding Publisher}" />
<ui:TextBlock
Margin="0,2,0,0"
- Foreground="{DynamicResource TextFillColorDisabledBrush}"
FontTypography="Caption"
+ Foreground="{DynamicResource TextFillColorDisabledBrush}"
Text="{Binding Command}"
- TextTrimming="CharacterEllipsis"
- />
+ TextTrimming="CharacterEllipsis" />
</StackPanel>
- <StackPanel
- Grid.Column="2"
- Orientation="Horizontal"
- >
+ <StackPanel Grid.Column="2" Orientation="Horizontal">
<ui:ToggleSwitch
- Style="{StaticResource DuckToggleSwitchStyle}"
IsChecked="{Binding IsEnabled, Mode=TwoWay}"
OffContent="{ext:Loc Common.Toggle.Off}"
OnContent="{ext:Loc Common.Toggle.On}"
- />
- <ui:SymbolIcon
- FontSize="16"
- Symbol="Open24"
- />
+ Style="{StaticResource ToggleSwitchStyle}" />
+ <ui:SymbolIcon FontSize="16" Symbol="Open24" />
</StackPanel>
</Grid>
</ui:CardAction>
@@ -382,130 +315,104 @@
Margin="0,0,0,12"
Icon="{ui:SymbolIcon CalculatorArrowClockwise24}"
IsExpanded="True"
- Visibility="{Binding ViewModel.HasTasks, Converter={StaticResource BooleanToVisibilityConverter}}"
- >
+ Visibility="{Binding ViewModel.HasTasks, Converter={StaticResource BooleanToVisibilityConverter}}">
<ui:CardExpander.Header>
<StackPanel>
<StackPanel Orientation="Horizontal">
<ui:TextBlock
VerticalAlignment="Center"
FontTypography="BodyStrong"
- Text="{ext:Loc StartupManager.Tasks.Title}"
- />
+ Text="{ext:Loc StartupManager.Tasks.Title}" />
<Border
Margin="8,0,0,0"
Padding="8,2"
VerticalAlignment="Center"
Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
- CornerRadius="10"
- >
+ CornerRadius="10">
<ui:TextBlock
VerticalAlignment="Center"
Appearance="Tertiary"
FontTypography="Caption"
Text="{ext:Loc StartupManager.Tasks.CountSuffix,
- {Binding ViewModel.Tasks.Count}}"
- />
+ {Binding ViewModel.Tasks.Count}}" />
</Border>
</StackPanel>
<ui:TextBlock
Margin="0,4,0,0"
- Foreground="{DynamicResource TextFillColorSecondaryBrush}"
FontTypography="Caption"
+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"
Text="{ext:Loc StartupManager.Tasks.Description}"
- TextWrapping="Wrap"
- />
+ TextWrapping="Wrap" />
</StackPanel>
</ui:CardExpander.Header>
<StackPanel>
<!-- Tasks Toolbar -->
- <Border Style="{StaticResource DuckToolbarSurfaceStyle}">
- <WrapPanel Orientation="Horizontal">
- <ui:TextBox
- Style="{StaticResource DuckSearchBoxStyle}"
- PlaceholderText="{ext:Loc Common.Search.Placeholder}"
- Text="{Binding ViewModel.TaskSearchText, UpdateSourceTrigger=PropertyChanged}"
- />
- <ComboBox
- Style="{StaticResource DuckComboBoxStyle}"
- SelectedIndex="{Binding ViewModel.TaskSortByIndex}"
- ToolTip="{ext:Loc Common.SortBy}"
- >
- <ComboBoxItem HorizontalContentAlignment="Left">
- <Grid
- HorizontalAlignment="Left"
- ColumnDefinitions="Auto Auto"
- >
- <ui:SymbolIcon
- Margin="0,0,6,0"
- HorizontalAlignment="Left"
- Symbol="TextSortAscending24"
- />
- <TextBlock
- Grid.Column="1"
- HorizontalAlignment="Left"
- Text="{ext:Loc Common.SortBy.Name}"
- />
- </Grid>
- </ComboBoxItem>
- <ComboBoxItem HorizontalContentAlignment="Left">
- <Grid
- HorizontalAlignment="Left"
- ColumnDefinitions="Auto Auto"
- >
- <ui:SymbolIcon
- Margin="0,0,6,0"
- HorizontalAlignment="Left"
- Symbol="ToggleRight24"
- />
- <TextBlock
- Grid.Column="1"
- HorizontalAlignment="Left"
- Text="{ext:Loc Common.SortBy.Status}"
- />
- </Grid>
- </ComboBoxItem>
- <ComboBoxItem HorizontalContentAlignment="Left">
- <Grid
- HorizontalAlignment="Left"
- ColumnDefinitions="Auto Auto"
- >
- <ui:SymbolIcon
- Margin="0,0,6,0"
- HorizontalAlignment="Left"
- Symbol="Folder24"
- />
- <TextBlock
- Grid.Column="1"
- HorizontalAlignment="Left"
- Text="{ext:Loc Common.SortBy.Path}"
- />
- </Grid>
- </ComboBoxItem>
- </ComboBox>
- <ui:ToggleSwitch
- Style="{StaticResource DuckToggleSwitchStyle}"
- IsChecked="{Binding ViewModel.HideMicrosoftTasks, Mode=TwoWay}"
- OffContent="{ext:Loc StartupManager.Tasks.HideMicrosoft}"
- OnContent="{ext:Loc StartupManager.Tasks.HideMicrosoft}"
- />
- <ui:Button
- Padding="8"
- VerticalAlignment="Center"
- Appearance="Secondary"
- Command="{Binding ViewModel.OpenTaskSchedulerCommand}"
- Icon="{ui:SymbolIcon Settings24,
- FontSize=16}"
- ToolTip="{ext:Loc ScheduledTasks.Menu.OpenSettings}"
- />
- </WrapPanel>
+ <Border Style="{StaticResource ToolbarSurfaceStyle}">
+ <WrapPanel Orientation="Horizontal">
+ <ui:TextBox
+ PlaceholderText="{ext:Loc Common.Search.Placeholder}"
+ Style="{StaticResource SearchBoxStyle}"
+ Text="{Binding ViewModel.TaskSearchText, UpdateSourceTrigger=PropertyChanged}" />
+ <ComboBox
+ SelectedIndex="{Binding ViewModel.TaskSortByIndex}"
+ Style="{StaticResource ComboBoxStyle}"
+ ToolTip="{ext:Loc Common.SortBy}">
+ <ComboBoxItem HorizontalContentAlignment="Left">
+ <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
+ <ui:SymbolIcon
+ Margin="0,0,6,0"
+ HorizontalAlignment="Left"
+ Symbol="TextSortAscending24" />
+ <TextBlock
+ Grid.Column="1"
+ HorizontalAlignment="Left"
+ Text="{ext:Loc Common.SortBy.Name}" />
+ </Grid>
+ </ComboBoxItem>
+ <ComboBoxItem HorizontalContentAlignment="Left">
+ <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
+ <ui:SymbolIcon
+ Margin="0,0,6,0"
+ HorizontalAlignment="Left"
+ Symbol="ToggleRight24" />
+ <TextBlock
+ Grid.Column="1"
+ HorizontalAlignment="Left"
+ Text="{ext:Loc Common.SortBy.Status}" />
+ </Grid>
+ </ComboBoxItem>
+ <ComboBoxItem HorizontalContentAlignment="Left">
+ <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
+ <ui:SymbolIcon
+ Margin="0,0,6,0"
+ HorizontalAlignment="Left"
+ Symbol="Folder24" />
+ <TextBlock
+ Grid.Column="1"
+ HorizontalAlignment="Left"
+ Text="{ext:Loc Common.SortBy.Path}" />
+ </Grid>
+ </ComboBoxItem>
+ </ComboBox>
+ <ui:ToggleSwitch
+ IsChecked="{Binding ViewModel.HideMicrosoftTasks, Mode=TwoWay}"
+ OffContent="{ext:Loc StartupManager.Tasks.HideMicrosoft}"
+ OnContent="{ext:Loc StartupManager.Tasks.HideMicrosoft}"
+ Style="{StaticResource ToggleSwitchStyle}" />
+ <ui:Button
+ Padding="8"
+ VerticalAlignment="Center"
+ Appearance="Secondary"
+ Command="{Binding ViewModel.OpenTaskSchedulerCommand}"
+ Icon="{ui:SymbolIcon Settings24,
+ FontSize=16}"
+ ToolTip="{ext:Loc ScheduledTasks.Menu.OpenSettings}" />
+ </WrapPanel>
</Border>
<!-- No search results (Tasks) -->
- <StackPanel
- Style="{StaticResource DuckEmptyStatePanelStyle}"
- >
+ <StackPanel Style="{StaticResource EmptyStatePanelStyle}">
<StackPanel.Visibility>
<MultiBinding Converter="{StaticResource EmptyWhileNotLoadingConverter}">
<Binding Path="ViewModel.Tasks.Count" />
@@ -517,26 +424,19 @@
HorizontalAlignment="Center"
FontSize="36"
Foreground="{DynamicResource SystemFillColorCriticalBrush}"
- Symbol="SearchInfo24"
- />
+ Symbol="SearchInfo24" />
<ui:TextBlock
HorizontalAlignment="Center"
- Foreground="{DynamicResource TextFillColorSecondaryBrush}"
FontTypography="Body"
- Text="{ext:Loc Bloatware.Search.NoResults}"
- />
+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"
+ Text="{ext:Loc Bloatware.Search.NoResults}" />
</StackPanel>
<!-- Tasks List -->
- <ItemsControl
- ItemsSource="{Binding ViewModel.Tasks}"
- Visibility="{Binding ViewModel.Tasks.Count, Converter={StaticResource GreaterThanZeroToVisibilityConverter}}"
- >
+ <ItemsControl ItemsSource="{Binding ViewModel.Tasks}" Visibility="{Binding ViewModel.Tasks.Count, Converter={StaticResource GreaterThanZeroToVisibilityConverter}}">
<ItemsControl.ItemTemplate>
<DataTemplate DataType="{x:Type startupManager:StartupTask}">
- <Border
- Style="{StaticResource DuckListRowStyle}"
- >
+ <Border Style="{StaticResource ListRowStyle}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
@@ -551,35 +451,25 @@
Margin="0,0,12,0"
VerticalAlignment="Center"
Source="{Binding LogoImage}"
- Stretch="UniformToFill"
- />
+ Stretch="UniformToFill" />
<StackPanel
Grid.Column="1"
Margin="0,0,12,0"
- VerticalAlignment="Center"
- >
- <ui:TextBlock
- FontTypography="BodyStrong"
- Text="{Binding TaskName}"
- />
+ VerticalAlignment="Center">
+ <ui:TextBlock FontTypography="BodyStrong" Text="{Binding TaskName}" />
<ui:TextBlock
Margin="0,4,0,0"
- Foreground="{DynamicResource TextFillColorSecondaryBrush}"
FontTypography="Caption"
+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"
Text="{Binding Description}"
- TextWrapping="Wrap"
- />
+ TextWrapping="Wrap" />
<ui:TextBlock
Margin="0,2,0,0"
- Foreground="{DynamicResource TextFillColorDisabledBrush}"
FontTypography="Caption"
- Text="{Binding TaskPath}"
- />
- <ItemsControl
- Margin="0,4,0,0"
- ItemsSource="{Binding TriggerTypes}"
- >
+ Foreground="{DynamicResource TextFillColorDisabledBrush}"
+ Text="{Binding TaskPath}" />
+ <ItemsControl Margin="0,4,0,0" ItemsSource="{Binding TriggerTypes}">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<WrapPanel Orientation="Horizontal" />
@@ -591,21 +481,18 @@
Margin="0,0,4,2"
Padding="6,2"
Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
- CornerRadius="4"
- >
+ CornerRadius="4">
<StackPanel Orientation="Horizontal">
<ui:SymbolIcon
Margin="0,0,4,0"
FontSize="15"
Foreground="{DynamicResource TextFillColorSecondaryBrush}"
- Symbol="Timer24"
- />
+ Symbol="Timer24" />
<ui:TextBlock
VerticalAlignment="Center"
FontTypography="Caption"
Foreground="{DynamicResource TextFillColorSecondaryBrush}"
- Text="{Binding}"
- />
+ Text="{Binding}" />
</StackPanel>
</Border>
</DataTemplate>
@@ -613,18 +500,16 @@
</ItemsControl>
<ui:TextBlock
Margin="0,2,0,0"
- Foreground="{DynamicResource TextFillColorDisabledBrush}"
FontTypography="Caption"
+ Foreground="{DynamicResource TextFillColorDisabledBrush}"
Text="{Binding ActionSummary}"
- TextTrimming="CharacterEllipsis"
- />
+ TextTrimming="CharacterEllipsis" />
</StackPanel>
<StackPanel
Grid.Column="2"
VerticalAlignment="Center"
- Orientation="Horizontal"
- >
+ Orientation="Horizontal">
<ui:Button
Margin="0,0,4,0"
Padding="8"
@@ -633,14 +518,12 @@
CommandParameter="{Binding}"
Icon="{ui:SymbolIcon Info24,
FontSize=16}"
- ToolTip="{ext:Loc ScheduledTasks.Action.Details}"
- />
+ ToolTip="{ext:Loc ScheduledTasks.Action.Details}" />
<ui:ToggleSwitch
- Style="{StaticResource DuckToggleSwitchStyle}"
IsChecked="{Binding IsEnabled, Mode=TwoWay}"
OffContent="{ext:Loc Common.Toggle.Off}"
OnContent="{ext:Loc Common.Toggle.On}"
- />
+ Style="{StaticResource ToggleSwitchStyle}" />
</StackPanel>
</Grid>
</Border>
diff --git a/optimizerDuck/UI/Styles/FluentDesign.xaml b/optimizerDuck/UI/Styles/FluentDesign.xaml
index 06081ce..5f5db9e 100644
--- a/optimizerDuck/UI/Styles/FluentDesign.xaml
+++ b/optimizerDuck/UI/Styles/FluentDesign.xaml
@@ -1,92 +1,92 @@
<ResourceDictionary
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:sys="clr-namespace:System;assembly=mscorlib"
- xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
- xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-
- <sys:Double x:Key="DuckSpace4">4</sys:Double>
- <sys:Double x:Key="DuckSpace8">8</sys:Double>
- <sys:Double x:Key="DuckSpace12">12</sys:Double>
- <sys:Double x:Key="DuckSpace16">16</sys:Double>
- <sys:Double x:Key="DuckSpace20">20</sys:Double>
- <sys:Double x:Key="DuckSpace24">24</sys:Double>
- <sys:Double x:Key="DuckSpace32">32</sys:Double>
- <sys:Double x:Key="DuckSpace40">40</sys:Double>
-
- <CornerRadius x:Key="DuckCornerRadiusSmall">4</CornerRadius>
- <CornerRadius x:Key="DuckCornerRadiusMedium">8</CornerRadius>
- <CornerRadius x:Key="DuckCornerRadiusLarge">12</CornerRadius>
- <Thickness x:Key="DuckPageMargin">42,32,42,0</Thickness>
- <Thickness x:Key="DuckPageInnerMargin">0,0,16,0</Thickness>
- <Thickness x:Key="DuckSectionMargin">0,0,0,24</Thickness>
- <Thickness x:Key="DuckSectionTopMargin">0,24,0,0</Thickness>
- <Thickness x:Key="DuckCardPadding">16,14</Thickness>
- <Thickness x:Key="DuckListRowPadding">16,12</Thickness>
- <Thickness x:Key="DuckToolbarPadding">16,12</Thickness>
- <Thickness x:Key="DuckControlGap">0,0,8,0</Thickness>
- <Thickness x:Key="DuckRowGap">0,0,0,8</Thickness>
-
- <Color x:Key="DuckAccentYellowColor">#FFFFD114</Color>
- <SolidColorBrush x:Key="DuckAccentYellowBrush" Color="{StaticResource DuckAccentYellowColor}" />
- <SolidColorBrush x:Key="DuckAccentYellowMutedBrush" Color="#33FFD114" />
-
- <Style x:Key="DuckPageRootStyle" TargetType="Page">
+ xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml">
+
+ <sys:Double x:Key="Space4">4</sys:Double>
+ <sys:Double x:Key="Space8">8</sys:Double>
+ <sys:Double x:Key="Space12">12</sys:Double>
+ <sys:Double x:Key="Space16">16</sys:Double>
+ <sys:Double x:Key="Space20">20</sys:Double>
+ <sys:Double x:Key="Space24">24</sys:Double>
+ <sys:Double x:Key="Space32">32</sys:Double>
+ <sys:Double x:Key="Space40">40</sys:Double>
+
+ <CornerRadius x:Key="CornerRadiusSmall">4</CornerRadius>
+ <CornerRadius x:Key="CornerRadiusMedium">8</CornerRadius>
+ <CornerRadius x:Key="CornerRadiusLarge">12</CornerRadius>
+ <Thickness x:Key="PageMargin">42,32,42,0</Thickness>
+ <Thickness x:Key="PageInnerMargin">0,0,16,0</Thickness>
+ <Thickness x:Key="SectionMargin">0,0,0,24</Thickness>
+ <Thickness x:Key="SectionTopMargin">0,12,0,0</Thickness>
+ <Thickness x:Key="CardPadding">16,14</Thickness>
+ <Thickness x:Key="ListRowPadding">16,12</Thickness>
+ <Thickness x:Key="ToolbarPadding">16,12</Thickness>
+ <Thickness x:Key="ControlGap">0,0,8,0</Thickness>
+ <Thickness x:Key="RowGap">0,0,0,8</Thickness>
+
+ <Color x:Key="AccentYellowColor">#FFFFD114</Color>
+ <SolidColorBrush x:Key="AccentYellowBrush" Color="{StaticResource AccentYellowColor}" />
+ <SolidColorBrush x:Key="AccentYellowMutedBrush" Color="#33FFD114" />
+
+ <Style x:Key="PageRootStyle" TargetType="Page">
<Setter Property="Foreground" Value="{DynamicResource TextFillColorPrimaryBrush}" />
- <Setter Property="Margin" Value="{StaticResource DuckPageMargin}" />
+ <Setter Property="Margin" Value="{StaticResource PageMargin}" />
<Setter Property="ScrollViewer.CanContentScroll" Value="False" />
<Setter Property="UseLayoutRounding" Value="True" />
<Setter Property="SnapsToDevicePixels" Value="True" />
</Style>
- <Style x:Key="DuckPageHeaderStyle" TargetType="StackPanel">
- <Setter Property="Margin" Value="{StaticResource DuckSectionMargin}" />
+ <Style x:Key="PageHeaderStyle" TargetType="StackPanel">
+ <Setter Property="Margin" Value="{StaticResource SectionMargin}" />
</Style>
- <Style x:Key="DuckPageTitleStyle" TargetType="ui:TextBlock">
+ <Style x:Key="PageTitleStyle" TargetType="ui:TextBlock">
<Setter Property="FontTypography" Value="Title" />
<Setter Property="TextWrapping" Value="Wrap" />
</Style>
- <Style x:Key="DuckPageDescriptionStyle" TargetType="ui:TextBlock">
+ <Style x:Key="PageDescriptionStyle" TargetType="ui:TextBlock">
<Setter Property="Margin" Value="0,4,0,0" />
<Setter Property="Appearance" Value="Secondary" />
<Setter Property="FontTypography" Value="Body" />
<Setter Property="TextWrapping" Value="Wrap" />
</Style>
- <Style x:Key="DuckSectionHeaderStyle" TargetType="ui:TextBlock">
- <Setter Property="Margin" Value="0,0,0,8" />
+ <Style x:Key="SectionHeaderStyle" TargetType="ui:TextBlock">
+ <Setter Property="Margin" Value="0,0,0,5" />
<Setter Property="FontTypography" Value="BodyStrong" />
<Setter Property="TextWrapping" Value="Wrap" />
</Style>
- <Style x:Key="DuckSecondaryTextStyle" TargetType="ui:TextBlock">
+ <Style x:Key="SecondaryTextStyle" TargetType="ui:TextBlock">
<Setter Property="Appearance" Value="Secondary" />
<Setter Property="TextWrapping" Value="Wrap" />
</Style>
- <Style x:Key="DuckCaptionTextStyle" TargetType="ui:TextBlock">
+ <Style x:Key="CaptionTextStyle" TargetType="ui:TextBlock">
<Setter Property="Appearance" Value="Secondary" />
<Setter Property="FontTypography" Value="Caption" />
<Setter Property="TextWrapping" Value="Wrap" />
</Style>
- <Style x:Key="DuckToolbarSurfaceStyle" TargetType="Border">
+ <Style x:Key="ToolbarSurfaceStyle" TargetType="Border">
<Setter Property="Margin" Value="0,0,0,12" />
- <Setter Property="Padding" Value="{StaticResource DuckToolbarPadding}" />
+ <Setter Property="Padding" Value="{StaticResource ToolbarPadding}" />
<Setter Property="Background" Value="{DynamicResource CardBackgroundFillColorSecondaryBrush}" />
<Setter Property="BorderBrush" Value="{DynamicResource CardStrokeColorDefaultBrush}" />
<Setter Property="BorderThickness" Value="1" />
- <Setter Property="CornerRadius" Value="{StaticResource DuckCornerRadiusLarge}" />
+ <Setter Property="CornerRadius" Value="{StaticResource CornerRadiusLarge}" />
</Style>
- <Style x:Key="DuckCardSurfaceStyle" TargetType="Border">
- <Setter Property="Margin" Value="{StaticResource DuckRowGap}" />
- <Setter Property="Padding" Value="{StaticResource DuckCardPadding}" />
+ <Style x:Key="CardSurfaceStyle" TargetType="Border">
+ <Setter Property="Margin" Value="{StaticResource RowGap}" />
+ <Setter Property="Padding" Value="{StaticResource CardPadding}" />
<Setter Property="Background" Value="{DynamicResource CardBackgroundFillColorDefaultBrush}" />
<Setter Property="BorderBrush" Value="{DynamicResource CardStrokeColorDefaultBrush}" />
<Setter Property="BorderThickness" Value="1" />
- <Setter Property="CornerRadius" Value="{StaticResource DuckCornerRadiusMedium}" />
+ <Setter Property="CornerRadius" Value="{StaticResource CornerRadiusMedium}" />
<Setter Property="Opacity" Value="1" />
<Style.Triggers>
<EventTrigger RoutedEvent="Loaded">
@@ -103,13 +103,13 @@
</Style.Triggers>
</Style>
- <Style x:Key="DuckListRowStyle" TargetType="Border">
- <Setter Property="Margin" Value="{StaticResource DuckRowGap}" />
- <Setter Property="Padding" Value="{StaticResource DuckListRowPadding}" />
+ <Style x:Key="ListRowStyle" TargetType="Border">
+ <Setter Property="Margin" Value="{StaticResource RowGap}" />
+ <Setter Property="Padding" Value="{StaticResource ListRowPadding}" />
<Setter Property="Background" Value="{DynamicResource CardBackgroundFillColorDefaultBrush}" />
<Setter Property="BorderBrush" Value="{DynamicResource CardStrokeColorDefaultBrush}" />
<Setter Property="BorderThickness" Value="1" />
- <Setter Property="CornerRadius" Value="{StaticResource DuckCornerRadiusMedium}" />
+ <Setter Property="CornerRadius" Value="{StaticResource CornerRadiusMedium}" />
<Setter Property="Opacity" Value="1" />
<Style.Triggers>
<EventTrigger RoutedEvent="Loaded">
@@ -126,80 +126,87 @@
</Style.Triggers>
</Style>
- <Style x:Key="DuckSubtlePillStyle" TargetType="Border">
+ <Style x:Key="SubtlePillStyle" TargetType="Border">
<Setter Property="Padding" Value="6,2" />
<Setter Property="Background" Value="{DynamicResource CardBackgroundFillColorSecondaryBrush}" />
- <Setter Property="CornerRadius" Value="{StaticResource DuckCornerRadiusSmall}" />
+ <Setter Property="CornerRadius" Value="{StaticResource CornerRadiusSmall}" />
</Style>
- <Style x:Key="DuckRoundIconSurfaceStyle" TargetType="Border">
+ <Style x:Key="RoundIconSurfaceStyle" TargetType="Border">
<Setter Property="Width" Value="40" />
<Setter Property="Height" Value="40" />
<Setter Property="Background" Value="{DynamicResource ControlFillColorSecondaryBrush}" />
<Setter Property="CornerRadius" Value="20" />
</Style>
- <Style x:Key="DuckEmptyStatePanelStyle" TargetType="StackPanel">
+ <Style x:Key="EmptyStatePanelStyle" TargetType="StackPanel">
<Setter Property="Margin" Value="0,64,0,32" />
<Setter Property="HorizontalAlignment" Value="Center" />
<Setter Property="VerticalAlignment" Value="Center" />
</Style>
- <Style x:Key="DuckEmptyStateIconStyle" TargetType="ui:SymbolIcon">
+ <Style x:Key="EmptyStateIconStyle" TargetType="ui:SymbolIcon">
<Setter Property="Margin" Value="0,0,0,12" />
<Setter Property="HorizontalAlignment" Value="Center" />
<Setter Property="FontSize" Value="40" />
<Setter Property="Foreground" Value="{DynamicResource TextFillColorDisabledBrush}" />
</Style>
- <Style x:Key="DuckSearchBoxStyle" TargetType="ui:TextBox">
+ <Style
+ x:Key="SearchBoxStyle"
+ BasedOn="{StaticResource DefaultUiTextBoxStyle}"
+ TargetType="ui:TextBox">
<Setter Property="MinWidth" Value="240" />
- <Setter Property="Margin" Value="{StaticResource DuckControlGap}" />
+ <Setter Property="Margin" Value="{StaticResource ControlGap}" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="Icon" Value="{ui:SymbolIcon Search24}" />
</Style>
- <Style x:Key="DuckToggleSwitchStyle" TargetType="ui:ToggleSwitch">
- <Setter Property="Margin" Value="{StaticResource DuckControlGap}" />
+ <Style
+ x:Key="ToggleSwitchStyle"
+ BasedOn="{StaticResource DefaultUiToggleSwitchStyle}"
+ TargetType="ui:ToggleSwitch">
+ <Setter Property="Margin" Value="{StaticResource ControlGap}" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="Cursor" Value="Hand" />
</Style>
- <Style x:Key="DuckComboBoxStyle" TargetType="ComboBox">
- <Setter Property="Margin" Value="{StaticResource DuckControlGap}" />
- <Setter Property="VerticalAlignment" Value="Center" />
- <Setter Property="MinWidth" Value="150" />
+ <Style
+ x:Key="ComboBoxStyle"
+ BasedOn="{StaticResource DefaultComboBoxStyle}"
+ TargetType="ComboBox">
+ <Setter Property="Margin" Value="{StaticResource ControlGap}" />
</Style>
- <Style x:Key="DuckSettingsSectionStyle" TargetType="StackPanel">
- <Setter Property="Margin" Value="{StaticResource DuckSectionTopMargin}" />
+ <Style x:Key="SettingsSectionStyle" TargetType="StackPanel">
+ <Setter Property="Margin" Value="{StaticResource SectionTopMargin}" />
</Style>
- <Style x:Key="DuckSettingsRowHeaderStyle" TargetType="StackPanel">
+ <Style x:Key="SettingsRowHeaderStyle" TargetType="StackPanel">
<Setter Property="VerticalAlignment" Value="Center" />
</Style>
- <Style x:Key="DuckDialogRootStyle" TargetType="Grid">
+ <Style x:Key="DialogRootStyle" TargetType="Grid">
<Setter Property="MinWidth" Value="420" />
</Style>
- <Style x:Key="DuckDialogContentStackStyle" TargetType="StackPanel">
+ <Style x:Key="DialogContentStackStyle" TargetType="StackPanel">
<Setter Property="Margin" Value="0" />
</Style>
- <Style x:Key="DuckDialogIconStyle" TargetType="ui:SymbolIcon">
+ <Style x:Key="DialogIconStyle" TargetType="ui:SymbolIcon">
<Setter Property="Margin" Value="0,0,0,12" />
<Setter Property="HorizontalAlignment" Value="Center" />
<Setter Property="FontSize" Value="44" />
- <Setter Property="Foreground" Value="{DynamicResource DuckAccentYellowBrush}" />
+ <Setter Property="Foreground" Value="{DynamicResource AccentYellowBrush}" />
</Style>
- <Style x:Key="DuckContentPresenterGridItemStyle" TargetType="ContentPresenter">
+ <Style x:Key="ContentPresenterGridItemStyle" TargetType="ContentPresenter">
<Setter Property="Margin" Value="0,0,12,12" />
<Setter Property="HorizontalAlignment" Value="Stretch" />
</Style>
- <Style x:Key="DuckContentPresenterRowStyle" TargetType="ContentPresenter">
+ <Style x:Key="ContentPresenterRowStyle" TargetType="ContentPresenter">
<Setter Property="Margin" Value="0,0,0,8" />
<Setter Property="HorizontalAlignment" Value="Stretch" />
</Style>
diff --git a/optimizerDuck/UI/Windows/MainWindow.xaml b/optimizerDuck/UI/Windows/MainWindow.xaml
index c7fb489..a7b8df0 100644
--- a/optimizerDuck/UI/Windows/MainWindow.xaml
+++ b/optimizerDuck/UI/Windows/MainWindow.xaml
@@ -23,8 +23,7 @@
WindowBackdropType="Mica"
WindowCornerPreference="Round"
WindowStartupLocation="CenterScreen"
- mc:Ignorable="d"
->
+ mc:Ignorable="d">
<Grid>
<ui:NavigationView
x:Name="RootNavigation"
@@ -36,15 +35,13 @@
IsTopSeparatorVisible="False"
OpenPaneLength="220"
PaneDisplayMode="Left"
- TitleBar="{Binding ElementName=TitleBar, Mode=OneWay}"
- >
+ TitleBar="{Binding ElementName=TitleBar, Mode=OneWay}">
<ui:NavigationView.MenuItems>
<controls:FilledNavigationViewItem
Content="{extensions:Loc Sidebar.Dashboard}"
Cursor="Hand"
Icon="{ui:SymbolIcon Home24}"
- TargetPageType="{x:Type pages:DashboardPage}"
- />
+ TargetPageType="{x:Type pages:DashboardPage}" />
<ui:NavigationViewItemSeparator Margin="0,2,0,2" />
@@ -52,21 +49,18 @@
Content="{extensions:Loc Sidebar.Optimize}"
Cursor="Hand"
Icon="{ui:SymbolIcon Rocket24}"
- TargetPageType="{x:Type pages:OptimizePage}"
- />
+ TargetPageType="{x:Type pages:OptimizePage}" />
<ui:NavigationViewItem
x:Name="FeaturesMenuItem"
Content="{extensions:Loc Sidebar.Features}"
- Icon="{ui:SymbolIcon ToggleLeft24}"
- />
+ Icon="{ui:SymbolIcon ToggleLeft24}" />
<controls:FilledNavigationViewItem
Content="{extensions:Loc Sidebar.Bloatware}"
Cursor="Hand"
Icon="{ui:SymbolIcon Delete24}"
- TargetPageType="{x:Type pages:BloatwarePage}"
- />
+ TargetPageType="{x:Type pages:BloatwarePage}" />
<ui:NavigationViewItemSeparator Margin="0,2,0,2" />
@@ -74,22 +68,19 @@
Content="{extensions:Loc Sidebar.StartupManager}"
Cursor="Hand"
Icon="{ui:SymbolIcon WindowArrowUp24}"
- TargetPageType="{x:Type pages:StartupManagerPage}"
- />
+ TargetPageType="{x:Type pages:StartupManagerPage}" />
<controls:FilledNavigationViewItem
Content="{extensions:Loc Sidebar.ScheduledTasks}"
Cursor="Hand"
Icon="{ui:SymbolIcon CalendarLtr24}"
- TargetPageType="{x:Type pages:ScheduledTasksPage}"
- />
+ TargetPageType="{x:Type pages:ScheduledTasksPage}" />
<controls:FilledNavigationViewItem
Content="{extensions:Loc Sidebar.DiskCleanup}"
Cursor="Hand"
Icon="{ui:SymbolIcon HardDrive20}"
- TargetPageType="{x:Type pages:DiskCleanupPage}"
- />
+ TargetPageType="{x:Type pages:DiskCleanupPage}" />
</ui:NavigationView.MenuItems>
<ui:NavigationView.FooterMenuItems>
@@ -98,8 +89,7 @@
Content="{extensions:Loc Sidebar.Settings}"
Cursor="Hand"
Icon="{ui:SymbolIcon Settings24}"
- TargetPageType="{x:Type pages:SettingsPage}"
- />
+ TargetPageType="{x:Type pages:SettingsPage}" />
</ui:NavigationView.FooterMenuItems>
<ui:NavigationView.ContentOverlay>
@@ -111,48 +101,50 @@
<ui:TitleBar x:Name="TitleBar">
<ui:TitleBar.Header>
- <StackPanel Margin="12,0,0,0" VerticalAlignment="Center" Orientation="Horizontal">
+ <StackPanel
+ Margin="12,0,0,0"
+ VerticalAlignment="Center"
+ Orientation="Horizontal">
<ui:SymbolIcon
FontSize="15"
Foreground="{DynamicResource TextFillColorDisabledBrush}"
- Symbol="Shield24"
- />
+ Symbol="Shield24" />
<ui:ImageIcon
Height="25"
Margin="8,0,6,0"
VerticalAlignment="Center"
- Source="pack://application:,,,/Resources/Images/Duck.png"
- />
+ Source="pack://application:,,,/Resources/Images/Duck.png" />
<ui:TextBlock
Margin="0,0,6,0"
VerticalAlignment="Center"
FontTypography="Body"
- Text="optimizerDuck"
- />
+ Text="optimizerDuck" />
<ui:TextBlock
VerticalAlignment="Center"
- Foreground="{DynamicResource TextFillColorDisabledBrush}"
FontTypography="Body"
- Text="{Binding Version, Mode=OneWay}"
- />
+ Foreground="{DynamicResource TextFillColorDisabledBrush}"
+ Text="{Binding Version, Mode=OneWay}" />
</StackPanel>
</ui:TitleBar.Header>
<ui:TitleBar.TrailingContent>
- <StackPanel Margin="0,0,8,0" VerticalAlignment="Center" Orientation="Horizontal">
+ <StackPanel
+ Margin="0,0,8,0"
+ VerticalAlignment="Center"
+ Orientation="Horizontal">
<ui:Button
Margin="0,0,8,0"
Appearance="Transparent"
Command="{Binding OpenSupportLinkCommand}"
+ Cursor="Hand"
Icon="{ui:SymbolIcon Heart24}"
- ToolTip="Support the project"
- />
+ ToolTip="Support the project" />
<ui:Button
Appearance="Transparent"
Command="{Binding OpenDiscordLinkCommand}"
+ Cursor="Hand"
Icon="{ui:SymbolIcon Link24}"
- ToolTip="Join our Discord"
- />
+ ToolTip="Join our Discord" />
</StackPanel>
</ui:TitleBar.TrailingContent>
</ui:TitleBar>