Skip to content

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

feat: IM TOO LAZY

itsfatduckc404362f6c7f
diff --git a/optimizerDuck/Resources/Languages/Translations.resx b/optimizerDuck/Resources/Languages/Translations.resx
index 8b72813..c8e6f1a 100644
--- a/optimizerDuck/Resources/Languages/Translations.resx
+++ b/optimizerDuck/Resources/Languages/Translations.resx
@@ -1003,6 +1003,9 @@ Update now to enjoy the latest features, improvements, and bug fixes.</value>
<data name="Bloatware.Menu.SelectAllSafe" xml:space="preserve">
<value>Select All Safe</value>
</data>
+ <data name="Bloatware.Menu.UnselectAllSafe" xml:space="preserve">
+ <value>Unselect All Safe</value>
+ </data>
<data name="Optimizer.Menu.HideApplied" xml:space="preserve">
<value>Hide Applied</value>
</data>
diff --git a/optimizerDuck/Resources/Languages/Translations.ru-RU.resx b/optimizerDuck/Resources/Languages/Translations.ru-RU.resx
index 84a0d94..9396492 100644
--- a/optimizerDuck/Resources/Languages/Translations.ru-RU.resx
+++ b/optimizerDuck/Resources/Languages/Translations.ru-RU.resx
@@ -1003,6 +1003,9 @@
<data name="Bloatware.Menu.SelectAllSafe" xml:space="preserve">
<value>Выбрать все безопасные</value>
</data>
+ <data name="Bloatware.Menu.UnselectAllSafe" xml:space="preserve">
+ <value>Отменить выбор безопасных</value>
+ </data>
<data name="Optimizer.Menu.HideApplied" xml:space="preserve">
<value>Скрыть примененные</value>
</data>
diff --git a/optimizerDuck/Resources/Languages/Translations.vi-vn.resx b/optimizerDuck/Resources/Languages/Translations.vi-VN.resx
similarity index 99%
rename from optimizerDuck/Resources/Languages/Translations.vi-vn.resx
rename to optimizerDuck/Resources/Languages/Translations.vi-VN.resx
index 52a81b0..f8a58b0 100644
--- a/optimizerDuck/Resources/Languages/Translations.vi-vn.resx
+++ b/optimizerDuck/Resources/Languages/Translations.vi-VN.resx
@@ -1003,6 +1003,9 @@ Cập nhật ngay để trải nghiệm các tính năng mới, cải tiến và
<data name="Bloatware.Menu.SelectAllSafe" xml:space="preserve">
<value>Chọn tất cả an toàn</value>
</data>
+ <data name="Bloatware.Menu.UnselectAllSafe" xml:space="preserve">
+ <value>Bỏ chọn tất cả an toàn</value>
+ </data>
<data name="Optimizer.Menu.HideApplied" xml:space="preserve">
<value>Ẩn đã áp dụng</value>
</data>
diff --git a/optimizerDuck/Resources/Languages/Translations.zh-Hans.resx b/optimizerDuck/Resources/Languages/Translations.zh-Hans.resx
index 4088492..ac37c43 100644
--- a/optimizerDuck/Resources/Languages/Translations.zh-Hans.resx
+++ b/optimizerDuck/Resources/Languages/Translations.zh-Hans.resx
@@ -964,6 +964,9 @@
<data name="Bloatware.Menu.SelectAllSafe" xml:space="preserve">
<value>选择所有安全项</value>
</data>
+ <data name="Bloatware.Menu.UnselectAllSafe" xml:space="preserve">
+ <value>取消选择安全项</value>
+ </data>
<data name="Bloatware.Search.NoResults" xml:space="preserve">
<value>未找到结果。请尝试其他搜索词或筛选条件。</value>
</data>
diff --git a/optimizerDuck/UI/ViewModels/Optimizer/OptimizationCategoryViewModel.cs b/optimizerDuck/UI/ViewModels/Optimizer/OptimizationCategoryViewModel.cs
index 736770b..0c38eb1 100644
--- a/optimizerDuck/UI/ViewModels/Optimizer/OptimizationCategoryViewModel.cs
+++ b/optimizerDuck/UI/ViewModels/Optimizer/OptimizationCategoryViewModel.cs
@@ -36,6 +36,8 @@ public partial class OptimizationCategoryViewModel : ViewModel
private readonly ObservableCollection<IOptimization> _allOptimizations = [];
[ObservableProperty] private ObservableCollection<IOptimization> _optimizations = [];
+ public bool HasAppliedOptimizations => _allOptimizations.Any(o => o.State.IsApplied);
+
// Search, Filter, Sort
[ObservableProperty] private string _searchText = string.Empty;
@@ -90,6 +92,11 @@ public partial class OptimizationCategoryViewModel : ViewModel
foreach (var optimization in _category.Optimizations)
{
+ optimization.State.PropertyChanged += (_, e) =>
+ {
+ if (e.PropertyName == nameof(OptimizationState.IsApplied))
+ OnPropertyChanged(nameof(HasAppliedOptimizations));
+ };
_allOptimizations.Add(optimization);
await Task.Delay(10);
}
@@ -135,6 +142,8 @@ public partial class OptimizationCategoryViewModel : ViewModel
Optimizations.Clear();
foreach (var item in filtered)
Optimizations.Add(item);
+
+ OnPropertyChanged(nameof(HasAppliedOptimizations));
}
// Keep the progress dialog visible while long-running work is running.
diff --git a/optimizerDuck/UI/ViewModels/Pages/BloatwareViewModel.cs b/optimizerDuck/UI/ViewModels/Pages/BloatwareViewModel.cs
index 25dc5e3..4e0a65a 100644
--- a/optimizerDuck/UI/ViewModels/Pages/BloatwareViewModel.cs
+++ b/optimizerDuck/UI/ViewModels/Pages/BloatwareViewModel.cs
@@ -55,6 +55,8 @@ public partial class BloatwareViewModel : ViewModel
public bool HasSelectedItems => AppxPackages.Any(x => x.IsSelected);
public int SelectedCount => AppxPackages.Count(x => x.IsSelected);
public bool HasData => _allPackages.Count > 0;
+ public bool HasSafePackages => AppxPackages.Any(x => x.Risk == AppRisk.Safe);
+ public bool IsAllSafeSelected => HasSafePackages && AppxPackages.Where(x => x.Risk == AppRisk.Safe).All(x => x.IsSelected);
public BloatwareViewModel(BloatwareService bloatwareService, IContentDialogService contentDialogService,
ISnackbarService snackbarService, ILogger<BloatwareViewModel> logger)
@@ -207,8 +209,9 @@ public partial class BloatwareViewModel : ViewModel
[RelayCommand]
private void SelectAllSafe()
{
- foreach (var package in AppxPackages)
- package.IsSelected = package.Risk == AppRisk.Safe;
+ var shouldDeselect = IsAllSafeSelected;
+ foreach (var package in AppxPackages.Where(x => x.Risk == AppRisk.Safe))
+ package.IsSelected = !shouldDeselect;
}
#endregion Commands
@@ -233,6 +236,8 @@ public partial class BloatwareViewModel : ViewModel
OnPropertyChanged(nameof(HasSelectedItems));
OnPropertyChanged(nameof(SelectedCount));
OnPropertyChanged(nameof(HasData));
+ OnPropertyChanged(nameof(HasSafePackages));
+ OnPropertyChanged(nameof(IsAllSafeSelected));
}
#endregion Helpers
diff --git a/optimizerDuck/UI/Views/Pages/BloatwarePage.xaml b/optimizerDuck/UI/Views/Pages/BloatwarePage.xaml
index c984a96..6660fef 100644
--- a/optimizerDuck/UI/Views/Pages/BloatwarePage.xaml
+++ b/optimizerDuck/UI/Views/Pages/BloatwarePage.xaml
@@ -1,7 +1,16 @@
<Page
+ Foreground="{DynamicResource TextFillColorPrimaryBrush}"
+ Margin="0,32,0,0"
+ ScrollViewer.CanContentScroll="False"
+ Title="BloatwarePage"
+ d:DataContext="{d:DesignInstance local:BloatwarePage}"
+ d:DesignHeight="1200"
+ d:DesignWidth="800"
+ mc:Ignorable="d"
+ ui:Design.Background="Black"
+ ui:Design.Foreground="White"
x:Class="optimizerDuck.UI.Views.Pages.BloatwarePage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
- xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:bloatware="clr-namespace:optimizerDuck.Core.Models.Bloatware"
xmlns:converters="clr-namespace:optimizerDuck.Common.Helpers.Converters"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -9,16 +18,7 @@
xmlns:local="clr-namespace:optimizerDuck.UI.Views.Pages"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
- Title="BloatwarePage"
- Margin="0,32,0,0"
- d:DataContext="{d:DesignInstance local:BloatwarePage}"
- d:DesignHeight="1200"
- d:DesignWidth="800"
- ui:Design.Background="Black"
- ui:Design.Foreground="White"
- Foreground="{DynamicResource TextFillColorPrimaryBrush}"
- ScrollViewer.CanContentScroll="False"
- mc:Ignorable="d">
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Page.Resources>
<converters:GreaterThanZeroToVisibilityConverter x:Key="GreaterThanZeroToVisibilityConverter" />
<converters:ZeroToVisibilityConverter x:Key="ZeroToVisibilityConverter" />
@@ -28,8 +28,8 @@
<Grid RowDefinitions="Auto *">
<ui:TextBlock
- Margin="0,0,0,20"
FontTypography="Title"
+ Margin="0,0,0,20"
Text="{ext:Loc Bloatware.Header.Title}"
TextWrapping="Wrap" />
@@ -52,26 +52,26 @@
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
<ui:SymbolIcon
- Margin="0,0,0,15"
- HorizontalAlignment="Center"
FontSize="46"
Foreground="{DynamicResource SystemFillColorCriticalBrush}"
+ HorizontalAlignment="Center"
+ Margin="0,0,0,15"
Symbol="DeleteOff24" />
<ui:TextBlock
- HorizontalAlignment="Center"
FontTypography="Subtitle"
+ HorizontalAlignment="Center"
Text="{ext:Loc Bloatware.Empty.Title}" />
<ui:TextBlock
- Margin="0,0,0,10"
- HorizontalAlignment="Center"
Appearance="Secondary"
FontTypography="Body"
+ HorizontalAlignment="Center"
+ Margin="0,0,0,10"
Text="{ext:Loc Bloatware.Empty.Description}" />
<ui:Button
- HorizontalAlignment="Center"
Appearance="Primary"
Command="{Binding ViewModel.RefreshCommand}"
Content="{ext:Loc Bloatware.Menu.Refresh}"
+ HorizontalAlignment="Center"
Icon="{ui:SymbolIcon ArrowClockwise24,
FontSize=18}" />
</StackPanel>
@@ -81,23 +81,23 @@
<Border Grid.Row="1" Visibility="{Binding ViewModel.IsLoading, Converter={StaticResource BooleanToVisibilityConverter}}">
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
<ui:ProgressRing
- Margin="0,0,0,5"
HorizontalAlignment="Center"
- VerticalAlignment="Center"
- IsIndeterminate="True" />
+ IsIndeterminate="True"
+ Margin="0,0,0,5"
+ VerticalAlignment="Center" />
<ui:TextBlock
- HorizontalAlignment="Center"
- VerticalAlignment="Center"
FontTypography="BodyStrong"
- Text="{ext:Loc Bloatware.Loading}" />
+ HorizontalAlignment="Center"
+ Text="{ext:Loc Bloatware.Loading}"
+ VerticalAlignment="Center" />
</StackPanel>
</Border>
<Border
- Grid.Row="1"
- Padding="8"
Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
CornerRadius="6"
+ Grid.Row="1"
+ Padding="8"
Visibility="{Binding ViewModel.HasData, Converter={StaticResource BooleanToVisibilityConverter}}">
<Grid RowDefinitions="Auto,Auto,*">
@@ -109,23 +109,26 @@
<!-- Search -->
<ui:TextBox
- MinWidth="200"
- Margin="0,0,8,4"
Icon="{ui:SymbolIcon Search24}"
+ Margin="0,0,8,0"
+ MinWidth="200"
PlaceholderText="{ext:Loc Common.Search.Placeholder}"
- Text="{Binding ViewModel.SearchText, UpdateSourceTrigger=PropertyChanged}" />
+ Text="{Binding ViewModel.SearchText, UpdateSourceTrigger=PropertyChanged}"
+ VerticalAlignment="Center" />
<!-- Filter by Risk -->
<ComboBox
Margin="0,0,8,0"
- VerticalAlignment="Center"
SelectedIndex="{Binding ViewModel.SelectedRiskFilterIndex}"
- ToolTip="{ext:Loc Common.Filter}">
+ ToolTip="{ext:Loc Common.Filter}"
+ ToolTipService.BetweenShowDelay="160"
+ ToolTipService.Placement="Top"
+ VerticalAlignment="Center">
<ComboBoxItem HorizontalContentAlignment="Left">
- <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
+ <Grid ColumnDefinitions="Auto Auto" HorizontalAlignment="Left">
<ui:SymbolIcon
- Margin="0,0,6,0"
HorizontalAlignment="Left"
+ Margin="0,0,6,0"
Symbol="Filter24" />
<TextBlock
Grid.Column="1"
@@ -134,21 +137,21 @@
</Grid>
</ComboBoxItem>
<ComboBoxItem HorizontalContentAlignment="Left">
- <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
+ <Grid ColumnDefinitions="Auto Auto" HorizontalAlignment="Left">
<ui:SymbolIcon
- Margin="0,0,6,0"
- HorizontalAlignment="Left"
Foreground="{DynamicResource SystemFillColorSuccessBrush}"
+ HorizontalAlignment="Left"
+ Margin="0,0,6,0"
Symbol="ShieldCheckmark24" />
<TextBlock Grid.Column="1" Text="{ext:Loc Optimizer.UI.Risk.Safe}" />
</Grid>
</ComboBoxItem>
<ComboBoxItem HorizontalContentAlignment="Left">
- <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
+ <Grid ColumnDefinitions="Auto Auto" HorizontalAlignment="Left">
<ui:SymbolIcon
- Margin="0,0,6,0"
- HorizontalAlignment="Left"
Foreground="{DynamicResource SystemFillColorCautionBrush}"
+ HorizontalAlignment="Left"
+ Margin="0,0,6,0"
Symbol="Warning24" />
<TextBlock Grid.Column="1" Text="{ext:Loc Optimizer.UI.Risk.Moderate}" />
</Grid>
@@ -156,9 +159,12 @@
</ComboBox>
<!-- Sort By -->
<ComboBox
- Margin="0,0,8,4"
+ Margin="0,0,8,0"
SelectedIndex="{Binding ViewModel.SelectedSortByIndex}"
- ToolTip="{ext:Loc Common.SortBy}">
+ ToolTip="{ext:Loc Common.SortBy}"
+ ToolTipService.BetweenShowDelay="160"
+ ToolTipService.Placement="Top"
+ VerticalAlignment="Center">
<ComboBoxItem Content="{ext:Loc Common.SortBy.Default}" />
<ComboBoxItem Content="{ext:Loc Common.SortBy.Name}" />
<ComboBoxItem Content="{ext:Loc Common.SortBy.Publisher}" />
@@ -179,14 +185,32 @@
Icon="{ui:SymbolIcon Delete24,
FontSize=18}" />
- <Separator Margin="3,0,3,0" />
+ <Separator Margin="3,0,3,0" Visibility="{Binding ViewModel.HasSafePackages, Converter={StaticResource BooleanToVisibilityConverter}}" />
- <ui:Button
- Appearance="Success"
- Command="{Binding ViewModel.SelectAllSafeCommand}"
- Content="{ext:Loc Bloatware.Menu.SelectAllSafe}"
- Icon="{ui:SymbolIcon ShieldCheckmark24,
- FontSize=18}" />
+ <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">
+ <Setter Property="Appearance" Value="Success" />
+ <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">
+ <Setter Property="Appearance" Value="Danger" />
+ <Setter Property="Content" Value="{ext:Loc Bloatware.Menu.UnselectAllSafe}" />
+ <Setter Property="Icon">
+ <Setter.Value>
+ <ui:SymbolIcon FontSize="18" Symbol="DismissCircle24" />
+ </Setter.Value>
+ </Setter>
+ </DataTrigger>
+ </Style.Triggers>
+ </Style>
+ </ui:Button.Style>
+ </ui:Button>
<Separator Margin="3,0,3,0" />
@@ -205,15 +229,15 @@
VerticalAlignment="Center"
Visibility="{Binding ViewModel.AppxPackages.Count, Converter={StaticResource ZeroToVisibilityConverter}}">
<ui:SymbolIcon
- Margin="0,0,0,10"
- HorizontalAlignment="Center"
FontSize="36"
- Foreground="{DynamicResource TextFillColorSecondaryBrush}"
+ Foreground="{DynamicResource SystemFillColorCriticalBrush}"
+ HorizontalAlignment="Center"
+ Margin="0,0,0,10"
Symbol="SearchInfo24" />
<ui:TextBlock
- HorizontalAlignment="Center"
Appearance="Secondary"
FontTypography="Body"
+ HorizontalAlignment="Center"
Text="{ext:Loc Bloatware.Search.NoResults}" />
</StackPanel>
@@ -239,10 +263,10 @@
<ui:VirtualizingItemsControl.ItemTemplate>
<DataTemplate DataType="{x:Type bloatware:AppXPackage}">
<Border
- Margin="0,0,0,4"
- Padding="12"
Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
- CornerRadius="6">
+ CornerRadius="6"
+ Margin="0,0,0,4"
+ Padding="12">
<Grid>
<Grid.ColumnDefinitions>
@@ -254,9 +278,9 @@
<!-- Checkbox -->
<CheckBox
Grid.Column="0"
+ IsChecked="{Binding IsSelected, Mode=TwoWay}"
Margin="0,4,12,0"
- VerticalAlignment="Top"
- IsChecked="{Binding IsSelected, Mode=TwoWay}" />
+ VerticalAlignment="Top" />
<!-- Content -->
<StackPanel Grid.Column="1">
@@ -268,25 +292,25 @@
<ui:TextBlock FontTypography="BodyStrong" Text="{Binding Name}" />
<Border
+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
+ CornerRadius="5"
+ HorizontalAlignment="Left"
Margin="5,0,0,0"
Padding="4,1"
- HorizontalAlignment="Left"
- VerticalAlignment="Center"
- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
- CornerRadius="5">
+ VerticalAlignment="Center">
<!-- Version -->
<ui:TextBlock
- VerticalAlignment="Center"
Appearance="Tertiary"
FontTypography="Body"
- Text="{Binding Version}" />
+ Text="{Binding Version}"
+ VerticalAlignment="Center" />
</Border>
<Border
+ CornerRadius="5"
+ HorizontalAlignment="Left"
Margin="5,0,0,0"
Padding="4,2"
- HorizontalAlignment="Left"
- CornerRadius="5"
Visibility="{Binding ShouldVisibleRisk, Converter={StaticResource BooleanToVisibilityConverter}}">
<Border.Style>
<Style TargetType="Border">
@@ -300,42 +324,42 @@
</Border.Style>
<StackPanel Orientation="Horizontal">
<ui:SymbolIcon
- Margin="0,0,5,0"
Foreground="{DynamicResource TextFillColorInverseBrush}"
+ Margin="0,0,5,0"
Symbol="{Binding RiskVisual.Icon}" />
<ui:TextBlock
- HorizontalAlignment="Center"
- VerticalAlignment="Center"
FontTypography="Caption"
Foreground="{DynamicResource TextFillColorInverseBrush}"
+ HorizontalAlignment="Center"
Text="{Binding RiskVisual.Display}"
- TextWrapping="Wrap" />
+ TextWrapping="Wrap"
+ VerticalAlignment="Center" />
</StackPanel>
</Border>
</DockPanel>
<!-- Publisher -->
<ui:TextBlock
- Margin="0,2,0,0"
Appearance="Disabled"
FontTypography="Body"
+ Margin="0,2,0,0"
Text="{Binding Publisher}"
TextTrimming="CharacterEllipsis" />
<!-- Install location -->
<ui:TextBlock
- Margin="0,2,0,0"
Appearance="Disabled"
FontTypography="Body"
+ Margin="0,2,0,0"
Text="{Binding InstallLocation}"
TextTrimming="CharacterEllipsis" />
<!-- Package full name -->
<ui:TextBlock
- Margin="0,4,0,0"
Appearance="Secondary"
FontTypography="Caption"
+ Margin="0,4,0,0"
Text="{Binding PackageFullName}"
TextTrimming="CharacterEllipsis" />
</StackPanel>
diff --git a/optimizerDuck/UI/Views/Pages/DashboardPage.xaml b/optimizerDuck/UI/Views/Pages/DashboardPage.xaml
index 4863975..19a9e92 100644
--- a/optimizerDuck/UI/Views/Pages/DashboardPage.xaml
+++ b/optimizerDuck/UI/Views/Pages/DashboardPage.xaml
@@ -1,29 +1,29 @@
<Page
+ Foreground="{DynamicResource TextFillColorPrimaryBrush}"
+ Margin="0,32,0,0"
+ 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.Views.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.Helpers.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.Views.Pages"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
- Title="Dashboard"
- Margin="0,32,0,0"
- d:DataContext="{d:DesignInstance pages:DashboardPage}"
- d:DesignHeight="650"
- d:DesignWidth="800"
- ui:Design.Background="Black"
- ui:Design.Foreground="White"
- Foreground="{DynamicResource TextFillColorPrimaryBrush}"
- ScrollViewer.CanContentScroll="False"
- mc:Ignorable="d">
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Page.Resources>
<converters:BooleanToVisibilityConverter x:Key="BoolToVisibilityConverter" />
<converters:MBToGBConverter x:Key="MBToGBConverter" />
- <converters:GreaterThanNumberToVisibilityConverter x:Key="GreaterThanOneToVisibilityConverter" Threshold="1" />
- <converters:MinusNumberConverter x:Key="MinusOneConverter" NumberToMinus="1" />
+ <converters:GreaterThanNumberToVisibilityConverter Threshold="1" x:Key="GreaterThanOneToVisibilityConverter" />
+ <converters:MinusNumberConverter NumberToMinus="1" x:Key="MinusOneConverter" />
<converters:ThemeToGitHubIconConverter x:Key="ThemeToGitHubIconConverter" />
</Page.Resources>
@@ -36,13 +36,13 @@
<Border Background="{DynamicResource ApplicationBackgroundBrush}" Opacity="0.8" />
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
<ui:ProgressRing
- Width="60"
Height="60"
- IsIndeterminate="True" />
+ IsIndeterminate="True"
+ Width="60" />
<ui:TextBlock
- Margin="0,16,0,0"
- HorizontalAlignment="Center"
FontTypography="Subtitle"
+ HorizontalAlignment="Center"
+ Margin="0,16,0,0"
Text="{ext:Loc Dashboard.SystemInfo.Loading}"
TextWrapping="Wrap" />
</StackPanel>
@@ -51,8 +51,8 @@
<!-- Header -->
<StackPanel Margin="0,0,0,20">
<ui:InfoBar
- Margin="0,0,0,10"
IsOpen="{Binding ViewModel.IsUpdateInfoOpen, Mode=TwoWay}"
+ Margin="0,0,0,10"
Message="{ext:Loc Dashboard.UpdateInfoBar.Message,
{Binding ViewModel.LatestVersion}}"
Severity="Warning" />
@@ -90,14 +90,14 @@
<!-- Action Cards -->
<UniformGrid
+ Columns="3"
Grid.Row="1"
- Margin="0,0,0,20"
- Columns="3">
+ Margin="0,0,0,20">
<ui:CardAction
- Margin="0,0,5,0"
- VerticalAlignment="Stretch"
Command="{Binding ViewModel.OpenActionCommand}"
- CommandParameter="Discord">
+ CommandParameter="Discord"
+ Margin="0,0,5,0"
+ VerticalAlignment="Stretch">
<ui:CardAction.Icon>
<ui:ImageIcon Height="25" Source="pack://application:,,,/Resources/Images/DiscordLogo.png" />
</ui:CardAction.Icon>
@@ -112,10 +112,10 @@
</ui:CardAction>
<ui:CardAction
- Margin="5,0,5,0"
- VerticalAlignment="Stretch"
Command="{Binding ViewModel.OpenActionCommand}"
- CommandParameter="GitHub">
+ CommandParameter="GitHub"
+ Margin="5,0,5,0"
+ VerticalAlignment="Stretch">
<ui:CardAction.Icon>
<ui:ImageIcon Height="40" Source="{Binding ViewModel.CurrentApplicationTheme, Converter={StaticResource ThemeToGitHubIconConverter}}" />
</ui:CardAction.Icon>
@@ -130,13 +130,19 @@
</ui:CardAction>
<ui:CardAction
- Margin="5,0,0,0"
- VerticalAlignment="Stretch"
BorderThickness="1"
Command="{Binding ViewModel.OpenActionCommand}"
CommandParameter="Support"
- Icon="{ui:SymbolIcon Star24,
- Filled=True}">
+ Margin="5,0,0,0"
+ VerticalAlignment="Stretch">
+
+ <ui:CardAction.Icon>
+ <ui:SymbolIcon
+ Filled="True"
+ Foreground="{DynamicResource SystemFillColorCautionBrush}"
+ Symbol="Star24" />
+ </ui:CardAction.Icon>
+
<StackPanel>
<ui:TextBlock FontTypography="BodyStrong" Text="{ext:Loc Dashboard.Actions.SupportMe.Title}" />
<ui:TextBlock
@@ -150,17 +156,17 @@
<ScrollViewer
Grid.Row="2"
- Padding="20,0"
HorizontalScrollBarVisibility="Disabled"
+ Padding="20,0"
VerticalScrollBarVisibility="Auto">
<StackPanel>
<!-- System Info Cards -->
<UniformGrid Columns="2" Rows="2">
<!-- Operating System -->
<ui:CardControl
+ Icon="{ui:SymbolIcon Tv24}"
Margin="0,0,5,5"
- VerticalAlignment="Stretch"
- Icon="{ui:SymbolIcon Tv24}">
+ VerticalAlignment="Stretch">
<ui:CardControl.Header>
<Grid>
<Grid.RowDefinitions>
@@ -182,17 +188,17 @@
Margin="0,8,0,0"
Orientation="Horizontal">
<Border
- Margin="0,0,4,4"
- Padding="6,3"
Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
- CornerRadius="4">
+ CornerRadius="4"
+ Margin="0,0,4,4"
+ Padding="6,3">
<ui:TextBlock FontTypography="Caption" Text="{Binding ViewModel.SystemInfo.Os.BuildNumber, StringFormat='{}Build {0}'}" />
</Border>
<Border
- Margin="0,0,4,4"
- Padding="6,3"
Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
- CornerRadius="4">
+ CornerRadius="4"
+ Margin="0,0,4,4"
+ Padding="6,3">
<ui:TextBlock FontTypography="Caption" Text="{Binding ViewModel.SystemInfo.Os.DeviceType}" />
</Border>
</WrapPanel>
@@ -202,9 +208,9 @@
<!-- CPU -->
<ui:CardControl
+ Icon="{ui:SymbolIcon DeveloperBoard24}"
Margin="5,0,0,5"
- VerticalAlignment="Stretch"
- Icon="{ui:SymbolIcon DeveloperBoard24}">
+ VerticalAlignment="Stretch">
<ui:CardControl.Header>
<Grid>
<Grid.RowDefinitions>
@@ -231,20 +237,20 @@
Margin="0,8,0,0"
Orientation="Horizontal">
<Border
- Margin="0,0,4,4"
- Padding="6,3"
Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
- CornerRadius="4">
+ CornerRadius="4"
+ Margin="0,0,4,4"
+ Padding="6,3">
<ui:TextBlock FontTypography="Caption">
<Run Text="{Binding ViewModel.SystemInfo.Cpu.CurrentClockMHz}" />
<Run Text="MHz" />
</ui:TextBlock>
</Border>
<Border
- Margin="0,0,4,4"
- Padding="6,3"
Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
- CornerRadius="4">
+ CornerRadius="4"
+ Margin="0,0,4,4"
+ Padding="6,3">
<ui:TextBlock FontTypography="Caption">
<Run Text="L2:" />
<Run Text="{Binding ViewModel.SystemInfo.Cpu.L2CacheKB}" />
@@ -252,10 +258,10 @@
</ui:TextBlock>
</Border>
<Border
- Margin="0,0,4,4"
- Padding="6,3"
Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
- CornerRadius="4">
+ CornerRadius="4"
+ Margin="0,0,4,4"
+ Padding="6,3">
<ui:TextBlock FontTypography="Caption">
<Run Text="L3:" />
<Run Text="{Binding ViewModel.SystemInfo.Cpu.L3CacheKB}" />
@@ -269,9 +275,9 @@
<!-- RAM -->
<ui:CardControl
+ Icon="{ui:SymbolIcon Memory16}"
Margin="0,5,5,0"
- VerticalAlignment="Stretch"
- Icon="{ui:SymbolIcon Memory16}">
+ VerticalAlignment="Stretch">
<ui:CardControl.Header>
<Grid>
<Grid.RowDefinitions>
@@ -304,9 +310,9 @@
Margin="0,8,0,0"
Orientation="Horizontal">
<Border
- Padding="6,3"
Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
- CornerRadius="4">
+ CornerRadius="4"
+ Padding="6,3">
<ui:TextBlock FontTypography="Caption">
<Run Text="{ext:Loc Dashboard.SystemInfo.Ram.Modules, {Binding ViewModel.RuntimeRam.Modules.Count, Mode=OneWay}}" />
</ui:TextBlock>
@@ -318,9 +324,9 @@
<!-- GPU -->
<ui:CardControl
+ Icon="{ui:SymbolIcon NetworkAdapter16}"
Margin="5,5,0,0"
- VerticalAlignment="Stretch"
- Icon="{ui:SymbolIcon NetworkAdapter16}">
+ VerticalAlignment="Stretch">
<ui:CardControl.Header>
<Grid>
<Grid.RowDefinitions>
@@ -344,30 +350,30 @@
Margin="0,8,0,0"
Orientation="Horizontal">
<Border
- Margin="0,0,4,4"
- Padding="6,3"
Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
- CornerRadius="4">
+ CornerRadius="4"
+ Margin="0,0,4,4"
+ Padding="6,3">
<ui:TextBlock FontTypography="Caption">
<Run Text="{Binding ViewModel.SystemInfo.PrimaryGpu.MemoryMB, Converter={StaticResource MBToGBConverter}}" />
<Run Text="GB" />
</ui:TextBlock>
</Border>
<Border
- Margin="0,0,4,4"
- Padding="6,3"
Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
- CornerRadius="4">
+ CornerRadius="4"
+ Margin="0,0,4,4"
+ Padding="6,3">
<ui:TextBlock
FontTypography="Caption"
Text="{Binding ViewModel.SystemInfo.PrimaryGpu.DriverVersion}"
TextTrimming="CharacterEllipsis" />
</Border>
<Border
- Margin="0,0,4,4"
- Padding="6,3"
Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
CornerRadius="4"
+ Margin="0,0,4,4"
+ Padding="6,3"
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}}}" />
@@ -381,8 +387,8 @@
<!-- Storage Section -->
<ui:TextBlock
- Margin="0,20,0,8"
FontTypography="BodyStrong"
+ Margin="0,20,0,8"
Text="{ext:Loc Dashboard.SystemInfo.Storage.Header}" />
<ItemsControl ItemsSource="{Binding ViewModel.SystemInfo.Disk.Volumes}">
@@ -414,22 +420,22 @@
<!-- Drive Letter and Label -->
<StackPanel Grid.Row="0" Orientation="Horizontal">
<ui:TextBlock
- Margin="0,0,5,0"
FontTypography="BodyStrong"
+ Margin="0,0,5,0"
Text="{Binding Letter, StringFormat='({0})'}" />
<ui:TextBlock
- Margin="0,0,5,0"
- VerticalAlignment="Center"
FontTypography="Caption"
- Text="{Binding Label}" />
+ Margin="0,0,5,0"
+ Text="{Binding Label}"
+ VerticalAlignment="Center" />
<Border
+ Background="{DynamicResource SystemFillColorAttentionBrush}"
+ CornerRadius="4"
Margin="0,0,4,0"
Padding="5,2"
VerticalAlignment="Center"
- Background="{DynamicResource SystemFillColorAttentionBrush}"
- CornerRadius="4"
Visibility="{Binding SystemDrive, Converter={StaticResource BoolToVisibilityConverter}}">
<ui:TextBlock
FontTypography="Caption"
@@ -438,11 +444,11 @@
</Border>
<Border
+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
+ CornerRadius="4"
Margin="0,0,4,0"
Padding="5,2"
- VerticalAlignment="Center"
- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
- CornerRadius="4">
+ VerticalAlignment="Center">
<ui:TextBlock FontTypography="Caption" Text="{Binding MediaType}">
<ui:TextBlock.Style>
<Style TargetType="ui:TextBlock">
@@ -460,20 +466,20 @@
</Border>
<Border
- Padding="5,2"
- VerticalAlignment="Center"
Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
- CornerRadius="4">
+ CornerRadius="4"
+ Padding="5,2"
+ VerticalAlignment="Center">
<ui:TextBlock FontTypography="Caption" Text="{Binding FileSystem}" />
</Border>
</StackPanel>
<!-- Model Information -->
<ui:TextBlock
- Grid.Row="1"
- Margin="0,4,0,0"
Appearance="Secondary"
FontTypography="Caption"
+ Grid.Row="1"
+ Margin="0,4,0,0"
Text="{Binding Model}"
TextTrimming="CharacterEllipsis"
Visibility="{Binding Model, Converter={StaticResource NullToVisibilityConverter}}" />
diff --git a/optimizerDuck/UI/Views/Pages/Optimizations/OptimizationPage.xaml b/optimizerDuck/UI/Views/Pages/Optimizations/OptimizationPage.xaml
index bca9b1c..c0a70ad 100644
--- a/optimizerDuck/UI/Views/Pages/Optimizations/OptimizationPage.xaml
+++ b/optimizerDuck/UI/Views/Pages/Optimizations/OptimizationPage.xaml
@@ -1,7 +1,16 @@
<Page
+ Foreground="{DynamicResource TextFillColorPrimaryBrush}"
+ Margin="0,32,0,0"
+ ScrollViewer.CanContentScroll="False"
+ Title="OptimizationPage"
+ d:DataContext="{d:DesignInstance optimizations:OptimizationPage}"
+ d:DesignHeight="650"
+ d:DesignWidth="800"
+ mc:Ignorable="d"
+ ui:Design.Background="Black"
+ ui:Design.Foreground="White"
x:Class="optimizerDuck.UI.Views.Pages.Optimizations.OptimizationPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
- xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:converters="clr-namespace:optimizerDuck.Common.Helpers.Converters"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:ext="clr-namespace:optimizerDuck.Common.Extensions"
@@ -9,24 +18,16 @@
xmlns:optimizations="clr-namespace:optimizerDuck.UI.Views.Pages.Optimizations"
xmlns:optimizers="clr-namespace:optimizerDuck.Core.Optimizers"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
- Title="OptimizationPage"
- Margin="0,32,0,0"
- d:DataContext="{d:DesignInstance optimizations:OptimizationPage}"
- d:DesignHeight="650"
- d:DesignWidth="800"
- ui:Design.Background="Black"
- ui:Design.Foreground="White"
- Foreground="{DynamicResource TextFillColorPrimaryBrush}"
- ScrollViewer.CanContentScroll="False"
- mc:Ignorable="d">
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Page.Resources>
<converters:WidthToColumnConverter x:Key="WidthToColumnConverter" />
<converters:ZeroToVisibilityConverter x:Key="ZeroToVisibilityConverter" />
<converters:GreaterThanZeroToVisibilityConverter x:Key="GreaterThanZeroToVisibilityConverter" />
+ <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
<converters:NullToVisibilityConverter
- x:Key="NullToVisibilityConverter"
False="Visible"
- True="Collapsed" />
+ True="Collapsed"
+ x:Key="NullToVisibilityConverter" />
</Page.Resources>
<Grid RowDefinitions="Auto,*">
@@ -35,29 +36,31 @@
<WrapPanel
Grid.Row="0"
Margin="5,0,5,10"
- VerticalAlignment="Center"
- Orientation="Horizontal">
+ Orientation="Horizontal"
+ VerticalAlignment="Center">
<!-- Search -->
<ui:TextBox
- MinWidth="200"
- Margin="0,0,8,0"
- VerticalAlignment="Center"
Icon="{ui:SymbolIcon Search24}"
+ Margin="0,0,8,0"
+ MinWidth="200"
PlaceholderText="{ext:Loc Common.Search.Placeholder}"
- Text="{Binding ViewModel.SearchText, UpdateSourceTrigger=PropertyChanged}" />
+ Text="{Binding ViewModel.SearchText, UpdateSourceTrigger=PropertyChanged}"
+ VerticalAlignment="Center" />
<!-- Filter by Risk -->
<ComboBox
Margin="0,0,8,0"
- VerticalAlignment="Center"
SelectedIndex="{Binding ViewModel.SelectedRiskFilterIndex}"
- ToolTip="{ext:Loc Common.Filter}">
+ ToolTip="{ext:Loc Common.Filter}"
+ ToolTipService.BetweenShowDelay="160"
+ ToolTipService.Placement="Top"
+ VerticalAlignment="Center">
<ComboBoxItem HorizontalContentAlignment="Left">
- <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
+ <Grid ColumnDefinitions="Auto Auto" HorizontalAlignment="Left">
<ui:SymbolIcon
- Margin="0,0,6,0"
HorizontalAlignment="Left"
+ Margin="0,0,6,0"
Symbol="Filter24" />
<TextBlock
Grid.Column="1"
@@ -66,28 +69,28 @@
</Grid>
</ComboBoxItem>
<ComboBoxItem HorizontalContentAlignment="Left">
- <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
+ <Grid ColumnDefinitions="Auto Auto" HorizontalAlignment="Left">
<ui:SymbolIcon
- Margin="0,0,6,0"
Foreground="{DynamicResource SystemFillColorSuccessBrush}"
+ Margin="0,0,6,0"
Symbol="ShieldCheckmark24" />
<TextBlock Grid.Column="1" Text="{ext:Loc Optimizer.UI.Risk.Safe}" />
</Grid>
</ComboBoxItem>
<ComboBoxItem HorizontalContentAlignment="Left">
- <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
+ <Grid ColumnDefinitions="Auto Auto" HorizontalAlignment="Left">
<ui:SymbolIcon
- Margin="0,0,6,0"
Foreground="{DynamicResource SystemFillColorCautionBrush}"
+ Margin="0,0,6,0"
Symbol="Warning24" />
<TextBlock Grid.Column="1" Text="{ext:Loc Optimizer.UI.Risk.Moderate}" />
</Grid>
</ComboBoxItem>
<ComboBoxItem HorizontalContentAlignment="Left">
- <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
+ <Grid ColumnDefinitions="Auto Auto" HorizontalAlignment="Left">
<ui:SymbolIcon
- Margin="0,0,6,0"
Foreground="{DynamicResource SystemFillColorCriticalBrush}"
+ Margin="0,0,6,0"
Symbol="ShieldError24" />
<TextBlock Grid.Column="1" Text="{ext:Loc Optimizer.UI.Risk.Risky}" />
</Grid>
@@ -97,9 +100,11 @@
<!-- Sort By -->
<ComboBox
Margin="0,0,8,0"
- VerticalAlignment="Center"
SelectedIndex="{Binding ViewModel.SelectedSortByIndex}"
- ToolTip="{ext:Loc Common.SortBy}">
+ ToolTip="{ext:Loc Common.SortBy}"
+ ToolTipService.BetweenShowDelay="160"
+ ToolTipService.Placement="Top"
+ VerticalAlignment="Center">
<ComboBoxItem Content="{ext:Loc Common.SortBy.Default}" />
<ComboBoxItem Content="{ext:Loc Common.SortBy.Name}" />
<ComboBoxItem Content="{ext:Loc Common.SortBy.Risk}" />
@@ -107,9 +112,10 @@
<!-- Hide Applied toggle -->
<ToggleButton
+ IsChecked="{Binding ViewModel.HideApplied}"
Margin="0,0,0,0"
VerticalAlignment="Stretch"
- IsChecked="{Binding ViewModel.HideApplied}">
+ Visibility="{Binding ViewModel.HasAppliedOptimizations, Converter={StaticResource BooleanToVisibilityConverter}}">
<StackPanel Orientation="Horizontal">
<ui:SymbolIcon Margin="0,0,6,0" Symbol="EyeOff24" />
<TextBlock Text="{ext:Loc Optimizer.Menu.HideApplied}" />
@@ -124,15 +130,15 @@
VerticalAlignment="Center"
Visibility="{Binding ViewModel.Optimizations.Count, Converter={StaticResource ZeroToVisibilityConverter}}">
<ui:SymbolIcon
- Margin="0,0,0,10"
- HorizontalAlignment="Center"
FontSize="36"
- Foreground="{DynamicResource TextFillColorSecondaryBrush}"
+ Foreground="{DynamicResource SystemFillColorCriticalBrush}"
+ HorizontalAlignment="Center"
+ Margin="0,0,0,10"
Symbol="SearchInfo24" />
<ui:TextBlock
- HorizontalAlignment="Center"
Appearance="Secondary"
FontTypography="Body"
+ HorizontalAlignment="Center"
Text="{ext:Loc Bloatware.Search.NoResults}" />
</StackPanel>
@@ -150,7 +156,7 @@
</ui:VirtualizingItemsControl.Template>
<ui:VirtualizingItemsControl.ItemsPanel>
<ItemsPanelTemplate>
- <UniformGrid VerticalAlignment="Top" Columns="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=ScrollViewer}, Converter={StaticResource WidthToColumnConverter}}" />
+ <UniformGrid Columns="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=ScrollViewer}, Converter={StaticResource WidthToColumnConverter}}" VerticalAlignment="Top" />
</ItemsPanelTemplate>
</ui:VirtualizingItemsControl.ItemsPanel>
<ui:VirtualizingItemsControl.ItemContainerStyle>
@@ -163,28 +169,28 @@
<ui:VirtualizingItemsControl.ItemTemplate>
<DataTemplate DataType="{x:Type optimizers:BaseOptimization}">
<Border
- Padding="20,10"
Background="{DynamicResource CardBackground}"
BorderBrush="{DynamicResource CardBorderBrush}"
BorderThickness="1"
- CornerRadius="5">
+ CornerRadius="5"
+ Padding="20,10">
<Grid RowDefinitions="Auto,Auto,Auto,Auto,*">
<ui:TextBlock
- Grid.Row="0"
Appearance="Disabled"
FontTypography="Caption"
+ Grid.Row="0"
Text="{Binding Id}"
TextWrapping="Wrap" />
<ui:TextBlock
- Grid.Row="1"
FontTypography="Subtitle"
+ Grid.Row="1"
Text="{Binding Name}"
TextWrapping="Wrap" />
<ui:VirtualizingItemsControl
Grid.Row="2"
- Margin="0,2,0,2"
- ItemsSource="{Binding TagDisplays}">
+ ItemsSource="{Binding TagDisplays}"
+ Margin="0,2,0,2">
<ui:VirtualizingItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<WrapPanel HorizontalAlignment="Left" VerticalAlignment="Top" />
@@ -199,24 +205,24 @@
<ui:VirtualizingItemsControl.ItemTemplate>
<DataTemplate>
<Border
- Padding="4,2"
- HorizontalAlignment="Left"
Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
- CornerRadius="5">
+ CornerRadius="5"
+ HorizontalAlignment="Left"
+ Padding="4,2">
<StackPanel Orientation="Horizontal">
<ui:SymbolIcon
- Margin="0,0,5,0"
Foreground="{DynamicResource TextFillColorSecondaryBrush}"
+ Margin="0,0,5,0"
Symbol="{Binding Icon}" />
<ui:TextBlock
- HorizontalAlignment="Center"
- VerticalAlignment="Center"
Appearance="Secondary"
FontTypography="Caption"
Foreground="{DynamicResource TextFillColorInverseBrush}"
+ HorizontalAlignment="Center"
Text="{Binding Display}"
- TextWrapping="Wrap" />
+ TextWrapping="Wrap"
+ VerticalAlignment="Center" />
</StackPanel>
</Border>
</DataTemplate>
@@ -224,23 +230,23 @@
</ui:VirtualizingItemsControl>
<ui:TextBlock
+ FontTypography="Body"
Grid.Row="3"
Margin="0,10,0,0"
- FontTypography="Body"
Text="{Binding ShortDescription}"
TextTrimming="WordEllipsis"
TextWrapping="Wrap" />
<Grid
+ ColumnDefinitions="*,Auto"
Grid.Row="4"
Margin="0,10,0,0"
- VerticalAlignment="Bottom"
- ColumnDefinitions="*,Auto">
+ VerticalAlignment="Bottom">
<Grid RowDefinitions="Auto,Auto">
<Border
- Padding="4,2"
+ CornerRadius="5"
HorizontalAlignment="Left"
- CornerRadius="5">
+ Padding="4,2">
<Border.Style>
<Style TargetType="Border">
<Setter Property="Background" Value="{DynamicResource SystemFillColorSuccessBrush}" />
@@ -256,72 +262,72 @@
</Border.Style>
<StackPanel Orientation="Horizontal">
<ui:SymbolIcon
- Margin="0,0,5,0"
Foreground="{DynamicResource TextFillColorInverseBrush}"
+ Margin="0,0,5,0"
Symbol="{Binding RiskVisual.Icon}" />
<ui:TextBlock
- HorizontalAlignment="Center"
- VerticalAlignment="Center"
FontTypography="Caption"
Foreground="{DynamicResource TextFillColorInverseBrush}"
+ HorizontalAlignment="Center"
Text="{Binding RiskVisual.Display}"
- TextWrapping="Wrap" />
+ TextWrapping="Wrap"
+ VerticalAlignment="Center" />
</StackPanel>
</Border>
<Border
+ Background="{DynamicResource CardBackgroundDisabled}"
+ CornerRadius="5"
Grid.Row="1"
+ HorizontalAlignment="Left"
Margin="0,5,0,0"
Padding="4,2"
- HorizontalAlignment="Left"
- Background="{DynamicResource CardBackgroundDisabled}"
- CornerRadius="5"
ToolTip="{Binding State.AppliedAt}"
ToolTipService.InitialShowDelay="150"
ToolTipService.Placement="Top"
Visibility="{Binding State.AppliedAt, Converter={StaticResource NullToVisibilityConverter}}">
<ui:TextBlock
- HorizontalAlignment="Center"
- VerticalAlignment="Center"
FontTypography="Caption"
+ HorizontalAlignment="Center"
Text="{Binding State.RelativeTime}"
- TextWrapping="Wrap" />
+ TextWrapping="Wrap"
+ VerticalAlignment="Center" />
</Border>
</Grid>
<StackPanel
Grid.Column="1"
Margin="10,0,0,0"
- VerticalAlignment="Bottom"
- Orientation="Horizontal">
+ Orientation="Horizontal"
+ VerticalAlignment="Bottom">
<ui:ToggleSwitch
- Margin="0,0,5,0"
- HorizontalAlignment="Right"
- VerticalAlignment="Center"
Command="{Binding DataContext.ViewModel.ToggleOptimizationCommand, RelativeSource={RelativeSource AncestorType=Page}}"
CommandParameter="{Binding}"
Cursor="Hand"
- IsChecked="{Binding State.IsApplied, Mode=TwoWay}" />
- <ui:Button
HorizontalAlignment="Right"
- VerticalAlignment="Bottom"
+ IsChecked="{Binding State.IsApplied, Mode=TwoWay}"
+ Margin="0,0,5,0"
+ VerticalAlignment="Center" />
+ <ui:Button
Background="Transparent"
BorderBrush="Transparent"
Command="{Binding DataContext.ViewModel.ViewSourceOnGitHubCommand, RelativeSource={RelativeSource AncestorType=Page}}"
CommandParameter="{Binding}"
Cursor="Hand"
+ HorizontalAlignment="Right"
Icon="{ui:SymbolIcon Open24}"
- ToolTip="{ext:Loc Optimizer.Menu.ViewSource}" />
+ ToolTip="{ext:Loc Optimizer.Menu.ViewSource}"
+ VerticalAlignment="Bottom" />
<ui:Button
- HorizontalAlignment="Right"
- VerticalAlignment="Bottom"
Background="Transparent"
BorderBrush="Transparent"
Command="{Binding DataContext.ViewModel.ShowDetailsCommand, RelativeSource={RelativeSource AncestorType=Page}}"
CommandParameter="{Binding}"
Cursor="Hand"
- Icon="{ui:SymbolIcon MoreVertical24}" />
+ HorizontalAlignment="Right"
+ Icon="{ui:SymbolIcon MoreVertical24}"
+ VerticalAlignment="Bottom" />
</StackPanel>
</Grid>
</Grid>
diff --git a/optimizerDuck/UI/Views/Pages/SettingsPage.xaml b/optimizerDuck/UI/Views/Pages/SettingsPage.xaml
index 4ed4598..055c294 100644
--- a/optimizerDuck/UI/Views/Pages/SettingsPage.xaml
+++ b/optimizerDuck/UI/Views/Pages/SettingsPage.xaml
@@ -1,22 +1,22 @@
<Page
+ Foreground="{DynamicResource TextFillColorPrimaryBrush}"
+ Margin="0,32,0,0"
+ Title="SettingsPage"
+ d:DataContext="{d:DesignInstance pages:SettingsPage}"
+ d:DesignHeight="1200"
+ d:DesignWidth="800"
+ mc:Ignorable="d"
+ ui:Design.Background="Black"
+ ui:Design.Foreground="White"
x:Class="optimizerDuck.UI.Views.Pages.SettingsPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
- xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:converters="clr-namespace:optimizerDuck.Common.Helpers.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.Views.Pages"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
- Title="SettingsPage"
- Margin="0,32,0,0"
- d:DataContext="{d:DesignInstance pages:SettingsPage}"
- d:DesignHeight="1200"
- d:DesignWidth="800"
- ui:Design.Background="Black"
- ui:Design.Foreground="White"
- Foreground="{DynamicResource TextFillColorPrimaryBrush}"
- mc:Ignorable="d">
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Page.Resources>
<converters:ThemeToIndexConverter x:Key="ThemeToIndexConverter" />
@@ -37,9 +37,9 @@
<ui:CardControl.Header>
<StackPanel>
<ui:TextBlock
- Margin="0"
FontTypography="BodyStrong"
Foreground="{DynamicResource TextFillColorPrimaryBrush}"
+ Margin="0"
Text="{ext:Loc Settings.Appearance.LanguageSelector.Title}"
TextWrapping="Wrap" />
<ui:TextBlock
@@ -59,9 +59,9 @@
<ui:CardControl.Header>
<StackPanel>
<ui:TextBlock
- Margin="0"
Appearance="Primary"
FontTypography="BodyStrong"
+ Margin="0"
Text="{ext:Loc Settings.Appearance.ThemeSelector.Title}"
TextWrapping="Wrap" />
<ui:TextBlock
@@ -87,9 +87,9 @@
<ui:CardControl.Header>
<StackPanel>
<ui:TextBlock
- Margin="0"
Appearance="Primary"
FontTypography="BodyStrong"
+ Margin="0"
Text="{ext:Loc Settings.Optimize.ShellTimeout.Title}"
TextWrapping="Wrap" />
<ui:TextBlock
@@ -120,9 +120,9 @@
<ui:CardControl.Header>
<StackPanel>
<ui:TextBlock
- Margin="0"
Appearance="Primary"
FontTypography="BodyStrong"
+ Margin="0"
Text="{ext:Loc Settings.Bloatware.RemoveProvisioned.Title}"
TextWrapping="Wrap" />
<ui:TextBlock
@@ -146,9 +146,9 @@
<ui:CardControl.Header>
<StackPanel>
<ui:TextBlock
- Margin="0"
Appearance="Primary"
FontTypography="BodyStrong"
+ Margin="0"
Text="{ext:Loc Settings.Advanced.ClearResources.Title}"
TextWrapping="Wrap" />
<ui:TextBlock
@@ -159,21 +159,21 @@
</ui:CardControl.Header>
<ui:Button
- VerticalAlignment="Center"
Appearance="Danger"
Command="{Binding ViewModel.ClearResourcesCommand}"
Content="{ext:Loc Button.Clear}"
Cursor="Hand"
- Icon="{ui:SymbolIcon Delete24}" />
+ Icon="{ui:SymbolIcon Delete24}"
+ VerticalAlignment="Center" />
</ui:CardControl>
<ui:CardControl Icon="{ui:SymbolIcon DatabaseLightning20}">
<ui:CardControl.Header>
<StackPanel>
<ui:TextBlock
- Margin="0"
Appearance="Primary"
FontTypography="BodyStrong"
+ Margin="0"
Text="{ext:Loc Settings.Advanced.ClearRevertDatas.Title}"
TextWrapping="Wrap" />
<ui:TextBlock
@@ -184,21 +184,21 @@
</ui:CardControl.Header>
<ui:Button
- VerticalAlignment="Center"
Appearance="Danger"
Command="{Binding ViewModel.ClearAllRevertDataCommand}"
Content="{ext:Loc Button.Clear}"
Cursor="Hand"
- Icon="{ui:SymbolIcon Delete24}" />
+ Icon="{ui:SymbolIcon Delete24}"
+ VerticalAlignment="Center" />
</ui:CardControl>
<ui:CardControl Icon="{ui:SymbolIcon Folder24}">
<ui:CardControl.Header>
<StackPanel>
<ui:TextBlock
- Margin="0"
Appearance="Primary"
FontTypography="BodyStrong"
+ Margin="0"
Text="{ext:Loc Settings.Advanced.OpenRootDir.Title}"
TextWrapping="Wrap" />
<ui:TextBlock
@@ -209,11 +209,11 @@
</ui:CardControl.Header>
<ui:Button
- VerticalAlignment="Center"
Command="{Binding ViewModel.OpenRootDirCommand}"
Content="{ext:Loc Button.Open}"
Cursor="Hand"
- Icon="{ui:SymbolIcon OpenFolder24}" />
+ Icon="{ui:SymbolIcon OpenFolder24}"
+ VerticalAlignment="Center" />
</ui:CardControl>
</StackPanel>
@@ -250,7 +250,7 @@
Icon="{ui:SymbolIcon Open24}" />
</ui:CardControl>
- <ui:CardAction VerticalAlignment="Stretch" Command="{Binding ViewModel.OpenAcknowledgementsCommand}">
+ <ui:CardAction Command="{Binding ViewModel.OpenAcknowledgementsCommand}" VerticalAlignment="Stretch">
<ui:CardAction.Icon>
<ui:SymbolIcon Symbol="DocumentHeart24" />
</ui:CardAction.Icon>
@@ -268,16 +268,13 @@
</ui:CardAction>
<ui:TextBlock
- Margin="0,15,0,0"
FontTypography="Subtitle"
+ Margin="0,15,0,0"
Text="{ext:Loc Settings.About.LearnMore}"
TextTrimming="WordEllipsis"
TextWrapping="Wrap" />
<StackPanel Margin="7,0,0,0">
- <ui:HyperlinkButton
- Content="{ext:Loc Settings.About.LearnMore.Support}"
- Icon="{ui:SymbolIcon Star24}"
- NavigateUri="{Binding ViewModel.SupportMe}" />
+ <ui:HyperlinkButton Content="{ext:Loc Settings.About.LearnMore.Support}" NavigateUri="{Binding ViewModel.SupportMe}" />
<ui:HyperlinkButton Content="{ext:Loc Settings.About.LearnMore.Documentation}" NavigateUri="{Binding ViewModel.Documentation}" />
<ui:HyperlinkButton Content="{ext:Loc Settings.About.LearnMore.Acknowledgements}" NavigateUri="{Binding ViewModel.Acknowledgements}" />
<ui:HyperlinkButton Content="{ext:Loc Settings.About.LearnMore.Discord}" NavigateUri="{Binding ViewModel.DiscordInvite}" />