mirror of
https://github.com/microsoft/PowerToys.git
synced 2026-04-05 10:46:33 +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>
140 lines
5.9 KiB
C#
140 lines
5.9 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.Text.Json;
|
|
using System.Text.Json.Serialization;
|
|
using ManagedCommon;
|
|
using Microsoft.PowerToys.Settings.UI.Library.Helpers;
|
|
using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
|
|
using MouseJump.Common.Helpers;
|
|
using MouseJump.Common.Models.Settings;
|
|
|
|
namespace Microsoft.PowerToys.Settings.UI.Library
|
|
{
|
|
public class MouseJumpSettings : BasePTModuleSettings, ISettingsConfig, IHotkeyConfig
|
|
{
|
|
public const string ModuleName = "MouseJump";
|
|
|
|
private static readonly JsonSerializerOptions _serializerOptions = new JsonSerializerOptions
|
|
{
|
|
WriteIndented = true,
|
|
};
|
|
|
|
[JsonPropertyName("properties")]
|
|
public MouseJumpProperties Properties { get; set; }
|
|
|
|
public MouseJumpSettings()
|
|
{
|
|
Name = ModuleName;
|
|
Properties = new MouseJumpProperties();
|
|
Version = "1.1";
|
|
}
|
|
|
|
public void Save(ISettingsUtils settingsUtils)
|
|
{
|
|
// Save settings to file
|
|
var options = _serializerOptions;
|
|
|
|
ArgumentNullException.ThrowIfNull(settingsUtils);
|
|
|
|
settingsUtils.SaveSettings(JsonSerializer.Serialize(this, options), ModuleName);
|
|
}
|
|
|
|
public string GetModuleName()
|
|
{
|
|
return Name;
|
|
}
|
|
|
|
public ModuleType GetModuleType() => ModuleType.MouseJump;
|
|
|
|
public HotkeyAccessor[] GetAllHotkeyAccessors()
|
|
{
|
|
var hotkeyAccessors = new List<HotkeyAccessor>
|
|
{
|
|
new HotkeyAccessor(
|
|
() => Properties.ActivationShortcut,
|
|
value => Properties.ActivationShortcut = value ?? Properties.DefaultActivationShortcut,
|
|
"MouseUtils_MouseJump_ActivationShortcut"),
|
|
};
|
|
|
|
return hotkeyAccessors.ToArray();
|
|
}
|
|
|
|
// This can be utilized in the future if the settings.json file is to be modified/deleted.
|
|
public bool UpgradeSettingsConfiguration()
|
|
{
|
|
/*
|
|
v1.0 - initial version
|
|
|
|
* DefaultActivationShortcut
|
|
* activation_shortcut
|
|
* thumbnail_size
|
|
* name
|
|
* version
|
|
*/
|
|
var upgraded = false;
|
|
|
|
if (this.Version == "1.0")
|
|
{
|
|
/*
|
|
v1.1 - added preview style settings
|
|
|
|
* preview_type
|
|
* background_color_1
|
|
* background_color_2
|
|
* border_thickness
|
|
* border_color
|
|
* border_3d_depth
|
|
* border_padding
|
|
* bezel_thickness
|
|
* bezel_color
|
|
* bezel_3d_depth
|
|
* screen_margin
|
|
* screen_color_1
|
|
* screen_color_2
|
|
*/
|
|
this.Version = "1.1";
|
|
|
|
// note - there's an issue where ITwoWayPipeMessageIPCManagedMethods.Send overwrites
|
|
// the settings file version as "1.0" regardless of the actual version. as a result,
|
|
// the UpgradeSettingsConfiguration can get triggered even if the config has already
|
|
// been upgraded, so we need to do an additional check to make sure values haven't
|
|
// already been upgraded before we overwrite them with default values.
|
|
if (string.IsNullOrEmpty(this.Properties.PreviewType))
|
|
{
|
|
// set default values for custom preview style
|
|
var previewStyle = StyleHelper.BezelledPreviewStyle;
|
|
this.Properties.PreviewType = PreviewType.Bezelled.ToString();
|
|
this.Properties.BackgroundColor1 = ConfigHelper.SerializeToConfigColorString(
|
|
ConfigHelper.ToUnnamedColor(previewStyle.CanvasStyle.BackgroundStyle.Color1));
|
|
this.Properties.BackgroundColor2 = ConfigHelper.SerializeToConfigColorString(
|
|
ConfigHelper.ToUnnamedColor(previewStyle.CanvasStyle.BackgroundStyle.Color2));
|
|
this.Properties.BorderThickness = (int)previewStyle.CanvasStyle.BorderStyle.Top;
|
|
this.Properties.BorderColor = ConfigHelper.SerializeToConfigColorString(
|
|
ConfigHelper.ToUnnamedColor(previewStyle.CanvasStyle.BorderStyle.Color));
|
|
this.Properties.Border3dDepth = (int)previewStyle.CanvasStyle.BorderStyle.Depth;
|
|
this.Properties.BorderPadding = (int)previewStyle.CanvasStyle.PaddingStyle.Top;
|
|
this.Properties.BezelThickness = (int)previewStyle.ScreenStyle.BorderStyle.Top;
|
|
this.Properties.BezelColor = ConfigHelper.SerializeToConfigColorString(
|
|
ConfigHelper.ToUnnamedColor(previewStyle.ScreenStyle.BorderStyle.Color));
|
|
this.Properties.Bezel3dDepth = (int)previewStyle.ScreenStyle.BorderStyle.Depth;
|
|
this.Properties.ScreenMargin = (int)previewStyle.ScreenStyle.MarginStyle.Top;
|
|
this.Properties.ScreenColor1 = ConfigHelper.SerializeToConfigColorString(
|
|
ConfigHelper.ToUnnamedColor(previewStyle.ScreenStyle.BackgroundStyle.Color1));
|
|
this.Properties.ScreenColor2 = ConfigHelper.SerializeToConfigColorString(
|
|
ConfigHelper.ToUnnamedColor(previewStyle.ScreenStyle.BackgroundStyle.Color2));
|
|
}
|
|
|
|
// we still need to flag the settings as "upgraded" so that the new version gets written
|
|
// back to the config file, even if we didn't actually change and setting values
|
|
upgraded = true;
|
|
}
|
|
|
|
return upgraded;
|
|
}
|
|
}
|
|
}
|