Free, open-source Windows optimization tool for performance, privacy, and simplicity.
C# csharpdebloatdotnetgamingopen-sourceoptimizationoptimizeroptimizerduckperformanceprivacytweakertweakswindowswinui
fix(optimization-viewsource): use optimization namespace instead of hardcode feat: update proj to 2.10.1
fatDuckf2c1f6de34ce
diff --git a/optimizerDuck/UI/Pages/Optimize/Categories/OptimizationPage.xaml b/optimizerDuck/UI/Pages/Optimize/Categories/OptimizationPage.xamlindex 3105f71..ebf8d95 100644--- a/optimizerDuck/UI/Pages/Optimize/Categories/OptimizationPage.xaml+++ b/optimizerDuck/UI/Pages/Optimize/Categories/OptimizationPage.xaml@@ -18,8 +18,7 @@ui:Design.Foreground="White"Foreground="{DynamicResource TextFillColorPrimaryBrush}"ScrollViewer.CanContentScroll="False"- mc:Ignorable="d"->+ mc:Ignorable="d"><Page.Resources><converters:WidthToColumnConverter x:Key="WidthToColumnConverter" /><converters:ZeroToVisibilityConverter x:Key="ZeroToVisibilityConverter" />@@ -28,28 +27,22 @@<converters:BooleanToVisibilityConverterx:Key="InverseBooleanToVisibilityConverter"False="Visible"- True="Collapsed"- />+ True="Collapsed" /><converters:NullToVisibilityConverterx:Key="NullToVisibilityConverter"False="Visible"- True="Collapsed"- />+ True="Collapsed" /></Page.Resources><Grid><!-- Main Content -->- <Grid- RowDefinitions="Auto,*"- Visibility="{Binding ViewModel.IsLoading, Converter={StaticResource InverseBooleanToVisibilityConverter}}"- >+ <Grid RowDefinitions="Auto,*" Visibility="{Binding ViewModel.IsLoading, Converter={StaticResource InverseBooleanToVisibilityConverter}}"><!-- Toolbar --><WrapPanelGrid.Row="0"Margin="5,0,5,10"VerticalAlignment="Center"- Orientation="Horizontal"- >+ Orientation="Horizontal"><!-- Search --><ui:TextBoxMinWidth="200"@@ -57,8 +50,7 @@VerticalAlignment="Center"Icon="{ui:SymbolIcon Search24}"PlaceholderText="{ext:Loc Common.Search.Placeholder}"- Text="{Binding ViewModel.SearchText, UpdateSourceTrigger=PropertyChanged}"- />+ Text="{Binding ViewModel.SearchText, UpdateSourceTrigger=PropertyChanged}" /><!-- Filter by Risk --><ComboBox@@ -67,20 +59,17 @@SelectedIndex="{Binding ViewModel.SelectedRiskFilterIndex}"ToolTip="{ext:Loc Common.Filter}"ToolTipService.BetweenShowDelay="160"- ToolTipService.Placement="Top"- >+ ToolTipService.Placement="Top"><ComboBoxItem HorizontalContentAlignment="Left"><Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto"><ui:SymbolIconMargin="0,0,6,0"HorizontalAlignment="Left"- Symbol="Filter24"- />+ Symbol="Filter24" /><TextBlockGrid.Column="1"HorizontalAlignment="Left"- Text="{ext:Loc Common.Filter.All}"- />+ Text="{ext:Loc Common.Filter.All}" /></Grid></ComboBoxItem><ComboBoxItem HorizontalContentAlignment="Left">@@ -88,8 +77,7 @@<ui:SymbolIconMargin="0,0,6,0"Foreground="{DynamicResource SystemFillColorSuccessBrush}"- Symbol="ShieldCheckmark24"- />+ Symbol="ShieldCheckmark24" /><TextBlock Grid.Column="1" Text="{ext:Loc Optimizer.UI.Risk.Safe}" /></Grid></ComboBoxItem>@@ -98,12 +86,8 @@<ui:SymbolIconMargin="0,0,6,0"Foreground="{DynamicResource SystemFillColorCautionBrush}"- Symbol="Warning24"- />- <TextBlock- Grid.Column="1"- Text="{ext:Loc Optimizer.UI.Risk.Moderate}"- />+ Symbol="Warning24" />+ <TextBlock Grid.Column="1" Text="{ext:Loc Optimizer.UI.Risk.Moderate}" /></Grid></ComboBoxItem><ComboBoxItem HorizontalContentAlignment="Left">@@ -111,8 +95,7 @@<ui:SymbolIconMargin="0,0,6,0"Foreground="{DynamicResource SystemFillColorCriticalBrush}"- Symbol="ShieldError24"- />+ Symbol="ShieldError24" /><TextBlock Grid.Column="1" Text="{ext:Loc Optimizer.UI.Risk.Risky}" /></Grid></ComboBoxItem>@@ -125,15 +108,13 @@SelectedIndex="{Binding ViewModel.SelectedSortByIndex}"ToolTip="{ext:Loc Common.SortBy}"ToolTipService.BetweenShowDelay="160"- ToolTipService.Placement="Top"- >+ ToolTipService.Placement="Top"><ComboBoxItem HorizontalContentAlignment="Left"><Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto"><ui:SymbolIconMargin="0,0,6,0"HorizontalAlignment="Left"- Symbol="Filter24"- />+ Symbol="Filter24" /><TextBlock Grid.Column="1" HorizontalAlignment="Left"><Run Text="{ext:Loc Common.SortBy.Risk}" /><Run Text=" & " />@@ -146,13 +127,11 @@<ui:SymbolIconMargin="0,0,6,0"HorizontalAlignment="Left"- Symbol="TextSortAscending24"- />+ Symbol="TextSortAscending24" /><TextBlockGrid.Column="1"HorizontalAlignment="Left"- Text="{ext:Loc Common.SortBy.Name}"- />+ Text="{ext:Loc Common.SortBy.Name}" /></Grid></ComboBoxItem><ComboBoxItem HorizontalContentAlignment="Left">@@ -160,13 +139,11 @@<ui:SymbolIconMargin="0,0,6,0"HorizontalAlignment="Left"- Symbol="Shield24"- />+ Symbol="Shield24" /><TextBlockGrid.Column="1"HorizontalAlignment="Left"- Text="{ext:Loc Common.SortBy.Risk}"- />+ Text="{ext:Loc Common.SortBy.Risk}" /></Grid></ComboBoxItem><ComboBoxItem HorizontalContentAlignment="Left">@@ -174,13 +151,11 @@<ui:SymbolIconMargin="0,0,6,0"HorizontalAlignment="Left"- Symbol="ToggleRight24"- />+ Symbol="ToggleRight24" /><TextBlockGrid.Column="1"HorizontalAlignment="Left"- Text="{ext:Loc Common.SortBy.Status}"- />+ Text="{ext:Loc Common.SortBy.Status}" /></Grid></ComboBoxItem></ComboBox>@@ -190,8 +165,7 @@Margin="0,0,0,0"VerticalAlignment="Stretch"IsChecked="{Binding ViewModel.HideApplied}"- Visibility="{Binding ViewModel.HasAppliedOptimizations, Converter={StaticResource BooleanToVisibilityConverter}}"- >+ 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}" />@@ -204,29 +178,25 @@Grid.Row="1"HorizontalAlignment="Center"VerticalAlignment="Center"- Visibility="{Binding ViewModel.Optimizations.Count, Converter={StaticResource ZeroToVisibilityConverter}}"- >+ Visibility="{Binding ViewModel.Optimizations.Count, Converter={StaticResource ZeroToVisibilityConverter}}"><ui:SymbolIconMargin="0,0,0,10"HorizontalAlignment="Center"FontSize="36"Foreground="{DynamicResource SystemFillColorCriticalBrush}"- Symbol="SearchInfo24"- />+ Symbol="SearchInfo24" /><ui:TextBlockHorizontalAlignment="Center"- Foreground="{DynamicResource TextFillColorSecondaryBrush}"FontTypography="Body"- Text="{ext:Loc Bloatware.Search.NoResults}"- />+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ Text="{ext:Loc Bloatware.Search.NoResults}" /></StackPanel><!-- Optimization Cards --><ui:VirtualizingItemsControlGrid.Row="1"ItemsSource="{Binding ViewModel.Optimizations}"- Visibility="{Binding ViewModel.Optimizations.Count, Converter={StaticResource GreaterThanZeroToVisibilityConverter}}"- >+ Visibility="{Binding ViewModel.Optimizations.Count, Converter={StaticResource GreaterThanZeroToVisibilityConverter}}"><ui:VirtualizingItemsControl.Template><ControlTemplate TargetType="ItemsControl"><ScrollViewer HorizontalScrollBarVisibility="Disabled">@@ -236,10 +206,7 @@</ui:VirtualizingItemsControl.Template><ui:VirtualizingItemsControl.ItemsPanel><ItemsPanelTemplate>- <UniformGrid- VerticalAlignment="Top"- Columns="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=ScrollViewer}, Converter={StaticResource WidthToColumnConverter}}"- />+ <UniformGrid VerticalAlignment="Top" Columns="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=ScrollViewer}, Converter={StaticResource WidthToColumnConverter}}" /></ItemsPanelTemplate></ui:VirtualizingItemsControl.ItemsPanel><ui:VirtualizingItemsControl.ItemContainerStyle>@@ -256,34 +223,27 @@Background="{DynamicResource CardBackground}"BorderBrush="{DynamicResource CardBorderBrush}"BorderThickness="1"- CornerRadius="5"- >+ CornerRadius="5"><Grid RowDefinitions="Auto,Auto,Auto,Auto,*"><ui:TextBlockGrid.Row="0"- Foreground="{DynamicResource TextFillColorDisabledBrush}"FontTypography="Caption"+ Foreground="{DynamicResource TextFillColorDisabledBrush}"Text="{Binding Id}"- TextWrapping="Wrap"- />+ TextWrapping="Wrap" /><ui:TextBlockGrid.Row="1"FontTypography="Subtitle"Text="{Binding Name}"- TextWrapping="Wrap"- />+ TextWrapping="Wrap" /><ui:VirtualizingItemsControlGrid.Row="2"Margin="0,2,0,2"- ItemsSource="{Binding TagDisplays}"- >+ ItemsSource="{Binding TagDisplays}"><ui:VirtualizingItemsControl.ItemsPanel><ItemsPanelTemplate>- <WrapPanel- HorizontalAlignment="Left"- VerticalAlignment="Top"- />+ <WrapPanel HorizontalAlignment="Left" VerticalAlignment="Top" /></ItemsPanelTemplate></ui:VirtualizingItemsControl.ItemsPanel><ui:VirtualizingItemsControl.ItemContainerStyle>@@ -298,14 +258,12 @@Padding="4,2"HorizontalAlignment="Left"Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"- CornerRadius="5"- >+ CornerRadius="5"><StackPanel Orientation="Horizontal"><ui:SymbolIconMargin="0,0,5,0"Foreground="{DynamicResource TextFillColorSecondaryBrush}"- Symbol="{Binding Icon}"- />+ Symbol="{Binding Icon}" /><ui:TextBlockHorizontalAlignment="Center"@@ -313,8 +271,7 @@FontTypography="Caption"Foreground="{DynamicResource TextFillColorSecondaryBrush}"Text="{Binding Display}"- TextWrapping="Wrap"- />+ TextWrapping="Wrap" /></StackPanel></Border></DataTemplate>@@ -327,45 +284,27 @@FontTypography="Body"Text="{Binding ShortDescription}"TextTrimming="WordEllipsis"- TextWrapping="Wrap"- />+ TextWrapping="Wrap" /><GridGrid.Row="4"Margin="0,10,0,0"VerticalAlignment="Bottom"- ColumnDefinitions="*,Auto"- >+ ColumnDefinitions="*,Auto"><Grid RowDefinitions="Auto,Auto"><BorderPadding="4,2"HorizontalAlignment="Left"- CornerRadius="5"- >+ CornerRadius="5"><Border.Style><Style TargetType="Border">- <Setter- Property="Background"- Value="{DynamicResource SystemFillColorSuccessBrush}"- />+ <Setter Property="Background" Value="{DynamicResource SystemFillColorSuccessBrush}" /><Style.Triggers>- <DataTrigger- Binding="{Binding Risk}"- Value="Moderate"- >- <Setter- Property="Background"- Value="{DynamicResource SystemFillColorCautionBrush}"- />+ <DataTrigger Binding="{Binding Risk}" Value="Moderate">+ <Setter Property="Background" Value="{DynamicResource SystemFillColorCautionBrush}" /></DataTrigger>- <DataTrigger- Binding="{Binding Risk}"- Value="Risky"- >- <Setter- Property="Background"- Value="{DynamicResource SystemFillColorCriticalBrush}"- />+ <DataTrigger Binding="{Binding Risk}" Value="Risky">+ <Setter Property="Background" Value="{DynamicResource SystemFillColorCriticalBrush}" /></DataTrigger></Style.Triggers></Style>@@ -374,8 +313,7 @@<ui:SymbolIconMargin="0,0,5,0"Foreground="{DynamicResource TextFillColorInverseBrush}"- Symbol="{Binding RiskVisual.Icon}"- />+ Symbol="{Binding RiskVisual.Icon}" /><ui:TextBlockHorizontalAlignment="Center"@@ -383,8 +321,7 @@FontTypography="Caption"Foreground="{DynamicResource TextFillColorInverseBrush}"Text="{Binding RiskVisual.Display}"- TextWrapping="Wrap"- />+ TextWrapping="Wrap" /></StackPanel></Border>@@ -398,20 +335,15 @@ToolTip="{Binding State.AppliedAt}"ToolTipService.InitialShowDelay="150"ToolTipService.Placement="Top"- Visibility="{Binding State.AppliedAt, Converter={StaticResource NullToVisibilityConverter}}"- >+ Visibility="{Binding State.AppliedAt, Converter={StaticResource NullToVisibilityConverter}}"><StackPanel Orientation="Horizontal">- <ui:SymbolIcon- Margin="0,0,6,0"- Symbol="CheckmarkCircle24"- />+ <ui:SymbolIcon Margin="0,0,6,0" Symbol="CheckmarkCircle24" /><ui:TextBlockHorizontalAlignment="Center"VerticalAlignment="Center"FontTypography="Caption"Text="{Binding State.RelativeTime}"- TextWrapping="Wrap"- />+ TextWrapping="Wrap" /></StackPanel></Border></Grid>@@ -420,8 +352,7 @@Grid.Column="1"Margin="10,0,0,0"VerticalAlignment="Bottom"- Orientation="Horizontal"- >+ Orientation="Horizontal"><ui:ToggleSwitchMargin="0,0,5,0"HorizontalAlignment="Right"@@ -429,8 +360,7 @@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}" /><ui:ButtonHorizontalAlignment="Right"VerticalAlignment="Bottom"@@ -439,9 +369,8 @@Command="{Binding DataContext.ViewModel.ViewSourceOnGitHubCommand, RelativeSource={RelativeSource AncestorType=Page}}"CommandParameter="{Binding}"Cursor="Hand"- Icon="{ui:SymbolIcon Open24}"- ToolTip="{ext:Loc Optimizer.Menu.ViewSource}"- />+ Icon="{ui:SymbolIcon Code24}"+ ToolTip="{ext:Loc Optimizer.Menu.ViewSource}" /><ui:ButtonHorizontalAlignment="Right"VerticalAlignment="Bottom"@@ -450,8 +379,7 @@Command="{Binding DataContext.ViewModel.ShowDetailsCommand, RelativeSource={RelativeSource AncestorType=Page}}"CommandParameter="{Binding}"Cursor="Hand"- Icon="{ui:SymbolIcon MoreVertical24}"- />+ Icon="{ui:SymbolIcon MoreVertical24}" /></StackPanel></Grid></Grid>@@ -470,20 +398,17 @@Margin="0,0,0,16"HorizontalAlignment="Center"VerticalAlignment="Center"- IsIndeterminate="True"- />+ IsIndeterminate="True" /><ui:TextBlockHorizontalAlignment="Center"FontTypography="BodyStrong"- Text="{ext:Loc Optimizations.Loading}"- />+ Text="{ext:Loc Optimizations.Loading}" /><ui:TextBlockMargin="0,4,0,0"HorizontalAlignment="Center"- Foreground="{DynamicResource TextFillColorSecondaryBrush}"FontTypography="Caption"- Text="{ext:Loc Optimizations.Loading.Hint}"- />+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ Text="{ext:Loc Optimizations.Loading.Hint}" /></StackPanel></Border></Grid>diff --git a/optimizerDuck/UI/ViewModels/Optimizer/OptimizationCategoryViewModel.cs b/optimizerDuck/UI/ViewModels/Optimizer/OptimizationCategoryViewModel.csindex 08ffbe3..1791724 100644--- a/optimizerDuck/UI/ViewModels/Optimizer/OptimizationCategoryViewModel.cs+++ b/optimizerDuck/UI/ViewModels/Optimizer/OptimizationCategoryViewModel.cs@@ -1,4 +1,4 @@-using System.Collections.Concurrent;+using System.Collections.Concurrent;using System.Collections.ObjectModel;using System.Diagnostics;using System.Net.Http;@@ -339,7 +339,8 @@ public partial class OptimizationCategoryViewModel : ViewModelvar fileName = baseOpt.OwnerType.Name;var className = optimization.OptimizationKey;- var relativePath = $"optimizerDuck/Domain/Optimizations/Categories/{fileName}.cs";+ var namespacePath = (baseOpt.OwnerType.Namespace ?? string.Empty).Replace('.', '/');+ var relativePath = $"{namespacePath}/{fileName}.cs";var url = $"{Shared.GitHubRepoURL}/blob/master/{relativePath}";// Fetch source from GitHub raw content to find the class line number@@ -364,7 +365,7 @@ public partial class OptimizationCategoryViewModel : ViewModelvar lines = source.Split('\n');for (var i = 0; i < lines.Length; i++)- if (lines[i].Contains($"class {className}", StringComparison.OrdinalIgnoreCase))+ if (lines[i].Contains($"class {className} : {nameof(BaseOptimization)}", StringComparison.OrdinalIgnoreCase)){url += $"#L{i + 1}";break;diff --git a/optimizerDuck/optimizerDuck.csproj b/optimizerDuck/optimizerDuck.csprojindex 447d4e8..1c94f65 100644--- a/optimizerDuck/optimizerDuck.csproj+++ b/optimizerDuck/optimizerDuck.csproj@@ -9,8 +9,8 @@<Authors>fatDuck</Authors><ApplicationIcon>Logo.ico</ApplicationIcon><Company>fatDuck</Company>- <FileVersion>2.10.0</FileVersion>- <Version>2.10.0</Version>+ <FileVersion>2.10.1</FileVersion>+ <Version>2.10.1</Version><Product>optimizerDuck</Product><Copyright>Copyright fatDuck 2026</Copyright><AssemblyTitle>optimizerDuck</AssemblyTitle>@@ -51,8 +51,8 @@<PackageReference Include="Serilog.Sinks.File" Version="7.0.0" /><PackageReference Include="System.Management.Automation" Version="7.6.1" /><PackageReference Include="TaskScheduler" Version="2.12.2" />- <PackageReference Include="WPF-UI" Version="4.2.1" />- <PackageReference Include="WPF-UI.DependencyInjection" Version="4.2.1" />+ <PackageReference Include="WPF-UI" Version="4.3.0" />+ <PackageReference Include="WPF-UI.DependencyInjection" Version="4.3.0" /></ItemGroup><ItemGroup>