Skip to content

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

feat: add DeleteSubKeyTree and CreateSubKey methods to RegistryService.cs

itsfatduckcaf45420b26a
diff --git a/optimizerDuck.Test/Services/OptimizationExecutionContextTests.cs b/optimizerDuck.Test/Services/OptimizationExecutionContextTests.cs
index b795019..9b56c41 100644
--- a/optimizerDuck.Test/Services/OptimizationExecutionContextTests.cs
+++ b/optimizerDuck.Test/Services/OptimizationExecutionContextTests.cs
@@ -113,7 +113,7 @@ public class ExecutionScopeTests
ExecutionScope.RecordStep("TestStep", "Description", true);
Assert.NotNull(ExecutionScope.Current);
- Assert.Single(scope.ExecutedSteps);
+ Assert.Empty(scope.ExecutedSteps);
Assert.Equal(Guid.Empty, scope.OptimizationId);
}
diff --git a/optimizerDuck.Test/Services/OptimizationServices/ServiceProcessServiceTests.cs b/optimizerDuck.Test/Services/OptimizationServices/ServiceProcessServiceTests.cs
deleted file mode 100644
index 52ec2cf..0000000
--- a/optimizerDuck.Test/Services/OptimizationServices/ServiceProcessServiceTests.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using optimizerDuck.Core.Models.Optimization.Services;
-using optimizerDuck.Services.OptimizationServices;
-
-namespace optimizerDuck.Test.Services.OptimizationServices;
-
-public class ServiceProcessServiceTests
-{
- [Fact]
- public void ChangeServiceStartupType_WithMissingService_ReturnsTrue()
- {
- var item = new ServiceItem
- {
- Name = "optimizerDuck-Test-NonExistent",
- StartupType = ServiceStartupType.Disabled
- };
-
- var result = ServiceProcessService.ChangeServiceStartupType(item);
-
- Assert.True(result);
- }
-}
\ No newline at end of file
diff --git a/optimizerDuck/Core/Features/System.cs b/optimizerDuck/Core/Features/System.cs
index 8174a91..23e63fb 100644
--- a/optimizerDuck/Core/Features/System.cs
+++ b/optimizerDuck/Core/Features/System.cs
@@ -12,9 +12,8 @@ namespace optimizerDuck.Core.Features;
[FeatureCategory(PageType = typeof(SystemFeatureCategory))]
public class System : IFeatureCategory
{
- public enum Sections
+ private enum Sections
{
- WindowsUpdate,
Storage
}
@@ -24,24 +23,9 @@ public class System : IFeatureCategory
public FeatureCategoryOrder Order { get; init; } = FeatureCategoryOrder.System;
public ObservableCollection<IFeature> Features { get; init; } = [];
- [Feature(Section = nameof(Sections.WindowsUpdate))]
- public class DisableAutomaticWindowsUpdate : BaseFeature
- {
- protected override IEnumerable<RegistryToggle> RegistryToggles =>
- [
- new()
- {
- Path = @"HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU",
- Name = "NoAutoUpdate",
- OnValue = 1,
- OffValue = 0,
- DefaultValue = 0
- }
- ];
- }
- [Feature(Section = nameof(Sections.Storage))]
- public class DisableStorageSense : BaseFeature
+ [Feature(Section = nameof(Sections.Storage), Icon = SymbolRegular.HardDrive20)]
+ public class StorageSense : BaseFeature
{
protected override IEnumerable<RegistryToggle> RegistryToggles =>
[
diff --git a/optimizerDuck/Core/Features/UserExperience.cs b/optimizerDuck/Core/Features/UserExperience.cs
index a5c04d1..4370d6b 100644
--- a/optimizerDuck/Core/Features/UserExperience.cs
+++ b/optimizerDuck/Core/Features/UserExperience.cs
@@ -2,8 +2,10 @@ using System.Collections.ObjectModel;
using optimizerDuck.Core.Interfaces;
using optimizerDuck.Core.Models.Attributes;
using optimizerDuck.Core.Models.Features;
+using optimizerDuck.Core.Models.Optimization.Services;
using optimizerDuck.Core.Models.UI;
using optimizerDuck.Services.Managers;
+using optimizerDuck.Services.OptimizationServices;
using optimizerDuck.UI.Views.Pages.Features;
using Wpf.Ui.Controls;
@@ -12,11 +14,10 @@ namespace optimizerDuck.Core.Features;
[FeatureCategory(PageType = typeof(UserExperienceFeatureCategory))]
public class UserExperience : IFeatureCategory
{
- public enum Sections
+ private enum Sections
{
Taskbar,
Appearance,
- SystemTray,
Explorer
}
@@ -26,8 +27,8 @@ public class UserExperience : IFeatureCategory
public FeatureCategoryOrder Order { get; init; } = FeatureCategoryOrder.UserExperience;
public ObservableCollection<IFeature> Features { get; init; } = [];
- [Feature(Section = nameof(Sections.Taskbar))]
- public class DisableTaskbarNewsAndInterests : BaseFeature
+ [Feature(Section = nameof(Sections.Taskbar), Icon = SymbolRegular.News24)]
+ public class TaskbarNewsAndInterests : BaseFeature
{
protected override IEnumerable<RegistryToggle> RegistryToggles =>
[
@@ -42,8 +43,8 @@ public class UserExperience : IFeatureCategory
];
}
- [Feature(Section = nameof(Sections.Appearance))]
- public class EnableDarkMode : BaseFeature
+ [Feature(Section = nameof(Sections.Appearance), Icon = SymbolRegular.DarkTheme24)]
+ public class DarkMode : BaseFeature
{
protected override IEnumerable<RegistryToggle> RegistryToggles =>
[
@@ -58,23 +59,7 @@ public class UserExperience : IFeatureCategory
];
}
- [Feature(Section = nameof(Sections.Taskbar))]
- public class DisableVisualEffects : BaseFeature
- {
- protected override IEnumerable<RegistryToggle> RegistryToggles =>
- [
- new()
- {
- Path = @"HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced",
- Name = "TaskbarAnimations",
- OnValue = 0,
- OffValue = 1,
- DefaultValue = 1
- }
- ];
- }
-
- [Feature(Section = nameof(Sections.SystemTray))]
+ [Feature(Section = nameof(Sections.Explorer), Icon = SymbolRegular.Clock24)]
public class ShowSecondsInSystemClock : BaseFeature
{
protected override IEnumerable<RegistryToggle> RegistryToggles =>
@@ -90,20 +75,31 @@ public class UserExperience : IFeatureCategory
];
}
- [Feature(Section = nameof(Sections.Explorer))]
- public class EnableClassicContextMenu : BaseFeature
+ [Feature(Section = nameof(Sections.Explorer), Icon = SymbolRegular.CursorClick24)]
+ public class ClassicContextMenu : BaseFeature
{
- protected override IEnumerable<RegistryToggle> RegistryToggles =>
- [
- new()
- {
- Path = @"HKCU\SOFTWARE\Classes\CLSID\{86ca1aa0-34aa-4e8b-a509-50c905bae2a2}\InprocServer32",
- Name = "",
- OnValue = 0,
- OffValue = 1,
- DefaultValue = 1,
- TreatMissingAsDefault = true
- }
- ];
+ private const string BasePath =
+ @"HKCU\SOFTWARE\Classes\CLSID\{86ca1aa0-34aa-4e8b-a509-50c905bae2a2}";
+
+ private const string InprocPath =
+ BasePath + @"\InprocServer32";
+
+ public override Task<bool> GetStateAsync()
+ {
+ var exists = RegistryService.KeyExists(new RegistryItem(InprocPath));
+ return Task.FromResult(exists);
+ }
+
+ public override Task EnableAsync()
+ {
+ RegistryService.CreateSubKey(new RegistryItem(InprocPath));
+ return Task.CompletedTask;
+ }
+
+ public override Task DisableAsync()
+ {
+ RegistryService.DeleteSubKeyTree(new RegistryItem(BasePath));
+ return Task.CompletedTask;
+ }
}
}
\ No newline at end of file
diff --git a/optimizerDuck/Core/Interfaces/IFeature.cs b/optimizerDuck/Core/Interfaces/IFeature.cs
index 3613c8d..378cd50 100644
--- a/optimizerDuck/Core/Interfaces/IFeature.cs
+++ b/optimizerDuck/Core/Interfaces/IFeature.cs
@@ -1,3 +1,5 @@
+using Wpf.Ui.Controls;
+
namespace optimizerDuck.Core.Interfaces;
public interface IFeature
@@ -5,6 +7,7 @@ public interface IFeature
string Name { get; }
string Description { get; }
string Section { get; }
+ public SymbolRegular Icon { get; }
string FeatureKey { get; }
Task<bool> GetStateAsync();
diff --git a/optimizerDuck/Core/Models/Attributes/FeatureAttribute.cs b/optimizerDuck/Core/Models/Attributes/FeatureAttribute.cs
index ff68560..c7474e1 100644
--- a/optimizerDuck/Core/Models/Attributes/FeatureAttribute.cs
+++ b/optimizerDuck/Core/Models/Attributes/FeatureAttribute.cs
@@ -1,9 +1,12 @@
+using Wpf.Ui.Controls;
+
namespace optimizerDuck.Core.Models.Attributes;
[AttributeUsage(AttributeTargets.Class, Inherited = false)]
public sealed class FeatureAttribute : Attribute
{
public object? Section { get; init; }
+ public required SymbolRegular Icon { get; init; }
public string GetSectionName()
{
diff --git a/optimizerDuck/Core/Models/Features/BaseFeature.cs b/optimizerDuck/Core/Models/Features/BaseFeature.cs
index 92d1395..b97b1a1 100644
--- a/optimizerDuck/Core/Models/Features/BaseFeature.cs
+++ b/optimizerDuck/Core/Models/Features/BaseFeature.cs
@@ -2,6 +2,7 @@ using System.Reflection;
using optimizerDuck.Core.Interfaces;
using optimizerDuck.Core.Models.Attributes;
using optimizerDuck.Services.Managers;
+using Wpf.Ui.Controls;
namespace optimizerDuck.Core.Models.Features;
@@ -40,6 +41,8 @@ public abstract class BaseFeature : IFeature
}
}
+ public SymbolRegular Icon => Meta.Icon;
+
public virtual Task<bool> GetStateAsync()
{
return Task.FromResult(RegistryToggles.All(t => t.GetState()));
diff --git a/optimizerDuck/Core/Models/Features/RegistryToggle.cs b/optimizerDuck/Core/Models/Features/RegistryToggle.cs
index e87f3ff..a5db425 100644
--- a/optimizerDuck/Core/Models/Features/RegistryToggle.cs
+++ b/optimizerDuck/Core/Models/Features/RegistryToggle.cs
@@ -8,13 +8,12 @@ public class RegistryToggle
{
public required string Path { get; init; }
public required string Name { get; init; }
- public required object? OnValue { get; init; } = 1;
- public required object? OffValue { get; init; } = 0;
- public required object? DefaultValue { get; init; } = 0;
+ public object? OnValue { get; init; } = 1;
+ public object? OffValue { get; init; } = 0;
+ public object? DefaultValue { get; init; } = 0;
public bool TreatMissingAsDefault { get; init; } = false;
public RegistryValueKind ValueKind { get; init; } = RegistryValueKind.DWord;
-
public bool GetState()
{
var value = GetRawValue();
@@ -48,7 +47,11 @@ public class RegistryToggle
private object? GetRawValue()
{
var value = RegistryService.Read<object?>(new RegistryItem(Path, Name));
- return value ?? (TreatMissingAsDefault ? null : DefaultValue);
+
+ if (value == null && TreatMissingAsDefault)
+ return DefaultValue;
+
+ return value ?? DefaultValue;
}
public void SetState(bool isOn)
diff --git a/optimizerDuck/Core/Models/Revert/Steps/RegistryRevertStep.cs b/optimizerDuck/Core/Models/Revert/Steps/RegistryRevertStep.cs
index 0693233..1a744af 100644
--- a/optimizerDuck/Core/Models/Revert/Steps/RegistryRevertStep.cs
+++ b/optimizerDuck/Core/Models/Revert/Steps/RegistryRevertStep.cs
@@ -32,6 +32,11 @@ public class RegistryRevertStep : IRevertStep
/// </summary>
public IReadOnlyList<string>? CreatedSubKeys { get; init; }
+ /// <summary>
+ /// Nested sub-steps to perform a complex action like restoring a full registry tree.
+ /// </summary>
+ public IReadOnlyList<RegistryRevertStep>? SubSteps { get; init; }
+
/// <summary>
/// The original registry value to restore.
@@ -47,42 +52,50 @@ public class RegistryRevertStep : IRevertStep
public string Type => "Registry";
/// <inheritdoc />
- public string Description => string.Format(
- Action == RevertAction.RestorePrevious
- ? Translations.Revert_Registry_Description_Restore
- : Translations.Revert_Registry_Description_Delete,
- Path, Name ?? "(Default)");
+ public string Description => Action switch
+ {
+ RevertAction.RestorePrevious => string.Format(Translations.Revert_Registry_Description_Restore, Path, Name ?? "(Default)"),
+ RevertAction.NoPreviousValue => string.Format(Translations.Revert_Registry_Description_Delete, Path, Name ?? "(Default)"),
+ RevertAction.RestoreKey => string.Format(Translations.Revert_Registry_Description_RestoreKey, Path),
+ RevertAction.DeleteKey => string.Format(Translations.Revert_Registry_Description_DeleteKey, Path),
+ RevertAction.RestoreKeyTree => string.Format(Translations.Revert_Registry_Description_RestoreKey, Path),
+ _ => $"Revert {Path}"
+ };
/// <inheritdoc />
- public async Task<bool> ExecuteAsync()
+ public Task<bool> ExecuteAsync()
{
- return await Task.Run(() =>
+ var result = Action switch
{
- var valueName = Name ?? string.Empty;
+ RevertAction.NoPreviousValue =>
+ RegistryService.DeleteValue(new RegistryItem(Path, Name)),
- var result = Action switch
- {
- RevertAction.NoPreviousValue =>
- RegistryService.DeleteValue(new RegistryItem(Path, valueName)),
+ RevertAction.RestorePrevious =>
+ Value == null
+ ? RegistryService.DeleteValue(new RegistryItem(Path, Name))
+ : RegistryService.Write(new RegistryItem(Path, Name, Value, Kind)),
- RevertAction.RestorePrevious =>
- Value == null
- ? false
- : RegistryService.Write(new RegistryItem(Path, valueName, Value!, Kind)),
+ RevertAction.RestoreKey =>
+ RegistryService.CreateSubKey(new RegistryItem(Path)),
- _ => false
- };
+ RevertAction.DeleteKey =>
+ RegistryService.DeleteSubKeyTree(new RegistryItem(Path)),
- if (!result)
- throw new Exception(
- string.Format(Translations
- .Service_Common_Error_AccessDenied)); // Generic for now, but better than nothing
+ RevertAction.RestoreKeyTree =>
+ ExecuteSubSteps(),
- // Cleanup empty subkeys if they were created during apply
- if (result && CreatedSubKeys?.Count > 0) RegistryService.CleanupEmptyKeys(CreatedSubKeys);
+ _ => false
+ };
- return result;
- });
+ if (!result)
+ throw new Exception(
+ string.Format(Translations
+ .Service_Common_Error_AccessDenied)); // Generic for now, but better than nothing
+
+ // Cleanup empty subkeys if they were created during apply
+ if (result && CreatedSubKeys?.Count > 0) RegistryService.CleanupEmptyKeys(CreatedSubKeys);
+
+ return Task.FromResult(result);
}
@@ -100,6 +113,13 @@ public class RegistryRevertStep : IRevertStep
// Save created subkeys list
if (CreatedSubKeys?.Count > 0) obj[nameof(CreatedSubKeys)] = new JArray(CreatedSubKeys);
+ if (SubSteps?.Count > 0)
+ {
+ var subArray = new JArray();
+ foreach (var step in SubSteps) subArray.Add(step.ToData());
+ obj[nameof(SubSteps)] = subArray;
+ }
+
// Serialize Value based on Kind to ensure deterministic JSON and avoid JValue rendering issues
if (Value == null)
{
@@ -182,6 +202,15 @@ public class RegistryRevertStep : IRevertStep
List<string>? createdSubKeys = null;
if (data[nameof(CreatedSubKeys)] is JArray subKeysArray) createdSubKeys = subKeysArray.ToObject<List<string>>();
+ List<RegistryRevertStep>? subSteps = null;
+ if (data[nameof(SubSteps)] is JArray stepsArray)
+ {
+ subSteps = [];
+ foreach (var stepToken in stepsArray)
+ if (stepToken is JObject stepObj)
+ subSteps.Add(FromData(stepObj));
+ }
+
return new RegistryRevertStep
{
Action = Enum.Parse<RevertAction>(data[nameof(Action)]!.ToString()),
@@ -189,9 +218,21 @@ public class RegistryRevertStep : IRevertStep
Name = data[nameof(Name)]?.ToObject<string>(),
Value = value,
Kind = kind,
- CreatedSubKeys = createdSubKeys
+ CreatedSubKeys = createdSubKeys,
+ SubSteps = subSteps
};
}
+
+ private bool ExecuteSubSteps()
+ {
+ if (SubSteps == null) return true;
+ foreach (var step in SubSteps)
+ {
+ // Run synchronously to ensure correct nested tree creation order
+ if (!step.ExecuteAsync().GetAwaiter().GetResult()) return false;
+ }
+ return true;
+ }
}
/// <summary>
@@ -203,5 +244,14 @@ public enum RevertAction
NoPreviousValue,
/// <summary>Restore the previously captured value.</summary>
- RestorePrevious
+ RestorePrevious,
+
+ /// <summary>The key did not exist before; delete tree during revert.</summary>
+ DeleteKey,
+
+ /// <summary>The key existed before; recreate it during revert (limited to root).</summary>
+ RestoreKey,
+
+ /// <summary>The key tree existed before; recreate the entire tree including values sequentially.</summary>
+ RestoreKeyTree
}
\ No newline at end of file
diff --git a/optimizerDuck/Resources/Languages/Translations.Designer.cs b/optimizerDuck/Resources/Languages/Translations.Designer.cs
index 5e17fab..0b44bf4 100644
--- a/optimizerDuck/Resources/Languages/Translations.Designer.cs
+++ b/optimizerDuck/Resources/Languages/Translations.Designer.cs
@@ -1,4 +1,4 @@
-//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
//
@@ -1050,24 +1050,6 @@ namespace optimizerDuck.Resources.Languages {
}
}
- /// <summary>
- /// Looks up a localized string similar to Control AI and smart features in Windows.
- /// </summary>
- internal static string Features_AI_Description {
- get {
- return ResourceManager.GetString("Features.AI.Description", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to AI.
- /// </summary>
- internal static string Features_AI_Name {
- get {
- return ResourceManager.GetString("Features.AI.Name", resourceCulture);
- }
- }
-
/// <summary>
/// Looks up a localized string similar to Enable or disable continuous Windows features.
/// </summary>
@@ -1077,15 +1059,6 @@ namespace optimizerDuck.Resources.Languages {
}
}
- /// <summary>
- /// Looks up a localized string similar to Control data collection and privacy settings.
- /// </summary>
- internal static string Features_Privacy_Description {
- get {
- return ResourceManager.GetString("Features.Privacy.Description", resourceCulture);
- }
- }
-
/// <summary>
/// Looks up a localized string similar to System and update settings.
/// </summary>
@@ -3223,6 +3196,15 @@ namespace optimizerDuck.Resources.Languages {
}
}
+ /// <summary>
+ /// Looks up a localized string similar to Create registry key {0}.
+ /// </summary>
+ internal static string Service_Registry_Description_CreateKey {
+ get {
+ return ResourceManager.GetString("Service.Registry.Description.CreateKey", resourceCulture);
+ }
+ }
+
/// <summary>
/// Looks up a localized string similar to Delete registry value: {0}\{1}.
/// </summary>
@@ -3232,6 +3214,15 @@ namespace optimizerDuck.Resources.Languages {
}
}
+ /// <summary>
+ /// Looks up a localized string similar to Delete registry key {0}.
+ /// </summary>
+ internal static string Service_Registry_Description_DeleteKey {
+ get {
+ return ResourceManager.GetString("Service.Registry.Description.DeleteKey", resourceCulture);
+ }
+ }
+
/// <summary>
/// Looks up a localized string similar to Write registry value: {0}\{1}.
/// </summary>
@@ -3963,245 +3954,20 @@ namespace optimizerDuck.Resources.Languages {
}
/// <summary>
- /// Looks up a localized string similar to Turn off automatic Windows updates.
- /// </summary>
- internal static string ToggleFeature_DisableAutomaticWindowsUpdate_Description {
- get {
- return ResourceManager.GetString("ToggleFeature.DisableAutomaticWindowsUpdate.Description", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to Disable Automatic Updates.
- /// </summary>
- internal static string ToggleFeature_DisableAutomaticWindowsUpdate_Name {
- get {
- return ResourceManager.GetString("ToggleFeature.DisableAutomaticWindowsUpdate.Name", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to Remove Bing search results from Windows search.
- /// </summary>
- internal static string ToggleFeature_DisableBingInWindowsSearch_Description {
- get {
- return ResourceManager.GetString("ToggleFeature.DisableBingInWindowsSearch.Description", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to Disable Bing in Windows Search.
- /// </summary>
- internal static string ToggleFeature_DisableBingInWindowsSearch_Name {
- get {
- return ResourceManager.GetString("ToggleFeature.DisableBingInWindowsSearch.Name", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to Turn off diagnostic data collection.
- /// </summary>
- internal static string ToggleFeature_DisableDiagnosticData_Description {
- get {
- return ResourceManager.GetString("ToggleFeature.DisableDiagnosticData.Description", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to Disable Diagnostic Data.
- /// </summary>
- internal static string ToggleFeature_DisableDiagnosticData_Name {
- get {
- return ResourceManager.GetString("ToggleFeature.DisableDiagnosticData.Name", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to Turn off feedback notifications.
- /// </summary>
- internal static string ToggleFeature_DisableFeedbackNotifications_Description {
- get {
- return ResourceManager.GetString("ToggleFeature.DisableFeedbackNotifications.Description", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to Disable Feedback.
- /// </summary>
- internal static string ToggleFeature_DisableFeedbackNotifications_Name {
- get {
- return ResourceManager.GetString("ToggleFeature.DisableFeedbackNotifications.Name", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to Turn off automatic disk cleanup.
- /// </summary>
- internal static string ToggleFeature_DisableStorageSense_Description {
- get {
- return ResourceManager.GetString("ToggleFeature.DisableStorageSense.Description", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to Disable Storage Sense.
- /// </summary>
- internal static string ToggleFeature_DisableStorageSense_Name {
- get {
- return ResourceManager.GetString("ToggleFeature.DisableStorageSense.Name", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to Turn off suggested content in Start menu.
- /// </summary>
- internal static string ToggleFeature_DisableSuggestionsInStart_Description {
- get {
- return ResourceManager.GetString("ToggleFeature.DisableSuggestionsInStart.Description", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to Disable Suggestions in Start.
- /// </summary>
- internal static string ToggleFeature_DisableSuggestionsInStart_Name {
- get {
- return ResourceManager.GetString("ToggleFeature.DisableSuggestionsInStart.Name", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to Turn off personalized tips and recommendations.
- /// </summary>
- internal static string ToggleFeature_DisableTailoredExperiences_Description {
- get {
- return ResourceManager.GetString("ToggleFeature.DisableTailoredExperiences.Description", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to Disable Tailored Experiences.
- /// </summary>
- internal static string ToggleFeature_DisableTailoredExperiences_Name {
- get {
- return ResourceManager.GetString("ToggleFeature.DisableTailoredExperiences.Name", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to Turn off news and interests in taskbar.
+ /// Looks up a localized string similar to Restore registry key: {0}.
/// </summary>
- internal static string ToggleFeature_DisableTaskbarNewsAndInterests_Description {
+ internal static string Revert_Registry_Description_RestoreKey {
get {
- return ResourceManager.GetString("ToggleFeature.DisableTaskbarNewsAndInterests.Description", resourceCulture);
+ return ResourceManager.GetString("Revert.Registry.Description.RestoreKey", resourceCulture);
}
}
-
- /// <summary>
- /// Looks up a localized string similar to Disable Taskbar News.
- /// </summary>
- internal static string ToggleFeature_DisableTaskbarNewsAndInterests_Name {
- get {
- return ResourceManager.GetString("ToggleFeature.DisableTaskbarNewsAndInterests.Name", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to Reduce diagnostic data sent to Microsoft.
- /// </summary>
- internal static string ToggleFeature_DisableTelemetry_Description {
- get {
- return ResourceManager.GetString("ToggleFeature.DisableTelemetry.Description", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to Disable Telemetry.
- /// </summary>
- internal static string ToggleFeature_DisableTelemetry_Name {
- get {
- return ResourceManager.GetString("ToggleFeature.DisableTelemetry.Name", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to Turn off animations and visual effects.
- /// </summary>
- internal static string ToggleFeature_DisableVisualEffects_Description {
- get {
- return ResourceManager.GetString("ToggleFeature.DisableVisualEffects.Description", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to Disable Visual Effects.
- /// </summary>
- internal static string ToggleFeature_DisableVisualEffects_Name {
- get {
- return ResourceManager.GetString("ToggleFeature.DisableVisualEffects.Name", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to Turn off the AI assistant in Windows.
- /// </summary>
- internal static string ToggleFeature_DisableWindowsCopilot_Description {
- get {
- return ResourceManager.GetString("ToggleFeature.DisableWindowsCopilot.Description", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to Disable Windows Copilot.
- /// </summary>
- internal static string ToggleFeature_DisableWindowsCopilot_Name {
- get {
- return ResourceManager.GetString("ToggleFeature.DisableWindowsCopilot.Name", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to Use classic right-click menu instead of modern.
- /// </summary>
- internal static string ToggleFeature_EnableClassicContextMenu_Description {
- get {
- return ResourceManager.GetString("ToggleFeature.EnableClassicContextMenu.Description", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to Enable Classic Context Menu.
- /// </summary>
- internal static string ToggleFeature_EnableClassicContextMenu_Name {
- get {
- return ResourceManager.GetString("ToggleFeature.EnableClassicContextMenu.Name", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to Use dark theme for apps and Windows.
- /// </summary>
- internal static string ToggleFeature_EnableDarkMode_Description {
- get {
- return ResourceManager.GetString("ToggleFeature.EnableDarkMode.Description", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to Enable Dark Mode.
- /// </summary>
- internal static string ToggleFeature_EnableDarkMode_Name {
- get {
- return ResourceManager.GetString("ToggleFeature.EnableDarkMode.Name", resourceCulture);
- }
- }
-
+
/// <summary>
- /// Looks up a localized string similar to Display seconds in system tray clock.
+ /// Looks up a localized string similar to Delete registry key: {0}.
/// </summary>
- internal static string ToggleFeature_ShowSecondsInSystemClock_Description {
+ internal static string Revert_Registry_Description_DeleteKey {
get {
- return ResourceManager.GetString("ToggleFeature.ShowSecondsInSystemClock.Description", resourceCulture);
+ return ResourceManager.GetString("Revert.Registry.Description.DeleteKey", resourceCulture);
}
}
}
diff --git a/optimizerDuck/Resources/Languages/Translations.resx b/optimizerDuck/Resources/Languages/Translations.resx
index d4617e4..b525102 100644
--- a/optimizerDuck/Resources/Languages/Translations.resx
+++ b/optimizerDuck/Resources/Languages/Translations.resx
@@ -169,108 +169,18 @@
</data>
<data name="Features.Description" xml:space="preserve">
<value>Enable or disable continuous Windows features</value>
- </data>
- <data name="Features.AI.Name" xml:space="preserve">
- <value>AI</value>
- </data>
- <data name="Features.AI.Description" xml:space="preserve">
- <value>Control AI and smart features in Windows</value>
</data>
<data name="Features.UserExperience.Name" xml:space="preserve">
<value>User Experience</value>
</data>
<data name="Features.UserExperience.Description" xml:space="preserve">
<value>Customize visual and interaction settings</value>
- </data>
- <data name="Features.Privacy.Description" xml:space="preserve">
- <value>Control data collection and privacy settings</value>
</data>
<data name="Features.System.Name" xml:space="preserve">
<value>System</value>
</data>
<data name="Features.System.Description" xml:space="preserve">
<value>System and update settings</value>
- </data>
- <data name="ToggleFeature.DisableWindowsCopilot.Name" xml:space="preserve">
- <value>Disable Windows Copilot</value>
- </data>
- <data name="ToggleFeature.DisableWindowsCopilot.Description" xml:space="preserve">
- <value>Turn off the AI assistant in Windows</value>
- </data>
- <data name="ToggleFeature.DisableBingInWindowsSearch.Name" xml:space="preserve">
- <value>Disable Bing in Windows Search</value>
- </data>
- <data name="ToggleFeature.DisableBingInWindowsSearch.Description" xml:space="preserve">
- <value>Remove Bing search results from Windows search</value>
- </data>
- <data name="ToggleFeature.DisableSuggestionsInStart.Name" xml:space="preserve">
- <value>Disable Suggestions in Start</value>
- </data>
- <data name="ToggleFeature.DisableSuggestionsInStart.Description" xml:space="preserve">
- <value>Turn off suggested content in Start menu</value>
- </data>
- <data name="ToggleFeature.DisableTailoredExperiences.Name" xml:space="preserve">
- <value>Disable Tailored Experiences</value>
- </data>
- <data name="ToggleFeature.DisableTailoredExperiences.Description" xml:space="preserve">
- <value>Turn off personalized tips and recommendations</value>
- </data>
- <data name="ToggleFeature.DisableTaskbarNewsAndInterests.Name" xml:space="preserve">
- <value>Disable Taskbar News</value>
- </data>
- <data name="ToggleFeature.DisableTaskbarNewsAndInterests.Description" xml:space="preserve">
- <value>Turn off news and interests in taskbar</value>
- </data>
- <data name="ToggleFeature.EnableDarkMode.Name" xml:space="preserve">
- <value>Enable Dark Mode</value>
- </data>
- <data name="ToggleFeature.EnableDarkMode.Description" xml:space="preserve">
- <value>Use dark theme for apps and Windows</value>
- </data>
- <data name="ToggleFeature.DisableVisualEffects.Name" xml:space="preserve">
- <value>Disable Visual Effects</value>
- </data>
- <data name="ToggleFeature.DisableVisualEffects.Description" xml:space="preserve">
- <value>Turn off animations and visual effects</value>
- </data>
- <data name="ToggleFeature.ShowSecondsInSystemClock.Description" xml:space="preserve">
- <value>Display seconds in system tray clock</value>
- </data>
- <data name="ToggleFeature.EnableClassicContextMenu.Name" xml:space="preserve">
- <value>Enable Classic Context Menu</value>
- </data>
- <data name="ToggleFeature.EnableClassicContextMenu.Description" xml:space="preserve">
- <value>Use classic right-click menu instead of modern</value>
- </data>
- <data name="ToggleFeature.DisableTelemetry.Name" xml:space="preserve">
- <value>Disable Telemetry</value>
- </data>
- <data name="ToggleFeature.DisableTelemetry.Description" xml:space="preserve">
- <value>Reduce diagnostic data sent to Microsoft</value>
- </data>
- <data name="ToggleFeature.DisableDiagnosticData.Name" xml:space="preserve">
- <value>Disable Diagnostic Data</value>
- </data>
- <data name="ToggleFeature.DisableDiagnosticData.Description" xml:space="preserve">
- <value>Turn off diagnostic data collection</value>
- </data>
- <data name="ToggleFeature.DisableFeedbackNotifications.Name" xml:space="preserve">
- <value>Disable Feedback</value>
- </data>
- <data name="ToggleFeature.DisableFeedbackNotifications.Description" xml:space="preserve">
- <value>Turn off feedback notifications</value>
- </data>
- <data name="ToggleFeature.DisableAutomaticWindowsUpdate.Name" xml:space="preserve">
- <value>Disable Automatic Updates</value>
- </data>
- <data name="ToggleFeature.DisableAutomaticWindowsUpdate.Description" xml:space="preserve">
- <value>Turn off automatic Windows updates</value>
- </data>
- <data name="ToggleFeature.DisableStorageSense.Name" xml:space="preserve">
- <value>Disable Storage Sense</value>
- </data>
- <data name="ToggleFeature.DisableStorageSense.Description" xml:space="preserve">
- <value>Turn off automatic disk cleanup</value>
</data>
<data name="Dashboard.SystemInfo.Gpu.More" xml:space="preserve">
<value>+ {0} more GPU</value>
@@ -292,6 +202,12 @@
</data>
<data name="Dashboard.Actions.SupportMe.Description" xml:space="preserve">
<value>Star the repo on GitHub, share it with friends, or donate every bit helps this project grow!</value>
+ </data>
+ <data name="Service.Registry.Description.CreateKey" xml:space="preserve">
+ <value>Create registry key {0}</value>
+ </data>
+ <data name="Service.Registry.Description.DeleteKey" xml:space="preserve">
+ <value>Delete registry key {0}</value>
</data>
<data name="Settings.LanguageChanged.Title" xml:space="preserve">
<value>Language change</value>
@@ -437,6 +353,12 @@
</data>
<data name="Optimization.Revert.StepDescription" xml:space="preserve">
<value>Revert step #{0}</value>
+ </data>
+ <data name="Revert.Registry.Description.RestoreKey" xml:space="preserve">
+ <value>Restore registry key: {0}</value>
+ </data>
+ <data name="Revert.Registry.Description.DeleteKey" xml:space="preserve">
+ <value>Delete registry key: {0}</value>
</data>
<data name="Revert.Error.FileNotFound" xml:space="preserve">
<value>Revert file not found</value>
diff --git a/optimizerDuck/Resources/Languages/Translations.vi-VN.resx b/optimizerDuck/Resources/Languages/Translations.vi-VN.resx
index 02ff2a0..5578267 100644
--- a/optimizerDuck/Resources/Languages/Translations.vi-VN.resx
+++ b/optimizerDuck/Resources/Languages/Translations.vi-VN.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
@@ -164,113 +164,23 @@
<data name="Sidebar.Optimize" xml:space="preserve">
<value>Tối ưu</value>
</data>
- <data name="Sidebar.ToggleFeatures" xml:space="preserve">
- <value>Tính năng bật/tắt</value>
+ <data name="Sidebar.Features" xml:space="preserve">
+ <value>Tính năng</value>
</data>
<data name="Features.Description" xml:space="preserve">
<value>Bật hoặc tắt các tính năng liên tục của Windows</value>
- </data>
- <data name="Features.AI.Name" xml:space="preserve">
- <value>AI</value>
- </data>
- <data name="Features.AI.Description" xml:space="preserve">
- <value>Điều khiển AI và các tính năng thông minh trong Windows</value>
</data>
<data name="Features.UserExperience.Name" xml:space="preserve">
<value>Trải nghiệm người dùng</value>
</data>
<data name="Features.UserExperience.Description" xml:space="preserve">
<value>Tùy chỉnh cài đặt hiển thị và tương tác</value>
- </data>
- <data name="Features.Privacy.Description" xml:space="preserve">
- <value>Điều khiển thu thập dữ liệu và cài đặt quyền riêng tư</value>
</data>
<data name="Features.System.Name" xml:space="preserve">
<value>Hệ thống</value>
</data>
<data name="Features.System.Description" xml:space="preserve">
<value>Cài đặt hệ thống và cập nhật</value>
- </data>
- <data name="ToggleFeature.DisableWindowsCopilot.Name" xml:space="preserve">
- <value>Tắt Windows Copilot</value>
- </data>
- <data name="ToggleFeature.DisableWindowsCopilot.Description" xml:space="preserve">
- <value>Tắt trợ lý AI trong Windows</value>
- </data>
- <data name="ToggleFeature.DisableBingInWindowsSearch.Name" xml:space="preserve">
- <value>Tắt Bing trong Windows Search</value>
- </data>
- <data name="ToggleFeature.DisableBingInWindowsSearch.Description" xml:space="preserve">
- <value>Xóa kết quả tìm kiếm Bing khỏi Windows search</value>
- </data>
- <data name="ToggleFeature.DisableSuggestionsInStart.Name" xml:space="preserve">
- <value>Tắt gợi ý trong Start</value>
- </data>
- <data name="ToggleFeature.DisableSuggestionsInStart.Description" xml:space="preserve">
- <value>Tắt nội dung gợi ý trong menu Start</value>
- </data>
- <data name="ToggleFeature.DisableTailoredExperiences.Name" xml:space="preserve">
- <value>Tắt Trải nghiệm cá nhân hóa</value>
- </data>
- <data name="ToggleFeature.DisableTailoredExperiences.Description" xml:space="preserve">
- <value>Tắt mẹo và đề xuất được cá nhân hóa</value>
- </data>
- <data name="ToggleFeature.DisableTaskbarNewsAndInterests.Name" xml:space="preserve">
- <value>Tắt Tin tức trên Taskbar</value>
- </data>
- <data name="ToggleFeature.DisableTaskbarNewsAndInterests.Description" xml:space="preserve">
- <value>Tắt tin tức và sở thích trên taskbar</value>
- </data>
- <data name="ToggleFeature.EnableDarkMode.Name" xml:space="preserve">
- <value>Bật Chế độ tối</value>
- </data>
- <data name="ToggleFeature.EnableDarkMode.Description" xml:space="preserve">
- <value>Sử dụng giao diện tối cho ứng dụng và Windows</value>
- </data>
- <data name="ToggleFeature.DisableVisualEffects.Name" xml:space="preserve">
- <value>Tắt Hiệu ứng hình ảnh</value>
- </data>
- <data name="ToggleFeature.DisableVisualEffects.Description" xml:space="preserve">
- <value>Tắt hoạt animation và hiệu ứng hình ảnh</value>
- </data>
- <data name="ToggleFeature.ShowSecondsInSystemClock.Description" xml:space="preserve">
- <value>Hiển thị giây trong đồng hồ system tray</value>
- </data>
- <data name="ToggleFeature.EnableClassicContextMenu.Name" xml:space="preserve">
- <value>Bật Menu chuột cổ điển</value>
- </data>
- <data name="ToggleFeature.EnableClassicContextMenu.Description" xml:space="preserve">
- <value>Sử dụng menu chuột phải cổ điển thay vì hiện đại</value>
- </data>
- <data name="ToggleFeature.DisableTelemetry.Name" xml:space="preserve">
- <value>Tắt Telemetry</value>
- </data>
- <data name="ToggleFeature.DisableTelemetry.Description" xml:space="preserve">
- <value>Giảm dữ liệu chẩn đoán gửi đến Microsoft</value>
- </data>
- <data name="ToggleFeature.DisableDiagnosticData.Name" xml:space="preserve">
- <value>Tắt Dữ liệu Chẩn đoán</value>
- </data>
- <data name="ToggleFeature.DisableDiagnosticData.Description" xml:space="preserve">
- <value>Tắt thu thập dữ liệu chẩn đoán</value>
- </data>
- <data name="ToggleFeature.DisableFeedbackNotifications.Name" xml:space="preserve">
- <value>Tắt Thông báo Phản hồi</value>
- </data>
- <data name="ToggleFeature.DisableFeedbackNotifications.Description" xml:space="preserve">
- <value>Tắt thông báo phản hồi</value>
- </data>
- <data name="ToggleFeature.DisableAutomaticWindowsUpdate.Name" xml:space="preserve">
- <value>Tắt Cập nhật Tự động</value>
- </data>
- <data name="ToggleFeature.DisableAutomaticWindowsUpdate.Description" xml:space="preserve">
- <value>Tắt cập nhật Windows tự động</value>
- </data>
- <data name="ToggleFeature.DisableStorageSense.Name" xml:space="preserve">
- <value>Tắt Storage Sense</value>
- </data>
- <data name="ToggleFeature.DisableStorageSense.Description" xml:space="preserve">
- <value>Tắt dọn dẹp đĩa tự động</value>
</data>
<data name="Dashboard.SystemInfo.Gpu.More" xml:space="preserve">
<value>Còn {0} GPU khác</value>
@@ -440,6 +350,12 @@
</data>
<data name="Optimization.Revert.StepDescription" xml:space="preserve">
<value>Đang hoàn tác bước #{0}</value>
+ </data>
+ <data name="Revert.Registry.Description.RestoreKey" xml:space="preserve">
+ <value>Khôi phục registry key: {0}</value>
+ </data>
+ <data name="Revert.Registry.Description.DeleteKey" xml:space="preserve">
+ <value>Xóa registry key: {0}</value>
</data>
<data name="Revert.Error.FileNotFound" xml:space="preserve">
<value>Không tìm thấy tệp hoàn tác</value>
diff --git a/optimizerDuck/Resources/Languages/Translations.zh-TW.resx b/optimizerDuck/Resources/Languages/Translations.zh-Hant-TW.resx
similarity index 100%
rename from optimizerDuck/Resources/Languages/Translations.zh-TW.resx
rename to optimizerDuck/Resources/Languages/Translations.zh-Hant-TW.resx
diff --git a/optimizerDuck/Services/OptimizationServices/RegistryService.cs b/optimizerDuck/Services/OptimizationServices/RegistryService.cs
index 1d0621b..530e97f 100644
--- a/optimizerDuck/Services/OptimizationServices/RegistryService.cs
+++ b/optimizerDuck/Services/OptimizationServices/RegistryService.cs
@@ -7,6 +7,7 @@ using optimizerDuck.Core.Models.Execution;
using optimizerDuck.Core.Models.Optimization.Services;
using optimizerDuck.Core.Models.Revert.Steps;
using optimizerDuck.Resources.Languages;
+using optimizerDuck.Services.Managers;
namespace optimizerDuck.Services.OptimizationServices;
@@ -139,6 +140,11 @@ public static class RegistryService
}
}
+ public static bool KeyExists(RegistryItem item)
+ {
+ return WithKey(item, key => true, false);
+ }
+
public static T? Read<T>(RegistryItem item)
{
return WithKey(item, key =>
@@ -223,7 +229,7 @@ public static class RegistryService
{
return WithKey(item, key =>
{
- var description = string.Format(Translations.Service_Registry_Description_Delete, item.Path, item.Name);
+ var description = string.Format(Translations.Service_Registry_Description_Delete, item.Path, item.Name ?? "(Default)");
try
{
var backupValue = key.GetValue(item.Name, null, RegistryValueOptions.DoNotExpandEnvironmentNames);
@@ -271,6 +277,148 @@ public static class RegistryService
}, true);
}
+ public static bool CreateSubKey(RegistryItem item)
+ {
+ if (!TryParsePath(item.Path, out var rootKey, out var subPath))
+ return false;
+
+ var description = string.Format(Translations.Service_Registry_Description_CreateKey, item.Path);
+ var createdSubKeys = new List<string>();
+
+ try
+ {
+ using var key = rootKey.OpenSubKey(subPath, false);
+ if (key != null)
+ {
+ ExecutionScope.LogInfo("Skip create registry {Path} (already exists)", item.Path);
+ ExecutionScope.Track(nameof(CreateSubKey), true);
+ return true;
+ }
+
+ using var newKey = CreateSubKeyTrack(rootKey, subPath, createdSubKeys);
+
+ var revertStep = new RegistryRevertStep
+ {
+ Action = RevertAction.NoPreviousValue,
+ Path = item.Path,
+ Name = null,
+ CreatedSubKeys = createdSubKeys
+ };
+
+ ExecutionScope.LogInfo("Created registry key {Path}", item.Path);
+ ExecutionScope.Track(nameof(CreateSubKey), true);
+ ExecutionScope.RecordStep(Translations.Service_Registry_Name, description, true, revertStep);
+ return true;
+ }
+ catch (UnauthorizedAccessException)
+ {
+ ExecutionScope.LogError(null, "Access denied creating {Path}", item.Path);
+ ExecutionScope.Track(nameof(CreateSubKey), false);
+ ExecutionScope.RecordStep(Translations.Service_Registry_Name, description, false, null,
+ Translations.Service_Common_Error_AccessDenied, () => Task.FromResult(CreateSubKey(item)));
+ return false;
+ }
+ catch (Exception ex)
+ {
+ ExecutionScope.LogError(ex, "Failed to create registry {Path}", item.Path);
+ ExecutionScope.Track(nameof(CreateSubKey), false);
+ ExecutionScope.RecordStep(Translations.Service_Registry_Name, description, false, null, ex.Message,
+ () => Task.FromResult(CreateSubKey(item)));
+ return false;
+ }
+ }
+
+ public static bool DeleteSubKeyTree(RegistryItem item)
+ {
+ if (!TryParsePath(item.Path, out var rootKey, out var subPath))
+ return false;
+
+ var description = string.Format(Translations.Service_Registry_Description_DeleteKey, item.Path);
+
+ try
+ {
+ using var key = rootKey.OpenSubKey(subPath, false);
+ if (key == null)
+ {
+ ExecutionScope.LogInfo("Skip delete registry key {Path} (not found)", item.Path);
+ ExecutionScope.Track(nameof(DeleteSubKeyTree), true);
+ ExecutionScope.RecordStep(Translations.Service_Registry_Name, description, true);
+ return true;
+ }
+
+ var subSteps = BackupRegistryTree(key, item.Path);
+ rootKey.DeleteSubKeyTree(subPath, false);
+
+ var revertStep = new RegistryRevertStep
+ {
+ Action = RevertAction.RestoreKeyTree,
+ Path = item.Path,
+ SubSteps = subSteps
+ };
+
+ ExecutionScope.LogInfo("Deleted registry key tree {Path}", item.Path);
+ ExecutionScope.Track(nameof(DeleteSubKeyTree), true);
+ ExecutionScope.RecordStep(Translations.Service_Registry_Name, description, true, revertStep);
+ return true;
+ }
+ catch (UnauthorizedAccessException)
+ {
+ ExecutionScope.LogError(null, "Access denied deleting {Path}", item.Path);
+ ExecutionScope.Track(nameof(DeleteSubKeyTree), false);
+ ExecutionScope.RecordStep(Translations.Service_Registry_Name, description, false, null,
+ Translations.Service_Registry_Error_AccessDeniedProtectedHive,
+ () => Task.FromResult(DeleteSubKeyTree(item)));
+ return false;
+ }
+ catch (Exception ex)
+ {
+ ExecutionScope.LogError(ex, "Failed to delete subkey tree {Path}", item.Path);
+ ExecutionScope.Track(nameof(DeleteSubKeyTree), false);
+ ExecutionScope.RecordStep(Translations.Service_Registry_Name, description, false, null, ex.Message,
+ () => Task.FromResult(DeleteSubKeyTree(item)));
+ return false;
+ }
+ }
+
+ private static List<RegistryRevertStep> BackupRegistryTree(RegistryKey key, string keyPath)
+ {
+ var steps = new List<RegistryRevertStep>();
+ BackupRegistryTreeRecursive(key, keyPath, steps, 0);
+ return steps;
+ }
+
+ private static void BackupRegistryTreeRecursive(RegistryKey key, string keyPath, List<RegistryRevertStep> steps, int depth)
+ {
+ // Guard against massive trees (e.g., HKCR\CLSID) to prevent OOM and giant JSON files
+ if (depth > 15 || steps.Count > 5000)
+ {
+ ExecutionScope.LogWarning("Skipping full backup of subtree {Path} (depth: {Depth}, items: {Count})", keyPath, depth, steps.Count);
+ return;
+ }
+
+ steps.Add(new RegistryRevertStep { Action = RevertAction.RestoreKey, Path = keyPath });
+
+ foreach (var valueName in key.GetValueNames())
+ {
+ if (steps.Count > 5000) break;
+ steps.Add(new RegistryRevertStep
+ {
+ Action = RevertAction.RestorePrevious,
+ Path = keyPath,
+ Name = string.IsNullOrEmpty(valueName) ? null : valueName,
+ Value = key.GetValue(valueName, null, RegistryValueOptions.DoNotExpandEnvironmentNames),
+ Kind = key.GetValueKind(valueName)
+ });
+ }
+
+ foreach (var subKeyName in key.GetSubKeyNames())
+ {
+ if (steps.Count > 5000) break;
+ using var subKey = key.OpenSubKey(subKeyName, false);
+ if (subKey != null)
+ BackupRegistryTreeRecursive(subKey, $@"{keyPath}\{subKeyName}", steps, depth + 1);
+ }
+ }
public static void Write(params RegistryItem[] items)
{
foreach (var item in items.Distinct()) Write(item);
diff --git a/optimizerDuck/UI/ViewModels/Features/FeatureViewModel.cs b/optimizerDuck/UI/ViewModels/Features/FeatureViewModel.cs
index 466d972..d095d88 100644
--- a/optimizerDuck/UI/ViewModels/Features/FeatureViewModel.cs
+++ b/optimizerDuck/UI/ViewModels/Features/FeatureViewModel.cs
@@ -3,6 +3,7 @@ using CommunityToolkit.Mvvm.Input;
using Microsoft.Extensions.Logging;
using optimizerDuck.Core.Interfaces;
using optimizerDuck.Core.Models.Execution;
+using Wpf.Ui.Controls;
namespace optimizerDuck.UI.ViewModels.Features;
@@ -16,12 +17,12 @@ public partial class FeatureViewModel(IFeature feature, ILoggerFactory loggerFac
[ObservableProperty] private bool _isLoading;
- [ObservableProperty] private bool _isVisible = true;
-
[ObservableProperty] private string _name = feature.Name;
[ObservableProperty] private string _section = feature.Section;
+ public SymbolRegular Icon => feature.Icon;
+
public async Task LoadStateAsync()
{
try
diff --git a/optimizerDuck/UI/ViewModels/Pages/FeatureCategoryViewModel.cs b/optimizerDuck/UI/ViewModels/Pages/FeatureCategoryViewModel.cs
index 1abb4d3..162d1da 100644
--- a/optimizerDuck/UI/ViewModels/Pages/FeatureCategoryViewModel.cs
+++ b/optimizerDuck/UI/ViewModels/Pages/FeatureCategoryViewModel.cs
@@ -69,7 +69,11 @@ public partial class FeatureCategoryViewModel : ViewModel
f.Description.Contains(search, StringComparison.InvariantCultureIgnoreCase));
}
- var sortedFeatures = filtered.OrderBy<FeatureViewModel, string>(f => f.Name).ToList();
+ var sortedFeatures = SelectedSortByIndex switch
+ {
+ 1 => filtered.OrderByDescending(f => f.IsEnabled).ThenBy(f => f.Name).ToList(),
+ _ => filtered.OrderBy(f => f.Name).ToList()
+ };
var grouped = sortedFeatures
.GroupBy(f => string.IsNullOrEmpty(f.Section) ? Translations.Common_Other : f.Section)
@@ -85,8 +89,6 @@ public partial class FeatureCategoryViewModel : ViewModel
Features = new ObservableCollection<FeatureViewModel>(group.ToList())
};
sections.Add(section);
-
- foreach (var feature in section.Features) feature.IsVisible = true;
}
Sections = sections;
diff --git a/optimizerDuck/UI/ViewModels/Pages/SettingsViewModel.cs b/optimizerDuck/UI/ViewModels/Pages/SettingsViewModel.cs
index 1f9677b..5209378 100644
--- a/optimizerDuck/UI/ViewModels/Pages/SettingsViewModel.cs
+++ b/optimizerDuck/UI/ViewModels/Pages/SettingsViewModel.cs
@@ -48,7 +48,7 @@ public partial class SettingsViewModel(
[
new() { DisplayName = "English", Culture = new CultureInfo("en-US") },
new() { DisplayName = "Tiếng Việt", Culture = new CultureInfo("vi-VN") },
- new() { DisplayName = "正體中文", Culture = new CultureInfo("zh-TW") }
+ new() { DisplayName = "正體中文", Culture = new CultureInfo("zh-Hant-TW") }
];
public override async Task OnNavigatedToAsync()
diff --git a/optimizerDuck/UI/Views/Pages/Features/FeatureCategoryPage.xaml b/optimizerDuck/UI/Views/Pages/Features/FeatureCategoryPage.xaml
index 053afd5..7e27c27 100644
--- a/optimizerDuck/UI/Views/Pages/Features/FeatureCategoryPage.xaml
+++ b/optimizerDuck/UI/Views/Pages/Features/FeatureCategoryPage.xaml
@@ -56,13 +56,40 @@
HorizontalAlignment="Left"
Icon="{ui:SymbolIcon Search24}"
Margin="0,0,8,0"
- MinWidth="300"
+ MinWidth="200"
PlaceholderText="{ext:Loc Common.Search.Placeholder}"
Text="{Binding ViewModel.SearchText, UpdateSourceTrigger=PropertyChanged}"
VerticalAlignment="Center" />
- <ComboBox SelectedIndex="{Binding ViewModel.SelectedSortByIndex}" VerticalAlignment="Center">
- <ComboBoxItem Content="{ext:Loc Common.SortBy.Name}" />
+ <ComboBox
+ Margin="0,0,8,0"
+ SelectedIndex="{Binding ViewModel.SelectedSortByIndex}"
+ ToolTip="{ext:Loc Common.SortBy}"
+ VerticalAlignment="Center">
+ <ComboBoxItem HorizontalContentAlignment="Left">
+ <Grid ColumnDefinitions="Auto Auto" HorizontalAlignment="Left">
+ <ui:SymbolIcon
+ HorizontalAlignment="Left"
+ Margin="0,0,6,0"
+ Symbol="TextSortAscending24" />
+ <TextBlock
+ Grid.Column="1"
+ HorizontalAlignment="Left"
+ Text="{ext:Loc Common.SortBy.Name}" />
+ </Grid>
+ </ComboBoxItem>
+ <ComboBoxItem HorizontalContentAlignment="Left">
+ <Grid ColumnDefinitions="Auto Auto" HorizontalAlignment="Left">
+ <ui:SymbolIcon
+ HorizontalAlignment="Left"
+ Margin="0,0,6,0"
+ Symbol="ToggleRight24" />
+ <TextBlock
+ Grid.Column="1"
+ HorizontalAlignment="Left"
+ Text="{ext:Loc Common.SortBy.Status}" />
+ </Grid>
+ </ComboBoxItem>
</ComboBox>
</WrapPanel>
@@ -76,15 +103,18 @@
<ItemsControl ItemsSource="{Binding ViewModel.Sections}" Margin="0,0,0,16">
<ItemsControl.ItemTemplate>
<DataTemplate>
- <StackPanel Margin="0,0,0,24">
+ <StackPanel Margin="0,0,0,18">
<ui:TextBlock
- FontTypography="Subtitle"
- Margin="0,0,0,12"
+ FontTypography="BodyStrong"
+ Margin="0,0,0,6"
Text="{Binding Name}" />
<ItemsControl ItemsSource="{Binding Features}">
<ItemsControl.ItemTemplate>
<DataTemplate>
- <ui:CardControl Margin="0,0,0,8" Visibility="{Binding IsVisible, Converter={StaticResource BoolToVisibilityConverter}}">
+ <ui:CardControl Margin="0,0,0,4">
+ <ui:CardControl.Icon>
+ <ui:SymbolIcon Symbol="{Binding Icon}" />
+ </ui:CardControl.Icon>
<ui:CardControl.Header>
<StackPanel VerticalAlignment="Center">
<ui:TextBlock
@@ -102,6 +132,7 @@
</ui:CardControl.Header>
<ui:ToggleSwitch
Command="{Binding ToggleCommand}"
+ Cursor="Hand"
HorizontalAlignment="Right"
IsChecked="{Binding IsEnabled, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
VerticalAlignment="Center" />