mirror of
https://github.com/microsoft/PowerToys.git
synced 2026-04-04 02:06:36 +02:00
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? --> ## Summary of the Pull Request This PR implements functionality to ignore specific hotkey conflicts in PowerToys settings. The primary purpose is to allow users to suppress individual shortcut conflict warnings if they find their configurations work correctly despite the detected conflicts. <!-- Please review the items on the PR checklist before submitting--> ## PR Checklist - [x] Closes: #41544 - [x] **Communication:** I've discussed this with core contributors already. If the work hasn't been agreed, this work might be rejected - [x] **Tests:** Added/updated and all pass - [x] **Localization:** All end-user-facing strings can be localized - [ ] **Dev docs:** Added/updated - [ ] **New binaries:** Added on the required places - [ ] [JSON for signing](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ESRPSigning_core.json) for new binaries - [ ] [WXS for installer](https://github.com/microsoft/PowerToys/blob/main/installer/PowerToysSetup/Product.wxs) for new binaries and localization folder - [ ] [YML for CI pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ci/templates/build-powertoys-steps.yml) for new test projects - [ ] [YML for signed pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/release.yml) - [ ] **Documentation updated:** If checked, please file a pull request on [our docs repo](https://github.com/MicrosoftDocs/windows-uwp/tree/docs/hub/powertoys) and link it here: #xxx <!-- Provide a more detailed description of the PR, other things fixed, or any additional comments/features here --> ## Detailed Description of the Pull Request / Additional comments - Added hotkey conflict ignore functionality with user-controllable settings - Updated shortcut control UI to support ignore states and clearer conflict messaging - Enhanced conflict detection to respect ignored shortcuts when counting conflicts <!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well --> ## Validation Steps Performed --------- Signed-off-by: Shawn Yuan <shuaiyuan@microsoft.com> Signed-off-by: Shuai Yuan <shuai.yuan.zju@gmail.com> Signed-off-by: Shawn Yuan (from Dev Box) <shuaiyuan@microsoft.com> Co-authored-by: Niels Laute <niels.laute@live.nl>
160 lines
5.5 KiB
C#
160 lines
5.5 KiB
C#
// Copyright (c) Microsoft Corporation
|
|
// The Microsoft Corporation licenses this file to you under the MIT license.
|
|
// See the LICENSE file in the project root for more information.
|
|
|
|
using System;
|
|
using System.Text.Json;
|
|
using System.Text.Json.Serialization;
|
|
|
|
using ManagedCommon;
|
|
using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
|
|
using Microsoft.PowerToys.Settings.UI.Library.Utilities;
|
|
using Settings.UI.Library.Attributes;
|
|
|
|
namespace Microsoft.PowerToys.Settings.UI.Library
|
|
{
|
|
public class GeneralSettings : ISettingsConfig
|
|
{
|
|
// Gets or sets a value indicating whether run powertoys on start-up.
|
|
[JsonPropertyName("startup")]
|
|
public bool Startup { get; set; }
|
|
|
|
// Gets or sets a value indicating whether the powertoys system tray icon should be hidden.
|
|
[JsonPropertyName("show_tray_icon")]
|
|
public bool ShowSysTrayIcon { get; set; }
|
|
|
|
// Gets or sets a value indicating whether the powertoy elevated.
|
|
[CmdConfigureIgnoreAttribute]
|
|
[JsonPropertyName("is_elevated")]
|
|
public bool IsElevated { get; set; }
|
|
|
|
// Gets or sets a value indicating whether powertoys should run elevated.
|
|
[JsonPropertyName("run_elevated")]
|
|
[CmdConfigureIgnoreAttribute]
|
|
public bool RunElevated { get; set; }
|
|
|
|
// Gets or sets a value indicating whether is admin.
|
|
[JsonPropertyName("is_admin")]
|
|
[CmdConfigureIgnoreAttribute]
|
|
public bool IsAdmin { get; set; }
|
|
|
|
// Gets or sets a value indicating whether is warnings of elevated apps enabled.
|
|
[JsonPropertyName("enable_warnings_elevated_apps")]
|
|
public bool EnableWarningsElevatedApps { get; set; }
|
|
|
|
// Gets or sets theme Name.
|
|
[JsonPropertyName("theme")]
|
|
public string Theme { get; set; }
|
|
|
|
// Gets or sets system theme name.
|
|
[JsonPropertyName("system_theme")]
|
|
[CmdConfigureIgnore]
|
|
public string SystemTheme { get; set; }
|
|
|
|
// Gets or sets powertoys version number.
|
|
[JsonPropertyName("powertoys_version")]
|
|
[CmdConfigureIgnore]
|
|
public string PowertoysVersion { get; set; }
|
|
|
|
[JsonPropertyName("action_name")]
|
|
[CmdConfigureIgnore]
|
|
public string CustomActionName { get; set; }
|
|
|
|
[JsonPropertyName("enabled")]
|
|
[CmdConfigureIgnore]
|
|
public EnabledModules Enabled { get; set; }
|
|
|
|
[JsonPropertyName("show_new_updates_toast_notification")]
|
|
public bool ShowNewUpdatesToastNotification { get; set; }
|
|
|
|
[JsonPropertyName("download_updates_automatically")]
|
|
public bool AutoDownloadUpdates { get; set; }
|
|
|
|
[JsonPropertyName("show_whats_new_after_updates")]
|
|
public bool ShowWhatsNewAfterUpdates { get; set; }
|
|
|
|
[JsonPropertyName("enable_experimentation")]
|
|
public bool EnableExperimentation { get; set; }
|
|
|
|
[JsonPropertyName("ignored_conflict_properties")]
|
|
public ShortcutConflictProperties IgnoredConflictProperties { get; set; }
|
|
|
|
public GeneralSettings()
|
|
{
|
|
Startup = false;
|
|
ShowSysTrayIcon = true;
|
|
IsAdmin = false;
|
|
EnableWarningsElevatedApps = true;
|
|
IsElevated = false;
|
|
ShowNewUpdatesToastNotification = true;
|
|
AutoDownloadUpdates = false;
|
|
EnableExperimentation = true;
|
|
Theme = "system";
|
|
SystemTheme = "light";
|
|
try
|
|
{
|
|
PowertoysVersion = DefaultPowertoysVersion();
|
|
}
|
|
catch (Exception e)
|
|
{
|
|
Logger.LogError("Exception encountered when getting PowerToys version", e);
|
|
PowertoysVersion = "v0.0.0";
|
|
}
|
|
|
|
Enabled = new EnabledModules();
|
|
CustomActionName = string.Empty;
|
|
IgnoredConflictProperties = new ShortcutConflictProperties();
|
|
}
|
|
|
|
// converts the current to a json string.
|
|
public string ToJsonString()
|
|
{
|
|
return JsonSerializer.Serialize(this);
|
|
}
|
|
|
|
private static string DefaultPowertoysVersion()
|
|
{
|
|
return global::PowerToys.Interop.CommonManaged.GetProductVersion();
|
|
}
|
|
|
|
// This function is to implement the ISettingsConfig interface.
|
|
// This interface helps in getting the settings configurations.
|
|
public string GetModuleName()
|
|
{
|
|
// The SettingsUtils functions access general settings when the module name is an empty string.
|
|
return string.Empty;
|
|
}
|
|
|
|
public bool UpgradeSettingsConfiguration()
|
|
{
|
|
try
|
|
{
|
|
if (Helper.CompareVersions(PowertoysVersion, Helper.GetProductVersion()) != 0)
|
|
{
|
|
// Update settings
|
|
PowertoysVersion = Helper.GetProductVersion();
|
|
return true;
|
|
}
|
|
}
|
|
catch (FormatException)
|
|
{
|
|
// If there is an issue with the version number format, don't migrate settings.
|
|
}
|
|
|
|
// Ensure IgnoredConflictProperties is initialized (for backward compatibility)
|
|
if (IgnoredConflictProperties == null)
|
|
{
|
|
IgnoredConflictProperties = new ShortcutConflictProperties();
|
|
return true; // Indicate that settings were upgraded
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
public void AddEnabledModuleChangeNotification(Action callBack)
|
|
{
|
|
Enabled.AddEnabledModuleChangeNotification(callBack);
|
|
}
|
|
}
|
|
}
|