mirror of
https://github.com/microsoft/PowerToys.git
synced 2026-04-07 03:36:44 +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 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>
337 lines
13 KiB
C#
337 lines
13 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.ComponentModel;
|
|
using System.Diagnostics;
|
|
using System.Linq;
|
|
using System.Net;
|
|
using System.Net.Http;
|
|
using System.Text;
|
|
using System.Text.Json;
|
|
using System.Text.RegularExpressions;
|
|
using System.Threading.Tasks;
|
|
|
|
using CommunityToolkit.WinUI.UI.Controls;
|
|
using global::PowerToys.GPOWrapper;
|
|
using ManagedCommon;
|
|
using Microsoft.PowerToys.Settings.UI.Helpers;
|
|
using Microsoft.PowerToys.Settings.UI.Library.HotkeyConflicts;
|
|
using Microsoft.PowerToys.Settings.UI.OOBE.Enums;
|
|
using Microsoft.PowerToys.Settings.UI.OOBE.ViewModel;
|
|
using Microsoft.PowerToys.Settings.UI.SerializationContext;
|
|
using Microsoft.PowerToys.Settings.UI.Services;
|
|
using Microsoft.PowerToys.Settings.UI.Views;
|
|
using Microsoft.PowerToys.Telemetry;
|
|
using Microsoft.UI.Xaml.Controls;
|
|
using Microsoft.UI.Xaml.Navigation;
|
|
|
|
namespace Microsoft.PowerToys.Settings.UI.OOBE.Views
|
|
{
|
|
public sealed partial class OobeWhatsNew : Page, INotifyPropertyChanged
|
|
{
|
|
public OobePowerToysModule ViewModel { get; set; }
|
|
|
|
private AllHotkeyConflictsData _allHotkeyConflictsData = new AllHotkeyConflictsData();
|
|
|
|
public bool ShowDataDiagnosticsInfoBar => GetShowDataDiagnosticsInfoBar();
|
|
|
|
public AllHotkeyConflictsData AllHotkeyConflictsData
|
|
{
|
|
get => _allHotkeyConflictsData;
|
|
set
|
|
{
|
|
if (_allHotkeyConflictsData != value)
|
|
{
|
|
_allHotkeyConflictsData = value;
|
|
OnPropertyChanged(nameof(AllHotkeyConflictsData));
|
|
OnPropertyChanged(nameof(HasConflicts));
|
|
}
|
|
}
|
|
}
|
|
|
|
public bool HasConflicts
|
|
{
|
|
get
|
|
{
|
|
if (AllHotkeyConflictsData == null)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
int count = 0;
|
|
if (AllHotkeyConflictsData.InAppConflicts != null)
|
|
{
|
|
count += AllHotkeyConflictsData.InAppConflicts.Count;
|
|
}
|
|
|
|
if (AllHotkeyConflictsData.SystemConflicts != null)
|
|
{
|
|
count += AllHotkeyConflictsData.SystemConflicts.Count;
|
|
}
|
|
|
|
return count > 0;
|
|
}
|
|
}
|
|
|
|
public event PropertyChangedEventHandler PropertyChanged;
|
|
|
|
/// <summary>
|
|
/// Initializes a new instance of the <see cref="OobeWhatsNew"/> class.
|
|
/// </summary>
|
|
public OobeWhatsNew()
|
|
{
|
|
this.InitializeComponent();
|
|
ViewModel = new OobePowerToysModule(OobeShellPage.OobeShellHandler.Modules[(int)PowerToysModules.WhatsNew]);
|
|
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 bool GetShowDataDiagnosticsInfoBar()
|
|
{
|
|
var isDataDiagnosticsGpoDisallowed = GPOWrapper.GetAllowDataDiagnosticsValue() == GpoRuleConfigured.Disabled;
|
|
|
|
if (isDataDiagnosticsGpoDisallowed)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
bool userActed = DataDiagnosticsSettings.GetUserActionValue();
|
|
|
|
if (userActed)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
bool registryValue = DataDiagnosticsSettings.GetEnabledValue();
|
|
|
|
bool isFirstRunAfterUpdate = (App.Current as Microsoft.PowerToys.Settings.UI.App).ShowScoobe;
|
|
if (isFirstRunAfterUpdate && registryValue == false)
|
|
{
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Regex to remove installer hash sections from the release notes.
|
|
/// </summary>
|
|
private const string RemoveInstallerHashesRegex = @"(\r\n)+## Installer Hashes(\r\n.*)+## Highlights";
|
|
private const string RemoveHotFixInstallerHashesRegex = @"(\r\n)+## Installer Hashes(\r\n.*)+$";
|
|
private const RegexOptions RemoveInstallerHashesRegexOptions = RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.CultureInvariant;
|
|
private bool _loadingReleaseNotes;
|
|
|
|
private static async Task<string> GetReleaseNotesMarkdown()
|
|
{
|
|
string releaseNotesJSON = string.Empty;
|
|
|
|
// Let's use system proxy
|
|
using var proxyClientHandler = new HttpClientHandler
|
|
{
|
|
DefaultProxyCredentials = CredentialCache.DefaultCredentials,
|
|
Proxy = WebRequest.GetSystemWebProxy(),
|
|
PreAuthenticate = true,
|
|
};
|
|
|
|
using var getReleaseInfoClient = new HttpClient(proxyClientHandler);
|
|
|
|
// GitHub APIs require sending an user agent
|
|
// https://docs.github.com/rest/overview/resources-in-the-rest-api#user-agent-required
|
|
getReleaseInfoClient.DefaultRequestHeaders.TryAddWithoutValidation("User-Agent", "PowerToys");
|
|
releaseNotesJSON = await getReleaseInfoClient.GetStringAsync("https://api.github.com/repos/microsoft/PowerToys/releases");
|
|
IList<PowerToysReleaseInfo> releases = JsonSerializer.Deserialize<IList<PowerToysReleaseInfo>>(releaseNotesJSON, SourceGenerationContextContext.Default.IListPowerToysReleaseInfo);
|
|
|
|
// Get the latest releases
|
|
var latestReleases = releases.OrderByDescending(release => release.PublishedDate).Take(5);
|
|
|
|
StringBuilder releaseNotesHtmlBuilder = new StringBuilder(string.Empty);
|
|
|
|
// Regex to remove installer hash sections from the release notes.
|
|
Regex removeHashRegex = new Regex(RemoveInstallerHashesRegex, RemoveInstallerHashesRegexOptions);
|
|
|
|
// Regex to remove installer hash sections from the release notes, since there'll be no Highlights section for hotfix releases.
|
|
Regex removeHotfixHashRegex = new Regex(RemoveHotFixInstallerHashesRegex, RemoveInstallerHashesRegexOptions);
|
|
int counter = 0;
|
|
foreach (var release in latestReleases)
|
|
{
|
|
releaseNotesHtmlBuilder.AppendLine("# " + release.Name);
|
|
var notes = removeHashRegex.Replace(release.ReleaseNotes, "\r\n### Highlights");
|
|
|
|
// Add a unique counter to [github-current-release-work] to distinguish each release,
|
|
// since this variable is used for all latest releases when they are merged.
|
|
notes = notes.Replace("[github-current-release-work]", $"[github-current-release-work{++counter}]");
|
|
notes = removeHotfixHashRegex.Replace(notes, string.Empty);
|
|
releaseNotesHtmlBuilder.AppendLine(notes);
|
|
releaseNotesHtmlBuilder.AppendLine(" ");
|
|
}
|
|
|
|
return releaseNotesHtmlBuilder.ToString();
|
|
}
|
|
|
|
private async Task Reload()
|
|
{
|
|
if (_loadingReleaseNotes)
|
|
{
|
|
return;
|
|
}
|
|
|
|
try
|
|
{
|
|
_loadingReleaseNotes = true;
|
|
ReleaseNotesMarkdown.Visibility = Microsoft.UI.Xaml.Visibility.Collapsed;
|
|
LoadingProgressRing.Visibility = Microsoft.UI.Xaml.Visibility.Visible;
|
|
string releaseNotesMarkdown = await GetReleaseNotesMarkdown();
|
|
ProxyWarningInfoBar.IsOpen = false;
|
|
ErrorInfoBar.IsOpen = false;
|
|
|
|
ReleaseNotesMarkdown.Text = releaseNotesMarkdown;
|
|
ReleaseNotesMarkdown.Visibility = Microsoft.UI.Xaml.Visibility.Visible;
|
|
LoadingProgressRing.Visibility = Microsoft.UI.Xaml.Visibility.Collapsed;
|
|
}
|
|
catch (HttpRequestException httpEx)
|
|
{
|
|
Logger.LogError("Exception when loading the release notes", httpEx);
|
|
if (httpEx.Message.Contains("407", StringComparison.CurrentCulture))
|
|
{
|
|
ProxyWarningInfoBar.IsOpen = true;
|
|
}
|
|
else
|
|
{
|
|
ErrorInfoBar.IsOpen = true;
|
|
}
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
Logger.LogError("Exception when loading the release notes", ex);
|
|
ErrorInfoBar.IsOpen = true;
|
|
}
|
|
finally
|
|
{
|
|
LoadingProgressRing.Visibility = Microsoft.UI.Xaml.Visibility.Collapsed;
|
|
_loadingReleaseNotes = false;
|
|
}
|
|
}
|
|
|
|
private async void Page_Loaded(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
|
|
{
|
|
await Reload();
|
|
}
|
|
|
|
/// <inheritdoc/>
|
|
protected override void OnNavigatedTo(NavigationEventArgs e)
|
|
{
|
|
ViewModel.LogOpeningModuleEvent();
|
|
}
|
|
|
|
/// <inheritdoc/>
|
|
protected override void OnNavigatedFrom(NavigationEventArgs e)
|
|
{
|
|
ViewModel.LogClosingModuleEvent();
|
|
|
|
// Unsubscribe from conflict updates when leaving the page
|
|
if (GlobalHotkeyConflictManager.Instance != null)
|
|
{
|
|
GlobalHotkeyConflictManager.Instance.ConflictsUpdated -= OnConflictsUpdated;
|
|
}
|
|
}
|
|
|
|
private void ReleaseNotesMarkdown_LinkClicked(object sender, LinkClickedEventArgs e)
|
|
{
|
|
if (Uri.TryCreate(e.Link, UriKind.Absolute, out Uri link))
|
|
{
|
|
this.DispatcherQueue.TryEnqueue(Microsoft.UI.Dispatching.DispatcherQueuePriority.Normal, () =>
|
|
{
|
|
Process.Start(new ProcessStartInfo(link.ToString()) { UseShellExecute = true });
|
|
});
|
|
}
|
|
}
|
|
|
|
private void DataDiagnostics_InfoBar_YesNo_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
|
|
{
|
|
string commandArg = string.Empty;
|
|
if (sender is Button senderBtn)
|
|
{
|
|
commandArg = senderBtn.CommandParameter.ToString();
|
|
}
|
|
else if (sender is HyperlinkButton senderLink)
|
|
{
|
|
commandArg = senderLink.CommandParameter.ToString();
|
|
}
|
|
|
|
if (string.IsNullOrEmpty(commandArg))
|
|
{
|
|
return;
|
|
}
|
|
|
|
// Update UI
|
|
if (commandArg == "Yes")
|
|
{
|
|
WhatsNewDataDiagnosticsInfoBar.Header = ResourceLoaderInstance.ResourceLoader.GetString("Oobe_WhatsNew_DataDiagnostics_Yes_Click_InfoBar_Title");
|
|
}
|
|
else
|
|
{
|
|
WhatsNewDataDiagnosticsInfoBar.Header = ResourceLoaderInstance.ResourceLoader.GetString("Oobe_WhatsNew_DataDiagnostics_No_Click_InfoBar_Title");
|
|
}
|
|
|
|
WhatsNewDataDiagnosticsInfoBarDescText.Visibility = Microsoft.UI.Xaml.Visibility.Collapsed;
|
|
WhatsNewDataDiagnosticsInfoBarDescTextYesClicked.Visibility = Microsoft.UI.Xaml.Visibility.Visible;
|
|
DataDiagnosticsButtonYes.Visibility = Microsoft.UI.Xaml.Visibility.Collapsed;
|
|
DataDiagnosticsButtonNo.Visibility = Microsoft.UI.Xaml.Visibility.Collapsed;
|
|
|
|
// Set Data Diagnostics registry values
|
|
if (commandArg == "Yes")
|
|
{
|
|
DataDiagnosticsSettings.SetEnabledValue(true);
|
|
}
|
|
else
|
|
{
|
|
DataDiagnosticsSettings.SetEnabledValue(false);
|
|
}
|
|
|
|
DataDiagnosticsSettings.SetUserActionValue(true);
|
|
|
|
this.DispatcherQueue.TryEnqueue(Microsoft.UI.Dispatching.DispatcherQueuePriority.Normal, () =>
|
|
{
|
|
ShellPage.ShellHandler?.SignalGeneralDataUpdate();
|
|
});
|
|
}
|
|
|
|
private void DataDiagnostics_InfoBar_Close_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
|
|
{
|
|
WhatsNewDataDiagnosticsInfoBar.Visibility = Microsoft.UI.Xaml.Visibility.Collapsed;
|
|
}
|
|
|
|
private void DataDiagnostics_OpenSettings_Click(Microsoft.UI.Xaml.Documents.Hyperlink sender, Microsoft.UI.Xaml.Documents.HyperlinkClickEventArgs args)
|
|
{
|
|
Common.UI.SettingsDeepLink.OpenSettings(Common.UI.SettingsDeepLink.SettingsWindow.Overview, true);
|
|
}
|
|
|
|
private async void LoadReleaseNotes_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
|
|
{
|
|
await Reload();
|
|
}
|
|
}
|
|
}
|