Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-05 18:57:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

[Feature] PowerToys hotkey conflict detection (#41029)

Browse Source 
<!-- 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

![image](https://github.com/user-attachments/assets/3915174e-d1e7-4f86-8835-2a1bafcc85c9)

<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>
This commit is contained in:
Shawn Yuan
2025-08-20 09:31:52 +08:00
committed by GitHub
parent ce4d8dc11e
commit 75526b9580
104 changed files with 4578 additions and 366 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
View File

@@ -2049,18 +2049,27 @@ Take a moment to preview the various utilities listed or view our comprehensive
<data name="Oobe_Overview_Telemetry_Desc.Text" xml:space="preserve">
<value>Diagnostics &amp; feedback helps us to improve PowerToys and keep it secure, up to date, and working as expected.</value>
</data>
<data name="Oobe_Overview_Hotkey_Conflict_Title.Text" xml:space="preserve">
<value>Shortcut conflict detection</value>
</data>
<data name="Oobe_Overview_Hotkey_Conflict_Card.Text" xml:space="preserve">
<value>Shortcuts configured by PowerToys are conflicting.</value>
</data>
<data name="Oobe_Overview_Hotkey_Conflict_Card_Description.Header" xml:space="preserve">
<value>Shortcuts configured by PowerToys are conflicting</value>
</data>
<data name="Oobe_Overview_Hotkey_NoConflict_Card_Header" xml:space="preserve">
<value>No conflicts found</value>
</data>
<data name="Oobe_Overview_Hotkey_NoConflict_Card_Description" xml:space="preserve">
<value>All shortcuts function correctly</value>
</data>
<data name="Oobe_Overview_DiagnosticsAndFeedback_Settings_Link.Content" xml:space="preserve">
<value>View more diagnostic data settings</value>
</data>
<data name="Oobe_Overview_DiagnosticsAndFeedback_Link.Content" xml:space="preserve">
<value>Learn more about the information PowerToys logs &amp; how it gets used</value>
</data>
<data name="Oobe_Overview_EnableDataDiagnostics.Header" xml:space="preserve">
<value>Diagnostic data</value>
</data>
<data name="Oobe_Overview_EnableDataDiagnostics.Description" xml:space="preserve">
<value>Helps us make PowerToys faster, more stable, and better over time</value>
</data>
<data name="Oobe_WhatsNew_DataDiagnostics_InfoBar.Header" xml:space="preserve">
<value>Turn on diagnostic data to help us improve PowerToys?</value>
</data>
@@ -5127,6 +5136,58 @@ To record a specific window, enter the hotkey with the Alt key in the opposite m
<data name="KeyBack" xml:space="preserve">
<value>Back key</value>
</data>
<data name="InAppHotkeyConflictTooltipText" xml:space="preserve">
<value>This shortcut is already in use by another utility.</value>
</data>
<data name="SysHotkeyConflictTooltipText" xml:space="preserve">
<value>This shortcut is already in use by a default system shortcut.</value>
</data>
<data name="ShortcutConflictWindow_Title" xml:space="preserve">
<value>PowerToys shortcut conflicts</value>
</data>
<data name="ShortcutConflictWindow_TitleTxt.Text" xml:space="preserve">
<value>PowerToys shortcut conflicts</value>
</data>
<data name="ShortcutConflictWindow_Description.Text" xml:space="preserve">
<value>Conflicting shortcuts may cause unexpected behavior. Edit them here or go to the module settings to update them.</value>
</data>
<data name="ShortcutConflictWindow_ModulesUsingShortcut.Text" xml:space="preserve">
<value>Conflicts found for</value>
</data>
<data name="ShortcutConflictWindow_SystemCard.Header" xml:space="preserve">
<value>System</value>
</data>
<data name="ShortcutConflictWindow_SystemCard.Description" xml:space="preserve">
<value>Windows system shortcut</value>
</data>
<data name="ShortcutConflictWindow_SystemShortcutMessage.Text" xml:space="preserve">
<value>This shortcut can't be changed.</value>
</data>
<data name="ShortcutConflictWindow_SystemShortcutTooltip.Content" xml:space="preserve">
<value>This shortcut is used by Windows and can't be changed.</value>
</data>
<data name="ShortcutConflictWindow_NoConflictsTitle.Text" xml:space="preserve">
<value>No conflicts detected</value>
</data>
<data name="ShortcutConflictWindow_NoConflictsDescription.Text" xml:space="preserve">
<value>All shortcuts function correctly</value>
</data>
<data name="ResolveConflicts_Button.Content" xml:space="preserve">
<value>Resolve conflicts</value>
</data>
<data name="ShortcutConflictControl_Title.Text" xml:space="preserve">
<value>Shortcut conflicts</value>
</data>
<data name="ShortcutConflictControl_NoConflictsFound" xml:space="preserve">
<value>No conflicts found</value>
</data>
<data name="ShortcutConflictControl_SingleConflictFound" xml:space="preserve">
<value>1 conflict found</value>
</data>
<data name="ShortcutConflictControl_MultipleConflictsFound" xml:space="preserve">
<value>{0} conflicts found</value>
<comment>{0} is replaced with the number of conflicts</comment>
</data>
<data name="Hosts_NoLeadingSpaces.Header" xml:space="preserve">
<value>No leading spaces</value>
</data>