mirror of
https://github.com/microsoft/PowerToys.git
synced 2025-12-15 19:27:56 +01: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>
286 lines
9.5 KiB
C#
286 lines
9.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.ComponentModel;
|
|
using global::PowerToys.GPOWrapper;
|
|
using Microsoft.PowerToys.Settings.UI.Helpers;
|
|
using Microsoft.PowerToys.Settings.UI.Library;
|
|
using Microsoft.PowerToys.Settings.UI.Library.HotkeyConflicts;
|
|
using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
|
|
using Microsoft.PowerToys.Settings.UI.OOBE.Enums;
|
|
using Microsoft.PowerToys.Settings.UI.OOBE.ViewModel;
|
|
using Microsoft.PowerToys.Settings.UI.Services;
|
|
using Microsoft.PowerToys.Settings.UI.SettingsXAML.Controls.Dashboard;
|
|
using Microsoft.PowerToys.Settings.UI.Views;
|
|
using Microsoft.PowerToys.Telemetry;
|
|
using Microsoft.UI;
|
|
using Microsoft.UI.Xaml.Controls;
|
|
using Microsoft.UI.Xaml.Media;
|
|
using Microsoft.UI.Xaml.Navigation;
|
|
|
|
namespace Microsoft.PowerToys.Settings.UI.OOBE.Views
|
|
{
|
|
public sealed partial class OobeOverview : Page, INotifyPropertyChanged
|
|
{
|
|
public OobePowerToysModule ViewModel { get; set; }
|
|
|
|
private bool _enableDataDiagnostics;
|
|
private AllHotkeyConflictsData _allHotkeyConflictsData = new AllHotkeyConflictsData();
|
|
private Windows.ApplicationModel.Resources.ResourceLoader resourceLoader = Helpers.ResourceLoaderInstance.ResourceLoader;
|
|
|
|
public bool EnableDataDiagnostics
|
|
{
|
|
get
|
|
{
|
|
return _enableDataDiagnostics;
|
|
}
|
|
|
|
set
|
|
{
|
|
if (_enableDataDiagnostics != value)
|
|
{
|
|
_enableDataDiagnostics = value;
|
|
|
|
DataDiagnosticsSettings.SetEnabledValue(_enableDataDiagnostics);
|
|
|
|
this.DispatcherQueue.TryEnqueue(Microsoft.UI.Dispatching.DispatcherQueuePriority.Normal, () =>
|
|
{
|
|
ShellPage.ShellHandler?.SignalGeneralDataUpdate();
|
|
});
|
|
}
|
|
}
|
|
}
|
|
|
|
public AllHotkeyConflictsData AllHotkeyConflictsData
|
|
{
|
|
get => _allHotkeyConflictsData;
|
|
set
|
|
{
|
|
if (_allHotkeyConflictsData != value)
|
|
{
|
|
_allHotkeyConflictsData = value;
|
|
OnPropertyChanged(nameof(AllHotkeyConflictsData));
|
|
OnPropertyChanged(nameof(ConflictCount));
|
|
OnPropertyChanged(nameof(ConflictText));
|
|
OnPropertyChanged(nameof(ConflictDescription));
|
|
OnPropertyChanged(nameof(HasConflicts));
|
|
OnPropertyChanged(nameof(IconGlyph));
|
|
OnPropertyChanged(nameof(IconForeground));
|
|
}
|
|
}
|
|
}
|
|
|
|
public int ConflictCount
|
|
{
|
|
get
|
|
{
|
|
if (AllHotkeyConflictsData == null)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
int count = 0;
|
|
if (AllHotkeyConflictsData.InAppConflicts != null)
|
|
{
|
|
count += AllHotkeyConflictsData.InAppConflicts.Count;
|
|
}
|
|
|
|
if (AllHotkeyConflictsData.SystemConflicts != null)
|
|
{
|
|
count += AllHotkeyConflictsData.SystemConflicts.Count;
|
|
}
|
|
|
|
return count;
|
|
}
|
|
}
|
|
|
|
public string ConflictText
|
|
{
|
|
get
|
|
{
|
|
var count = ConflictCount;
|
|
if (count == 0)
|
|
{
|
|
// Return no-conflict message
|
|
try
|
|
{
|
|
return resourceLoader.GetString("ShortcutConflictControl_NoConflictsFound");
|
|
}
|
|
catch
|
|
{
|
|
return "No conflicts found";
|
|
}
|
|
}
|
|
else if (count == 1)
|
|
{
|
|
// Try to get localized string
|
|
try
|
|
{
|
|
return resourceLoader.GetString("ShortcutConflictControl_SingleConflictFound");
|
|
}
|
|
catch
|
|
{
|
|
return "1 shortcut conflict";
|
|
}
|
|
}
|
|
else
|
|
{
|
|
// Try to get localized string
|
|
try
|
|
{
|
|
var template = resourceLoader.GetString("ShortcutConflictControl_MultipleConflictsFound");
|
|
return string.Format(System.Globalization.CultureInfo.CurrentCulture, template, count);
|
|
}
|
|
catch
|
|
{
|
|
return $"{count} shortcut conflicts";
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
public string ConflictDescription
|
|
{
|
|
get
|
|
{
|
|
var count = ConflictCount;
|
|
if (count == 0)
|
|
{
|
|
// Return no-conflict description
|
|
try
|
|
{
|
|
return resourceLoader.GetString("ShortcutConflictWindow_NoConflictsDescription");
|
|
}
|
|
catch
|
|
{
|
|
return "All shortcuts function correctly";
|
|
}
|
|
}
|
|
else
|
|
{
|
|
// Return conflict description
|
|
try
|
|
{
|
|
return resourceLoader.GetString("Oobe_Overview_Hotkey_Conflict_Card_Description");
|
|
}
|
|
catch
|
|
{
|
|
return "Shortcuts configured by PowerToys are conflicting";
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
public bool HasConflicts => ConflictCount > 0;
|
|
|
|
public string IconGlyph => HasConflicts ? "\uE814" : "\uE73E";
|
|
|
|
public SolidColorBrush IconForeground
|
|
{
|
|
get
|
|
{
|
|
if (HasConflicts)
|
|
{
|
|
// Red color for conflicts
|
|
return (SolidColorBrush)App.Current.Resources["SystemFillColorCriticalBrush"];
|
|
}
|
|
else
|
|
{
|
|
// Green color for no conflicts
|
|
return (SolidColorBrush)App.Current.Resources["SystemFillColorSuccessBrush"];
|
|
}
|
|
}
|
|
}
|
|
|
|
public bool ShowDataDiagnosticsSetting => GetIsDataDiagnosticsInfoBarEnabled();
|
|
|
|
public event PropertyChangedEventHandler PropertyChanged;
|
|
|
|
private bool GetIsDataDiagnosticsInfoBarEnabled()
|
|
{
|
|
var isDataDiagnosticsGpoDisallowed = GPOWrapper.GetAllowDataDiagnosticsValue() == GpoRuleConfigured.Disabled;
|
|
|
|
return !isDataDiagnosticsGpoDisallowed;
|
|
}
|
|
|
|
public OobeOverview()
|
|
{
|
|
this.InitializeComponent();
|
|
|
|
_enableDataDiagnostics = DataDiagnosticsSettings.GetEnabledValue();
|
|
|
|
ViewModel = new OobePowerToysModule(OobeShellPage.OobeShellHandler.Modules[(int)PowerToysModules.Overview]);
|
|
DataContext = this;
|
|
|
|
// Subscribe to hotkey conflict updates
|
|
if (GlobalHotkeyConflictManager.Instance != null)
|
|
{
|
|
GlobalHotkeyConflictManager.Instance.ConflictsUpdated += OnConflictsUpdated;
|
|
GlobalHotkeyConflictManager.Instance.RequestAllConflicts();
|
|
}
|
|
}
|
|
|
|
private void OnConflictsUpdated(object sender, AllHotkeyConflictsEventArgs e)
|
|
{
|
|
this.DispatcherQueue.TryEnqueue(Microsoft.UI.Dispatching.DispatcherQueuePriority.Normal, () =>
|
|
{
|
|
AllHotkeyConflictsData = e.Conflicts ?? new AllHotkeyConflictsData();
|
|
});
|
|
}
|
|
|
|
private void OnPropertyChanged(string propertyName)
|
|
{
|
|
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
|
|
}
|
|
|
|
private void SettingsLaunchButton_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
|
|
{
|
|
if (OobeShellPage.OpenMainWindowCallback != null)
|
|
{
|
|
OobeShellPage.OpenMainWindowCallback(typeof(DashboardPage));
|
|
}
|
|
|
|
ViewModel.LogOpeningSettingsEvent();
|
|
}
|
|
|
|
private void GeneralSettingsLaunchButton_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
|
|
{
|
|
if (OobeShellPage.OpenMainWindowCallback != null)
|
|
{
|
|
OobeShellPage.OpenMainWindowCallback(typeof(GeneralPage));
|
|
}
|
|
|
|
ViewModel.LogOpeningSettingsEvent();
|
|
}
|
|
|
|
private void ShortcutConflictBtn_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
|
|
{
|
|
if (AllHotkeyConflictsData == null || !HasConflicts)
|
|
{
|
|
return;
|
|
}
|
|
|
|
// Create and show the shortcut conflict window
|
|
var conflictWindow = new ShortcutConflictWindow();
|
|
conflictWindow.Activate();
|
|
}
|
|
|
|
protected override void OnNavigatedTo(NavigationEventArgs e)
|
|
{
|
|
ViewModel.LogOpeningModuleEvent();
|
|
}
|
|
|
|
protected override void OnNavigatedFrom(NavigationEventArgs e)
|
|
{
|
|
ViewModel.LogClosingModuleEvent();
|
|
|
|
// Unsubscribe from conflict updates when leaving the page
|
|
if (GlobalHotkeyConflictManager.Instance != null)
|
|
{
|
|
GlobalHotkeyConflictManager.Instance.ConflictsUpdated -= OnConflictsUpdated;
|
|
}
|
|
}
|
|
}
|
|
}
|