mirror of
https://github.com/microsoft/PowerToys.git
synced 2026-02-24 04:00:02 +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 Key Changes: 1. Settings.UI.Library: - Added SettingsSerializationContext.cs with comprehensive JsonSerializable attributes for all settings types - Updated BasePTModuleSettings.ToJsonString() to use AOT-compatible serialization - Updated SettingsUtils.GetFile<T>() to use AOT-compatible deserialization - Modified all ToString() methods in Properties classes to use SettingsSerializationContext - Converted struct fields to properties in SunTimes and MouseWithoutBordersProperties for serialization compatibility 2. Settings.UI: - Fixed namespace alias in SourceGenerationContextContext.cs to avoid conflicts For any future developers who discover incorrect settings resolution, please follow up my changes to add your setting type into JsonSerilizerContext. <!-- Please review the items on the PR checklist before submitting--> ## PR Checklist - [ ] Closes: #xxx - [ ] **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 - [ ] **Localization:** All end-user-facing strings can be localized - [ ] **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) - [ ] **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: #xxx <!-- 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 Co-authored-by: Yu Leng <yuleng@microsoft.com>
216 lines
7.9 KiB
C#
216 lines
7.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.Linq;
|
|
using System.Text.Json.Serialization;
|
|
|
|
using Settings.UI.Library.Attributes;
|
|
|
|
namespace Microsoft.PowerToys.Settings.UI.Library
|
|
{
|
|
#pragma warning disable SA1649 // File name should match first type name
|
|
public struct ConnectionRequest
|
|
#pragma warning restore SA1649 // File name should match first type name
|
|
{
|
|
public string PCName { get; set; }
|
|
|
|
public string SecurityKey { get; set; }
|
|
}
|
|
|
|
public struct NewKeyGenerationRequest
|
|
{
|
|
}
|
|
|
|
public class MouseWithoutBordersProperties : ICloneable
|
|
{
|
|
[CmdConfigureIgnore]
|
|
public static HotkeySettings DefaultHotKeySwitch2AllPC => new HotkeySettings();
|
|
|
|
[CmdConfigureIgnore]
|
|
public static HotkeySettings DefaultHotKeyLockMachine => new HotkeySettings(true, true, true, false, 0x4C);
|
|
|
|
[CmdConfigureIgnore]
|
|
public static HotkeySettings DefaultHotKeyReconnect => new HotkeySettings(true, true, true, false, 0x52);
|
|
|
|
[CmdConfigureIgnore]
|
|
public static HotkeySettings DefaultHotKeyToggleEasyMouse => new HotkeySettings(true, true, true, false, 0x45);
|
|
|
|
[CmdConfigureIgnore]
|
|
public StringProperty SecurityKey { get; set; }
|
|
|
|
[CmdConfigureIgnore]
|
|
[JsonConverter(typeof(BoolPropertyJsonConverter))]
|
|
public bool UseService { get; set; }
|
|
|
|
[JsonConverter(typeof(BoolPropertyJsonConverter))]
|
|
public bool ShowOriginalUI { get; set; }
|
|
|
|
[JsonConverter(typeof(BoolPropertyJsonConverter))]
|
|
public bool WrapMouse { get; set; }
|
|
|
|
[JsonConverter(typeof(BoolPropertyJsonConverter))]
|
|
public bool ShareClipboard { get; set; }
|
|
|
|
[JsonConverter(typeof(BoolPropertyJsonConverter))]
|
|
public bool TransferFile { get; set; }
|
|
|
|
[JsonConverter(typeof(BoolPropertyJsonConverter))]
|
|
public bool HideMouseAtScreenEdge { get; set; }
|
|
|
|
[JsonConverter(typeof(BoolPropertyJsonConverter))]
|
|
public bool DrawMouseCursor { get; set; }
|
|
|
|
[JsonConverter(typeof(BoolPropertyJsonConverter))]
|
|
public bool ValidateRemoteMachineIP { get; set; }
|
|
|
|
[JsonConverter(typeof(BoolPropertyJsonConverter))]
|
|
public bool SameSubnetOnly { get; set; }
|
|
|
|
[JsonConverter(typeof(BoolPropertyJsonConverter))]
|
|
public bool BlockScreenSaverOnOtherMachines { get; set; }
|
|
|
|
[JsonConverter(typeof(BoolPropertyJsonConverter))]
|
|
public bool MoveMouseRelatively { get; set; }
|
|
|
|
[JsonConverter(typeof(BoolPropertyJsonConverter))]
|
|
public bool BlockMouseAtScreenCorners { get; set; }
|
|
|
|
[JsonConverter(typeof(BoolPropertyJsonConverter))]
|
|
public bool ShowClipboardAndNetworkStatusMessages { get; set; }
|
|
|
|
[CmdConfigureIgnoreAttribute]
|
|
public List<string> MachineMatrixString { get; set; }
|
|
|
|
[CmdConfigureIgnoreAttribute]
|
|
public StringProperty MachinePool { get; set; }
|
|
|
|
[JsonConverter(typeof(BoolPropertyJsonConverter))]
|
|
[CmdConfigureIgnoreAttribute]
|
|
public bool MatrixOneRow { get; set; }
|
|
|
|
public IntProperty EasyMouse { get; set; }
|
|
|
|
[JsonConverter(typeof(BoolPropertyJsonConverter))]
|
|
public bool DisableEasyMouseWhenForegroundWindowIsFullscreen { get; set; }
|
|
|
|
// Apps that are to be excluded when using DisableEasyMouseWhenForegroundWindowIsFullscreen
|
|
// meaning that it is possible to switch screen when these apps are running in fullscreen.
|
|
[CmdConfigureIgnore]
|
|
public GenericProperty<HashSet<string>> EasyMouseFullscreenSwitchBlockExcludedApps { get; set; }
|
|
|
|
[CmdConfigureIgnore]
|
|
public IntProperty MachineID { get; set; }
|
|
|
|
[CmdConfigureIgnoreAttribute]
|
|
public IntProperty LastX { get; set; }
|
|
|
|
[CmdConfigureIgnoreAttribute]
|
|
public IntProperty LastY { get; set; }
|
|
|
|
[CmdConfigureIgnoreAttribute]
|
|
public IntProperty PackageID { get; set; }
|
|
|
|
[JsonConverter(typeof(BoolPropertyJsonConverter))]
|
|
[CmdConfigureIgnoreAttribute]
|
|
public bool FirstRun { get; set; }
|
|
|
|
public IntProperty HotKeySwitchMachine { get; set; }
|
|
|
|
[ObsoleteAttribute("Use ToggleEasyMouseShortcut instead", false)]
|
|
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
|
|
[CmdConfigureIgnoreAttribute]
|
|
public IntProperty HotKeyToggleEasyMouse { get; set; }
|
|
|
|
[ObsoleteAttribute("Use LockMachineShortcut instead", false)]
|
|
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
|
|
[CmdConfigureIgnoreAttribute]
|
|
public IntProperty HotKeyLockMachine { get; set; }
|
|
|
|
[ObsoleteAttribute("Use ReconnectShortcut instead", false)]
|
|
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
|
|
[CmdConfigureIgnoreAttribute]
|
|
public IntProperty HotKeyReconnect { get; set; }
|
|
|
|
[ObsoleteAttribute("Use Switch2AllPCShortcut instead", false)]
|
|
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
|
|
[CmdConfigureIgnoreAttribute]
|
|
public IntProperty HotKeySwitch2AllPC { get; set; }
|
|
|
|
public HotkeySettings ToggleEasyMouseShortcut { get; set; }
|
|
|
|
public HotkeySettings LockMachineShortcut { get; set; }
|
|
|
|
public HotkeySettings ReconnectShortcut { get; set; }
|
|
|
|
public HotkeySettings Switch2AllPCShortcut { get; set; }
|
|
|
|
[CmdConfigureIgnoreAttribute]
|
|
public IntProperty TCPPort { get; set; }
|
|
|
|
[JsonConverter(typeof(BoolPropertyJsonConverter))]
|
|
public bool DrawMouseEx { get; set; }
|
|
|
|
public StringProperty Name2IP { get; set; }
|
|
|
|
[JsonConverter(typeof(BoolPropertyJsonConverter))]
|
|
[CmdConfigureIgnoreAttribute]
|
|
public bool FirstCtrlShiftS { get; set; }
|
|
|
|
[CmdConfigureIgnoreAttribute]
|
|
public StringProperty DeviceID { get; set; }
|
|
|
|
public MouseWithoutBordersProperties()
|
|
{
|
|
SecurityKey = new StringProperty(string.Empty);
|
|
WrapMouse = true;
|
|
ShareClipboard = true;
|
|
TransferFile = true;
|
|
HideMouseAtScreenEdge = true;
|
|
DrawMouseCursor = true;
|
|
ValidateRemoteMachineIP = false;
|
|
SameSubnetOnly = false;
|
|
BlockScreenSaverOnOtherMachines = true;
|
|
MoveMouseRelatively = false;
|
|
BlockMouseAtScreenCorners = false;
|
|
ShowClipboardAndNetworkStatusMessages = false;
|
|
EasyMouse = new IntProperty(1);
|
|
MachineMatrixString = new List<string>();
|
|
DeviceID = new StringProperty(string.Empty);
|
|
ShowOriginalUI = false;
|
|
UseService = false;
|
|
|
|
DisableEasyMouseWhenForegroundWindowIsFullscreen = true;
|
|
EasyMouseFullscreenSwitchBlockExcludedApps = new GenericProperty<HashSet<string>>(new HashSet<string>(StringComparer.OrdinalIgnoreCase));
|
|
|
|
HotKeySwitchMachine = new IntProperty(0x70); // VK.F1
|
|
ToggleEasyMouseShortcut = DefaultHotKeyToggleEasyMouse;
|
|
LockMachineShortcut = DefaultHotKeyLockMachine;
|
|
ReconnectShortcut = DefaultHotKeyReconnect;
|
|
Switch2AllPCShortcut = DefaultHotKeySwitch2AllPC;
|
|
|
|
// These are internal, i.e. cannot be edited directly from UI
|
|
MachinePool = ":,:,:,:";
|
|
MatrixOneRow = true;
|
|
MachineID = new IntProperty(0);
|
|
LastX = new IntProperty(0);
|
|
LastY = new IntProperty(0);
|
|
PackageID = new IntProperty(0);
|
|
FirstRun = false;
|
|
TCPPort = new IntProperty(15100);
|
|
DrawMouseEx = true;
|
|
Name2IP = new StringProperty(string.Empty);
|
|
FirstCtrlShiftS = false;
|
|
}
|
|
|
|
public object Clone()
|
|
{
|
|
var clone = new MouseWithoutBordersProperties();
|
|
clone = this;
|
|
return clone;
|
|
}
|
|
}
|
|
}
|