mirror of
https://github.com/microsoft/PowerToys
synced 2025-08-22 18:17:19 +00: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 Implements comprehensive hotkey conflict detection and resolution system for PowerToys, providing real-time conflict checking and centralized management interface. ## PR Checklist - [ ] **Closes:** #xxx - [x] **Communication:** I've discussed this with core contributors already. If the work hasn't been agreed, this work might be rejected - [ ] **Tests:** Added/updated and all pass - [x] **Localization:** All end-user-facing strings can be localized - [x] **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) - [x] **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: [Shortcut conflict detction dev spec](https://github.com/MicrosoftDocs/windows-dev-docs/pull/5519) ## TODO Lists - [x] Add real-time hotkey validation functionality to the hotkey dialog - [x] Immediately detect conflicts and update shortcut conflict status after applying new shortcuts - [x] Return conflict list from runner hotkey conflict detector for conflict checking. - [x] Implement the Tooltip for every shortcut control - [x] Add dialog UI for showing all the shortcut conflicts - [x] Support changing shortcut directly inside the shortcut conflict window/dialog, no need to nav to the settings page. - [x] Redesign the `ShortcutConflictDialogContentControl` to align with the spec - [x] Add navigating and changing hotkey auctionability to the `ShortcutConflictDialogContentControl` - [x] Add telemetry. Impemented in [another PR](https://github.com/shuaiyuanxx/PowerToys/pull/47) ## Shortcut Conflict Support Modules  <details> <summary>Demo videos</summary> https://github.com/user-attachments/assets/476d992c-c6ca-4bcd-a3f2-b26cc612d1b9 https://github.com/user-attachments/assets/1c1a2537-de54-4db2-bdbf-6f1908ff1ce7 https://github.com/user-attachments/assets/9c992254-fc2b-402c-beec-20fceef25e6b https://github.com/user-attachments/assets/d66abc1c-b8bf-45f8-a552-ec989dab310f </details> <!-- 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 <!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well --> ## Validation Steps Performed Manually validation performed. --------- Signed-off-by: Shawn Yuan <shuaiyuan@microsoft.com> Signed-off-by: Shuai Yuan <shuai.yuan.zju@gmail.com> Co-authored-by: Niels Laute <niels.laute@live.nl>
156 lines
3.7 KiB
C#
156 lines
3.7 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.Collections.Generic;
|
|
using System.Text.Json.Serialization;
|
|
using Microsoft.PowerToys.Settings.UI.Library.Helpers;
|
|
using Microsoft.PowerToys.Settings.UI.Library.HotkeyConflicts;
|
|
|
|
namespace Microsoft.PowerToys.Settings.UI.Library;
|
|
|
|
public sealed class AdvancedPasteCustomAction : Observable, IAdvancedPasteAction, ICloneable
|
|
{
|
|
private int _id;
|
|
private string _name = string.Empty;
|
|
private string _prompt = string.Empty;
|
|
private HotkeySettings _shortcut = new();
|
|
private bool _isShown;
|
|
private bool _canMoveUp;
|
|
private bool _canMoveDown;
|
|
private bool _isValid;
|
|
private bool _hasConflict;
|
|
private string _tooltip;
|
|
|
|
[JsonPropertyName("id")]
|
|
public int Id
|
|
{
|
|
get => _id;
|
|
set => Set(ref _id, value);
|
|
}
|
|
|
|
[JsonPropertyName("name")]
|
|
public string Name
|
|
{
|
|
get => _name;
|
|
set
|
|
{
|
|
if (Set(ref _name, value))
|
|
{
|
|
UpdateIsValid();
|
|
}
|
|
}
|
|
}
|
|
|
|
[JsonPropertyName("prompt")]
|
|
public string Prompt
|
|
{
|
|
get => _prompt;
|
|
set
|
|
{
|
|
if (Set(ref _prompt, value))
|
|
{
|
|
UpdateIsValid();
|
|
}
|
|
}
|
|
}
|
|
|
|
[JsonPropertyName("shortcut")]
|
|
public HotkeySettings Shortcut
|
|
{
|
|
get => _shortcut;
|
|
set
|
|
{
|
|
if (_shortcut != value)
|
|
{
|
|
// We null-coalesce here rather than outside this branch as we want to raise PropertyChanged when the setter is called
|
|
// with null; the ShortcutControl depends on this.
|
|
_shortcut = value ?? new();
|
|
OnPropertyChanged();
|
|
}
|
|
}
|
|
}
|
|
|
|
[JsonPropertyName("isShown")]
|
|
public bool IsShown
|
|
{
|
|
get => _isShown;
|
|
set => Set(ref _isShown, value);
|
|
}
|
|
|
|
[JsonIgnore]
|
|
public bool CanMoveUp
|
|
{
|
|
get => _canMoveUp;
|
|
set => Set(ref _canMoveUp, value);
|
|
}
|
|
|
|
[JsonIgnore]
|
|
public bool CanMoveDown
|
|
{
|
|
get => _canMoveDown;
|
|
set => Set(ref _canMoveDown, value);
|
|
}
|
|
|
|
[JsonIgnore]
|
|
public bool IsValid
|
|
{
|
|
get => _isValid;
|
|
private set => Set(ref _isValid, value);
|
|
}
|
|
|
|
[JsonIgnore]
|
|
public bool HasConflict
|
|
{
|
|
get => _hasConflict;
|
|
set => Set(ref _hasConflict, value);
|
|
}
|
|
|
|
[JsonIgnore]
|
|
public string Tooltip
|
|
{
|
|
get => _tooltip;
|
|
set => Set(ref _tooltip, value);
|
|
}
|
|
|
|
[JsonIgnore]
|
|
public IEnumerable<IAdvancedPasteAction> SubActions => [];
|
|
|
|
public object Clone()
|
|
{
|
|
AdvancedPasteCustomAction clone = new();
|
|
clone.Update(this);
|
|
return clone;
|
|
}
|
|
|
|
public void Update(AdvancedPasteCustomAction other)
|
|
{
|
|
Id = other.Id;
|
|
Name = other.Name;
|
|
Prompt = other.Prompt;
|
|
Shortcut = other.GetShortcutClone();
|
|
IsShown = other.IsShown;
|
|
CanMoveUp = other.CanMoveUp;
|
|
CanMoveDown = other.CanMoveDown;
|
|
HasConflict = other.HasConflict;
|
|
Tooltip = other.Tooltip;
|
|
}
|
|
|
|
private HotkeySettings GetShortcutClone()
|
|
{
|
|
object shortcut = null;
|
|
if (Shortcut.TryToCmdRepresentable(out string shortcutString))
|
|
{
|
|
_ = HotkeySettings.TryParseFromCmd(shortcutString, out shortcut);
|
|
}
|
|
|
|
return (shortcut as HotkeySettings) ?? new HotkeySettings();
|
|
}
|
|
|
|
private void UpdateIsValid()
|
|
{
|
|
IsValid = !string.IsNullOrWhiteSpace(Name) && !string.IsNullOrWhiteSpace(Prompt);
|
|
}
|
|
}
|