Skip to content

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

refactor: Reformat and Cleanup

itsfatduck5d9609b1cde3
diff --git a/optimizerDuck/Resources/Languages/Translations.Designer.cs b/optimizerDuck/Resources/Languages/Translations.Designer.cs
index dc79bd6..e407ca7 100644
--- a/optimizerDuck/Resources/Languages/Translations.Designer.cs
+++ b/optimizerDuck/Resources/Languages/Translations.Designer.cs
@@ -1,7 +1,6 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -1209,8 +1208,8 @@ namespace optimizerDuck.Resources.Languages {
/// </summary>
public static string Optimizer_BloatwareAndServices_ConfigureServices_Progress_ChangeServiceStartupType {
get {
- return ResourceManager.GetString("Optimizer.BloatwareAndServices.ConfigureServices.Progress.ChangeServiceStartupTyp" +
- "e", resourceCulture);
+ return ResourceManager.GetString(("Optimizer.BloatwareAndServices.ConfigureServices.Progress.ChangeServiceStartupTyp" +
+ "e"), resourceCulture);
}
}
@@ -1759,8 +1758,8 @@ namespace optimizerDuck.Resources.Languages {
/// </summary>
public static string Optimizer_PowerManagement_InstallOptimizerDuckPowerPlan_Error_DetectActivePlanFailed {
get {
- return ResourceManager.GetString("Optimizer.PowerManagement.InstallOptimizerDuckPowerPlan.Error.DetectActivePlanFai" +
- "led", resourceCulture);
+ return ResourceManager.GetString(("Optimizer.PowerManagement.InstallOptimizerDuckPowerPlan.Error.DetectActivePlanFai" +
+ "led"), resourceCulture);
}
}
@@ -3108,6 +3107,24 @@ namespace optimizerDuck.Resources.Languages {
}
}
+ /// <summary>
+ /// Looks up a localized string similar to No startup applications or scheduled tasks were found on this system..
+ /// </summary>
+ public static string StartupManager_Empty_Description {
+ get {
+ return ResourceManager.GetString("StartupManager.Empty.Description", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to No startup items.
+ /// </summary>
+ public static string StartupManager_Empty_Title {
+ get {
+ return ResourceManager.GetString("StartupManager.Empty.Title", resourceCulture);
+ }
+ }
+
/// <summary>
/// Looks up a localized string similar to Manage applications and tasks that run automatically when Windows starts..
/// </summary>
@@ -3126,6 +3143,33 @@ namespace optimizerDuck.Resources.Languages {
}
}
+ /// <summary>
+ /// Looks up a localized string similar to Scanning startup items....
+ /// </summary>
+ public static string StartupManager_Loading {
+ get {
+ return ResourceManager.GetString("StartupManager.Loading", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to This may take a moment while we scan the registry and startup folders..
+ /// </summary>
+ public static string StartupManager_Loading_Hint {
+ get {
+ return ResourceManager.GetString("StartupManager.Loading.Hint", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Refresh.
+ /// </summary>
+ public static string StartupManager_Menu_Refresh {
+ get {
+ return ResourceManager.GetString("StartupManager.Menu.Refresh", resourceCulture);
+ }
+ }
+
/// <summary>
/// Looks up a localized string similar to Scheduled Tasks (Logon).
/// </summary>
diff --git a/optimizerDuck/UI/Views/Dialogs/RestorePointDialog.xaml b/optimizerDuck/UI/Views/Dialogs/RestorePointDialog.xaml
index 9873495..2a1b543 100644
--- a/optimizerDuck/UI/Views/Dialogs/RestorePointDialog.xaml
+++ b/optimizerDuck/UI/Views/Dialogs/RestorePointDialog.xaml
@@ -1,28 +1,28 @@
<UserControl
+ d:DesignHeight="300"
+ d:DesignWidth="300"
+ mc:Ignorable="d"
x:Class="optimizerDuck.UI.Views.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"
- d:DesignHeight="300"
- d:DesignWidth="300"
- mc:Ignorable="d">
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Grid>
<StackPanel>
<ui:SymbolIcon FontSize="48" Symbol="DatabaseLightning20" />
<ui:TextBlock
- HorizontalAlignment="Center"
FontTypography="Body"
+ HorizontalAlignment="Center"
Text="{ext:Loc RestorePointDialog.Description}"
TextAlignment="Center"
TextWrapping="Wrap" />
<ui:InfoBar
- Margin="0,15,0,0"
IsClosable="False"
IsOpen="True"
+ Margin="0,15,0,0"
Message="{ext:Loc RestorePointDialog.Help}"
Severity="Success" />
</StackPanel>
diff --git a/optimizerDuck/UI/Views/Pages/BloatwarePage.xaml b/optimizerDuck/UI/Views/Pages/BloatwarePage.xaml
index dce9249..cf3d43d 100644
--- a/optimizerDuck/UI/Views/Pages/BloatwarePage.xaml
+++ b/optimizerDuck/UI/Views/Pages/BloatwarePage.xaml
@@ -84,8 +84,7 @@
</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
HorizontalAlignment="Center"
@@ -190,11 +189,9 @@
Icon="{ui:SymbolIcon Delete24,
FontSize=18}" />
- <Separator Margin="3,0,3,0"
- Visibility="{Binding ViewModel.HasSafePackages, Converter={StaticResource BooleanToVisibilityConverter}}" />
+ <Separator Margin="3,0,3,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">
<Setter Property="Appearance" Value="Success" />
@@ -332,12 +329,10 @@
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}" />
+ <Setter Property="Background" Value="{DynamicResource SystemFillColorCautionBrush}" />
</DataTrigger>
</Style.Triggers>
</Style>
diff --git a/optimizerDuck/UI/Views/Pages/DashboardPage.xaml b/optimizerDuck/UI/Views/Pages/DashboardPage.xaml
index 2c05edb..9285aa4 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.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,13 +112,12 @@
</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: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}" />
@@ -131,11 +130,11 @@
</ui:CardAction>
<ui:CardAction
- Margin="5,0,0,0"
- VerticalAlignment="Stretch"
BorderThickness="1"
Command="{Binding ViewModel.OpenActionCommand}"
- CommandParameter="Support">
+ CommandParameter="Support"
+ Margin="5,0,0,0"
+ VerticalAlignment="Stretch">
<ui:CardAction.Icon>
<ui:SymbolIcon
@@ -157,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>
@@ -176,8 +175,7 @@
</Grid.RowDefinitions>
<StackPanel Grid.Row="0">
- <ui:TextBlock FontTypography="BodyStrong"
- Text="{Binding ViewModel.SystemInfo.Os.Name}" />
+ <ui:TextBlock FontTypography="BodyStrong" Text="{Binding ViewModel.SystemInfo.Os.Name}" />
<ui:TextBlock Appearance="Secondary" FontTypography="Caption">
<Run Text="{Binding ViewModel.SystemInfo.Os.Edition}" />
<Run Text="·" />
@@ -190,28 +188,25 @@
Margin="0,8,0,0"
Orientation="Horizontal">
<Border
- Margin="0,0,4,4"
- Padding="6,3"
Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
- CornerRadius="4">
- <ui:TextBlock FontTypography="Caption"
- Text="{ext:Loc Dashboard.SystemInfo.Os.Build, {Binding ViewModel.SystemInfo.Os.BuildNumber}}" />
+ CornerRadius="4"
+ Margin="0,0,4,4"
+ Padding="6,3">
+ <ui:TextBlock FontTypography="Caption" Text="{ext:Loc Dashboard.SystemInfo.Os.Build, {Binding ViewModel.SystemInfo.Os.BuildNumber}}" />
</Border>
<Border
- Margin="0,0,4,4"
- Padding="6,3"
Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
- CornerRadius="4">
- <ui:TextBlock FontTypography="Caption"
- Text="{Binding ViewModel.SystemInfo.Os.DeviceType}" />
+ CornerRadius="4"
+ Margin="0,0,4,4"
+ Padding="6,3">
+ <ui:TextBlock FontTypography="Caption" Text="{Binding ViewModel.SystemInfo.Os.DeviceType}" />
</Border>
<Border
- Margin="0,0,4,4"
- Padding="6,3"
Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
- CornerRadius="4">
- <ui:TextBlock FontTypography="Caption"
- Text="{Binding ViewModel.SystemInfo.Os.InstallDate}" />
+ CornerRadius="4"
+ Margin="0,0,4,4"
+ Padding="6,3">
+ <ui:TextBlock FontTypography="Caption" Text="{Binding ViewModel.SystemInfo.Os.InstallDate}" />
</Border>
</WrapPanel>
</Grid>
@@ -220,9 +215,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>
@@ -238,11 +233,9 @@
<ui:TextBlock Appearance="Secondary" FontTypography="Caption">
<Run Text="{Binding ViewModel.SystemInfo.Cpu.Vendor}" />
<Run Text="·" />
- <Run
- Text="{ext:Loc Dashboard.SystemInfo.Cpu.Cores, {Binding ViewModel.SystemInfo.Cpu.Cores}}" />
+ <Run Text="{ext:Loc Dashboard.SystemInfo.Cpu.Cores, {Binding ViewModel.SystemInfo.Cpu.Cores}}" />
<Run Text="/" />
- <Run
- Text="{ext:Loc Dashboard.SystemInfo.Cpu.Threads, {Binding ViewModel.SystemInfo.Cpu.Threads}}" />
+ <Run Text="{ext:Loc Dashboard.SystemInfo.Cpu.Threads, {Binding ViewModel.SystemInfo.Cpu.Threads}}" />
</ui:TextBlock>
</StackPanel>
@@ -251,20 +244,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}" />
@@ -272,10 +265,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}" />
@@ -289,9 +282,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>
@@ -306,11 +299,9 @@
<Run Text="GB RAM" />
</ui:TextBlock>
<ui:TextBlock Appearance="Secondary" FontTypography="Caption">
- <Run
- Text="{ext:Loc Dashboard.SystemInfo.Ram.Used, {Binding ViewModel.RuntimeRam.UsedGB, StringFormat='{}{0:F1}'}}" />
+ <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}'}}" />
+ <Run Text="{ext:Loc Dashboard.SystemInfo.Ram.Available, {Binding ViewModel.RuntimeRam.AvailableGB, StringFormat='{}{0:F1}'}}" />
</ui:TextBlock>
</StackPanel>
@@ -326,12 +317,11 @@
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}}" />
+ <Run Text="{ext:Loc Dashboard.SystemInfo.Ram.Modules, {Binding ViewModel.RuntimeRam.Modules.Count, Mode=OneWay}}" />
</ui:TextBlock>
</Border>
</WrapPanel>
@@ -341,9 +331,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>
@@ -367,35 +357,33 @@
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="{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}}}" />
+ <Run Text="{ext:Loc Dashboard.SystemInfo.Gpu.More, {Binding ViewModel.SystemInfo.Gpus.Count, Mode=OneWay, Converter={StaticResource MinusOneConverter}}}" />
</ui:TextBlock>
</Border>
</WrapPanel>
@@ -406,8 +394,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.RuntimeDisk.Volumes}">
@@ -420,8 +408,7 @@
<Style TargetType="ui:SymbolIcon">
<Style.Triggers>
<DataTrigger Binding="{Binding SystemDrive}" Value="True">
- <Setter Property="Foreground"
- Value="{DynamicResource SystemFillColorAttentionBrush}" />
+ <Setter Property="Foreground" Value="{DynamicResource SystemFillColorAttentionBrush}" />
</DataTrigger>
</Style.Triggers>
</Style>
@@ -440,22 +427,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"
@@ -464,22 +451,20 @@
</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">
<Style.Triggers>
<DataTrigger Binding="{Binding MediaType}" Value="SSD">
- <Setter Property="Foreground"
- Value="{DynamicResource SystemFillColorSuccessBrush}" />
+ <Setter Property="Foreground" Value="{DynamicResource SystemFillColorSuccessBrush}" />
</DataTrigger>
<DataTrigger Binding="{Binding MediaType}" Value="HDD">
- <Setter Property="Foreground"
- Value="{DynamicResource SystemFillColorCautionBrush}" />
+ <Setter Property="Foreground" Value="{DynamicResource SystemFillColorCautionBrush}" />
</DataTrigger>
</Style.Triggers>
</Style>
@@ -488,20 +473,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/DiskCleanupPage.xaml b/optimizerDuck/UI/Views/Pages/DiskCleanupPage.xaml
index 63483bb..750c00b 100644
--- a/optimizerDuck/UI/Views/Pages/DiskCleanupPage.xaml
+++ b/optimizerDuck/UI/Views/Pages/DiskCleanupPage.xaml
@@ -41,8 +41,7 @@
</StackPanel>
<!-- Loading state (initial scan) -->
- <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"
Orientation="Vertical"
@@ -181,8 +180,7 @@
FontSize="18"
Margin="0,0,6,0"
Symbol="Delete24" />
- <TextBlock
- Text="{ext:Loc DiskCleanup.Button.CleanSelected, {Binding ViewModel.TotalSelectedSizeFormatted}}" />
+ <TextBlock Text="{ext:Loc DiskCleanup.Button.CleanSelected, {Binding ViewModel.TotalSelectedSizeFormatted}}" />
</StackPanel>
</ui:Button.Content>
</ui:Button>
@@ -293,11 +291,9 @@
Margin="0,6,0,0">
<Border.Style>
<Style TargetType="Border">
- <Setter Property="Visibility"
- Value="{Binding IsScanned, Converter={StaticResource BooleanToVisibilityConverter}}" />
+ <Setter Property="Visibility" Value="{Binding IsScanned, Converter={StaticResource BooleanToVisibilityConverter}}" />
<Setter Property="Padding" Value="8,3" />
- <Setter Property="Background"
- Value="{Binding SizeBytes, Converter={StaticResource SizeToBrushConverter}}" />
+ <Setter Property="Background" Value="{Binding SizeBytes, Converter={StaticResource SizeToBrushConverter}}" />
<Style.Triggers>
<DataTrigger Binding="{Binding IsScanning}" Value="True">
<Setter Property="Visibility" Value="Collapsed" />
diff --git a/optimizerDuck/UI/Views/Pages/SettingsPage.xaml b/optimizerDuck/UI/Views/Pages/SettingsPage.xaml
index b417429..d754a76 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.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
@@ -70,8 +70,7 @@
TextWrapping="Wrap" />
</StackPanel>
</ui:CardControl.Header>
- <ComboBox
- SelectedIndex="{Binding ViewModel.CurrentApplicationTheme, Converter={StaticResource ThemeToIndexConverter}, 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}" />
@@ -88,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
@@ -121,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
@@ -133,8 +132,7 @@
</StackPanel>
</ui:CardControl.Header>
- <ui:ToggleSwitch Command="{Binding ViewModel.ToggleRemoveProvisionedCommand}"
- IsChecked="{Binding ViewModel.RemoveProvisioned, Mode=TwoWay}" />
+ <ui:ToggleSwitch Command="{Binding ViewModel.ToggleRemoveProvisionedCommand}" IsChecked="{Binding ViewModel.RemoveProvisioned, Mode=TwoWay}" />
</ui:CardControl>
</StackPanel>
@@ -147,9 +145,9 @@
<ui:CardAction Command="{Binding ViewModel.ClearResourcesCommand}" Icon="{ui:SymbolIcon Archive24}">
<StackPanel>
<ui:TextBlock
- Margin="0"
Appearance="Primary"
FontTypography="BodyStrong"
+ Margin="0"
Text="{ext:Loc Settings.Advanced.ClearResources.Title}"
TextWrapping="Wrap" />
<ui:TextBlock
@@ -159,13 +157,12 @@
</StackPanel>
</ui:CardAction>
- <ui:CardAction Command="{Binding ViewModel.ClearAllRevertDataCommand}"
- Icon="{ui:SymbolIcon DatabaseLightning20}">
+ <ui:CardAction Command="{Binding ViewModel.ClearAllRevertDataCommand}" Icon="{ui:SymbolIcon DatabaseLightning20}">
<StackPanel>
<ui:TextBlock
- Margin="0"
Appearance="Primary"
FontTypography="BodyStrong"
+ Margin="0"
Text="{ext:Loc Settings.Advanced.ClearRevertDatas.Title}"
TextWrapping="Wrap" />
<ui:TextBlock
@@ -178,9 +175,9 @@
<ui:CardAction Command="{Binding ViewModel.OpenRootDirCommand}" Icon="{ui:SymbolIcon Folder24}">
<StackPanel>
<ui:TextBlock
- Margin="0"
Appearance="Primary"
FontTypography="BodyStrong"
+ Margin="0"
Text="{ext:Loc Settings.Advanced.OpenRootDir.Title}"
TextWrapping="Wrap" />
<ui:TextBlock
@@ -199,8 +196,7 @@
<ui:CardControl>
<ui:CardControl.Icon>
- <ui:ImageIcon Height="25"
- Source="pack://application:,,,/optimizerDuck;component/Resources/Images/Duck.png" />
+ <ui:ImageIcon Height="25" Source="pack://application:,,,/optimizerDuck;component/Resources/Images/Duck.png" />
</ui:CardControl.Icon>
<ui:CardControl.Header>
@@ -230,11 +226,11 @@
<ui:CardControl.Header>
<StackPanel>
<ui:HyperlinkButton
- Padding="0"
Content="fatDuck (itsfatduck)"
FontSize="14"
FontWeight="SemiBold"
- NavigateUri="{Binding ViewModel.SupportMe}" />
+ NavigateUri="{Binding ViewModel.SupportMe}"
+ Padding="0" />
<ui:TextBlock
Appearance="Secondary"
Text="{ext:Loc Settings.About.Author.Description}"
@@ -243,7 +239,7 @@
</ui:CardControl.Header>
</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>
@@ -261,22 +257,17 @@
</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}"
- 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}" />
- <ui:HyperlinkButton Content="{ext:Loc Settings.About.LearnMore.GitHub}"
- NavigateUri="{Binding ViewModel.GitHubRepo}" />
+ <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}" />
+ <ui:HyperlinkButton Content="{ext:Loc Settings.About.LearnMore.GitHub}" NavigateUri="{Binding ViewModel.GitHubRepo}" />
</StackPanel>
</StackPanel>
</StackPanel>
diff --git a/optimizerDuck/UI/Views/Pages/StartupManagerPage.xaml b/optimizerDuck/UI/Views/Pages/StartupManagerPage.xaml
index 5abf1f3..8f5893c 100644
--- a/optimizerDuck/UI/Views/Pages/StartupManagerPage.xaml
+++ b/optimizerDuck/UI/Views/Pages/StartupManagerPage.xaml
@@ -38,8 +38,7 @@
</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
Height="48"
@@ -106,8 +105,7 @@
</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}}">
<Grid RowDefinitions="Auto,*">
<!-- Toolbar -->
<WrapPanel
@@ -188,8 +186,7 @@
Width="36" />
<StackPanel Grid.Column="1" VerticalAlignment="Center">
<DockPanel LastChildFill="False">
- <ui:TextBlock FontTypography="BodyStrong"
- Text="{Binding Name}" />
+ <ui:TextBlock FontTypography="BodyStrong" Text="{Binding Name}" />
<Border
Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
CornerRadius="4"