mirror of
https://github.com/microsoft/PowerToys.git
synced 2025-12-16 11:48:06 +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>
137 lines
5.7 KiB
C#
137 lines
5.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.ObjectModel;
|
|
using System.IO;
|
|
using Common.UI;
|
|
using ManagedCommon;
|
|
using Microsoft.PowerToys.Settings.UI.Helpers;
|
|
using Microsoft.PowerToys.Settings.UI.Library;
|
|
using Microsoft.PowerToys.Settings.UI.Library.Utilities;
|
|
using Microsoft.PowerToys.Settings.UI.ViewModels;
|
|
using Microsoft.UI.Xaml.Controls;
|
|
|
|
namespace Microsoft.PowerToys.Settings.UI.Views
|
|
{
|
|
public sealed partial class PowerLauncherPage : Page, IRefreshablePage
|
|
{
|
|
public PowerLauncherViewModel ViewModel { get; set; }
|
|
|
|
private readonly ObservableCollection<Tuple<string, string>> searchResultPreferencesOptions;
|
|
private readonly ObservableCollection<Tuple<string, string>> searchTypePreferencesOptions;
|
|
|
|
private int _lastIPCMessageSentTick;
|
|
|
|
// Keep track of the last IPC Message that was sent.
|
|
private int SendDefaultIPCMessageTimed(string msg)
|
|
{
|
|
_lastIPCMessageSentTick = Environment.TickCount;
|
|
return ShellPage.SendDefaultIPCMessage(msg);
|
|
}
|
|
|
|
public PowerLauncherPage()
|
|
{
|
|
InitializeComponent();
|
|
var settingsUtils = new SettingsUtils();
|
|
_lastIPCMessageSentTick = Environment.TickCount;
|
|
|
|
PowerLauncherSettings settings = SettingsRepository<PowerLauncherSettings>.GetInstance(settingsUtils)?.SettingsConfig;
|
|
ViewModel = new PowerLauncherViewModel(settings, SettingsRepository<GeneralSettings>.GetInstance(settingsUtils), SendDefaultIPCMessageTimed, App.IsDarkTheme);
|
|
DataContext = ViewModel;
|
|
|
|
_ = Helper.GetFileWatcher(PowerLauncherSettings.ModuleName, "settings.json", () =>
|
|
{
|
|
if (Environment.TickCount < _lastIPCMessageSentTick + 500)
|
|
{
|
|
// Don't try to update data from the file if we tried to write to it through IPC in the last 500 milliseconds.
|
|
return;
|
|
}
|
|
|
|
PowerLauncherSettings powerLauncherSettings = null;
|
|
try
|
|
{
|
|
powerLauncherSettings = SettingsRepository<PowerLauncherSettings>.GetInstance(settingsUtils)?.SettingsConfig;
|
|
}
|
|
catch (IOException ex)
|
|
{
|
|
Logger.LogInfo(ex.Message);
|
|
}
|
|
|
|
if (powerLauncherSettings != null && !ViewModel.IsUpToDate(powerLauncherSettings))
|
|
{
|
|
this.DispatcherQueue.TryEnqueue(() =>
|
|
{
|
|
DataContext = ViewModel = new PowerLauncherViewModel(powerLauncherSettings, SettingsRepository<GeneralSettings>.GetInstance(settingsUtils), ShellPage.SendDefaultIPCMessage, App.IsDarkTheme);
|
|
this.Bindings.Update();
|
|
});
|
|
}
|
|
});
|
|
|
|
var loader = Helpers.ResourceLoaderInstance.ResourceLoader;
|
|
|
|
searchResultPreferencesOptions = new ObservableCollection<Tuple<string, string>>();
|
|
searchResultPreferencesOptions.Add(Tuple.Create(loader.GetString("PowerLauncher_SearchResultPreference_AlphabeticalOrder"), "alphabetical_order"));
|
|
searchResultPreferencesOptions.Add(Tuple.Create(loader.GetString("PowerLauncher_SearchResultPreference_MostRecentlyUsed"), "most_recently_used"));
|
|
searchResultPreferencesOptions.Add(Tuple.Create(loader.GetString("PowerLauncher_SearchResultPreference_RunningProcessesOpenApplications"), "running_processes_open_applications"));
|
|
|
|
searchTypePreferencesOptions = new ObservableCollection<Tuple<string, string>>();
|
|
searchTypePreferencesOptions.Add(Tuple.Create(loader.GetString("PowerLauncher_SearchTypePreference_ApplicationName"), "application_name"));
|
|
searchTypePreferencesOptions.Add(Tuple.Create(loader.GetString("PowerLauncher_SearchTypePreference_StringInApplication"), "string_in_application"));
|
|
searchTypePreferencesOptions.Add(Tuple.Create(loader.GetString("PowerLauncher_SearchTypePreference_ExecutableName"), "executable_name"));
|
|
|
|
Loaded += (s, e) => ViewModel.OnPageLoaded();
|
|
}
|
|
|
|
private void OpenColorsSettings_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
|
|
{
|
|
Helpers.StartProcessHelper.Start(Helpers.StartProcessHelper.ColorsSettings);
|
|
}
|
|
|
|
public void RefreshEnabledState()
|
|
{
|
|
ViewModel.RefreshEnabledState();
|
|
}
|
|
|
|
private void NavigateCmdPalSettings_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
|
|
{
|
|
SettingsDeepLink.OpenSettings(SettingsDeepLink.SettingsWindow.CmdPal, true);
|
|
}
|
|
|
|
/*
|
|
public Tuple<string, string> SelectedSearchResultPreference
|
|
{
|
|
get
|
|
{
|
|
return searchResultPreferencesOptions.First(item => item.Item2 == ViewModel.SearchResultPreference);
|
|
}
|
|
|
|
set
|
|
{
|
|
if (ViewModel.SearchResultPreference != value.Item2)
|
|
{
|
|
ViewModel.SearchResultPreference = value.Item2;
|
|
}
|
|
}
|
|
}
|
|
|
|
public Tuple<string, string> SelectedSearchTypePreference
|
|
{
|
|
get
|
|
{
|
|
return searchTypePreferencesOptions.First(item => item.Item2 == ViewModel.SearchTypePreference);
|
|
}
|
|
|
|
set
|
|
{
|
|
if (ViewModel.SearchTypePreference != value.Item2)
|
|
{
|
|
ViewModel.SearchTypePreference = value.Item2;
|
|
}
|
|
}
|
|
}
|
|
*/
|
|
}
|
|
}
|