mirror of
https://github.com/microsoft/PowerToys.git
synced 2026-04-03 09:46:54 +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 Boosting productivity #2x. Customer mentioned with Custom Action (Shortcut trigger) "We should not need to do two keyboard actions to finish this awesome AI data transformation, instead, just single shortcut should do copy + advanced paste." This pull request introduces a new feature to the Advanced Paste module that allows users to automatically copy the current selection when triggering a custom action hotkey. The changes include backend logic for sending the copy command, updates to configuration and settings management, and UI additions to expose this option to users. ### Feature Addition: Auto-Copy Selection for Custom Action Hotkeys * Added a new boolean setting, `AutoCopySelectionForCustomActionHotkey`, to both the backend (`dllmain.cpp`, `AdvancedPasteProperties.cs`) and the settings UI, allowing users to enable or disable automatic copying of the current selection when a custom action hotkey is pressed. [[1]](diffhunk://#diff-3866eb99ffe4453e0d03248e11d3560f7f15f4b982e323519d45e282f0fe898dR63) [[2]](diffhunk://#diff-3866eb99ffe4453e0d03248e11d3560f7f15f4b982e323519d45e282f0fe898dR106) [[3]](diffhunk://#diff-7f5d34989db7593fa4969a79cf97f709d210c157343d474650d5df4b9bf18114R31) [[4]](diffhunk://#diff-7f5d34989db7593fa4969a79cf97f709d210c157343d474650d5df4b9bf18114R83-R85) [[5]](diffhunk://#diff-09c575763019d9108b85a2e7b87a3bb6ed23a835970bf511b1a6bbe9a9f53835R174-R178) [[6]](diffhunk://#diff-0f8bf95882c074d687f6c4f2673cf9c8b1a904b117c11f75d0c892d809f3cd42R558-R570) ### Backend Logic and Integration * Implemented the `send_copy_selection()` and `try_send_copy_message()` methods in `dllmain.cpp` to send a WM_COPY message or simulate a Ctrl+C keystroke, ensuring the selected content is copied before executing the custom action. * Integrated the new setting into the hotkey handler logic so that when a custom action hotkey is pressed and the setting is enabled, the copy operation is triggered before running the custom action. ### Configuration and State Management * Updated serialization/deserialization and property synchronization logic to support the new setting, ensuring its value is correctly loaded, saved, and reflected in the UI and runtime behavior. [[1]](diffhunk://#diff-3866eb99ffe4453e0d03248e11d3560f7f15f4b982e323519d45e282f0fe898dR353-R357) [[2]](diffhunk://#diff-0f8bf95882c074d687f6c4f2673cf9c8b1a904b117c11f75d0c892d809f3cd42R1235-R1240) ### UI and Localization * Added a new checkbox to the Advanced Paste settings page in XAML to allow users to toggle the auto-copy feature. * Provided localized strings for the new setting, including header and description, in the resource file for user clarity. ### Refactoring for Hotkey Logic * Refactored hotkey handling code to correctly calculate indices for additional and custom actions, supporting the new auto-copy logic and improving code clarity. [[1]](diffhunk://#diff-3866eb99ffe4453e0d03248e11d3560f7f15f4b982e323519d45e282f0fe898dR918-R936) [[2]](diffhunk://#diff-3866eb99ffe4453e0d03248e11d3560f7f15f4b982e323519d45e282f0fe898dL871) [[3]](diffhunk://#diff-3866eb99ffe4453e0d03248e11d3560f7f15f4b982e323519d45e282f0fe898dL884)
114 lines
3.9 KiB
C#
114 lines
3.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.Collections.Generic;
|
|
using System.Text.Json;
|
|
using System.Text.Json.Serialization;
|
|
|
|
using Settings.UI.Library.Attributes;
|
|
|
|
namespace Microsoft.PowerToys.Settings.UI.Library
|
|
{
|
|
public class AdvancedPasteProperties
|
|
{
|
|
public static readonly HotkeySettings DefaultAdvancedPasteUIShortcut = new HotkeySettings(true, false, false, true, 0x56); // Win+Shift+V
|
|
|
|
public static readonly HotkeySettings DefaultPasteAsPlainTextShortcut = new HotkeySettings(true, true, true, false, 0x56); // Ctrl+Win+Alt+V
|
|
|
|
public AdvancedPasteProperties()
|
|
{
|
|
AdvancedPasteUIShortcut = DefaultAdvancedPasteUIShortcut;
|
|
PasteAsPlainTextShortcut = DefaultPasteAsPlainTextShortcut;
|
|
PasteAsMarkdownShortcut = new();
|
|
PasteAsJsonShortcut = new();
|
|
CustomActions = new();
|
|
AdditionalActions = new();
|
|
IsAIEnabled = false;
|
|
ShowCustomPreview = true;
|
|
CloseAfterLosingFocus = false;
|
|
EnableClipboardPreview = true;
|
|
AutoCopySelectionForCustomActionHotkey = false;
|
|
PasteAIConfiguration = new();
|
|
}
|
|
|
|
[JsonConverter(typeof(BoolPropertyJsonConverter))]
|
|
public bool IsAIEnabled { get; set; }
|
|
|
|
private bool? _legacyAdvancedAIEnabled;
|
|
|
|
[JsonPropertyName("IsAdvancedAIEnabled")]
|
|
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
|
|
public BoolProperty LegacyAdvancedAIEnabledProperty
|
|
{
|
|
get => null;
|
|
set
|
|
{
|
|
if (value is not null)
|
|
{
|
|
LegacyAdvancedAIEnabled = value.Value;
|
|
}
|
|
}
|
|
}
|
|
|
|
[JsonIgnore]
|
|
public bool? LegacyAdvancedAIEnabled
|
|
{
|
|
get => _legacyAdvancedAIEnabled;
|
|
private set => _legacyAdvancedAIEnabled = value;
|
|
}
|
|
|
|
public bool TryConsumeLegacyAdvancedAIEnabled(out bool value)
|
|
{
|
|
if (_legacyAdvancedAIEnabled is bool flag)
|
|
{
|
|
value = flag;
|
|
_legacyAdvancedAIEnabled = null;
|
|
return true;
|
|
}
|
|
|
|
value = default;
|
|
return false;
|
|
}
|
|
|
|
[JsonConverter(typeof(BoolPropertyJsonConverter))]
|
|
public bool ShowCustomPreview { get; set; }
|
|
|
|
[JsonConverter(typeof(BoolPropertyJsonConverter))]
|
|
public bool CloseAfterLosingFocus { get; set; }
|
|
|
|
[JsonConverter(typeof(BoolPropertyJsonConverter))]
|
|
public bool EnableClipboardPreview { get; set; }
|
|
|
|
[JsonConverter(typeof(BoolPropertyJsonConverter))]
|
|
public bool AutoCopySelectionForCustomActionHotkey { get; set; }
|
|
|
|
[JsonPropertyName("advanced-paste-ui-hotkey")]
|
|
public HotkeySettings AdvancedPasteUIShortcut { get; set; }
|
|
|
|
[JsonPropertyName("paste-as-plain-hotkey")]
|
|
public HotkeySettings PasteAsPlainTextShortcut { get; set; }
|
|
|
|
[JsonPropertyName("paste-as-markdown-hotkey")]
|
|
public HotkeySettings PasteAsMarkdownShortcut { get; set; }
|
|
|
|
[JsonPropertyName("paste-as-json-hotkey")]
|
|
public HotkeySettings PasteAsJsonShortcut { get; set; }
|
|
|
|
[JsonPropertyName("custom-actions")]
|
|
[CmdConfigureIgnoreAttribute]
|
|
public AdvancedPasteCustomActions CustomActions { get; set; }
|
|
|
|
[JsonPropertyName("additional-actions")]
|
|
[CmdConfigureIgnoreAttribute]
|
|
public AdvancedPasteAdditionalActions AdditionalActions { get; set; }
|
|
|
|
[JsonPropertyName("paste-ai-configuration")]
|
|
[CmdConfigureIgnoreAttribute]
|
|
public PasteAIConfiguration PasteAIConfiguration { get; set; }
|
|
|
|
public override string ToString()
|
|
=> JsonSerializer.Serialize(this, SettingsSerializationContext.Default.AdvancedPasteProperties);
|
|
}
|
|
}
|