mirror of
https://github.com/microsoft/PowerToys.git
synced 2025-12-18 20:49:46 +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>
292 lines
9.3 KiB
C#
292 lines
9.3 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.Globalization;
|
|
using System.Runtime.CompilerServices;
|
|
using System.Text.Json;
|
|
using global::PowerToys.GPOWrapper;
|
|
using Microsoft.PowerToys.Settings.UI.Helpers;
|
|
using Microsoft.PowerToys.Settings.UI.Library;
|
|
using Microsoft.PowerToys.Settings.UI.Library.Helpers;
|
|
using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
|
|
using Microsoft.PowerToys.Settings.UI.SerializationContext;
|
|
|
|
namespace Microsoft.PowerToys.Settings.UI.ViewModels
|
|
{
|
|
public partial class ShortcutGuideViewModel : PageViewModelBase
|
|
{
|
|
protected override string ModuleName => ShortcutGuideSettings.ModuleName;
|
|
|
|
private ISettingsUtils SettingsUtils { get; set; }
|
|
|
|
private GeneralSettings GeneralSettingsConfig { get; set; }
|
|
|
|
private ShortcutGuideSettings Settings { get; set; }
|
|
|
|
private Func<string, int> SendConfigMSG { get; }
|
|
|
|
private string _settingsConfigFileFolder = string.Empty;
|
|
private string _disabledApps;
|
|
|
|
public ShortcutGuideViewModel(ISettingsUtils settingsUtils, ISettingsRepository<GeneralSettings> settingsRepository, ISettingsRepository<ShortcutGuideSettings> moduleSettingsRepository, Func<string, int> ipcMSGCallBackFunc, string configFileSubfolder = "")
|
|
{
|
|
SettingsUtils = settingsUtils;
|
|
|
|
// Update Settings file folder:
|
|
_settingsConfigFileFolder = configFileSubfolder;
|
|
|
|
// To obtain the general PowerToys settings.
|
|
ArgumentNullException.ThrowIfNull(settingsRepository);
|
|
|
|
GeneralSettingsConfig = settingsRepository.SettingsConfig;
|
|
|
|
// To obtain the shortcut guide settings, if the file exists.
|
|
// If not, to create a file with the default settings and to return the default configurations.
|
|
ArgumentNullException.ThrowIfNull(moduleSettingsRepository);
|
|
|
|
Settings = moduleSettingsRepository.SettingsConfig;
|
|
|
|
// set the callback functions value to handle outgoing IPC message.
|
|
SendConfigMSG = ipcMSGCallBackFunc;
|
|
|
|
InitializeEnabledValue();
|
|
|
|
_useLegacyPressWinKeyBehavior = Settings.Properties.UseLegacyPressWinKeyBehavior.Value;
|
|
_pressTimeForGlobalWindowsShortcuts = Settings.Properties.PressTimeForGlobalWindowsShortcuts.Value;
|
|
_pressTimeForTaskbarIconShortcuts = Settings.Properties.PressTimeForTaskbarIconShortcuts.Value;
|
|
_opacity = Settings.Properties.OverlayOpacity.Value;
|
|
_disabledApps = Settings.Properties.DisabledApps.Value;
|
|
|
|
switch (Settings.Properties.Theme.Value)
|
|
{
|
|
case "dark": _themeIndex = 0; break;
|
|
case "light": _themeIndex = 1; break;
|
|
case "system": _themeIndex = 2; break;
|
|
}
|
|
}
|
|
|
|
private void InitializeEnabledValue()
|
|
{
|
|
_enabledGpoRuleConfiguration = GPOWrapper.GetConfiguredShortcutGuideEnabledValue();
|
|
if (_enabledGpoRuleConfiguration == GpoRuleConfigured.Disabled || _enabledGpoRuleConfiguration == GpoRuleConfigured.Enabled)
|
|
{
|
|
// Get the enabled state from GPO.
|
|
_enabledStateIsGPOConfigured = true;
|
|
_isEnabled = _enabledGpoRuleConfiguration == GpoRuleConfigured.Enabled;
|
|
}
|
|
else
|
|
{
|
|
_isEnabled = GeneralSettingsConfig.Enabled.ShortcutGuide;
|
|
}
|
|
}
|
|
|
|
public override Dictionary<string, HotkeySettings[]> GetAllHotkeySettings()
|
|
{
|
|
var hotkeysDict = new Dictionary<string, HotkeySettings[]>
|
|
{
|
|
[ModuleName] = [OpenShortcutGuide],
|
|
};
|
|
|
|
return hotkeysDict;
|
|
}
|
|
|
|
private GpoRuleConfigured _enabledGpoRuleConfiguration;
|
|
private bool _enabledStateIsGPOConfigured;
|
|
private bool _isEnabled;
|
|
private int _themeIndex;
|
|
private bool _useLegacyPressWinKeyBehavior;
|
|
private int _pressTimeForGlobalWindowsShortcuts;
|
|
private int _pressTimeForTaskbarIconShortcuts;
|
|
private int _opacity;
|
|
|
|
public bool IsEnabled
|
|
{
|
|
get
|
|
{
|
|
return _isEnabled;
|
|
}
|
|
|
|
set
|
|
{
|
|
if (_enabledStateIsGPOConfigured)
|
|
{
|
|
// If it's GPO configured, shouldn't be able to change this state.
|
|
return;
|
|
}
|
|
|
|
if (value != _isEnabled)
|
|
{
|
|
_isEnabled = value;
|
|
|
|
// To update the status of shortcut guide in General PowerToy settings.
|
|
GeneralSettingsConfig.Enabled.ShortcutGuide = value;
|
|
OutGoingGeneralSettings snd = new OutGoingGeneralSettings(GeneralSettingsConfig);
|
|
|
|
SendConfigMSG(snd.ToString());
|
|
OnPropertyChanged(nameof(IsEnabled));
|
|
}
|
|
}
|
|
}
|
|
|
|
public bool IsEnabledGpoConfigured
|
|
{
|
|
get => _enabledStateIsGPOConfigured;
|
|
}
|
|
|
|
public HotkeySettings OpenShortcutGuide
|
|
{
|
|
get
|
|
{
|
|
return Settings.Properties.OpenShortcutGuide;
|
|
}
|
|
|
|
set
|
|
{
|
|
if (Settings.Properties.OpenShortcutGuide != value)
|
|
{
|
|
Settings.Properties.OpenShortcutGuide = value ?? Settings.Properties.DefaultOpenShortcutGuide;
|
|
NotifyPropertyChanged();
|
|
}
|
|
}
|
|
}
|
|
|
|
public int ThemeIndex
|
|
{
|
|
get
|
|
{
|
|
return _themeIndex;
|
|
}
|
|
|
|
set
|
|
{
|
|
if (_themeIndex != value)
|
|
{
|
|
switch (value)
|
|
{
|
|
case 0: Settings.Properties.Theme.Value = "dark"; break;
|
|
case 1: Settings.Properties.Theme.Value = "light"; break;
|
|
case 2: Settings.Properties.Theme.Value = "system"; break;
|
|
}
|
|
|
|
_themeIndex = value;
|
|
NotifyPropertyChanged();
|
|
}
|
|
}
|
|
}
|
|
|
|
public int OverlayOpacity
|
|
{
|
|
get
|
|
{
|
|
return _opacity;
|
|
}
|
|
|
|
set
|
|
{
|
|
if (_opacity != value)
|
|
{
|
|
_opacity = value;
|
|
Settings.Properties.OverlayOpacity.Value = value;
|
|
NotifyPropertyChanged();
|
|
}
|
|
}
|
|
}
|
|
|
|
public bool UseLegacyPressWinKeyBehavior
|
|
{
|
|
get
|
|
{
|
|
return _useLegacyPressWinKeyBehavior;
|
|
}
|
|
|
|
set
|
|
{
|
|
if (_useLegacyPressWinKeyBehavior != value)
|
|
{
|
|
_useLegacyPressWinKeyBehavior = value;
|
|
Settings.Properties.UseLegacyPressWinKeyBehavior.Value = value;
|
|
NotifyPropertyChanged();
|
|
}
|
|
}
|
|
}
|
|
|
|
public int PressTime
|
|
{
|
|
get
|
|
{
|
|
return _pressTimeForGlobalWindowsShortcuts;
|
|
}
|
|
|
|
set
|
|
{
|
|
if (_pressTimeForGlobalWindowsShortcuts != value)
|
|
{
|
|
_pressTimeForGlobalWindowsShortcuts = value;
|
|
Settings.Properties.PressTimeForGlobalWindowsShortcuts.Value = value;
|
|
NotifyPropertyChanged();
|
|
}
|
|
}
|
|
}
|
|
|
|
public int DelayTime
|
|
{
|
|
get
|
|
{
|
|
return _pressTimeForTaskbarIconShortcuts;
|
|
}
|
|
|
|
set
|
|
{
|
|
if (_pressTimeForTaskbarIconShortcuts != value)
|
|
{
|
|
_pressTimeForTaskbarIconShortcuts = value;
|
|
Settings.Properties.PressTimeForTaskbarIconShortcuts.Value = value;
|
|
NotifyPropertyChanged();
|
|
}
|
|
}
|
|
}
|
|
|
|
public string DisabledApps
|
|
{
|
|
get
|
|
{
|
|
return _disabledApps;
|
|
}
|
|
|
|
set
|
|
{
|
|
if (value != _disabledApps)
|
|
{
|
|
_disabledApps = value;
|
|
Settings.Properties.DisabledApps.Value = value;
|
|
NotifyPropertyChanged();
|
|
}
|
|
}
|
|
}
|
|
|
|
public string GetSettingsSubPath()
|
|
{
|
|
return _settingsConfigFileFolder + "\\" + ModuleName;
|
|
}
|
|
|
|
public void NotifyPropertyChanged([CallerMemberName] string propertyName = null)
|
|
{
|
|
OnPropertyChanged(propertyName);
|
|
|
|
SndShortcutGuideSettings outsettings = new SndShortcutGuideSettings(Settings);
|
|
SndModuleSettings<SndShortcutGuideSettings> ipcMessage = new SndModuleSettings<SndShortcutGuideSettings>(outsettings);
|
|
SendConfigMSG(ipcMessage.ToJsonString());
|
|
SettingsUtils.SaveSettings(Settings.ToJsonString(), ModuleName);
|
|
}
|
|
|
|
public void RefreshEnabledState()
|
|
{
|
|
InitializeEnabledValue();
|
|
OnPropertyChanged(nameof(IsEnabled));
|
|
}
|
|
}
|
|
}
|