mirror of
https://github.com/microsoft/PowerToys.git
synced 2026-02-24 12:11:09 +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 This pull request refactors how the `ToggleThemeHotkey` property is handled in the LightSwitch settings and view model. The changes simplify property management by directly referencing the property within `LightSwitchProperties` and ensure that the hotkey setting is consistently updated and serialized. **Settings property management:** * In `LightSwitchSettings.Clone()`, the `LightSwitchProperties` object now directly references the existing property instances instead of creating new ones, and also includes the `ToggleThemeHotkey` property. **View model property handling:** * In `LightSwitchViewModel.ToggleThemeActivationShortcut`, the getter and setter now directly access and update `ModuleSettings.Properties.ToggleThemeHotkey.Value`, removing the need for a backing field and ensuring changes are properly serialized and notified. <!-- Please review the items on the PR checklist before submitting--> ## PR Checklist - [x] Closes: #42330 - [ ] **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 --------- Signed-off-by: Shawn Yuan (from Dev Box) <shuaiyuan@microsoft.com>
78 lines
2.8 KiB
C#
78 lines
2.8 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.Reflection;
|
|
using System.Text.Json.Serialization;
|
|
using ManagedCommon;
|
|
using Microsoft.PowerToys.Settings.UI.Library;
|
|
using Microsoft.PowerToys.Settings.UI.Library.Helpers;
|
|
using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
|
|
|
|
namespace Settings.UI.Library
|
|
{
|
|
public class LightSwitchSettings : BasePTModuleSettings, ISettingsConfig, ICloneable, IHotkeyConfig
|
|
{
|
|
public const string ModuleName = "LightSwitch";
|
|
|
|
public LightSwitchSettings()
|
|
{
|
|
Name = ModuleName;
|
|
Version = Assembly.GetExecutingAssembly().GetName().Version.ToString();
|
|
Properties = new LightSwitchProperties();
|
|
}
|
|
|
|
[JsonPropertyName("properties")]
|
|
public LightSwitchProperties Properties { get; set; }
|
|
|
|
public HotkeyAccessor[] GetAllHotkeyAccessors()
|
|
{
|
|
var hotkeyAccessors = new List<HotkeyAccessor>
|
|
{
|
|
new HotkeyAccessor(
|
|
() => Properties.ToggleThemeHotkey.Value,
|
|
value => Properties.ToggleThemeHotkey.Value = value ?? LightSwitchProperties.DefaultToggleThemeHotkey,
|
|
"LightSwitch_ThemeToggle_Shortcut"),
|
|
};
|
|
|
|
return hotkeyAccessors.ToArray();
|
|
}
|
|
|
|
public ModuleType GetModuleType() => ModuleType.LightSwitch;
|
|
|
|
public object Clone()
|
|
{
|
|
return new LightSwitchSettings()
|
|
{
|
|
Name = Name,
|
|
Version = Version,
|
|
Properties = new LightSwitchProperties()
|
|
{
|
|
ChangeSystem = new BoolProperty(Properties.ChangeSystem.Value),
|
|
ChangeApps = new BoolProperty(Properties.ChangeApps.Value),
|
|
ScheduleMode = new StringProperty(Properties.ScheduleMode.Value),
|
|
LightTime = new IntProperty((int)Properties.LightTime.Value),
|
|
DarkTime = new IntProperty((int)Properties.DarkTime.Value),
|
|
SunriseOffset = new IntProperty((int)Properties.SunriseOffset.Value),
|
|
SunsetOffset = new IntProperty((int)Properties.SunsetOffset.Value),
|
|
Latitude = new StringProperty(Properties.Latitude.Value),
|
|
Longitude = new StringProperty(Properties.Longitude.Value),
|
|
ToggleThemeHotkey = new KeyboardKeysProperty(Properties.ToggleThemeHotkey.Value),
|
|
},
|
|
};
|
|
}
|
|
|
|
public string GetModuleName()
|
|
{
|
|
return Name;
|
|
}
|
|
|
|
public bool UpgradeSettingsConfiguration()
|
|
{
|
|
return false;
|
|
}
|
|
}
|
|
}
|